Create evaluator for custom functions

smnp/runtime/evaluator.py

@@ -1,5 +1,6 @@
 from smnp.ast.node.block import Block
 from smnp.ast.node.condition import IfElse
+from smnp.ast.node.function import FunctionDefinition
 from smnp.ast.node.imports import Import
 from smnp.ast.node.program import Program
 from smnp.error.runtime import RuntimeException
@@ -71,11 +72,13 @@ def evaluate(node, environment):
     from smnp.runtime.evaluators.condition import IfElseStatementEvaluator
     from smnp.runtime.evaluators.block import BlockEvaluator
     from smnp.runtime.evaluators.imports import ImportEvaluator
+    from smnp.runtime.evaluators.function import FunctionDefinitionEvaluator
     result = Evaluator.oneOf(
         Evaluator.forNodes(ProgramEvaluator.evaluate, Program),
         Evaluator.forNodes(IfElseStatementEvaluator.evaluate, IfElse),
         Evaluator.forNodes(BlockEvaluator.evaluate, Block),
         Evaluator.forNodes(ImportEvaluator.evaluate, Import),
+        Evaluator.forNodes(FunctionDefinitionEvaluator.evaluate, FunctionDefinition),
         #Evaluator.forNodes(ImportEvaluator.evaluate, ImportNode),
         #Evaluator.forNodes(FunctionDefinitionEvaluator.evaluate, FunctionDefinitionNode),
         #Evaluator.forNodes(ExtendEvaluator.evaluate, ExtendNode),

smnp/runtime/tools/signature.py

@@ -1,5 +1,6 @@
+from smnp.ast.node import type as ast
 from smnp.ast.node.none import NoneNode
-from smnp.ast.node.type import Type, TypesList
+from smnp.ast.node.type import TypesList
 from smnp.error.runtime import RuntimeException
 from smnp.function.signature import varargSignature, signature
 from smnp.runtime.tools.error import updatePos
@@ -16,7 +17,7 @@ def argumentsNodeToMethodSignature(node):
         argumentsCount = len(node.children)
         for i, child in enumerate(node.children):
             matchers = {
-                Type: (lambda c: c.type, typeMatcher),
+                ast.Type: (lambda c: c.type, typeMatcher),
                 NoneNode: (lambda c: c.type, lambda c: allTypes()),
                 TypesList: (lambda c: c, multipleTypeMatcher)
             }
@@ -49,10 +50,10 @@ def multipleTypeMatcher(typeNode):
 
 def typeMatcher(typeNode):
     if type(typeNode.specifiers) == NoneNode:
-        return ofType(typeNode.type)
-    elif typeNode.type == Type.LIST and len(typeNode.specifiers) == 1:
+        return ofType(typeNode.type.value)
+    elif typeNode.type.value == Type.LIST and len(typeNode.specifiers) == 1:
         return listSpecifier(typeNode.specifiers[0])
-    elif typeNode.type == Type.MAP and len(typeNode.specifiers) == 2:
+    elif typeNode.type.value == Type.MAP and len(typeNode.specifiers) == 2:
         return mapSpecifier(typeNode.specifiers[0], typeNode.specifiers[1])
 
     raise RuntimeException("Unknown type", typeNode.pos)  # Todo: Improve pointing position