Create evaluator for function call

2019-07-08 14:10:10 +02:00
parent 6e42ac0f91
commit 1e634180d6
10 changed files with 81 additions and 62 deletions
--- a/smnp/runtime/evaluator.py
+++ b/smnp/runtime/evaluator.py
@@ -64,11 +64,11 @@ class EvaluationResult():

 def evaluate(node, environment):
    from smnp.runtime.evaluators.program import ProgramEvaluator
-    from smnp.runtime.evaluators.expression import evaluateExpression
+    from smnp.runtime.evaluators.expression import expressionEvaluator

    result = Evaluator.oneOf(
        Evaluator.forNodes(ProgramEvaluator.evaluate, Program),
-        evaluateExpression
+        expressionEvaluator()
    )(node, environment)

    if not result.result: