diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-11-07 19:00:57 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-11-07 19:00:57 +0200 |
commit | 188986fac37aa0c12b645283dbe12cabb6cf6822 (patch) | |
tree | eca4e25aec5718f6647187ba999c79f94874acd1 /interpreter.py | |
parent | d73af2558ab5ad8d3a3f09499e55a77c96dc2248 (diff) | |
download | meson-188986fac37aa0c12b645283dbe12cabb6cf6822.zip meson-188986fac37aa0c12b645283dbe12cabb6cf6822.tar.gz meson-188986fac37aa0c12b645283dbe12cabb6cf6822.tar.bz2 |
Harmonise held_object usage somewhat.
Diffstat (limited to 'interpreter.py')
-rw-r--r-- | interpreter.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/interpreter.py b/interpreter.py index fd1507a..b1616fb 100644 --- a/interpreter.py +++ b/interpreter.py @@ -170,47 +170,47 @@ class ConfigurationDataHolder(InterpreterObject): class ExternalProgramHolder(InterpreterObject): def __init__(self, ep): InterpreterObject.__init__(self) - self.ep = ep + self.held_object = ep self.methods.update({'found': self.found_method}) def found_method(self, args, kwargs): return self.found() def found(self): - return self.ep.found() + return self.held_object.found() def get_command(self): - return self.ep.fullpath + return self.held_object.fullpath def get_name(self): - return self.ep.name + return self.held_object.name class ExternalLibraryHolder(InterpreterObject): def __init__(self, el): InterpreterObject.__init__(self) - self.el = el + self.held_object = el self.methods.update({'found': self.found_method}) def found(self): - return self.el.found() + return self.held_object.found() def found_method(self, args, kwargs): return self.found() def get_filename(self): - return self.el.fullpath + return self.held_object.fullpath def get_name(self): - return self.el.name + return self.held_object.name def get_compile_args(self): - return self.el.get_compile_args() + return self.held_object.get_compile_args() def get_link_args(self): - return self.el.get_link_args() + return self.held_object.get_link_args() def get_exe_args(self): - return self.el.get_exe_args() + return self.held_object.get_exe_args() class GeneratorHolder(InterpreterObject): def __init__(self, interpreter, args, kwargs): |