Create evaluators for lists and maps
This commit is contained in:
@@ -1,4 +1,7 @@
|
|||||||
|
from smnp.error.runtime import RuntimeException
|
||||||
from smnp.runtime.evaluator import Evaluator
|
from smnp.runtime.evaluator import Evaluator
|
||||||
|
from smnp.runtime.evaluators.expression import expressionEvaluator
|
||||||
|
from smnp.runtime.evaluators.iterable import abstractIterableEvaluator
|
||||||
from smnp.type.model import Type
|
from smnp.type.model import Type
|
||||||
|
|
||||||
|
|
||||||
@@ -34,4 +37,27 @@ class TypeEvaluator(Evaluator):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def evaluator(cls, node, environment):
|
def evaluator(cls, node, environment):
|
||||||
return Type.type(node.value)
|
return Type.type(node.value)
|
||||||
|
|
||||||
|
|
||||||
|
class ListEvaluator(Evaluator):
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def evaluator(cls, node, environment):
|
||||||
|
list = abstractIterableEvaluator(expressionEvaluator(doAssert=True))(node, environment)
|
||||||
|
return Type.list(list)
|
||||||
|
|
||||||
|
|
||||||
|
class MapEvaluator(Evaluator):
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def evaluator(cls, node, environment):
|
||||||
|
map = {}
|
||||||
|
exprEvaluator = expressionEvaluator(doAssert=True)
|
||||||
|
for entry in node.children:
|
||||||
|
key = exprEvaluator(entry.key, environment).value
|
||||||
|
if key in map:
|
||||||
|
raise RuntimeException(f"Duplicated key '{key.stringify()}' found in map", entry.pos)
|
||||||
|
map[key] = exprEvaluator(entry.value, environment).value
|
||||||
|
|
||||||
|
return Type.map(map)
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
from smnp.ast.node.atom import StringLiteral, IntegerLiteral, NoteLiteral, BoolLiteral, TypeLiteral
|
from smnp.ast.node.atom import StringLiteral, IntegerLiteral, NoteLiteral, BoolLiteral, TypeLiteral
|
||||||
from smnp.ast.node.identifier import FunctionCall
|
from smnp.ast.node.identifier import FunctionCall
|
||||||
|
from smnp.ast.node.list import List
|
||||||
|
from smnp.ast.node.map import Map
|
||||||
from smnp.error.runtime import RuntimeException
|
from smnp.error.runtime import RuntimeException
|
||||||
from smnp.runtime.evaluator import Evaluator
|
from smnp.runtime.evaluator import Evaluator
|
||||||
from smnp.type.model import Type
|
from smnp.type.model import Type
|
||||||
@@ -14,6 +16,8 @@ def expressionEvaluator(doAssert=False):
|
|||||||
from smnp.runtime.evaluators.atom import BoolEvaluator
|
from smnp.runtime.evaluators.atom import BoolEvaluator
|
||||||
|
|
||||||
from smnp.runtime.evaluators.function import FunctionCallEvaluator
|
from smnp.runtime.evaluators.function import FunctionCallEvaluator
|
||||||
|
from smnp.runtime.evaluators.atom import ListEvaluator
|
||||||
|
from smnp.runtime.evaluators.atom import MapEvaluator
|
||||||
result = Evaluator.oneOf(
|
result = Evaluator.oneOf(
|
||||||
Evaluator.forNodes(FunctionCallEvaluator.evaluate, FunctionCall),
|
Evaluator.forNodes(FunctionCallEvaluator.evaluate, FunctionCall),
|
||||||
Evaluator.forNodes(StringEvaluator.evaluate, StringLiteral),
|
Evaluator.forNodes(StringEvaluator.evaluate, StringLiteral),
|
||||||
@@ -21,6 +25,8 @@ def expressionEvaluator(doAssert=False):
|
|||||||
Evaluator.forNodes(NoteEvaluator.evaluate, NoteLiteral),
|
Evaluator.forNodes(NoteEvaluator.evaluate, NoteLiteral),
|
||||||
Evaluator.forNodes(BoolEvaluator.evaluate, BoolLiteral),
|
Evaluator.forNodes(BoolEvaluator.evaluate, BoolLiteral),
|
||||||
Evaluator.forNodes(TypeEvaluator.evaluate, TypeLiteral),
|
Evaluator.forNodes(TypeEvaluator.evaluate, TypeLiteral),
|
||||||
|
Evaluator.forNodes(ListEvaluator.evaluate, List),
|
||||||
|
Evaluator.forNodes(MapEvaluator.evaluate, Map)
|
||||||
# Evaluator.forNodes(IdentifierEvaluator.evaluate, Identifier),
|
# Evaluator.forNodes(IdentifierEvaluator.evaluate, Identifier),
|
||||||
# Evaluator.forNodes(ListEvaluator.evaluate, List),
|
# Evaluator.forNodes(ListEvaluator.evaluate, List),
|
||||||
# Evaluator.forNodes(AccessEvaluator.evaluate, LeftAssociativeOperatorNode),
|
# Evaluator.forNodes(AccessEvaluator.evaluate, LeftAssociativeOperatorNode),
|
||||||
|
|||||||
Reference in New Issue
Block a user