aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-03-16 23:07:00 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2014-03-16 23:07:00 +0200
commit06417090a22e8150fa4a273dd4e2e74fea2fee76 (patch)
tree4e7dce6136463f4962647305889e9f3d3d1c637c
parentc74f0f3a3b0044cfd824f5b17be39a50a00ddcb9 (diff)
downloadmeson-06417090a22e8150fa4a273dd4e2e74fea2fee76.zip
meson-06417090a22e8150fa4a273dd4e2e74fea2fee76.tar.gz
meson-06417090a22e8150fa4a273dd4e2e74fea2fee76.tar.bz2
More stuff passing.
-rw-r--r--interpreter.py4
-rwxr-xr-xparsertest.py8
2 files changed, 6 insertions, 6 deletions
diff --git a/interpreter.py b/interpreter.py
index 5e0e292..9f9b51c 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -1274,8 +1274,8 @@ class Interpreter():
def method_call(self, node):
invokable = node.invokable
- if isinstance(invokable, nodes.AtomStatement):
- object_name = invokable.get_value()
+ if isinstance(invokable, mparser2.IdNode):
+ object_name = invokable.value
obj = self.get_variable(object_name)
else:
obj = self.evaluate_statement(invokable)
diff --git a/parsertest.py b/parsertest.py
index b1c3a3c..677dda6 100755
--- a/parsertest.py
+++ b/parsertest.py
@@ -398,11 +398,11 @@ class Parser:
s.lineno, s.colno)
value = self.statement()
if self.accept('comma'):
- rest = self.args()
- rest.set_kwarg(s.value, value)
- return rest
- a = ArgumentNode(self.current)
+ a = self.args()
+ else:
+ a = ArgumentNode(self.current)
a.set_kwarg(s.value, value)
+ return a
a = ArgumentNode(self.current)
a.arguments.append(s)
return a