diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-16 23:44:32 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-16 23:44:32 +0200 |
commit | 163a31beef2488ce4ce470daaa4d28b83e5fc2e4 (patch) | |
tree | d58d16001c16763f878b9a224845361126016d2a /interpreter.py | |
parent | 967f0110a5c0e05a8a0372843516664e4f2f9d5f (diff) | |
download | meson-163a31beef2488ce4ce470daaa4d28b83e5fc2e4.zip meson-163a31beef2488ce4ce470daaa4d28b83e5fc2e4.tar.gz meson-163a31beef2488ce4ce470daaa4d28b83e5fc2e4.tar.bz2 |
Method calls work now.
Diffstat (limited to 'interpreter.py')
-rw-r--r-- | interpreter.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/interpreter.py b/interpreter.py index d4bd29e..8c7695e 100644 --- a/interpreter.py +++ b/interpreter.py @@ -1054,7 +1054,7 @@ class Interpreter(): code = open(absname).read() assert(isinstance(code, str)) try: - codeblock = mparser.build_ast(code) + codeblock = mparser2.Parser(code).parse() except coredata.MesonException as me: me.file = buildfilename raise me @@ -1273,16 +1273,16 @@ class Interpreter(): return templ def method_call(self, node): - invokable = node.invokable + invokable = node.source_object if isinstance(invokable, mparser2.IdNode): object_name = invokable.value obj = self.get_variable(object_name) else: obj = self.evaluate_statement(invokable) - method_name = node.method_name.get_value() + method_name = node.name if method_name == 'extract_objects' and self.environment.coredata.unity: raise InterpreterException('Single object files can not be extracted in Unity builds.') - args = node.arguments + args = node.args if isinstance(obj, nodes.StringStatement): obj = obj.get_value() if isinstance(obj, str): |