Create evaluator for function call and basic atoms

smnp/runtime/evaluators/atom.py

@@ -0,0 +1,37 @@
+from smnp.runtime.evaluator import Evaluator
+from smnp.type.model import Type
+
+
+class IntegerEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        return Type.integer(node.value)
+
+
+class StringEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        return Type.string(node.value)
+
+
+class NoteEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        return Type.note(node.value)
+
+
+class BoolEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        return Type.bool(node.value)
+
+
+class TypeEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        return Type.type(node.value)

smnp/runtime/evaluators/expression.py

@@ -1,15 +1,5 @@
-from smnp.ast.node.assignment import AssignmentNode
-from smnp.ast.node.asterisk import AsteriskNode
-from smnp.ast.node.bool import BoolLiteralNode
-from smnp.ast.node.identifier import Identifier
-from smnp.ast.node.integer import IntegerLiteralNode
-from smnp.ast.node.invocation import FunctionCallNode
-from smnp.ast.node.list import List
-from smnp.ast.node.map import MapNode
-from smnp.ast.node.note import NoteLiteralNode
-from smnp.ast.node.operator import LeftAssociativeOperatorNode
-from smnp.ast.node.string import StringLiteralNode
-from smnp.ast.node.type import TypeNode
+from smnp.ast.node.atom import StringLiteral, IntegerLiteral, NoteLiteral, BoolLiteral, TypeLiteral
+from smnp.ast.node.identifier import FunctionCall
 from smnp.error.runtime import RuntimeException
 from smnp.runtime.evaluator import Evaluator
 from smnp.type.model import Type
@@ -17,32 +7,26 @@ from smnp.type.model import Type
 
 def expressionEvaluator(doAssert=False):
     def evaluateExpression(node, environment):
-            from smnp.runtime.evaluators.string import StringEvaluator
-            from smnp.runtime.evaluators.integer import IntegerEvaluator
-            from smnp.runtime.evaluators.note import NoteEvaluator
-            from smnp.runtime.evaluators.identifier import IdentifierEvaluator
-            from smnp.runtime.evaluators.list import ListEvaluator
-            from smnp.runtime.evaluators.function import FunctionCallEvaluator
+            from smnp.runtime.evaluators.atom import StringEvaluator
+            from smnp.runtime.evaluators.atom import TypeEvaluator
+            from smnp.runtime.evaluators.atom import IntegerEvaluator
+            from smnp.runtime.evaluators.atom import NoteEvaluator
+            from smnp.runtime.evaluators.atom import BoolEvaluator
 
-            from smnp.runtime.evaluators.access import AccessEvaluator
-            from smnp.runtime.evaluators.assignment import AssignmentEvaluator
-            from smnp.runtime.evaluators.asterisk import AsteriskEvaluator
-            from smnp.runtime.evaluators.map import MapEvaluator
-            from smnp.runtime.evaluators.type import TypeEvaluator
-            from smnp.runtime.evaluators.bool import BoolEvaluator
+            from smnp.runtime.evaluators.function import FunctionCallEvaluator
             result =  Evaluator.oneOf(
-                Evaluator.forNodes(FunctionCallEvaluator.evaluate, FunctionCallNode),
-                Evaluator.forNodes(StringEvaluator.evaluate, StringLiteralNode),
-                Evaluator.forNodes(IntegerEvaluator.evaluate, IntegerLiteralNode),
-                Evaluator.forNodes(NoteEvaluator.evaluate, NoteLiteralNode),
-                Evaluator.forNodes(BoolEvaluator.evaluate, BoolLiteralNode),
-                Evaluator.forNodes(TypeEvaluator.evaluate, TypeNode),
-                Evaluator.forNodes(IdentifierEvaluator.evaluate, Identifier),
-                Evaluator.forNodes(ListEvaluator.evaluate, List),
-                Evaluator.forNodes(AccessEvaluator.evaluate, LeftAssociativeOperatorNode),
-                Evaluator.forNodes(AssignmentEvaluator.evaluate, AssignmentNode),
-                Evaluator.forNodes(AsteriskEvaluator.evaluate, AsteriskNode),
-                Evaluator.forNodes(MapEvaluator.evaluate, MapNode)
+                Evaluator.forNodes(FunctionCallEvaluator.evaluate, FunctionCall),
+                Evaluator.forNodes(StringEvaluator.evaluate, StringLiteral),
+                Evaluator.forNodes(IntegerEvaluator.evaluate, IntegerLiteral),
+                Evaluator.forNodes(NoteEvaluator.evaluate, NoteLiteral),
+                Evaluator.forNodes(BoolEvaluator.evaluate, BoolLiteral),
+                Evaluator.forNodes(TypeEvaluator.evaluate, TypeLiteral),
+                # Evaluator.forNodes(IdentifierEvaluator.evaluate, Identifier),
+                # Evaluator.forNodes(ListEvaluator.evaluate, List),
+                # Evaluator.forNodes(AccessEvaluator.evaluate, LeftAssociativeOperatorNode),
+                # Evaluator.forNodes(AssignmentEvaluator.evaluate, AssignmentNode),
+                # Evaluator.forNodes(AsteriskEvaluator.evaluate, AsteriskNode),
+                # Evaluator.forNodes(MapEvaluator.evaluate, MapNode)
             )(node, environment)
 
             if doAssert and result.result and result.value.type == Type.VOID: