Add optional semicolon at the end of statements and move loop parser from factor to expression (change precedence)

smnp/ast/node/atom.py

@@ -1,7 +1,6 @@
 from smnp.ast.node.model import Node
-from smnp.ast.parser import Parsers
+from smnp.ast.parser import Parser
 from smnp.token.type import TokenType
-from smnp.util.singleton import SingletonParser
 
 
 class Atom(Node):
@@ -44,60 +43,48 @@ class TypeLiteral(Atom):
     pass
 
 
-@SingletonParser
-def IntegerParser():
-    return Parsers.oneOf(
-        Parsers.terminal(TokenType.INTEGER, lambda val, pos: IntegerLiteral.withValue(int(val), pos)),
-        Parsers.allOf(
-            Parsers.terminal(TokenType.MINUS),
-            Parsers.terminal(TokenType.INTEGER, lambda val, pos: IntegerLiteral.withValue(int(val), pos)),
-            createNode=lambda minus, integer: IntegerLiteral.withValue(-integer.value, minus.pos),
-            name="negativeInteger"
-        ),
-        name="int"
-    )
+def IntegerParser(input):
+    return Parser.terminal(TokenType.INTEGER, createNode=IntegerLiteral.withValue)(input)
 
 
-@SingletonParser
-def StringParser():
-    return Parsers.terminal(TokenType.STRING, createNode=StringLiteral.withValue)
+def StringParser(input):
+    return Parser.terminal(TokenType.STRING, createNode=StringLiteral.withValue)(input)
 
 
-@SingletonParser
-def NoteParser():
-    return Parsers.terminal(TokenType.NOTE, createNode=NoteLiteral.withValue)
+def NoteParser(input):
+    return Parser.terminal(TokenType.NOTE, createNode=NoteLiteral.withValue)(input)
 
 
-@SingletonParser
-def BoolParser():
-    return Parsers.terminal(TokenType.BOOL, createNode=BoolLiteral.withValue)
+def BoolParser(input):
+    return Parser.terminal(TokenType.BOOL, createNode=BoolLiteral.withValue)(input)
 
 
-@SingletonParser
-def TypeParser():
-    return Parsers.terminal(TokenType.TYPE, createNode=TypeLiteral.withValue)
+def TypeLiteralParser(input):
+    return Parser.terminal(TokenType.TYPE, createNode=TypeLiteral.withValue)(input)
 
 
-@SingletonParser
-def LiteralParser():
-    return Parsers.oneOf(
-        IntegerParser(),
-        StringParser(),
-        NoteParser(),
-        BoolParser(),
-        TypeParser(),
+def LiteralParser(input):
+    return Parser.oneOf(
+        IntegerParser,
+        StringParser,
+        NoteParser,
+        BoolParser,
+        TypeLiteralParser,
         name="literal"
-    )
+    )(input)
 
 
-@SingletonParser
-def AtomParser():
+def AtomParser(input):
     from smnp.ast.node.identifier import IdentifierParser
+    from smnp.ast.node.list import ListParser
+    from smnp.ast.node.map import MapParser
 
-    return Parsers.oneOf(
-        LiteralParser(),
-        IdentifierParser(),
+    return Parser.oneOf(
+        LiteralParser,
+        IdentifierParser,
+        ListParser,
+        MapParser,
         name="atom"
-    )
+    )(input)
 
 

smnp/ast/node/block.py

@@ -9,11 +9,9 @@ class Block(Node):
 
 
 def BlockParser(input):
-    parser = Parser.loop(
-        Parser.terminalParser(TokenType.OPEN_CURLY),
+    return Parser.loop(
+        Parser.terminal(TokenType.OPEN_CURLY),
         Parser.doAssert(StatementParser, f"statement or '{TokenType.CLOSE_CURLY.key}'"),
-        Parser.terminalParser(TokenType.CLOSE_CURLY),
+        Parser.terminal(TokenType.CLOSE_CURLY),
         createNode=lambda open, statements, close: Block.withChildren(statements, open.pos)
-    )
-
-    return Parser(parser, "block", [parser])(input)
+    )(input)

smnp/ast/node/chain.py

@@ -1,32 +0,0 @@
-from smnp.ast.node.list import ListParser
-from smnp.ast.node.operator import BinaryOperator
-from smnp.ast.node.valuable import Valuable
-from smnp.ast.parser import Parsers
-from smnp.token.type import TokenType
-from smnp.util.singleton import SingletonParser
-
-
-class Chain(Valuable):
-    pass
-
-
-
-@SingletonParser
-def ChainParser():
-    from smnp.ast.node.atom import AtomParser
-
-    itemParser = Parsers.oneOf(
-        ListParser,
-        #MapParser,
-        AtomParser,
-        name="chainItem"
-    )
-
-    return Parsers.leftAssociativeOperatorParser(
-        itemParser,
-        [TokenType.DOT],
-        itemParser,
-        lambda left, op, right: Chain.withValue(BinaryOperator.withValues(left, op, right)),
-        name="chain"
-    )
-

smnp/ast/node/condition.py

@@ -1,4 +1,4 @@
-from smnp.ast.node.expression import MaxPrecedenceExpressionParser
+from smnp.ast.node.expression import ExpressionParser
 from smnp.ast.node.model import Node
 from smnp.ast.node.none import NoneNode
 from smnp.ast.node.statement import StatementParser
@@ -46,23 +46,23 @@ class IfElse(Node):
 
 def IfElseStatementParser(input):
     ifStatementParser = Parser.allOf(
-        Parser.terminalParser(TokenType.IF),
-        Parser.terminalParser(TokenType.OPEN_PAREN),
-        MaxPrecedenceExpressionParser,
-        Parser.terminalParser(TokenType.CLOSE_PAREN),
+        Parser.terminal(TokenType.IF),
+        Parser.terminal(TokenType.OPEN_PAREN),
+        ExpressionParser,
+        Parser.terminal(TokenType.CLOSE_PAREN),
         StatementParser,
         createNode=lambda _, __, condition, ___, ifStatement: IfElse.createNode(ifStatement, condition),
         name="if statement"
     )
 
     ifElseStatementParser = Parser.allOf(
-        Parser.terminalParser(TokenType.IF),
-        Parser.terminalParser(TokenType.OPEN_PAREN),
-        MaxPrecedenceExpressionParser,
-        Parser.terminalParser(TokenType.CLOSE_PAREN),
-        StatementParser,
-        Parser.terminalParser(TokenType.ELSE),
-        StatementParser,
+        Parser.terminal(TokenType.IF),
+        Parser.terminal(TokenType.OPEN_PAREN, doAssert=True),
+        Parser.doAssert(ExpressionParser, "expression"),
+        Parser.terminal(TokenType.CLOSE_PAREN, doAssert=True),
+        Parser.doAssert(StatementParser, "statement"),
+        Parser.terminal(TokenType.ELSE),
+        Parser.doAssert(StatementParser, "statement"),
         createNode=lambda _, __, condition, ___, ifStatement, ____, elseStatement: IfElse.createNode(ifStatement, condition, elseStatement),
         name="if-else statement"
     )

smnp/ast/node/expression.py

@@ -1,63 +1,111 @@
-from smnp.ast.node.operator import BinaryOperator
+from smnp.ast.node.model import Node
+from smnp.ast.node.none import NoneNode
+from smnp.ast.node.operator import BinaryOperator, Operator
 from smnp.ast.node.term import TermParser
-from smnp.ast.node.valuable import Valuable
 from smnp.ast.parser import Parser
 from smnp.token.type import TokenType
 
 
-class Expression(Valuable):
+class Sum(BinaryOperator):
     pass
 
 
-def ExpressionParser(input):
-    return Parser.leftAssociativeOperatorParser(
+class Relation(BinaryOperator):
+    pass
+
+
+class And(BinaryOperator):
+    pass
+
+
+class Or(BinaryOperator):
+    pass
+
+
+class Loop(BinaryOperator):
+    def __init__(self, pos):
+        super().__init__(pos)
+        self.children.append(NoneNode())
+
+    @property
+    def parameters(self):
+        return self[3]
+
+    @parameters.setter
+    def parameters(self, value):
+        self[3] = value
+
+    @classmethod
+    def loop(cls, left, parameters, operator, right):
+        node = cls(left.pos)
+        node.left = left
+        node.parameters = parameters
+        node.operator = operator
+        node.right = right
+        return node
+
+
+class LoopParameters(Node):
+    pass
+
+
+def ExpressionWithoutLoopParser(input):
+    expr1 = Parser.leftAssociativeOperatorParser(
         TermParser,
         [TokenType.PLUS, TokenType.MINUS],
         TermParser,
-        lambda left, op, right: Expression.withValue(BinaryOperator.withValues(left, op, right))
-    )(input)
+        lambda left, op, right: Sum.withValues(left, op, right)
+    )
 
+    expr2 = Parser.leftAssociativeOperatorParser(
+        expr1,
+        [TokenType.RELATION, TokenType.OPEN_ANGLE, TokenType.CLOSE_ANGLE],
+        expr1,
+        lambda left, op, right: Relation.withValues(left, op, right)
+    )
 
-def Expression2Parser(input):
-    return Parser.leftAssociativeOperatorParser(
-        ExpressionParser,
-        [TokenType.RELATION],
-        ExpressionParser,
-        lambda left, op, right: Expression.withValue(BinaryOperator.withValues(left, op, right))
-    )(input)
-
-
-def Expression3Parser(input):
-    return Parser.leftAssociativeOperatorParser(
-        Expression2Parser,
+    expr3 = Parser.leftAssociativeOperatorParser(
+        expr2,
         [TokenType.AND],
-        Expression2Parser,
-        lambda left, op, right: Expression.withValue(BinaryOperator.withValues(left, op, right))
-    )(input)
+        expr2,
+        lambda left, op, right: And.withValues(left, op, right)
+    )
 
-
-def Expression4Parser(input):
-    from smnp.ast.node.condition import IfElse
-    exprParser = Parser.leftAssociativeOperatorParser(
-        Expression3Parser,
+    return Parser.leftAssociativeOperatorParser(
+        expr3,
         [TokenType.OR],
-        Expression3Parser,
-        lambda left, op, right: Expression.withValue(BinaryOperator.withValues(left, op, right))
-    )
-
-    ifElseExpression = Parser.allOf(
-        exprParser,
-        Parser.terminalParser(TokenType.IF),
-        Expression4Parser,
-        Parser.terminalParser(TokenType.ELSE),
-        Expression4Parser,
-        createNode=lambda ifNode, _, condition, __, elseNode: IfElse.createNode(ifNode, condition, elseNode)
-    )
-
-    return Parser.oneOf(
-        ifElseExpression,
-        exprParser,
+        expr3,
+        lambda left, op, right: Or.withValues(left, op, right)
     )(input)
 
 
-MaxPrecedenceExpressionParser = Expression4Parser
+def LoopParser(input):
+    from smnp.ast.node.identifier import IdentifierLiteralParser
+    from smnp.ast.node.iterable import abstractIterableParser
+    from smnp.ast.node.statement import StatementParser
+
+    loopParameters = Parser.allOf(
+        Parser.terminal(TokenType.AS),
+        Parser.oneOf(
+            Parser.wrap(IdentifierLiteralParser, lambda id: LoopParameters.withChildren([id], id.pos)),
+            abstractIterableParser(LoopParameters, TokenType.OPEN_PAREN, TokenType.CLOSE_PAREN, IdentifierLiteralParser)
+        ),
+        createNode=lambda asKeyword, parameters: parameters,
+        name="loop parameters"
+    )
+
+    return Parser.allOf(
+        ExpressionWithoutLoopParser,
+        Parser.optional(loopParameters),
+        Parser.terminal(TokenType.DASH, createNode=Operator.withValue),
+        StatementParser,
+        createNode=Loop.loop,
+        name="dash-loop"
+    )(input)
+
+
+def ExpressionParser(input):
+    return Parser.oneOf(
+        LoopParser,
+        ExpressionWithoutLoopParser
+    )(input)

smnp/ast/node/extend.py

@@ -1,70 +1,88 @@
-# from smnp.ast.node.block import BlockNode
-# from smnp.ast.node.function import FunctionDefinitionNode
-# from smnp.ast.node.identifier import IdentifierNode
-# from smnp.ast.node.none import NoneNode
-# from smnp.ast.node.statement import StatementNode
-# from smnp.ast.node.type import TypeNode
-# from smnp.ast.parser import Parser
-# from smnp.token.type import TokenType
-#
-#
-# class ExtendNode(StatementNode):
-#     def __init__(self, pos):
-#         super().__init__(pos)
-#         self.children = [NoneNode(), NoneNode(), NoneNode()]
-#
-#     @property
-#     def type(self):
-#         return self[0]
-#
-#     @type.setter
-#     def type(self, value):
-#         self[0] = value
-#
-#     @property
-#     def variable(self):
-#         return self[1]
-#
-#     @variable.setter
-#     def variable(self, value):
-#         self[1] = value
-#
-#     @property
-#     def methods(self):
-#         return self[2]
-#
-#     @methods.setter
-#     def methods(self, value):
-#         self[2] = value
-#
-#     @classmethod
-#     def _parse(cls, input):
-#         def createNode(extend, type, asKeyword, variable, methods):
-#             node = ExtendNode(extend.pos)
-#             node.type = type
-#             node.variable = variable
-#             node.methods = methods
-#             return node
-#
-#         return Parser.allOf(
-#             Parser.terminalParser(TokenType.EXTEND),
-#             Parser.doAssert(TypeNode.parse, "type being extended"),
-#             Parser.terminalParser(TokenType.AS, doAssert=True),
-#             Parser.doAssert(IdentifierNode.identifierParser(), "variable name"),
-#             Parser.doAssert(cls._methodsDeclarationsParser(), "methods declarations"),
-#             createNode=createNode
-#         )(input)
-#
-#     @classmethod
-#     def _methodsDeclarationsParser(cls):
-#         def createNode(openBracket, items, closeBracket):
-#             node = BlockNode(openBracket.pos)
-#             node.children = items
-#             return node
-#
-#         return Parser.loop(
-#             Parser.terminalParser(TokenType.OPEN_CURLY),
-#             Parser.doAssert(FunctionDefinitionNode.parse, f"method declaration or '{TokenType.CLOSE_CURLY.key}'"),
-#             Parser.terminalParser(TokenType.CLOSE_CURLY),
-#             createNode=createNode
-#         )
+from smnp.ast.node.block import Block
+from smnp.ast.node.function import FunctionDefinitionParser
+from smnp.ast.node.identifier import IdentifierLiteralParser
+from smnp.ast.node.model import Node
+from smnp.ast.node.none import NoneNode
+from smnp.ast.node.type import TypeParser
+from smnp.ast.parser import Parser
+from smnp.token.type import TokenType
+
+
+class Extend(Node):
+    def __init__(self, pos):
+        super().__init__(pos)
+        self.children = [NoneNode(), NoneNode(), NoneNode()]
+
+    @property
+    def type(self):
+        return self[0]
+
+    @type.setter
+    def type(self, value):
+        self[0] = value
+
+    @property
+    def variable(self):
+        return self[1]
+
+    @variable.setter
+    def variable(self, value):
+        self[1] = value
+
+    @property
+    def methods(self):
+        return self[2]
+
+    @methods.setter
+    def methods(self, value):
+        self[2] = value
+
+    @classmethod
+    def withValues(cls, pos, type, variable, methods):
+        node = cls(pos)
+        node.type = type
+        node.variable = variable
+        node.methods = methods
+        return node
+
+
+def ExtendParser(input):
+
+    simpleExtend = Parser.allOf(
+        Parser.terminal(TokenType.EXTEND),
+        TypeParser,
+        Parser.terminal(TokenType.AS),
+        IdentifierLiteralParser,
+        Parser.terminal(TokenType.WITH),
+        Parser.doAssert(Parser.wrap(FunctionDefinitionParser, lambda method: Block.withChildren([ method ], method.pos)), "method definition"),
+        createNode=lambda extend, type, _, variable, __, methods: Extend.withValues(extend.pos, type, variable, methods),
+        name="simple extend"
+    )
+
+    multiExtend = Parser.allOf(
+        Parser.terminal(TokenType.EXTEND),
+        Parser.doAssert(TypeParser, "type being extended"),
+        Parser.terminal(TokenType.AS, doAssert=True),
+        Parser.doAssert(IdentifierLiteralParser, "variable name"),
+        Parser.doAssert(MethodsDeclarationParser, f"block with methods definitions or '{TokenType.WITH.key}' keyword"),
+        createNode=lambda extend, type, _, variable, methods: Extend.withValues(extend.pos, type, variable, methods),
+        name="multiple extend"
+    )
+
+
+    return Parser.oneOf(
+        simpleExtend,
+        multiExtend,
+        name="extend"
+    )(input)
+
+
+def MethodsDeclarationParser(input):
+    return Parser.loop(
+        Parser.terminal(TokenType.OPEN_CURLY),
+        Parser.doAssert(FunctionDefinitionParser, f"method definition or '{TokenType.CLOSE_CURLY.key}'"),
+        Parser.terminal(TokenType.CLOSE_CURLY),
+        createNode=lambda open, methods, close: Block.withChildren(methods, open.pos),
+        name="methods block"
+    )(input)
+

smnp/ast/node/factor.py

@@ -1,64 +1,49 @@
-from smnp.ast.node.chain import ChainParser
 from smnp.ast.node.operator import BinaryOperator, Operator, UnaryOperator
-from smnp.ast.node.valuable import Valuable
+from smnp.ast.node.unit import UnitParser
 from smnp.ast.parser import Parser
 from smnp.token.type import TokenType
 
-
-class Factor(Valuable):
-    pass
-
-
 class NotOperator(UnaryOperator):
     pass
 
-class Loop(BinaryOperator):
+
+class Power(BinaryOperator):
     pass
 
-
 def FactorParser(input):
-    from smnp.ast.node.expression import MaxPrecedenceExpressionParser
-    from smnp.ast.node.statement import StatementParser
+    from smnp.ast.node.expression import ExpressionParser
 
-    powerFactor = Parser.leftAssociativeOperatorParser(
-        ChainParser,
-        [TokenType.DOUBLE_ASTERISK],
-        ChainParser,
-        lambda left, op, right: Factor.withValue(BinaryOperator.withValues(left, op, right)),
-        name="power operator"
-    )
-
-    exprFactor = Parser.allOf(
-        Parser.terminalParser(TokenType.OPEN_PAREN),
-        MaxPrecedenceExpressionParser,
-        Parser.terminalParser(TokenType.CLOSE_PAREN),
+    parentheses = Parser.allOf(
+        Parser.terminal(TokenType.OPEN_PAREN),
+        Parser.doAssert(ExpressionParser, "expression"),
+        Parser.terminal(TokenType.CLOSE_PAREN),
         createNode=lambda open, expr, close: expr,
         name="grouping parentheses"
     )
 
-    factorParser = Parser.oneOf(
-        powerFactor,
-        exprFactor,
-        name="basic factor"
+    factorOperands = Parser.oneOf(
+        parentheses,
+        UnitParser,
+        name="factor operands"
+    )
+
+    powerFactor = Parser.leftAssociativeOperatorParser(
+        factorOperands,
+        [TokenType.DOUBLE_ASTERISK],
+        factorOperands,
+        lambda left, op, right: Power.withValues(left, op, right),
+        name="power operator"
     )
 
     notOperator = Parser.allOf(
-        Parser.terminalParser(TokenType.NOT, Operator.withValue),
-        factorParser,
+        Parser.terminal(TokenType.NOT, Operator.withValue),
+        powerFactor,
         createNode=NotOperator.withValues,
         name="not"
     )
 
-    loopFactor = Parser.allOf(
-        factorParser,
-        Parser.terminalParser(TokenType.DASH, createNode=Operator.withValue),
-        StatementParser,
-        createNode=Loop.withValues,
-        name="dash-loop"
-    )
-
     return Parser.oneOf(
-        loopFactor,
         notOperator,
-        factorParser
+        powerFactor,
+        name="factor"
     )(input)

smnp/ast/node/function.py

@@ -1,128 +1,165 @@
-# from smnp.ast.node.block import BlockNode
-# from smnp.ast.node.expression import ExpressionNode
-# from smnp.ast.node.identifier import IdentifierNode
-# from smnp.ast.node.iterable import abstractIterableParser
-# from smnp.ast.node.model import Node
-# from smnp.ast.node.none import NoneNode
-# from smnp.ast.node.statement import StatementNode
-# from smnp.ast.node.type import TypeNode, TypeSpecifier
-# from smnp.ast.parser import Parser
-# from smnp.token.type import TokenType
-#
-#
-# class ArgumentsDeclarationNode(Node):
-#
-#     @classmethod
-#     def _parse(cls, input):
-#         raise RuntimeError("This class is not supposed to be automatically called")
-#
-#
-# class VarargNode(Node):
-#     pass
-#
-#
-# class ArgumentDefinitionNode(ExpressionNode):
-#     def __init__(self, pos):
-#         super().__init__(pos)
-#         self.children.extend([NoneNode(), False])
-#
-#     @property
-#     def type(self):
-#         return self[0]
-#
-#     @type.setter
-#     def type(self, value):
-#         self[0] = value
-#
-#     @property
-#     def variable(self):
-#         return self[1]
-#
-#     @variable.setter
-#     def variable(self, value):
-#         self[1] = value
-#
-#     @property
-#     def vararg(self):
-#         return self[2]
-#
-#     @vararg.setter
-#     def vararg(self, value):
-#         self[2] = value
-#
-#
-#     @classmethod
-#     def parser(cls):
-#         def createNode(type, variable, dots):
-#             node = ArgumentDefinitionNode(type.pos)
-#             node.type = type
-#             node.variable = variable
-#             node.vararg = isinstance(dots, VarargNode)
-#             return node
-#
-#         return Parser.allOf(
-#             Parser.optional(Parser.oneOf(
-#                 TypeNode.parse,
-#                 TypeSpecifier.parse
-#             )),
-#             Parser.doAssert(IdentifierNode.identifierParser(), "variable name"),
-#             Parser.optional(Parser.terminalParser(TokenType.DOTS, lambda val, pos: VarargNode(pos))),
-#             createNode=createNode
-#         )
-#
-#     @classmethod
-#     def _parse(cls, input):
-#         #TODO
-#         raise RuntimeError("Not implemented yet. There is still required work to correctly build AST related to IdentifierNode")
-#
-#
-#
-# class FunctionDefinitionNode(StatementNode):
-#     def __init__(self, pos):
-#         super().__init__(pos)
-#         self.children = [NoneNode(), NoneNode(), NoneNode()]
-#
-#     @property
-#     def name(self):
-#         return self[0]
-#
-#     @name.setter
-#     def name(self, value):
-#         self[0] = value
-#
-#     @property
-#     def arguments(self):
-#         return self[1]
-#
-#     @arguments.setter
-#     def arguments(self, value):
-#         self[1] = value
-#
-#     @property
-#     def body(self):
-#         return self[2]
-#
-#     @body.setter
-#     def body(self, value):
-#         self[2] = value
-#
-#     @classmethod
-#     def _parse(cls, input):
-#         def createNode(function, name, arguments, body):
-#             node = FunctionDefinitionNode(function.pos)
-#             node.name = name
-#             node.arguments = arguments
-#             node.body = body
-#             return node
-#
-#         return Parser.allOf(
-#             Parser.terminalParser(TokenType.FUNCTION),
-#             Parser.doAssert(IdentifierNode.identifierParser(), "function name"),
-#             Parser.doAssert(cls._argumentsDeclarationParser(), "arguments list"),
-#             Parser.doAssert(BlockNode.parse, "function body"),
-#             createNode=createNode
-#         )(input)
-#
-#     @staticmethod
-#     def _argumentsDeclarationParser():
-#         return abstractIterableParser(ArgumentsDeclarationNode, TokenType.OPEN_PAREN, TokenType.CLOSE_PAREN, ArgumentDefinitionNode.parser())
+from smnp.ast.node.block import BlockParser
+from smnp.ast.node.expression import ExpressionParser
+from smnp.ast.node.identifier import IdentifierLiteralParser
+from smnp.ast.node.iterable import abstractIterableParser
+from smnp.ast.node.model import Node
+from smnp.ast.node.none import NoneNode
+from smnp.ast.node.type import TypeParser, Type
+from smnp.ast.parser import Parser
+from smnp.token.type import TokenType
+
+
+class ArgumentsDeclaration(Node):
+    pass
+
+
+class Argument(Node):
+
+    def __init__(self, pos):
+        super().__init__(pos)
+        self.children = [NoneNode(), NoneNode(), False, NoneNode()]
+
+    @property
+    def type(self):
+        return self[0]
+
+
+    @type.setter
+    def type(self, value):
+        self[0] = value
+
+
+    @property
+    def variable(self):
+        return self[1]
+
+
+    @variable.setter
+    def variable(self, value):
+        self[1] = value
+
+
+    @property
+    def vararg(self):
+        return self[2]
+
+
+    @vararg.setter
+    def vararg(self, value):
+        self[2] = value
+
+
+    @property
+    def optionalValue(self):
+        return self[3]
+
+    @optionalValue.setter
+    def optionalValue(self, value):
+        self[3] = value
+
+class VarargNode(Node):
+    pass
+
+
+class FunctionDefinition(Node):
+    def __init__(self, pos):
+        super().__init__(pos)
+        self.children = [NoneNode(), NoneNode(), NoneNode()]
+
+    @property
+    def name(self):
+        return self[0]
+
+    @name.setter
+    def name(self, value):
+        self[0] = value
+
+    @property
+    def arguments(self):
+        return self[1]
+
+    @arguments.setter
+    def arguments(self, value):
+        self[1] = value
+
+    @property
+    def body(self):
+        return self[2]
+
+    @body.setter
+    def body(self, value):
+        self[2] = value
+
+    @classmethod
+    def withValues(cls, name, arguments, body):
+        node = cls(name.pos)
+        node.name = name
+        node.arguments = arguments
+        node.body = body
+        return node
+
+
+def RegularArgumentParser(input):
+    def createNode(type, variable, vararg):
+        pos = type.pos if isinstance(type, Type) else variable.pos
+        node = Argument(pos)
+        node.type = type
+        node.variable = variable
+        node.vararg = vararg is True
+        return node
+
+    return Parser.allOf(
+        Parser.optional(TypeParser),
+        Parser.doAssert(IdentifierLiteralParser, "argument name"),
+        Parser.optional(Parser.terminal(TokenType.DOTS, lambda val, pos: True)),
+        createNode=createNode,
+        name="regular function argument"
+    )(input)
+
+
+def OptionalArgumentParser(input):
+    def createNode(type, variable, _, optional):
+        pos = type.pos if isinstance(type, Type) else variable.pos
+        node = Argument(pos)
+        node.type = type
+        node.variable = variable
+        node.optionalValue = optional
+        return node
+
+    return Parser.allOf(
+        Parser.optional(TypeParser),
+        Parser.doAssert(IdentifierLiteralParser, "argument name"),
+        Parser.terminal(TokenType.ASSIGN),
+        Parser.doAssert(ExpressionParser, "expression"),
+        createNode=createNode,
+        name="optional function argument"
+    )(input)
+
+
+def ArgumentParser(input):
+    return Parser.oneOf(
+        OptionalArgumentParser,
+        RegularArgumentParser,
+        name="function argument"
+    )(input)
+
+
+def ArgumentsDeclarationParser(input):
+    return abstractIterableParser(
+        ArgumentsDeclaration,
+        TokenType.OPEN_PAREN,
+        TokenType.CLOSE_PAREN,
+        Parser.doAssert(ArgumentParser, "function/method argument")
+    )(input)
+
+
+def FunctionDefinitionParser(input):
+    return Parser.allOf(
+        Parser.terminal(TokenType.FUNCTION),
+        Parser.doAssert(IdentifierLiteralParser, "function/method name"),
+        Parser.doAssert(ArgumentsDeclarationParser, "function/method arguments"),
+        Parser.doAssert(BlockParser, "function/method body"),
+        createNode=lambda _, name, args, body: FunctionDefinition.withValues(name, args, body),
+        name="function definition"
+    )(input)
+

smnp/ast/node/identifier.py

@@ -1,10 +1,11 @@
 from smnp.ast.node.atom import Atom
+from smnp.ast.node.expression import ExpressionParser
+from smnp.ast.node.iterable import abstractIterableParser
 from smnp.ast.node.model import Node
 from smnp.ast.node.none import NoneNode
 from smnp.ast.node.operator import BinaryOperator, Operator
-from smnp.ast.parser import Parsers
+from smnp.ast.parser import Parser
 from smnp.token.type import TokenType
-from smnp.util.singleton import SingletonParser
 
 
 class Identifier(Atom):
@@ -48,28 +49,26 @@ class Assignment(BinaryOperator):
     pass
 
 
-@SingletonParser
-def IdentifierParser():
-    identifierLiteralParser = Parsers.terminal(TokenType.IDENTIFIER, createNode=Identifier.withValue)
+def IdentifierLiteralParser(input):
+    return Parser.terminal(TokenType.IDENTIFIER, createNode=Identifier.withValue)(input)
 
-    functionCallParser = Parsers.allOf(
-        identifierLiteralParser,
-        #abstractIterableParser(ArgumentsList, TokenType.OPEN_PAREN, TokenType.CLOSE_PAREN, MaxPrecedenceExpressionParser),
-        createNode=lambda name, arguments: FunctionCall.withChildren(name, arguments),
-        name="functionCall"
+
+def IdentifierParser(input):
+    functionCallParser = Parser.allOf(
+        IdentifierLiteralParser,
+        abstractIterableParser(ArgumentsList, TokenType.OPEN_PAREN, TokenType.CLOSE_PAREN, Parser.doAssert(ExpressionParser, "expression")),
+        createNode=lambda name, arguments: FunctionCall.withChildren(name, arguments)
     )
 
-    assignmentParser = Parsers.allOf(
-        identifierLiteralParser,
-        Parsers.terminal(TokenType.ASSIGN, createNode=Operator.withValue),
-        #MaxPrecedenceExpressionParser,
-        createNode=lambda identifier, assign, expr: Assignment.withValues(identifier, assign, expr),
-        name="assignment"
+    assignmentParser = Parser.allOf(
+        IdentifierLiteralParser,
+        Parser.terminal(TokenType.ASSIGN, createNode=Operator.withValue),
+        Parser.doAssert(ExpressionParser, "expression"),
+        createNode=lambda identifier, assign, expr: Assignment.withValues(identifier, assign, expr)
     )
 
-    return Parsers.oneOf(
+    return Parser.oneOf(
         assignmentParser,
         functionCallParser,
-        identifierLiteralParser,
-        name="idExpr"
-    )
+        IdentifierLiteralParser
+    )(input)

smnp/ast/node/imports.py

@@ -1,11 +1,3 @@
-# from smnp.ast.node.identifier import Identifier
-# from smnp.ast.node.model import Node
-# from smnp.ast.node.none import NoneNode
-# from smnp.ast.node.string import StringLiteralNode
-# from smnp.ast.node.type import TypeNode
-# from smnp.ast.parser import Parser
-# from smnp.token.type import TokenType
-#
 from smnp.ast.node.atom import StringParser
 from smnp.ast.node.model import Node
 from smnp.ast.parser import Parser
@@ -34,8 +26,8 @@ class Import(Node):
 
 def ImportParser(input):
     return Parser.allOf(
-        Parser.terminalParser(TokenType.IMPORT),
-        StringParser,
+        Parser.terminal(TokenType.IMPORT),
+        Parser.doAssert(StringParser, "import source as string"),
         createNode=lambda imp, source: Import.withValue(source),
         name="import"
     )(input)

smnp/ast/node/iterable.py

@@ -1,11 +1,11 @@
 from smnp.ast.node.ignore import IgnoredNode
 from smnp.ast.node.model import Node, ParseResult
 from smnp.ast.node.none import NoneNode
-from smnp.ast.parser import Parsers, DecoratorParser
+from smnp.ast.parser import Parser
 from smnp.token.type import TokenType
 
 
-def abstractIterableParser(iterableNodeType, openTokenType, closeTokenType, itemParser, name):
+def abstractIterableParser(iterableNodeType, openTokenType, closeTokenType, itemParser):
 
     class AbstractIterable(Node):
         def __init__(self, pos):
@@ -31,74 +31,70 @@ def abstractIterableParser(iterableNodeType, openTokenType, closeTokenType, item
     class AbstractIterableTail(AbstractIterable):
         pass
 
-    def abstractIterableParser():
-        return Parsers.oneOf(
-            emptyIterable(),
-            openIterable(),
-            name=name
-        )
+    def abstractIterableParser(input):
+        return Parser.oneOf(
+            emptyIterable,
+            openIterable
+        )(input)
 
-    def emptyIterable():
+    def emptyIterable(input):
         def createNode(open, close):
             node = AbstractIterable(open.pos)
             node.value = open
             node.next = close
             return node
 
-        return Parsers.allOf(
-            Parsers.terminal(openTokenType),
-            Parsers.terminal(closeTokenType),
-            createNode=createNode,
-            name=name+"Empty"
-        )
+        return Parser.allOf(
+            Parser.terminal(openTokenType),
+            Parser.terminal(closeTokenType),
+            createNode=createNode
+        )(input)
 
-    def openIterable():
+    def openIterable(input):
         def createNode(open, item, tail):
             node = AbstractIterable(open.pos)
             node.value = item
             node.next = tail
             return node
 
-        return Parsers.allOf(
-            Parsers.terminal(openTokenType),
+        return Parser.allOf(
+            Parser.terminal(openTokenType),
             itemParser,
-            abstractIterableTailParser(),
-            createNode=createNode,
-            name=name+"Open"
-        )
+            abstractIterableTailParser,
+            createNode=createNode
+        )(input)
 
-    def abstractIterableTailParser():
-        return Parsers.oneOf(
-            closeIterable(),
-            nextItem(),
-            name=name+"Tail"
-        )
+    def abstractIterableTailParser(input):
+        return Parser.oneOf(
+            closeIterable,
+            nextItem,
+        )(input)
 
-    def nextItem():
+    def nextItem(input):
         def createNode(comma, item, tail):
             node = AbstractIterableTail(item.pos)
             node.value = item
             node.next = tail
             return node
 
-        return Parsers.allOf(
-            Parsers.terminal(TokenType.COMMA, doAssert=True),
+        return Parser.allOf(
+            Parser.doAssert(Parser.terminal(TokenType.COMMA), f"'{TokenType.COMMA.key}' or '{closeTokenType.key}'"),
             itemParser,
-            abstractIterableTailParser(),
-            name=name+"NextItem",
+            abstractIterableTailParser,
             createNode=createNode
-        )
+        )(input)
 
-    def closeIterable():
-        return Parsers.terminal(closeTokenType)
+    def closeIterable(input):
+        return Parser.terminal(closeTokenType)(input)
 
 
-    return abstractIterableParser()
-    #return toFlatDesiredNode(iterableNodeType, abstractIterableParser())
+    return toFlatDesiredNode(iterableNodeType, abstractIterableParser)
 
 
 def toFlatDesiredNode(iterableNodeType, parser):
-    def wrapper(result):
+    def parse(input):
+        result = parser(input)
+
         if result.result:
             value = flattenList(result.node)
             node = iterableNodeType(result.node.pos)
@@ -109,7 +105,7 @@ def toFlatDesiredNode(iterableNodeType, parser):
 
         return ParseResult.FAIL()
 
-    return DecoratorParser(wrapper, parser)
+    return Parser(parse, "flat", [parser])
 
 
 def flattenList(node, output=None):

smnp/ast/node/list.py

@@ -1,6 +1,6 @@
-from smnp.ast.node.atom import AtomParser
 from smnp.ast.node.iterable import abstractIterableParser
 from smnp.ast.node.model import Node
+from smnp.ast.parser import Parser
 from smnp.token.type import TokenType
 
 
@@ -8,6 +8,12 @@ class List(Node):
     pass
 
 
-def ListParser():
-    return abstractIterableParser(List, TokenType.OPEN_SQUARE, TokenType.CLOSE_SQUARE, AtomParser(), name="list")
-                                    #MaxPrecedenceExpressionParser)(input)
+def ListParser(input):
+    from smnp.ast.node.expression import ExpressionParser
+
+    return abstractIterableParser(
+        List,
+        TokenType.OPEN_SQUARE,
+        TokenType.CLOSE_SQUARE,
+        Parser.doAssert(ExpressionParser, "expression")
+    )(input)

smnp/ast/node/map.py

@@ -1,7 +1,8 @@
+from smnp.ast.node.atom import LiteralParser
 from smnp.ast.node.iterable import abstractIterableParser
 from smnp.ast.node.model import Node
 from smnp.ast.node.operator import BinaryOperator, Operator
-from smnp.ast.parser import Parsers
+from smnp.ast.parser import Parser
 from smnp.token.type import TokenType
 
 
@@ -29,19 +30,21 @@ class Map(Node):
 
 
 def MapParser(input):
-    from smnp.ast.node.atom import LiteralParser
-    #from smnp.ast.node.expression import MaxPrecedenceExpressionParser
+    from smnp.ast.node.expression import ExpressionParser
     keyParser = LiteralParser
-    #valueParser = MaxPrecedenceExpressionParser
+    valueParser = ExpressionParser
 
-    mapEntryParser = Parsers.allOf(
+    mapEntryParser = Parser.allOf(
         keyParser,
-        Parsers.terminal(TokenType.ARROW, createNode=Operator.withValue),
-        #valueParser,
-        createNode=MapEntry.withValues,
-        name="mapEntry"
+        Parser.terminal(TokenType.ARROW, createNode=Operator.withValue, doAssert=True),
+        Parser.doAssert(valueParser, "expression"),
+        createNode=MapEntry.withValues
     )
 
-    return abstractIterableParser(Map, TokenType.OPEN_CURLY, TokenType.CLOSE_CURLY, mapEntryParser)
-
+    return abstractIterableParser(
+        Map,
+        TokenType.OPEN_CURLY,
+        TokenType.CLOSE_CURLY,
+        mapEntryParser
+    )(input)
 

smnp/ast/node/model.py

@@ -28,21 +28,6 @@ class Node:
     def pop(self, index):
         return self.children.pop(index)
 
-    @classmethod
-    def _parse(cls, input):
-        pass
-
-    @classmethod
-    def parse(cls, input):
-        result = cls._parse(input)
-        if result is None:
-            return ParseResult.FAIL()
-
-        if not isinstance(result, ParseResult):
-            raise RuntimeError(f"_parse() method of '{cls.__name__}' class haven't returned ParseResult object")
-
-        return result
-
     def print(self):
         self._print(first=True)
 

smnp/ast/node/operator.py

@@ -68,68 +68,7 @@ class BinaryOperator(Node):
         node.right = right
         return node
 
-#
-# class LeftAssociativeOperatorNode(ExpressionNode):
-#     def __init__(self, pos):
-#         super().__init__(pos)
-#         self.children = [NoneNode(), NoneNode(), NoneNode()]
-#
-#     @property
-#     def left(self):
-#         return self[0]
-#
-#     @left.setter
-#     def left(self, value):
-#         self[0] = value
-#
-#     @property
-#     def operator(self):
-#         return self[1]
-#
-#     @operator.setter
-#     def operator(self, value):
-#         self[1] = value
-#
-#     @property
-#     def right(self):
-#         return self[2]
-#
-#     @right.setter
-#     def right(self, value):
-#         self[2] = value
-#
-#     @classmethod
-#     def _parse(cls, input):
-#         def createNode(left, operator, right):
-#             node = LeftAssociativeOperatorNode(right.pos)
-#             node.left = left
-#             node.operator = operator
-#             node.right = right
-#             return node
-#
-#         return Parser.leftAssociativeOperatorParser(
-#             cls._lhsParser(),
-#             TokenType.DOT,
-#             cls._rhsParser(),
-#             createNode=createNode
-#         )(input)
-#
-#     @classmethod
-#     def _lhsParser(cls):
-#         raise RuntimeError(f"LHS parser is not implemented in {cls.__name__}")
-#
-#     @staticmethod
-#     def _rhsParser():
-#         from smnp.ast.node.identifier import IdentifierNode
-#
-#         return Parser.oneOf(
-#             # TODO!!!
-#             IdentifierNode._lhsParser(),
-#             IdentifierNode._functionCallParser(),
-#             exception=lambda input: SyntaxException(f"Expected property name or method call, found '{input.current().rawValue}'", input.currentPos())
-#         )
-#
-#
+
 class Operator(Node):
     def __init__(self, pos):
         super().__init__(pos)

smnp/ast/node/program.py

@@ -1,44 +1,36 @@
+from smnp.ast.node.extend import ExtendParser
+from smnp.ast.node.function import FunctionDefinitionParser
 from smnp.ast.node.imports import ImportParser
 from smnp.ast.node.model import Node, ParseResult
 from smnp.ast.node.statement import StatementParser
 from smnp.ast.parser import Parser
+from smnp.error.syntax import SyntaxException
 
 
 class Program(Node):
     def __init__(self):
         super().__init__((-1, -1))
 
+def ProgramParser(input):
     def parse(input):
         root = Program()
-    while input.hasCurrent():
-        result = Parser.oneOf(
+
         # Start Symbol
+        startSymbolParser = Parser.oneOf(
             ImportParser,
+            FunctionDefinitionParser,
+            ExtendParser,
             StatementParser,
-            exception=RuntimeError("Nie znam tego wyrazenia")
-        )(input)
+            exception=lambda inp: SyntaxException(f"Invalid statement: {inp.currentToEndOfLine()}", inp.current().pos),
+            name="start symbol"
+        )
+
+        while input.hasCurrent():
+            result = startSymbolParser(input)
 
             if result.result:
                 root.append(result.node)
 
         return ParseResult.OK(root)
 
-ProgramParser = Parser(parse, name="program")
-    # @classmethod
-    # def _parse(cls, input):
-    #     def parseToken(input):
-    #         return Parser.oneOf(
-    #             FunctionDefinitionNode.parse,
-    #             ExtendNode.parse,
-    #             ExpressionNode.parse,
-    #             ImportNode.parse,
-    #             StatementNode.parse,
-    #             exception = SyntaxException(f"Invalid statement: {input.currentToEndOfLine()}", input.current().pos)
-    #         )(input)
-    #
-    #     root = Program()
-    #     while input.hasCurrent():
-    #         result = parseToken(input)
-    #         if result.result:
-    #             root.append(result.node)
-    #     return ParseResult.OK(root)
+    return Parser(parse, name="program")(input)

smnp/ast/node/ret.py

@@ -1,32 +1,17 @@
-# from smnp.ast.node.expression import ExpressionNode
-# from smnp.ast.node.none import NoneNode
-# from smnp.ast.node.statement import StatementNode
-# from smnp.ast.parser import Parser
-# from smnp.token.type import TokenType
-#
-#
-# class ReturnNode(StatementNode):
-#     def __init__(self, pos):
-#         super().__init__(pos)
-#         self.children.append(NoneNode())
-#
-#     @property
-#     def value(self):
-#         return self[0]
-#
-#     @value.setter
-#     def value(self, value):
-#         self[0] = value
-#
-#     @classmethod
-#     def _parse(cls, input):
-#         def createNode(ret, value):
-#             node = ReturnNode(ret.pos)
-#             node.value = value
-#             return node
-#
-#         return Parser.allOf(
-#             Parser.terminalParser(TokenType.RETURN),
-#             Parser.doAssert(ExpressionNode.parse, "expression"),
-#             createNode=createNode
-#         )(input)
+from smnp.ast.node.expression import ExpressionParser
+from smnp.ast.node.valuable import Valuable
+from smnp.ast.parser import Parser
+from smnp.token.type import TokenType
+
+
+class Return(Valuable):
+    pass
+
+
+def ReturnParser(input):
+    return Parser.allOf(
+        Parser.terminal(TokenType.RETURN),
+        Parser.optional(ExpressionParser),
+        createNode=lambda ret, val: Return.withValue(val, ret.pos),
+        name="return"
+    )(input)

smnp/ast/node/statement.py

@@ -1,6 +1,6 @@
-from smnp.ast.node.expression import MaxPrecedenceExpressionParser
 from smnp.ast.node.model import Node
 from smnp.ast.parser import Parser
+from smnp.token.type import TokenType
 
 
 class Statement(Node):
@@ -10,25 +10,28 @@ class Statement(Node):
 def StatementParser(input):
     from smnp.ast.node.block import BlockParser
     from smnp.ast.node.condition import IfElseStatementParser
+    from smnp.ast.node.expression import ExpressionParser
+    from smnp.ast.node.ret import ReturnParser
+    from smnp.ast.node.throw import ThrowParser
 
-    parser = Parser.oneOf(
+    return withSemicolon(
+        Parser.oneOf(
             IfElseStatementParser,
+            ExpressionParser,  # Must be above BlockParser because of Map's syntax with curly braces
             BlockParser,
-        MaxPrecedenceExpressionParser
+            ReturnParser,
+            ThrowParser,
+            name="statement"
+        ), optional=True)(input)
+
+
+def withSemicolon(parser, optional=False, doAssert=False):
+    semicolonParser = Parser.optional(Parser.terminal(TokenType.SEMICOLON)) if optional else Parser.terminal(
+        TokenType.SEMICOLON, doAssert=doAssert)
+
+    return Parser.allOf(
+        parser,
+        semicolonParser,
+        createNode=lambda stmt, semicolon: stmt,
+        name="semicolon" + "?" if optional else ""
     )
-
-    return Parser(parser, "statement", parser)(input)
-
-# class StatementNode(Node):
-#
-#     @classmethod
-#     def _parse(cls, input):
-#         from smnp.ast.node.block import BlockNode
-#         from smnp.ast.node.expression import ExpressionNode
-#         from smnp.ast.node.ret import ReturnNode
-#
-#         return Parser.oneOf(
-#             ExpressionNode.parse,
-#             BlockNode.parse,
-#             ReturnNode.parse,
-#         )(input)

smnp/ast/node/term.py

@@ -1,12 +1,17 @@
 from smnp.ast.node.factor import FactorParser
 from smnp.ast.node.operator import BinaryOperator
-from smnp.ast.node.valuable import Valuable
 from smnp.ast.parser import Parser
 from smnp.token.type import TokenType
 
 
-class Term(Valuable):
+class Product(BinaryOperator):
     pass
 
-TermParser = Parser.leftAssociativeOperatorParser(FactorParser, [TokenType.ASTERISK, TokenType.SLASH], FactorParser,
-                                                    lambda left, op, right: Term.withValue(BinaryOperator.withValues(left, op, right)))
+
+def TermParser(input):
+    return Parser.leftAssociativeOperatorParser(
+        FactorParser,
+        [TokenType.ASTERISK, TokenType.SLASH],
+        FactorParser,
+        lambda left, op, right: Product.withValues(left, op, right)
+    )(input)

smnp/ast/node/throw.py

@@ -0,0 +1,17 @@
+from smnp.ast.node.expression import ExpressionParser
+from smnp.ast.node.valuable import Valuable
+from smnp.ast.parser import Parser
+from smnp.token.type import TokenType
+
+
+class Throw(Valuable):
+    pass
+
+
+def ThrowParser(input):
+    return Parser.allOf(
+        Parser.terminal(TokenType.THROW),
+        Parser.doAssert(ExpressionParser, "error message as string"),
+        createNode=lambda throw, message: Throw.withValue(message, throw.pos),
+        name="throw"
+    )(input)

smnp/ast/node/type.py

@@ -1,63 +1,67 @@
-# from smnp.ast.node.iterable import abstractIterableParser
-# from smnp.ast.node.model import Node
-# from smnp.ast.node.operator import LeftAssociativeOperatorNode
-# from smnp.ast.parser import Parser
-# from smnp.token.type import TokenType
-# from smnp.type.model import Type
-#
-#
-# class TypeSpecifier(Node):
-#
-#     @classmethod
-#     def _parse(cls, input):
-#         return abstractIterableParser(TypeSpecifier, TokenType.OPEN_ANGLE, TokenType.CLOSE_ANGLE,
-#                                       Parser.doAssert(cls._specifierItem(), "type"))(input)
-#
-#     @classmethod
-#     def _specifierItem(cls):
-#         return Parser.oneOf(
-#             TypeNode.parse,
-#             cls.parse
-#         )
-#
-# class TypeSpecifiers(Node):
-#     pass
-#
-#
-# class TypeNode(LeftAssociativeOperatorNode):
-#     def __init__(self, pos):
-#         super().__init__(pos)
-#
-#     @property
-#     def type(self):
-#         return self[0]
-#
-#     @type.setter
-#     def type(self, value):
-#         self[0] = value
-#
-#     @property
-#     def specifiers(self):
-#         return self[1]
-#
-#     @specifiers.setter
-#     def specifiers(self, value):
-#         self[1] = value
-#
-#     @classmethod
-#     def _parse(cls, input):
-#         def createNode(type, specifiers):
-#             node = TypeNode(type.pos)
-#             node.type = Type[type.value.upper()]
-#             node.specifiers = specifiers
-#             return node
-#
-#         return Parser.allOf(
-#             cls._rawTypeParser(),
-#             Parser.many(TypeSpecifier.parse, lambda specifiers, pos: TypeSpecifiers.withChildren(specifiers, pos)),
-#             createNode=createNode
-#         )(input)
-#
-#     @classmethod
-#     def _rawTypeParser(cls):
-#         return Parser.terminalParser(TokenType.TYPE, lambda val, pos: TypeNode.withValue(val, pos))
+from smnp.ast.node.atom import TypeLiteralParser
+from smnp.ast.node.iterable import abstractIterableParser
+from smnp.ast.node.model import Node
+from smnp.ast.node.none import NoneNode
+from smnp.ast.parser import Parser
+from smnp.token.type import TokenType
+
+
+class Type(Node):
+    def __init__(self, pos):
+        super().__init__(pos)
+        self.children = [NoneNode(), NoneNode()]
+
+    @property
+    def type(self):
+        return self[0]
+
+    @type.setter
+    def type(self, value):
+        self[0] = value
+
+    @property
+    def specifiers(self):
+        return self[1]
+
+    @specifiers.setter
+    def specifiers(self, value):
+        self[1] = value
+
+    @classmethod
+    def withValues(cls, pos, type, specifiers=NoneNode()):
+        node = cls(pos)
+        node.type = type
+        node.specifiers = specifiers
+        return node
+
+
+class TypesList(Node):
+    pass
+
+
+def TypesListParser(input):
+    return abstractIterableParser(
+        TypesList,
+        TokenType.OPEN_ANGLE,
+        TokenType.CLOSE_ANGLE,
+        TypeParser
+    )(input)
+
+
+class TypeSpecifiers(Node):
+    pass
+
+
+def TypeParser(input):
+    typeWithSpecifier = Parser.allOf(
+        TypeLiteralParser,
+        Parser.many(TypesListParser, createNode=TypeSpecifiers.withChildren),
+        createNode=lambda type, specifiers: Type.withValues(type.pos, type, specifiers),
+        name="type with specifiers?"
+    )
+
+    return Parser.oneOf(
+        typeWithSpecifier,
+        TypesListParser,
+        name="mult. types or type with specifier"
+    )(input)

smnp/ast/node/unit.py

@@ -0,0 +1,36 @@
+from smnp.ast.node.atom import AtomParser
+from smnp.ast.node.operator import BinaryOperator, UnaryOperator, Operator
+from smnp.ast.parser import Parser
+from smnp.token.type import TokenType
+
+
+class MinusOperator(UnaryOperator):
+    pass
+
+
+class Access(BinaryOperator):
+    pass
+
+
+def UnitParser(input):
+    minusOperator = Parser.allOf(
+        Parser.terminal(TokenType.MINUS, createNode=Operator.withValue),
+        Parser.doAssert(AtomParser, "atom"),
+        createNode=MinusOperator.withValues,
+        name="minus"
+    )
+
+    atom2 = Parser.oneOf(
+        minusOperator,
+        AtomParser,
+        name="atom2"
+    )
+
+    return Parser.leftAssociativeOperatorParser(
+        atom2,
+        [TokenType.DOT],
+        Parser.doAssert(atom2, "atom"),
+        createNode=lambda left, op, right: Access.withValues(left, op, right),
+        name="unit"
+    )(input)
+

smnp/ast/node/valuable.py

@@ -16,7 +16,7 @@ class Valuable(Node):
         self[0] = value
 
     @classmethod
-    def withValue(cls, value):
-        node = cls(value.pos)
+    def withValue(cls, value, pos=None):
+        node = cls(value.pos if pos is None else pos)
         node.value = value
         return node

smnp/ast/parser.py

@@ -9,8 +9,15 @@ def parse(input):
     return ProgramParser(input).node
 
 
-class Parser(object):
-    def __init__(self, name):
+class Parser:
+    def __init__(self, parse, name=None, parsers=None):
+        if parsers is None:
+            parsers = []
+        self.parsers = parsers
+
+        self._parse = parse
+        if name is None:
+            name = parse.__name__
         self.name = name
 
     def parse(self, input):
@@ -19,27 +26,10 @@ class Parser(object):
             return ParseResult.FAIL()
 
         if not isinstance(result, ParseResult):
-            raise RuntimeError(
-                f"_parse() method of '{self.__class__.__name__}' class haven't returned ParseResult object")
+            raise RuntimeError(f"_parse() method of '{self.__class__.__name__}' class haven't returned ParseResult object")
 
         return result
 
-    def _parse(self, input):
-        raise RuntimeError(f"_name method of '{self.__class__.__name__}' class is not implemented")
-
-    def grammar(self):
-        rules = []
-        self._grammarRules(rules)
-        return "\n".join(self._uniq(rules))
-
-    def _uniq(self, seq):
-        seen = set()
-        seen_add = seen.add
-        return [x for x in seq if not (x in seen or seen_add(x))]
-
-    def _grammarRules(self, output):
-        output.append(f"class '{self.__class__.__name__}' does not implement _grammarRules() method")
-
     def __call__(self, input):
         return self.parse(input)
 
@@ -49,242 +39,186 @@ class Parser(object):
     def __repr__(self):
         return self.__str__()
 
-
-class Parsers:
-
+    # a -> A
     @staticmethod
-    def terminal(expectedType, createNode=lambda val, pos: IgnoredNode(pos), doAssert=False):
-        return TerminalParser(expectedType, createNode, doAssert)
+    def terminal(expectedType, createNode=None, doAssert=False):
+        def provideNode(value, pos):
+            if createNode is None:
+                return IgnoredNode(pos)
+            return createNode(value, pos)
 
-    @staticmethod
-    def oneOf(*parsers, name, exception=None):
-        return OneOfParser(*parsers, name=name, exception=exception)
-
-    @staticmethod
-    def allOf(*parsers, createNode, exception=None, name):
-        return AllOfParser(*parsers, createNode=createNode, exception=exception, name=name)
-
-    @staticmethod
-    def leftAssociativeOperatorParser(leftParser, operatorTokenTypes, rightParser, createNode, name):
-        return LeftAssociativeOperatorParser(leftParser, operatorTokenTypes, rightParser, createNode, name)
-
-    @staticmethod
-    def many(itemParser, createNode, name):
-        return ManyParser(itemParser, createNode, name)
-
-    @staticmethod
-    def optional(parser, name):
-        return OptionalParser(parser, name)
-
-    @staticmethod
-    def loop(startParser, itemParser, endParser, createNode, name):
-        return LoopParser(startParser, itemParser, endParser, createNode, name)
-
-
-class DecoratorParser(Parser):
-    def __init__(self, wrapper, parser):
-        super().__init__(parser.name)
-        self.wrapper = wrapper
-        self.parser = parser
-        self._grammarRules = parser._grammarRules
-
-    def _parse(self, input):
-        result = self.parser.parse(input)
-        return self.wrapper(result)
-
-
-class TerminalParser(Parser):
-
-    def __init__(self, expectedType, createNode=lambda val, pos: IgnoredNode(pos), doAssert=False):
-        super().__init__(expectedType.name.lower())
-        self.expectedType = expectedType
-        self.createNode = createNode
-        self.doAssert = doAssert
-
-    def _grammarRules(self, output):
-        output.append(f"{self.name} -> '{self.expectedType.value}'")
-
-    def _parse(self, input):
-        if input.isCurrent(self.expectedType):
+        def parse(input):
+            if input.hasCurrent() and input.current().type == expectedType:
                 token = input.current()
                 input.ahead()
-            return ParseResult.OK(self.createNode(token.value, token.pos))
-        elif self.doAssert:
+                return ParseResult.OK(provideNode(token.value, token.pos))
+            elif doAssert:
                 found = f", found '{input.current().rawValue}'" if input.hasCurrent() else ""
-            raise SyntaxException(f"Expected '{self.expectedType.key}'{found}", input.currentPos())
+                raise SyntaxException(f"Expected '{expectedType.key}'{found}", input.currentPos())
 
             return ParseResult.FAIL()
 
+        return Parser(parse, name=expectedType.name.lower())
 
-
-class OneOfParser(Parser):
-    def __init__(self, *parsers, name, exception=None):
-        super().__init__(name)
-        self.parsers = parsers
-        self.exception = exception
-
-    def _parse(self, input):
+    # oneOf -> a | b | c | ...
+    @staticmethod
+    def oneOf(*parsers, assertExpected=None, exception=None, name="or"):
+        def combinedParser(input):
             snap = input.snapshot()
-        for parser in self.parsers:
-            value = parser.parse(input)
+            for parser in parsers:
+                value = parser(input)
                 if value.result:
                     return value
-            input.reset(snap) # TODO sprawdzic, czy koneiczne !!!!!
+                input.reset(snap)
 
-        if self.exception is not None:
-            if callable(self.exception):
-                raise self.exception(input)
+            if assertExpected is not None:
+                found = f", found '{input.current().rawValue}'" if input.hasCurrent() else ""
+                raise SyntaxException(f"Expected {assertExpected}{found}", input.currentPos())
+
+            if exception is not None:
+                if callable(exception):
+                    raise exception(input)
                 else:
-                raise self.exception
-
-        return ParseResult.FAIL()
-
-    def _grammarRules(self, output):
-        output.extend([ f"{self.name} -> {parser.name}" for parser in self.parsers ])
-        [ parser._grammarRules(output) for parser in self.parsers ]
-
-
-class AllOfParser(Parser):
-    def __init__(self, *parsers, createNode, exception=None, name):
-        super().__init__(name)
-
-        if len(parsers) == 0:
-            raise RuntimeError("Pass one parser at least")
-
-        self.parsers = parsers
-        self.createNode = createNode
-        self.exception = exception
-
-    def _parse(self, input):
-        snap = input.snapshot()
-        parsedItems = []
-
-        for parser in self.parsers:
-            result = parser.parse(input)
-
-            if not result.result:
-                if self.exception is not None:
-                    if callable(self.exception):
-                        raise self.exception(input)
-                    else:
-                        raise self.exception
+                    raise exception
 
             input.reset(snap)
             return ParseResult.FAIL()
 
-            parsedItems.append(result.node)
+        return Parser(combinedParser, name=name, parsers=parsers)
 
-        node = self.createNode(*parsedItems)
+    # allOf -> a b c ...
+    @staticmethod
+    def allOf(*parsers, createNode, exception=None, name="all"):
+        if len(parsers) == 0:
+            raise RuntimeError("Pass one parser at least")
+
+        def extendedParser(input):
+            snap = input.snapshot()
+
+            results = []
+
+            for parser in parsers:
+                result = parser(input)
+
+                if not result.result:
+                    if exception is not None:
+                        if callable(exception):
+                            raise exception(input)
+                        else:
+                            raise exception
+
+                    input.reset(snap)
+                    return ParseResult.FAIL()
+
+                results.append(result.node)
+
+            node = createNode(*results)
             if not isinstance(node, Node):
-            raise RuntimeError(f"Method 'createNode' of class '{self.__class__.__name__}' haven't returned a Node object. Probably forget to pass 'return'")
+                raise RuntimeError("Function 'createNode' haven't returned a Node object. Probably forget to pass 'return'")
 
             return ParseResult.OK(node)
 
-    def _grammarRules(self, output):
-        output.append(self.name + ' -> ' + ' '.join([ parser.name for parser in self.parsers ]))
-        [ parser._grammarRules(output) for parser in self.parsers ]
+
+        return Parser(extendedParser, name=name, parsers=parsers)
 
 
-class LeftAssociativeOperatorParser(Parser):
-    def __init__(self, leftParser, operatorTokenTypes, rightParser, createNode, name):
+    # leftAssociative -> left | left OP right
+    @staticmethod
+    def leftAssociativeOperatorParser(leftParser, operatorTokenTypes, rightParser, createNode, name="leftAssoc"):
         from smnp.ast.node.operator import Operator
 
-        super().__init__(name)
-        self.leftParser = leftParser
-        self.rightParser = rightParser
-        self.createNode = createNode
-        self.operators = operatorTokenTypes
-
-        operatorParsers = [ TerminalParser(expectedType, createNode=lambda val, pos: Operator.withValue(val, pos)) for expectedType in operatorTokenTypes ]
-        self.operatorParser = OneOfParser(*operatorParsers, name="not important")
-
-    def _parse(self, input):
-        snap = input.snapshot()
-        left = self.leftParser.parse(input)
+        def parse(input):
+            operatorParser = Parser.oneOfTerminals(*operatorTokenTypes, createNode=lambda val, pos: Operator.withChildren([val], pos))
+            left = leftParser(input)
             if left.result:
-            operator = self.operatorParser.parse(input)
+                operator = operatorParser(input)
                 while operator.result:
-                right = self.rightParser.parse(input)
-                left = ParseResult.OK(self.createNode(left.node, operator.node, right.node))
-                operator = self.operatorParser.parse(input)
+                    right = rightParser(input)
+                    left = ParseResult.OK(createNode(left.node, operator.node, right.node))
+                    operator = operatorParser(input)
                 return left
 
             return ParseResult.FAIL()
 
+        return Parser(parse, name=name, parsers=[leftParser, '|'.join([t.value for t in operatorTokenTypes]), rightParser])
 
-    def _grammarRules(self, output):
-        output.append('\n'.join([f"{self.name} -> {self.leftParser.name} {operator.name.lower()} {self.rightParser.name} | {self.leftParser.name}" for operator in self.operators]))
-        self.leftParser._grammarRules(output)
-        self.rightParser._grammarRules(output)
+    @staticmethod
+    def oneOfTerminals(*tokenTypes, createNode=None):
+        return Parser.oneOf(*[Parser.terminal(expectedType, createNode=createNode) for expectedType in tokenTypes], name='|'.join([t.value for t in tokenTypes]))
 
-
-class ManyParser(Parser):
-    def __init__(self, itemParser, createNode, name):
-        super().__init__(name)
-        self.itemParser = itemParser
-        self.createNode = createNode
-
-    def _parse(self, input):
-        snap = input.snapshot()
-
-        parsedItems = []
-        pos = input.currentPos()
-        while True:
-            result = self.itemParser.parse(input)
-            if result.result:
-                parsedItems.append(result.node)
-                snap = input.snapshot()
-            else:
-                input.reset(snap)
-                return ParseResult.OK(self.createNode(parsedItems, pos) if len(parsedItems) > 0 else NoneNode())
-
-    def _grammarRules(self, output):
-        output.append(f"{self.name} -> {self.itemParser.name}*")
-        self.itemParser._grammarRules(output)
-
-
-class OptionalParser(Parser):
-    def __init__(self, parser, name):
-        super().__init__(name)
-        self.parser = parser
-
-    def _parse(self, input):
-        result = self.parser.parse(input)
-        if result.result:
-            return result
-
-        return ParseResult.OK(NoneNode())
-
-    def _grammarRules(self, output):
-        output.append(f"{self.name} -> {self.parser.name}?")
-
-
-class LoopParser(Parser):
-    def __init__(self, startParser, itemParser, endParser, createNode, name):
-        super().__init__(name)
-        self.startParser = startParser
-        self.itemParser = itemParser
-        self.endParser = endParser
-        self.createNode = createNode
-
-    def _parse(self, input):
+    # loop -> start item* end
+    @staticmethod
+    def loop(startParser, itemParser, endParser, createNode, name="loop"):
+        def parse(input):
             items = []
-        start = self.startParser.parse(input)
+            start = startParser(input)
             if start.result:
                 while True:
-                end = self.endParser.parse(input)
+                    end = endParser(input)
                     if end.result:
-                    return ParseResult.OK(self.createNode(start.node, items, end.node))
-                item = self.itemParser.parse(input)
+                        return ParseResult.OK(createNode(start.node, items, end.node))
+                    item = itemParser(input)
                     if not item.result:
                         return ParseResult.FAIL()
                     items.append(item.node)
 
             return ParseResult.FAIL()
 
-    def _grammarRules(self, output):
-        output.append(f"{self.name} -> {self.startParser.name} {self.itemParser.name}* {self.endParser.name}")
-        self.startParser._grammarRules(output)
-        self.itemParser._grammarRules(output)
-        self.endParser._grammarRules(output)
+        return Parser(parse, name, parsers=[startParser, itemParser, endParser])
 
+    @staticmethod
+    def doAssert(parser, expected, name="!!"):
+        def parse(input):
+            result = parser(input)
+
+            if not result.result:
+                found = f", found '{input.current().rawValue}'" if input.hasCurrent() else ''
+
+                raise SyntaxException(f"Expected {expected}{found}", input.currentPos())
+
+            return result
+
+        return Parser(parse, name, parsers=parser)
+
+    @staticmethod
+    def optional(parser, name="??"):
+        def parse(input):
+            result = parser(input)
+            if result.result:
+                return result
+
+            return ParseResult.OK(NoneNode())
+
+        return Parser(parse, name, parsers=[parser])
+
+    @staticmethod
+    def epsilon():
+        return lambda *args: ParseResult.OK(NoneNode())
+
+    @staticmethod
+    def many(parser, createNode, name="*"):
+        def parse(input):
+            results = []
+            snap = input.snapshot()
+            pos = input.currentPos()
+            while True:
+                result = parser(input)
+                if result.result:
+                    results.append(result.node)
+                    snap = input.snapshot()
+                else:
+                    input.reset(snap)
+                    return ParseResult.OK(createNode(results, pos) if len(results) > 0 else NoneNode())
+
+        return Parser(parse, name, parsers=[parser])
+
+    @staticmethod
+    def wrap(parser, createNode):
+        def parse(input):
+            result = parser(input)
+            if result.result:
+                return ParseResult.OK(createNode(result.node))
+
+            return result
+
+        return parse

smnp/audio/sound.py

@@ -10,6 +10,9 @@ class Sound:
     def play(self):
         sd.play(self.data, self.fs, blocking=True)
 
+    def __eq__(self, other):
+        return self.file == other.file and self.data == other.data
+
     def __str__(self):
         return f"sound[{self.file}]"
 

smnp/environment/environment.py

@@ -1,17 +1,19 @@
 from smnp.error.function import FunctionNotFoundException, MethodNotFoundException, IllegalFunctionInvocationException
 from smnp.error.runtime import RuntimeException
 from smnp.function.tools import argsTypesToString
-from smnp.runtime.evaluators.function import BodyEvaluator
+from smnp.runtime.evaluators.function import BodyEvaluator, Return
+from smnp.type.model import Type
 
 
 class Environment():
-    def __init__(self, scopes, functions, methods):
+    def __init__(self, scopes, functions, methods, source):
         self.scopes = scopes
         self.functions = functions
         self.methods = methods
         self.customFunctions = []
         self.customMethods = []
         self.callStack = []
+        self.source = source
 
     def invokeMethod(self, object, name, args):
         builtinMethodResult = self._invokeBuiltinMethod(object, name, args)
@@ -38,10 +40,15 @@ class Environment():
             if method.typeSignature.check([object])[0] and method.name == name: #Todo sprawdzic sygnature typu
                 signatureCheckresult = method.signature.check(args)
                 if signatureCheckresult[0]:
-                    self.scopes.append({argName: argValue for argName, argValue in zip(method.arguments, list(signatureCheckresult[1:]))})
+                    self.scopes.append(method.defaultArgs)
+                    self.scopes[-1].update({argName: argValue for argName, argValue in zip(method.arguments, list(signatureCheckresult[1:]))})
                     self.scopes[-1][method.alias] = object
                     self.callStack.append(CallStackItem(name))
-                    result = BodyEvaluator.evaluate(method.body, self).value  # TODO check if it isn't necessary to verify 'result' attr of EvaluatioNResult
+                    result = Type.void()
+                    try:
+                        BodyEvaluator.evaluate(method.body, self).value  # TODO check if it isn't necessary to verify 'result' attr of EvaluatioNResult
+                    except Return as r:
+                        result = r.value
                     self.callStack.pop(-1)
                     self.scopes.pop(-1)
                     return (True, result)
@@ -74,20 +81,25 @@ class Environment():
             if function.name == name:
                 signatureCheckresult = function.signature.check(args)
                 if signatureCheckresult[0]:
-                    self.scopes.append({ argName: argValue for argName, argValue in zip(function.arguments, list(signatureCheckresult[1:])) })
+                    self.scopes.append(function.defaultArgs)
+                    self.scopes[-1].update({ argName: argValue for argName, argValue in zip(function.arguments, list(signatureCheckresult[1:])) })
                     self.callStack.append(CallStackItem(name))
-                    result = BodyEvaluator.evaluate(function.body, self).value #TODO check if it isn't necessary to verify 'result' attr of EvaluatioNResult
+                    result = Type.void()
+                    try:
+                        BodyEvaluator.evaluate(function.body, self).value #TODO check if it isn't necessary to verify 'result' attr of EvaluatioNResult
+                    except Return as r:
+                        result = r.value
                     self.callStack.pop(-1)
                     self.scopes.pop(-1)
                     return (True, result)
                 raise IllegalFunctionInvocationException(f"{function.name}{function.signature.string}", f"{name}{argsTypesToString(args)}")
         return (False, None)
 
-    def addCustomFunction(self, name, signature, arguments, body):
+    def addCustomFunction(self, name, signature, arguments, body, defaultArguments):
         if len([fun for fun in self.functions + self.customFunctions if fun.name == name]) > 0:
             raise RuntimeException(f"Cannot redeclare function '{name}'", None)
 
-        self.customFunctions.append(CustomFunction(name, signature, arguments, body))
+        self.customFunctions.append(CustomFunction(name, signature, arguments, body, defaultArguments))
 
     # TODO:
     # There is still problem with checking existing of generic types, like lists:
@@ -98,14 +110,14 @@ class Environment():
     #   function foo() { return 2 }
     # }
     # Then calling [1, 2, 3, 4].foo() will produce 1, when the second method is more suitable
-    def addCustomMethod(self, typeSignature, alias, name, signature, arguments, body):
+    def addCustomMethod(self, typeSignature, alias, name, signature, arguments, body, defaultArguments):
         if len([m for m in self.methods if m.name == name and m.signature.matchers[0] == typeSignature.matchers[0]]) > 0:
             raise RuntimeException(f"Cannot redeclare method '{name}' for type '{typeSignature.matchers[0]}'", None)
 
         if len([m for m in self.customMethods if m.name == name and m.typeSignature.matchers[0] == typeSignature.matchers[0]]) > 0:
             raise RuntimeException(f"Cannot redeclare method '{name}' for type '{typeSignature.matchers[0]}'", None)
 
-        self.customMethods.append(CustomMethod(typeSignature, alias, name, signature, arguments, body))
+        self.customMethods.append(CustomMethod(typeSignature, alias, name, signature, arguments, body, defaultArguments))
 
     def findVariable(self, name, type=None, pos=None):
         for scope in reversed(self.scopes):
@@ -162,22 +174,23 @@ class Environment():
 class CallStackItem:
     def __init__(self, function):
         self.function = function
-        self.value = None
 
 
 class CustomFunction:
-    def __init__(self, name, signature, arguments, body):
+    def __init__(self, name, signature, arguments, body, defaultArgs):
         self.name = name
         self.signature = signature
         self.arguments = arguments
         self.body = body
+        self.defaultArgs = defaultArgs
 
 
 class CustomMethod:
-    def __init__(self, typeSignature, alias, name, signature, arguments, body):
+    def __init__(self, typeSignature, alias, name, signature, arguments, body, defaultArgs):
         self.typeSignature = typeSignature
         self.alias = alias
         self.name = name
         self.signature = signature
         self.arguments = arguments
         self.body = body
+        self.defaultArgs = defaultArgs

smnp/environment/factory.py

@@ -1,7 +1,3 @@
-from smnp.environment.environment import Environment
-from smnp.module import functions, methods
-
-
 def createEnvironment():
-    return Environment([{}], functions, methods)
+    return
  

smnp/error/base.py

@@ -2,6 +2,7 @@ class SmnpException(Exception):
     def __init__(self, msg, pos):
         self.msg = msg
         self.pos = pos
+        self.file = None
 
     def _title(self):
         pass
@@ -12,5 +13,8 @@ class SmnpException(Exception):
     def _position(self):
         return "" if self.pos is None else f"[line {self.pos[0]+1}, col {self.pos[1]+1}]"
 
+    def _file(self):
+        return "" if self.file is None else f"File: {self.file}"
+
     def message(self):
-        return f"{self._title()}{self._position()}:\n{self.msg}\n{self._postMessage()}"
+        return f"{self._title()}\n{self._file()} {self._position()}\n\n{self.msg}\n{self._postMessage()}"

smnp/error/custom.py

@@ -0,0 +1,12 @@
+from smnp.error.runtime import RuntimeException
+
+
+class CustomException(RuntimeException):
+    def __init__(self, message, pos):
+        super().__init__(message, pos)
+
+    def _title(self):
+        return "Execution Error"
+
+    def _postMessage(self):
+        return "\n" + self.environment.callStackToString() if len(self.environment.callStack) > 0 else ""

smnp/function/signature.py

@@ -12,6 +12,9 @@ class Signature:
 
 def varargSignature(varargMatcher, *basicSignature, wrapVarargInValue=False):
     def check(args):
+        if any([ matcher.optional for matcher in [ varargMatcher, *basicSignature ]]):
+            raise RuntimeError("Vararg signature can't have optional arguments")
+
         if len(basicSignature) > len(args):
             return doesNotMatchVararg(basicSignature)
 
@@ -38,7 +41,7 @@ def doesNotMatchVararg(basicSignature):
 
 def signature(*signature):
     def check(args):
-        if len(signature) != len(args):
+        if len(args) > len(signature) or len(args) < len([ matcher for matcher in signature if not matcher.optional ]):
             return doesNotMatch(signature)
 
         for s, a in zip(signature, args):
@@ -52,6 +55,12 @@ def signature(*signature):
     return Signature(check, string, signature)
 
 
+def optional(matcher):
+    matcher.optional = True
+    matcher.string += "?"
+    return matcher
+
+
 def doesNotMatch(sign):
     return (False, *[None for n in sign])
 

smnp/library/loader.py

@@ -5,7 +5,5 @@ from smnp.program.interpreter import Interpreter
 
 def loadStandardLibrary():
     mainSource = resource_string('smnp.library.code', 'main.mus').decode("utf-8")
-    boolSource = resource_string('smnp.library.code', 'bool.mus').decode("utf-8")
-    env = Interpreter.interpretString(mainSource)
-    return Interpreter.interpretString(boolSource, baseEnvironment=env)
-
+    env = Interpreter.interpretString(mainSource, "<stdlib>")
+    return env

smnp/main.py

@@ -1,32 +1,14 @@
-from smnp.ast.node.atom import AtomParser
-from smnp.ast.node.chain import ChainParser
-from smnp.ast.node.list import ListParser
-from smnp.ast.node.model import Node
+import sys
+
 from smnp.error.base import SmnpException
-from smnp.token.tokenizer import tokenize
+from smnp.library.loader import loadStandardLibrary
+from smnp.program.interpreter import Interpreter
 
 
 def main():
     try:
-        # stdLibraryEnv = loadStandardLibrary()
-        # Interpreter.interpretFile(sys.argv[1], printTokens=True, printAst=True, execute=False, baseEnvironment=None)
-        # draft()
-
-        class TestNode(Node):
-            def __init__(self, children):
-                super().__init__((-1, -1))
-                self.children = children
-
-        tokens = tokenize(['[1, 2]'])
-        parser = ListParser()
-        #print(parser.grammar())
-        res = parser.parse(tokens)
-
-        print()
-        if res.result:
-            res.node.print()
-        else:
-            print("nie sparsowano")
+        stdLibraryEnv = loadStandardLibrary()
+        Interpreter.interpretFile(sys.argv[1], printTokens=False, printAst=False, execute=True, baseEnvironment=stdLibraryEnv)
 
     except SmnpException as e:
         print(e.message())

smnp/module/__init__.py

@@ -1,4 +1,4 @@
 from smnp.module import system, mic, note, iterable, sound, synth, string, util
 
 functions = [ *system.functions, *mic.functions, *note.functions, *iterable.functions, *sound.functions, *synth.functions, *string.functions, *util.functions ]
-methods = [ *system.methods, *mic.methods, *note.methods, *iterable.methods, *sound.methods, *synth.methods, *string.functions, *util.methods ]
+methods = [ *system.methods, *mic.methods, *note.methods, *iterable.methods, *sound.methods, *synth.methods, *string.methods, *util.methods ]

smnp/module/iterable/__init__.py

@@ -1,4 +1,4 @@
-from smnp.module.iterable.function import combine, flat, map, range, get
+from smnp.module.iterable.function import combine, map, get
 
-functions = [ combine.function, flat.function, map.function, range.function ]
+functions = [ combine.function, map.function ]
 methods = [ get.function ]

smnp/module/iterable/function/flat.py

@@ -1,23 +0,0 @@
-from smnp.function.model import Function
-from smnp.function.signature import varargSignature
-from smnp.type.model import Type
-from smnp.type.signature.matcher.type import allTypes
-
-_signature = varargSignature(allTypes())
-def _function(env, vararg):
-    return Type.list(doFlat(vararg, [])).decompose()
-
-
-def doFlat(input, output=None):
-    if output is None:
-        output = []
-
-    for item in input:
-        if item.type == Type.LIST:
-            doFlat(item.value, output)
-        else:
-            output.append(item)
-    return output
-
-
-function = Function(_signature, _function, 'flat')

smnp/module/iterable/function/range.py

@@ -6,17 +6,17 @@ from smnp.type.signature.matcher.type import ofType
 
 _signature1 = signature(ofType(Type.INTEGER))
 def _function1(env, upper):
-    return Type.list(list(range(upper.value + 1)))
+    return Type.list([ Type.integer(i) for i in range(upper.value + 1)])
 
 
 _signature2 = signature(ofType(Type.INTEGER), ofType(Type.INTEGER))
 def _function2(env, lower, upper):
-    return Type.list(list(range(lower.value, upper.value + 1)))
+    return Type.list([ Type.integer(i) for i in range(lower.value, upper.value + 1)])
 
 
 _signature3 = signature(ofType(Type.INTEGER), ofType(Type.INTEGER), ofType(Type.INTEGER))
 def _function3(env, lower, upper, step):
-    return Type.list(list(range(lower.value, upper.value + 1, step.value)))
+    return Type.list([ Type.integer(i) for i in range(lower.value, upper.value + 1, step.value)])
 
 
 _signature4 = signature(ofType(Type.NOTE), ofType(Type.NOTE))

smnp/module/note/__init__.py

@@ -1,4 +1,4 @@
-from smnp.module.note.function import tuplet, transpose, semitones, octave, duration, interval
+from smnp.module.note.function import note
 
-functions = [ semitones.function, interval.function, transpose.function, tuplet.function ]
-methods = [ duration.function, octave.function ]
+functions = [ note.function ]
+methods = []

smnp/module/note/function/duration.py

@@ -1,11 +0,0 @@
-from smnp.function.model import Function
-from smnp.function.signature import signature
-from smnp.type.model import Type
-from smnp.type.signature.matcher.type import ofType
-
-_signature = signature(ofType(Type.NOTE), ofType(Type.INTEGER))
-def _function(env, note, duration):
-    return Type.note(note.value.withDuration(duration.value))
-
-
-function = Function(_signature, _function, 'withDuration')

smnp/module/note/function/interval.py

@@ -1,27 +0,0 @@
-from smnp.function.model import Function, CombinedFunction
-from smnp.function.signature import varargSignature
-from smnp.note.interval import intervalToString
-from smnp.note.model import Note
-from smnp.type.model import Type
-from smnp.type.signature.matcher.list import listOf
-from smnp.type.signature.matcher.type import ofTypes
-
-_signature1 = varargSignature(ofTypes(Type.NOTE, Type.INTEGER))
-def _function1(env, vararg):
-    withoutPauses = [note.value for note in vararg if note.type == Type.NOTE]
-    if len(withoutPauses) < 2:
-        return Type.list([])
-    semitones = [Note.checkInterval(withoutPauses[i-1], withoutPauses[i]) for i in range(1, len(withoutPauses))]
-    return Type.list([Type.string(intervalToString(s)) for s in semitones]).decompose()
-
-
-_signature2 = varargSignature(listOf(Type.NOTE, Type.INTEGER))
-def _function2(env, vararg):
-    return Type.list([_function1(env, arg.value) for arg in vararg]).decompose()
-
-
-function = CombinedFunction(
-    'interval',
-    Function(_signature1, _function1),
-    Function(_signature2, _function2)
-)

smnp/module/note/function/note.py

@@ -0,0 +1,11 @@
+from smnp.function.model import Function
+from smnp.function.signature import signature
+from smnp.note.model import Note
+from smnp.type.model import Type
+from smnp.type.signature.matcher.type import ofType
+
+_signature = signature(ofType(Type.STRING), ofType(Type.INTEGER), ofType(Type.INTEGER), ofType(Type.BOOL))
+def _function(env, note, octave, duration, dot):
+    return Type.note(Note(note.value, octave.value, duration.value, dot.value))
+
+function = Function(_signature, _function, 'Note')

smnp/module/note/function/octave.py

@@ -1,11 +0,0 @@
-from smnp.function.model import Function
-from smnp.function.signature import signature
-from smnp.type.model import Type
-from smnp.type.signature.matcher.type import ofType
-
-_signature = signature(ofType(Type.NOTE), ofType(Type.INTEGER))
-def _function(env, note, octave):
-    return Type.note(note.value.withOctave(octave.value))
-
-
-function = Function(_signature, _function, 'withOctave')

smnp/module/note/function/semitones.py

@@ -1,25 +0,0 @@
-from smnp.function.model import Function, CombinedFunction
-from smnp.function.signature import varargSignature
-from smnp.note.model import Note
-from smnp.type.model import Type
-from smnp.type.signature.matcher.list import listOf
-from smnp.type.signature.matcher.type import ofTypes
-
-_signature1 = varargSignature(ofTypes(Type.NOTE, Type.INTEGER))
-def _function1(env, vararg):
-    withoutPauses = [note.value for note in vararg if note.type == Type.NOTE]
-    if len(withoutPauses) < 2:
-        return Type.list([])
-    return Type.list([Type.integer(Note.checkInterval(withoutPauses[i-1], withoutPauses[i])) for i in range(1, len(withoutPauses))]).decompose()
-
-
-_signature2 = varargSignature(listOf(Type.NOTE, Type.INTEGER))
-def _function2(env, vararg):
-    return Type.list([_function1(env, arg.value) for arg in vararg]).decompose()
-
-
-function = CombinedFunction(
-    "semitones",
-    Function(_signature1, _function1),
-    Function(_signature2, _function2),
-)

smnp/module/note/function/transpose.py

@@ -1,22 +0,0 @@
-from smnp.function.model import CombinedFunction, Function
-from smnp.function.signature import varargSignature
-from smnp.type.model import Type
-from smnp.type.signature.matcher.list import listOf
-from smnp.type.signature.matcher.type import ofTypes
-
-_signature1 = varargSignature(ofTypes(Type.INTEGER, Type.NOTE), ofTypes(Type.INTEGER))
-def _function1(env, value, vararg):
-    transposed = [Type.note(arg.value.transpose(value.value)) if arg.type == Type.NOTE else arg for arg in vararg]
-    return Type.list(transposed).decompose()
-
-
-_signature2 = varargSignature(listOf(Type.INTEGER, Type.NOTE), ofTypes(Type.INTEGER))
-def _function2(env, value, vararg):
-    return Type.list([_function1(env, value, arg.value) for arg in vararg]).decompose()
-
-
-function = CombinedFunction(
-    'transpose',
-    Function(_signature1, _function1),
-    Function(_signature2, _function2)
-)

smnp/module/note/function/tuplet.py

@@ -1,23 +0,0 @@
-from smnp.function.model import CombinedFunction, Function
-from smnp.function.signature import signature, varargSignature
-from smnp.type.model import Type
-from smnp.type.signature.matcher.list import listOf
-from smnp.type.signature.matcher.type import ofTypes
-
-_signature1 = varargSignature(ofTypes(Type.NOTE), ofTypes(Type.INTEGER), ofTypes(Type.INTEGER))
-def _function1(env, n, m, vararg):
-    t = [Type.note(arg.value.withDuration(int(arg.value.duration * n.value / m.value))) for arg in vararg]
-    return Type.list(t).decompose()
-
-
-
-_signature2 = signature(ofTypes(Type.INTEGER), ofTypes(Type.INTEGER), listOf(Type.NOTE))
-def _function2(env, n, m, notes):
-    return _function1(env, n, m, notes.value)
-
-
-function = CombinedFunction(
-    'tuplet',
-    Function(_signature1, _function1),
-    Function(_signature2, _function2)
-)

smnp/module/string/__init__.py

@@ -1,4 +1,4 @@
-from smnp.module.string.function import concat
+from smnp.module.string.function import concat, stringify
 
 functions = [ concat.function ]
-methods = []
+methods = [ stringify.function ]

smnp/module/string/function/stringify.py

@@ -0,0 +1,10 @@
+from smnp.function.model import Function
+from smnp.function.signature import signature
+from smnp.type.model import Type
+from smnp.type.signature.matcher.type import allTypes
+
+_signature = signature(allTypes())
+def _function(env, object):
+    return Type.string(object.stringify())
+
+function = Function(_signature, _function, 'toString')

smnp/module/synth/function/synth.py

@@ -1,25 +1,13 @@
-from smnp.function.model import CombinedFunction, Function
-from smnp.function.signature import varargSignature
-from smnp.module.synth.lib.player import playNotes
+from smnp.function.model import Function
+from smnp.function.signature import signature
+from smnp.module.synth.lib.player import play
 from smnp.type.model import Type
-from smnp.type.signature.matcher.list import listOf
-from smnp.type.signature.matcher.type import ofTypes
+from smnp.type.signature.matcher.type import ofType
 
-_signature1 = varargSignature(ofTypes(Type.NOTE, Type.INTEGER))
-def _function1(env, vararg):
-    notes = [arg.value for arg in vararg]
+_signature = signature(ofType(Type.NOTE))
+def _function(env, note):
     bpm = env.findVariable('bpm')
-    playNotes(notes, bpm.value)
+    play(note.value, bpm.value)
 
 
-_signature2 = varargSignature(listOf(Type.NOTE, Type.INTEGER))
-def _function2(env, vararg):
-    for arg in vararg:
-        _function1(env, arg.value)
-
-
-function = CombinedFunction(
-    'synth',
-    Function(_signature1, _function1),
-    Function(_signature2, _function2)
-)
+function = Function(_signature, _function, 'synthNote')

smnp/module/system/__init__.py

@@ -1,4 +1,4 @@
-from smnp.module.system.function import sleep, display, debug, exit, type
+from smnp.module.system.function import sleep, display, displayln, debug, exit, type
 
-functions = [ debug.function, display.function, exit.function, sleep.function, type.function ]
+functions = [ debug.function, display.function, displayln.function, exit.function, sleep.function, type.function ]
 methods = []

smnp/module/system/function/display.py

@@ -4,7 +4,7 @@ from smnp.type.signature.matcher.type import allTypes
 
 _signature = varargSignature(allTypes())
 def _function(env, vararg):
-    print("".join([arg.stringify() for arg in vararg]))
+    print("".join([arg.stringify() for arg in vararg]), end="")
 
 
 function = Function(_signature, _function, 'print')

smnp/module/system/function/displayln.py

@@ -0,0 +1,10 @@
+from smnp.function.model import Function
+from smnp.function.signature import varargSignature
+from smnp.type.signature.matcher.type import allTypes
+
+_signature = varargSignature(allTypes())
+def _function(env, vararg):
+    print("".join([arg.stringify() for arg in vararg]))
+
+
+function = Function(_signature, _function, 'println')

smnp/module/util/function/rand.py

@@ -1,29 +1,12 @@
-import random as r
+import random
 
-from smnp.error.function import IllegalArgumentException
-from smnp.function.model import Function, CombinedFunction
-from smnp.function.signature import varargSignature
+from smnp.function.model import Function
+from smnp.function.signature import signature
 from smnp.type.model import Type
-from smnp.type.signature.matcher.list import listMatches
-from smnp.type.signature.matcher.type import ofTypes
+from smnp.type.signature.matcher.type import ofType
 
+_signature = signature(ofType(Type.INTEGER), ofType(Type.INTEGER))
+def _function(env, min, max):
+    return Type.integer(random.randint(min.value, max.value))
 
-def forType(t):
-    _signature = varargSignature(listMatches(ofTypes(Type.PERCENT), ofTypes(t)))
-    def _function(env, vararg):
-        choice = r.random()
-        acc = 0
-        if sum(arg.value[0].value for arg in vararg) != 1.0:
-            raise IllegalArgumentException("Sum of all percentage values must be equal 100%")
-        for arg in vararg:
-            percent, item = arg.value
-            acc += percent.value
-            if choice <= acc:
-                return item
-
-    return Function(_signature, _function)
-
-
-function = CombinedFunction('random', *[ forType(t) for t in Type if t != Type.VOID ])
-
-#TODO: sample
+function = Function(_signature, _function, 'rand')

smnp/note/pitch.py

@@ -41,11 +41,15 @@ class NotePitch(Enum):
 
     @staticmethod
     def toPitch(string):
-        try:            
+        if string.lower() in stringToPitch:
             return stringToPitch[string.lower()]
-        except KeyError as e:
+
+        if string.upper() in NotePitch.__members__:
+            return NotePitch[string.upper()]
+
         raise NoteException(f"Note '{string}' does not exist")
 
+
 stringToPitch = {
     'cb': NotePitch.H,
     'c': NotePitch.C,

smnp/program/interpreter.py

@@ -1,25 +1,42 @@
 from smnp.ast.parser import parse
-#from smnp.environment.factory import createEnvironment
+from smnp.environment.environment import Environment
 from smnp.error.runtime import RuntimeException
+from smnp.module import functions, methods
 from smnp.program.FileReader import readLines
+from smnp.runtime.evaluator import evaluate
 from smnp.token.tokenizer import tokenize
 
 
 class Interpreter:
 
     @staticmethod
-    def interpretString(string, printTokens=False, printAst=False, execute=True, baseEnvironment=None):
-        return Interpreter._interpret(string.splitlines(), printTokens, printAst, execute, baseEnvironment)
+    def interpretString(string, source, printTokens=False, printAst=False, execute=True, baseEnvironment=None):
+        return Interpreter._interpret(
+            string.splitlines(),
+            source,
+            printTokens,
+            printAst,
+            execute,
+            baseEnvironment,
+        )
 
     @staticmethod
-    def interpretFile(file, printTokens=False, printAst=False, execute=True, baseEnvironment=None):
-        return Interpreter._interpret(readLines(file), printTokens, printAst, execute, baseEnvironment)
+    def interpretFile(file, printTokens=False, printAst=False, execute=True, baseEnvironment=None, source=None):
+        return Interpreter._interpret(
+            readLines(file),
+            source if source is not None else file,
+            printTokens,
+            printAst,
+            execute,
+            baseEnvironment,
+        )
 
     @staticmethod
-    def _interpret(lines, printTokens=False, printAst=False, execute=True, baseEnvironment=None):
-        #environment = createEnvironment()
-        #if baseEnvironment is not None:
-        #    environment.extend(baseEnvironment)
+    def _interpret(lines, source, printTokens=False, printAst=False, execute=True, baseEnvironment=None):
+        environment = Environment([{}], functions, methods, source=source)
+
+        if baseEnvironment is not None:
+            environment.extend(baseEnvironment)
 
         try:
             tokens = tokenize(lines)
@@ -30,10 +47,11 @@ class Interpreter:
             if printAst:
                 ast.print()
 
-            #if execute:
-            #    evaluate(ast, environment)
+            if execute:
+                evaluate(ast, environment)
 
-            #return environment
+            return environment
         except RuntimeException as e:
-            #e.environment = environment
+            e.environment = environment
+            e.file = environment.source
             raise e

smnp/runtime/evaluator.py

@@ -1,9 +1,11 @@
-from smnp.ast.node.block import BlockNode
-from smnp.ast.node.extend import ExtendNode
-from smnp.ast.node.function import FunctionDefinitionNode
-from smnp.ast.node.imports import ImportNode
+from smnp.ast.node.block import Block
+from smnp.ast.node.condition import IfElse
+from smnp.ast.node.extend import Extend
+from smnp.ast.node.function import FunctionDefinition
+from smnp.ast.node.imports import Import
 from smnp.ast.node.program import Program
-from smnp.ast.node.ret import ReturnNode
+from smnp.ast.node.ret import Return
+from smnp.ast.node.throw import Throw
 from smnp.error.runtime import RuntimeException
 from smnp.type.model import Type
 
@@ -69,19 +71,28 @@ class EvaluationResult():
 def evaluate(node, environment):
     from smnp.runtime.evaluators.program import ProgramEvaluator
     from smnp.runtime.evaluators.expression import expressionEvaluator
-
-    from smnp.runtime.evaluators.function import FunctionDefinitionEvaluator
-    from smnp.runtime.evaluators.extend import ExtendEvaluator
+    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
     from smnp.runtime.evaluators.function import ReturnEvaluator
+    from smnp.runtime.evaluators.extend import ExtendEvaluator
+    from smnp.runtime.evaluators.throw import ThrowEvaluator
+
     result = Evaluator.oneOf(
         Evaluator.forNodes(ProgramEvaluator.evaluate, Program),
-        Evaluator.forNodes(ImportEvaluator.evaluate, ImportNode),
-        Evaluator.forNodes(FunctionDefinitionEvaluator.evaluate, FunctionDefinitionNode),
-        Evaluator.forNodes(ExtendEvaluator.evaluate, ExtendNode),
-        Evaluator.forNodes(BlockEvaluator.evaluate, BlockNode),
-        Evaluator.forNodes(ReturnEvaluator.evaluate, ReturnNode),
+        Evaluator.forNodes(IfElseStatementEvaluator.evaluate, IfElse),
+        Evaluator.forNodes(BlockEvaluator.evaluate, Block),
+        Evaluator.forNodes(ImportEvaluator.evaluate, Import),
+        Evaluator.forNodes(FunctionDefinitionEvaluator.evaluate, FunctionDefinition),
+        Evaluator.forNodes(ReturnEvaluator.evaluate, Return),
+        Evaluator.forNodes(ExtendEvaluator.evaluate, Extend),
+        Evaluator.forNodes(ThrowEvaluator.evaluate, Throw),
+        #Evaluator.forNodes(ImportEvaluator.evaluate, ImportNode),
+        #Evaluator.forNodes(FunctionDefinitionEvaluator.evaluate, FunctionDefinitionNode),
+        #Evaluator.forNodes(ExtendEvaluator.evaluate, ExtendNode),
+        #Evaluator.forNodes(BlockEvaluator.evaluate, BlockNode),
+        #Evaluator.forNodes(ReturnEvaluator.evaluate, ReturnNode),
         expressionEvaluator()
     )(node, environment)
 

smnp/runtime/evaluators/access.py

@@ -1,5 +1,4 @@
-from smnp.ast.node.identifier import Identifier
-from smnp.ast.node.invocation import FunctionCallNode
+from smnp.ast.node.identifier import Identifier, FunctionCall
 from smnp.error.runtime import RuntimeException
 from smnp.runtime.evaluator import Evaluator
 from smnp.runtime.evaluators.expression import expressionEvaluator
@@ -20,9 +19,9 @@ class AccessEvaluator(Evaluator):
             except KeyError:
                 raise RuntimeException(f"Unknown property '{right.value}' of type '{left.type.name.lower()}'", right.pos)
 
-        if type(right) == FunctionCallNode:
+        if type(right) == FunctionCall:
             try:
-                arguments = abstractIterableEvaluator(expressionEvaluator(True))(right.arguments, environment)
+                arguments = abstractIterableEvaluator(expressionEvaluator(doAssert=True))(right.arguments, environment)
                 return environment.invokeMethod(left, right.name.value, arguments)
             except RuntimeException as e:
                 raise updatePos(e, right)

smnp/runtime/evaluators/assignment.py

@@ -1,4 +1,3 @@
-from smnp.error.runtime import RuntimeException
 from smnp.runtime.evaluator import Evaluator
 from smnp.runtime.evaluators.expression import expressionEvaluator
 
@@ -7,11 +6,8 @@ class AssignmentEvaluator(Evaluator):
 
     @classmethod
     def evaluator(cls, node, environment):
-        target = node.target.value
-        if target.startswith("_"):
-            raise RuntimeException("Declaration and assignation variables with names starting with '_' is not allowed", node.target.pos)
-
-        value = expressionEvaluator(doAssert=True)(node.value, environment).value #TODO check if it isn't necessary to verify 'result' attr of EvaluatioNResult
+        target = node.left.value
+        value = expressionEvaluator(doAssert=True)(node.right, environment).value #TODO check if it isn't necessary to verify 'result' attr of EvaluatioNResult
         scopeOfExistingVariable = environment.findVariableScope(target)
         if scopeOfExistingVariable is None:
             environment.scopes[-1][target] = value

smnp/runtime/evaluators/atom.py

@@ -0,0 +1,94 @@
+from smnp.ast.node.atom import StringLiteral, IntegerLiteral, NoteLiteral, BoolLiteral, TypeLiteral
+from smnp.ast.node.identifier import Identifier
+from smnp.ast.node.list import List
+from smnp.ast.node.map import Map
+from smnp.error.runtime import RuntimeException
+from smnp.runtime.evaluator import Evaluator
+from smnp.runtime.evaluators.expression import expressionEvaluator
+from smnp.runtime.evaluators.iterable import abstractIterableEvaluator
+from smnp.runtime.tools.error import updatePos
+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)
+
+
+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)
+
+
+class IdentifierEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        try:
+            return environment.findVariable(node.value)
+        except RuntimeException as e:
+            raise updatePos(e, node)
+
+
+class AtomEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        return Evaluator.oneOf(
+            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(MapEvaluator.evaluate, Map)
+        )(node, environment).value

smnp/runtime/evaluators/condition.py

@@ -0,0 +1,35 @@
+from smnp.error.runtime import RuntimeException
+from smnp.runtime.evaluator import Evaluator, evaluate
+from smnp.runtime.evaluators.expression import expressionEvaluator
+from smnp.type.model import Type
+
+
+class IfElseEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        condition = expressionEvaluator(doAssert=True)(node.condition, environment).value
+
+        if condition.type != Type.BOOL:
+            raise RuntimeException(f"Only {Type.BOOL.name.lower()} types can be used as conditions in conditional expression", node.condition.pos)
+
+        if condition.value:
+            return expressionEvaluator(doAssert=True)(node.ifNode, environment).value
+        else:
+            return expressionEvaluator(doAssert=True)(node.elseNode, environment).value
+
+
+class IfElseStatementEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        condition = expressionEvaluator(doAssert=True)(node.condition, environment).value
+
+        if condition.type != Type.BOOL:
+            raise RuntimeException(
+                f"Only {Type.BOOL.name.lower()} types can be used as conditions in conditional expression", node.condition.pos)
+
+        if condition.value:
+            evaluate(node.ifNode, environment)
+        else:
+            evaluate(node.elseNode, environment)

smnp/runtime/evaluators/expression.py

@@ -1,15 +1,9 @@
-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.condition import IfElse
+from smnp.ast.node.expression import Sum, Relation, And, Or, Loop
+from smnp.ast.node.factor import NotOperator, Power
+from smnp.ast.node.identifier import FunctionCall, Assignment
+from smnp.ast.node.term import Product
+from smnp.ast.node.unit import MinusOperator, Access
 from smnp.error.runtime import RuntimeException
 from smnp.runtime.evaluator import Evaluator
 from smnp.type.model import Type
@@ -17,32 +11,36 @@ 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.minus import MinusEvaluator
+        from smnp.runtime.evaluators.atom import AtomEvaluator
         from smnp.runtime.evaluators.access import AccessEvaluator
+        from smnp.runtime.evaluators.negation import NotEvaluator
+        from smnp.runtime.evaluators.power import PowerEvaluator
+        from smnp.runtime.evaluators.loop import LoopEvaluator
         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.product import ProductEvaluator
+
+        from smnp.runtime.evaluators.sum import SumEvaluator
+        from smnp.runtime.evaluators.relation import RelationEvaluator
+        from smnp.runtime.evaluators.condition import IfElseEvaluator
+        from smnp.runtime.evaluators.logic import AndEvaluator
+        from smnp.runtime.evaluators.logic import OrEvaluator
         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(MinusEvaluator.evaluate, MinusOperator),
+            Evaluator.forNodes(AccessEvaluator.evaluate, Access),
+            Evaluator.forNodes(NotEvaluator.evaluate, NotOperator),
+            Evaluator.forNodes(PowerEvaluator.evaluate, Power),
+            Evaluator.forNodes(LoopEvaluator.evaluate, Loop),
+            Evaluator.forNodes(AssignmentEvaluator.evaluate, Assignment),
+            Evaluator.forNodes(ProductEvaluator.evaluate, Product),
+            Evaluator.forNodes(SumEvaluator.evaluate, Sum),
+            Evaluator.forNodes(RelationEvaluator.evaluate, Relation),
+            Evaluator.forNodes(IfElseEvaluator.evaluate, IfElse),
+            Evaluator.forNodes(AndEvaluator.evaluate, And),
+            Evaluator.forNodes(OrEvaluator.evaluate, Or),
+            AtomEvaluator.evaluate
         )(node, environment)
 
         if doAssert and result.result and result.value.type == Type.VOID:
@@ -50,5 +48,17 @@ def expressionEvaluator(doAssert=False):
 
         return result
 
+
     return evaluateExpression
 
+
+def expressionEvaluatorWithMatcher(matcher, exceptionProvider, doAssert=True):
+    def evaluate(node, environment):
+        value = expressionEvaluator(doAssert=doAssert)(node, environment).value
+
+        if not matcher.match(value):
+            raise exceptionProvider(value)
+
+        return value
+
+    return evaluate

smnp/runtime/evaluators/extend.py

@@ -17,11 +17,11 @@ class ExtendEvaluator(Evaluator):
     @classmethod
     def _typeToMethodSignature(cls, node):
         if type(node.specifiers) == NoneNode:
-            return signature(ofType(node.type))
+            return signature(ofType(node.type.value))
 
-        elif node.type == Type.LIST:
+        elif node.type.value == Type.LIST:
             return signature(listSpecifier(node.specifiers[0]))
-        elif node.type == Type.MAP:
+        elif node.type.value == Type.MAP:
             return signature(mapSpecifier(node.specifiers[0], node.specifiers[1]))
 
     @classmethod
@@ -32,8 +32,8 @@ class ExtendEvaluator(Evaluator):
     @classmethod
     def _evaluateMethodDefinition(cls, node, environment, type, variable):
         name = node.name.value
-        signature = argumentsNodeToMethodSignature(node.arguments)
+        defaultArguments, signature = argumentsNodeToMethodSignature(node.arguments, environment)
         arguments = [arg.variable.value for arg in node.arguments]
         body = node.body
-        environment.addCustomMethod(type, variable, name, signature, arguments, body)
+        environment.addCustomMethod(type, variable, name, signature, arguments, body, defaultArguments)
 

smnp/runtime/evaluators/function.py

@@ -4,6 +4,7 @@ from smnp.runtime.evaluators.expression import expressionEvaluator
 from smnp.runtime.evaluators.iterable import abstractIterableEvaluator
 from smnp.runtime.tools.error import updatePos
 from smnp.runtime.tools.signature import argumentsNodeToMethodSignature
+from smnp.type.model import Type
 
 
 class FunctionCallEvaluator(Evaluator):
@@ -24,10 +25,10 @@ class FunctionDefinitionEvaluator(Evaluator):
     def evaluator(cls, node, environment):
         try:
             name = node.name.value
-            signature = argumentsNodeToMethodSignature(node.arguments)
+            defaultArguments, signature = argumentsNodeToMethodSignature(node.arguments, environment)
             arguments = [ arg.variable.value for arg in node.arguments ]
             body = node.body
-            environment.addCustomFunction(name, signature, arguments, body)
+            environment.addCustomFunction(name, signature, arguments, body, defaultArguments)
         except RuntimeException as e:
             raise updatePos(e, node)
 
@@ -38,8 +39,6 @@ class BodyEvaluator(Evaluator):
     def evaluator(cls, node, environment):
         for child in node.children:
             evaluate(child, environment)
-            if environment.callStack[-1].value is not None:
-                return environment.callStack[-1].value
 
 
 class ReturnEvaluator(Evaluator):
@@ -47,7 +46,21 @@ class ReturnEvaluator(Evaluator):
     @classmethod
     def evaluator(cls, node, environment):
         if len(environment.callStack) > 0:
-            returnValue = expressionEvaluator(doAssert=True)(node.value, environment)
-            environment.callStack[-1].value = returnValue.value
+            returnValue = expressionEvaluator()(node.value, environment).value
+            raise Return(returnValue)
+            # Disclaimer
+            # Exception system usage to control program execution flow is really bad idea.
+            # However because of lack of 'goto' instruction equivalent in Python
+            # there is to need to use some mechanism to break function execution on 'return' statement
+            # and immediately go to Environment's method 'invokeFunction()' or 'invokeMethod()',
+            # which can handle value that came with exception and return it to code being executed.
         else:
             raise RuntimeException("Cannot use 'return' statement outside a function or method", node.pos, environment)
+
+
+class Return(Exception):
+    def __init__(self, value):
+        if value is None:
+            value = Type.void()
+
+        self.value = value

smnp/runtime/evaluators/imports.py

@@ -1,4 +1,3 @@
-from smnp.ast.node.none import NoneNode
 from smnp.program.interpreter import Interpreter
 from smnp.runtime.evaluator import Evaluator
 
@@ -7,13 +6,6 @@ class ImportEvaluator(Evaluator):
 
     @classmethod
     def evaluator(cls, node, environment):
-        if type(node.type) == NoneNode:
-            cls._evaluateCodeImport(node, environment)
-        else:
-            raise RuntimeError("Importing types is not implemented yet")
-
-    @classmethod
-    def _evaluateCodeImport(cls, node, environment):
         source = node.source
-        newEnvironment = Interpreter.interpretFile(source.value)
+        newEnvironment = Interpreter.interpretFile(source.value, baseEnvironment=environment)
         environment.extend(newEnvironment)

smnp/runtime/evaluators/logic.py

@@ -0,0 +1,21 @@
+from smnp.runtime.evaluator import Evaluator
+from smnp.runtime.evaluators.expression import expressionEvaluator
+from smnp.type.model import Type
+
+
+class AndEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        left = expressionEvaluator(doAssert=True)(node.left, environment).value
+        right = expressionEvaluator(doAssert=True)(node.right, environment).value
+        return Type.bool(left.value and right.value)
+
+
+class OrEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        left = expressionEvaluator(doAssert=True)(node.left, environment).value
+        right = expressionEvaluator(doAssert=True)(node.right, environment).value
+        return Type.bool(left.value or right.value)

smnp/runtime/evaluators/loop.py

@@ -0,0 +1,104 @@
+from smnp.ast.node.none import NoneNode
+from smnp.error.runtime import RuntimeException
+from smnp.runtime.evaluator import Evaluator, evaluate
+from smnp.runtime.evaluators.expression import expressionEvaluator
+from smnp.type.model import Type
+
+
+class LoopEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        iterator = expressionEvaluator(doAssert=True)(node.left, environment).value
+        parameters = [ identifier.value for identifier in node.parameters ] if type(node.parameters) != NoneNode() else []
+
+        try:
+            environment.scopes.append({})
+
+            output = {
+                Type.INTEGER: cls.numberEvaluator,
+                Type.BOOL: cls.boolEvaluator,
+                Type.LIST: cls.listEvaluator,
+                Type.MAP: cls.mapEvaluator
+            }[iterator.type](node, environment, iterator, parameters)
+
+            environment.scopes.pop(-1)
+        except KeyError:
+            raise RuntimeException(f"The {iterator.type.name.lower()} type cannot stand as an iterator for loop statement", node.left.pos)
+
+        return Type.list(output)
+
+    @classmethod
+    def numberEvaluator(cls, node, environment, evaluatedIterator, parameters):
+        output = []
+
+
+        if len(parameters) > 1:
+            raise RuntimeException(f"Loop with numeric iterator can handle only one parameter", node.parameters.pos)
+
+        for i in range(evaluatedIterator.value):
+            if len(parameters) > 0:
+                environment.scopes[-1][parameters[0]] = Type.integer(i)
+
+            output.append(evaluate(node.right, environment).value)
+
+
+
+        return output
+
+    @classmethod
+    def boolEvaluator(cls, node, environment, evaluatedIterator, parameters):
+        output = []
+
+        if len(parameters) > 0:
+            raise RuntimeException(f"Loop with logic iterator can't' handle any parameters", node.parameters.pos)
+
+        condition = evaluatedIterator
+        while condition.value:
+            output.append(evaluate(node.right, environment).value)
+            condition = expressionEvaluator(doAssert=True)(node.left, environment).value
+
+        return output
+
+    @classmethod
+    def listEvaluator(cls, node, environment, evaluatedIterator, parameters):
+        output = []
+
+        if len(parameters) > 2:
+            raise RuntimeException(f"Loop with list iterator can handle only two parameters", node.parameters.pos)
+
+        for i, value in enumerate(evaluatedIterator.value):
+            if len(parameters) == 1:
+                environment.scopes[-1][parameters[0]] = value
+            if len(parameters) == 2:
+                environment.scopes[-1][parameters[0]] = Type.integer(i)
+                environment.scopes[-1][parameters[1]] = value
+
+            output.append(evaluate(node.right, environment).value)
+
+        return output
+
+
+    @classmethod
+    def mapEvaluator(cls, node, environment, evaluatedIterator, parameters):
+        output = []
+
+        if len(parameters) > 3:
+            raise RuntimeException(f"Loop with map iterator can handle only three parameters", node.parameters.pos)
+
+        i = 0
+        for key, value in evaluatedIterator.value.items():
+            if len(parameters) == 1:
+                environment.scopes[-1][parameters[0]] = value
+            if len(parameters) == 2:
+                environment.scopes[-1][parameters[0]] = key
+                environment.scopes[-1][parameters[1]] = value
+            if len(parameters) == 3:
+                environment.scopes[-1][parameters[0]] = Type.integer(i)
+                environment.scopes[-1][parameters[1]] = key
+                environment.scopes[-1][parameters[2]] = value
+                i += 1
+
+            output.append(evaluate(node.right, environment).value)
+
+        return output

smnp/runtime/evaluators/minus.py

@@ -0,0 +1,31 @@
+from smnp.error.runtime import RuntimeException
+from smnp.runtime.evaluator import Evaluator, evaluate
+from smnp.type.model import Type
+
+
+class MinusEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        value = evaluate(node.value, environment).value
+        try:
+            return {
+                Type.INTEGER: cls.evaluateForInteger,
+                Type.STRING: cls.evaluateForString,
+                Type.LIST: cls.evaluateForList
+            }[value.type](value.value)
+        except KeyError:
+            raise RuntimeException(f"Type {value.type.name.lower()} does not support '{node.operator.value}' operator", node.pos)
+
+    @classmethod
+    def evaluateForInteger(cls, value):
+
+        return Type.integer(-value)
+
+    @classmethod
+    def evaluateForString(cls, value):
+        return Type.string(value[::-1])
+
+    @classmethod
+    def evaluateForList(cls, value):
+        return Type.list(value[::-1])

smnp/runtime/evaluators/negation.py

@@ -0,0 +1,16 @@
+from smnp.error.runtime import RuntimeException
+from smnp.runtime.evaluator import Evaluator
+from smnp.runtime.evaluators.expression import expressionEvaluator
+from smnp.type.model import Type
+
+
+class NotEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        value = expressionEvaluator(doAssert=True)(node.value, environment).value
+
+        if value.type != Type.BOOL:
+            raise RuntimeException(f"Operator '{node.operator.value}' is supported only by {Type.BOOL.name.lower()} type", node.value.pos)
+
+        return Type.bool(not value.value)

smnp/runtime/evaluators/power.py

@@ -0,0 +1,20 @@
+from smnp.error.runtime import RuntimeException
+from smnp.runtime.evaluator import Evaluator
+from smnp.runtime.evaluators.expression import expressionEvaluator
+from smnp.type.model import Type
+
+
+class PowerEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        left = expressionEvaluator(doAssert=True)(node.left, environment).value
+        right = expressionEvaluator(doAssert=True)(node.right, environment).value
+
+        if left.type != Type.INTEGER:
+            raise RuntimeException( f"Operator '{node.operator.value}' is supported only by {Type.INTEGER.name.lower()} type", node.left.pos)
+
+        if right.type != Type.INTEGER:
+            raise RuntimeException( f"Operator '{node.operator.value}' is supported only by {Type.INTEGER.name.lower()} type", node.right.pos)
+
+        return Type.integer(int(left.value ** right.value))

smnp/runtime/evaluators/product.py

@@ -0,0 +1,31 @@
+from smnp.error.runtime import RuntimeException
+from smnp.runtime.evaluator import Evaluator
+from smnp.runtime.evaluators.expression import expressionEvaluator
+from smnp.type.model import Type
+
+
+class ProductEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        left = expressionEvaluator(doAssert=True)(node.left, environment).value
+        right = expressionEvaluator(doAssert=True)(node.right, environment).value
+
+        if left.type != Type.INTEGER:
+            raise RuntimeException(
+                f"Operator '{node.operator.value}' is supported only by {Type.INTEGER.name.lower()} type", node.left.pos)
+
+        if right.type != Type.INTEGER:
+            raise RuntimeException(
+                f"Operator '{node.operator.value}' is supported only by {Type.INTEGER.name.lower()} type", node.right.pos)
+
+        if node.operator.value == "*":
+            return Type.integer(int(left.value * right.value))
+
+        if node.operator.value == "/":
+            if right.value == 0:
+                raise RuntimeException("Attempt to divide by 0", node.right.pos)
+            return Type.integer(int(left.value / right.value))
+
+        raise RuntimeError("This line should never be reached")
+

smnp/runtime/evaluators/relation.py

@@ -0,0 +1,46 @@
+from smnp.error.runtime import RuntimeException
+from smnp.runtime.evaluator import Evaluator
+from smnp.runtime.evaluators.expression import expressionEvaluator
+from smnp.type.model import Type
+
+
+class RelationEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        left = expressionEvaluator(doAssert=True)(node.left, environment).value
+        right = expressionEvaluator(doAssert=True)(node.right, environment).value
+
+        if node.operator.value == "==":
+            return cls.equalOperatorEvaluator(left, node.operator, right)
+
+        if node.operator.value == "!=":
+            return cls.notEqualOperatorEvaluator(left, node.operator, right)
+
+        return cls.otherRelationOperatorsEvaluator(left, node.operator, right)
+
+    @classmethod
+    def equalOperatorEvaluator(cls, left, operator, right):
+        return Type.bool(left.type == right.type and left.value == right.value)
+
+    @classmethod
+    def notEqualOperatorEvaluator(cls, left, operator, right):
+        return Type.bool(left.type != right.type or left.value != right.value)
+
+    @classmethod
+    def otherRelationOperatorsEvaluator(cls, left, operator, right):
+        if left.type == right.type == Type.INTEGER:
+            if operator.value == ">":
+                return Type.bool(left.value > right.value)
+
+            if operator.value == ">=":
+                return Type.bool(left.value >= right.value)
+
+            if operator.value == "<":
+                return Type.bool(left.value < right.value)
+
+            if operator.value == "<=":
+                return Type.bool(left.value < right.value)
+
+        raise RuntimeException(f"Operator {operator.value} is not supported by {left.type.name.lower()} and {right.type.name.lower()} types", operator.pos)
+

smnp/runtime/evaluators/sum.py

@@ -0,0 +1,66 @@
+from smnp.error.runtime import RuntimeException
+from smnp.runtime.evaluator import Evaluator
+from smnp.runtime.evaluators.expression import expressionEvaluator
+from smnp.type.model import Type
+
+
+class SumEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        left = expressionEvaluator(doAssert=True)(node.left, environment).value
+        right = expressionEvaluator(doAssert=True)(node.right, environment).value
+
+        if left.type == right.type == Type.INTEGER:
+            return cls.integerEvaluator(left, node.operator, right)
+
+        if left.type == right.type == Type.STRING:
+            return cls.stringEvaluator(left, node.operator, right)
+
+        if left.type == right.type == Type.LIST:
+            return cls.listEvaluator(left, node.operator, right)
+
+        if left.type == right.type == Type.MAP:
+            return cls.mapEvaluator(left, node.operator, right)
+
+        raise RuntimeException(f"Operator {node.operator.value} is not supported by {left.type.name.lower()} and {right.type.name.lower()} types", node.operator.pos)
+
+    @classmethod
+    def integerEvaluator(cls, left, operator, right):
+        if operator.value == "+":
+            return Type.integer(left.value + right.value)
+
+        if operator.value == "-":
+            return Type.integer(left.value - right.value)
+
+        raise RuntimeError("This line should never be reached")
+
+    @classmethod
+    def stringEvaluator(cls, left, operator, right):
+        if operator.value == "+":
+            return Type.string(left.value + right.value)
+
+        if operator.value == "-":
+            raise RuntimeException(f"Operator {operator.value} is not supported by string types", operator.pos)
+
+        raise RuntimeError("This line should never be reached")
+
+    @classmethod
+    def listEvaluator(cls, left, operator, right):
+        if operator.value == "+":
+            return Type.list(left.value + right.value)
+
+        if operator.value == "-":
+            raise RuntimeException(f"Operator {operator.value} is not supported by list types", operator.pos)
+
+        raise RuntimeError("This line should never be reached")
+
+    @classmethod
+    def mapEvaluator(cls, left, operator, right):
+        if operator.value == "+":
+            return Type.map({**left.value, **right.value})
+
+        if operator.value == "-":
+            raise RuntimeException(f"Operator {operator.value} is not supported by map types", operator.pos)
+
+        raise RuntimeError("This line should never be reached")

smnp/runtime/evaluators/throw.py

@@ -0,0 +1,17 @@
+from smnp.error.custom import CustomException
+from smnp.error.runtime import RuntimeException
+from smnp.runtime.evaluator import Evaluator
+from smnp.runtime.evaluators.expression import expressionEvaluator
+from smnp.type.model import Type
+
+
+class ThrowEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        string = expressionEvaluator(doAssert=True)(node.value, environment).value
+
+        if string.type != Type.STRING:
+            raise RuntimeException(f"Only {Type.STRING.name.lower()} types can be thrown", node.value.pos)
+
+        raise CustomException(string.value, node.pos)

smnp/runtime/evaluators/unit.py

@@ -0,0 +1,34 @@
+from smnp.ast.node.identifier import Identifier, FunctionCall
+from smnp.error.runtime import RuntimeException
+from smnp.runtime.evaluator import Evaluator
+from smnp.runtime.evaluators.expression import expressionEvaluator
+from smnp.runtime.evaluators.iterable import abstractIterableEvaluator
+from smnp.runtime.tools.error import updatePos
+
+
+class UnitEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        return
+
+
+class AccessEvaluator(Evaluator):
+
+    @classmethod
+    def evaluator(cls, node, environment):
+        left = expressionEvaluator(doAssert=True)(node.left, environment).value  # TODO check if it isn't necessary to verify 'result' attr of EvaluatioNResult
+        right = node.right
+
+        if type(right) == Identifier:
+            try:
+                return left.properties[right.value]
+            except KeyError:
+                raise RuntimeException(f"Unknown property '{right.value}' of type '{left.type.name.lower()}'", right.pos)
+
+        if type(right) == FunctionCall:
+            try:
+                arguments = abstractIterableEvaluator(expressionEvaluator(doAssert=True))(right.arguments, environment)
+                return environment.invokeMethod(left, right.name.value, arguments)
+            except RuntimeException as e:
+                raise updatePos(e, right)

smnp/runtime/tools/signature.py

@@ -1,7 +1,9 @@
+from smnp.ast.node import type as ast
 from smnp.ast.node.none import NoneNode
-from smnp.ast.node.type import TypeNode, TypeSpecifier
+from smnp.ast.node.type import TypesList
 from smnp.error.runtime import RuntimeException
-from smnp.function.signature import varargSignature, signature
+from smnp.function.signature import varargSignature, signature, optional
+from smnp.runtime.evaluators.expression import expressionEvaluator, expressionEvaluatorWithMatcher
 from smnp.runtime.tools.error import updatePos
 from smnp.type.model import Type
 from smnp.type.signature.matcher.list import listOfMatchers
@@ -9,31 +11,54 @@ from smnp.type.signature.matcher.map import mapOfMatchers
 from smnp.type.signature.matcher.type import allTypes, oneOf, ofType
 
 
-def argumentsNodeToMethodSignature(node):
+def evaluateDefaultArguments(node, environment):
+    defaultValues = { arg.variable.value: expressionEvaluator(doAssert=True)(arg.optionalValue, environment).value for arg in node.children if type(arg.optionalValue) != NoneNode }
+
+    return defaultValues
+
+
+def argumentsNodeToMethodSignature(node, environment):
     try:
         sign = []
         vararg = None
         argumentsCount = len(node.children)
+        checkPositionOfOptionalArguments(node)
+        defaultArgs = {}
         for i, child in enumerate(node.children):
             matchers = {
-                TypeNode: (lambda c: c.type, typeMatcher),
+                ast.Type: (lambda c: c.type, typeMatcher),
                 NoneNode: (lambda c: c.type, lambda c: allTypes()),
-                TypeSpecifier: (lambda c: c, multipleTypeMatcher)
+                TypesList: (lambda c: c, multipleTypeMatcher)
             }
             evaluatedMatcher = matchers[type(child.type)][1](matchers[type(child.type)][0](child))
+
             if child.vararg:
                 if i != argumentsCount - 1:
                     raise RuntimeException("Vararg must be the last argument in signature", child.pos)
                 vararg = evaluatedMatcher
             else:
+                if type(child.optionalValue) != NoneNode:
+                    defaultArgs[child.variable.value] = expressionEvaluatorWithMatcher(
+                        evaluatedMatcher,
+                        exceptionProvider=lambda value: RuntimeException(
+                            f"Value '{value.stringify()}' doesn't match declared type: {evaluatedMatcher.string}", child.optionalValue.pos)
+                    )(child.optionalValue, environment)
+                    evaluatedMatcher = optional(evaluatedMatcher)
                 sign.append(evaluatedMatcher)
 
-
-        return varargSignature(vararg, *sign, wrapVarargInValue=True) if vararg is not None else signature(*sign)
+        return defaultArgs, (varargSignature(vararg, *sign, wrapVarargInValue=True) if vararg is not None else signature(*sign))
     except RuntimeException as e:
         raise updatePos(e, node)
 
 
+def checkPositionOfOptionalArguments(node):
+    firstOptional = next((i for i, v in enumerate(node.children) if type(v.optionalValue) != NoneNode), None) #next(filter(lambda arg: type(arg.optionalValue) != NoneNode, node.children), None)
+    if firstOptional is not None:
+        regularAfterOptional = next((i for i, v in enumerate(node.children[firstOptional:]) if type(v.optionalValue) == NoneNode), None)
+        if regularAfterOptional is not None:
+            raise RuntimeException(f"Optional arguments should be declared at the end of the arguments list", node.children[regularAfterOptional].pos)
+
+
 def multipleTypeMatcher(typeNode):
     subSignature = []
 
@@ -49,10 +74,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

smnp/token/tokenizer.py

@@ -8,7 +8,7 @@ from smnp.token.tokenizers.note import noteTokenizer
 from smnp.token.tokenizers.relation import relationOperatorTokenizer
 from smnp.token.tokenizers.string import stringTokenizer
 from smnp.token.tokenizers.whitespace import whitespacesTokenizer
-from smnp.token.tools import defaultTokenizer, separated, regexPatternTokenizer
+from smnp.token.tools import defaultTokenizer, separated, regexPatternTokenizer, mapValue
 from smnp.token.type import TokenType
 
 tokenizers = (
@@ -27,6 +27,7 @@ tokenizers = (
     defaultTokenizer(TokenType.CLOSE_SQUARE),
     defaultTokenizer(TokenType.OPEN_ANGLE),
     defaultTokenizer(TokenType.CLOSE_ANGLE),
+    defaultTokenizer(TokenType.SEMICOLON),
     defaultTokenizer(TokenType.ASTERISK),
     defaultTokenizer(TokenType.ASSIGN),
     defaultTokenizer(TokenType.COMMA),
@@ -39,7 +40,7 @@ tokenizers = (
     defaultTokenizer(TokenType.DOT),
 
     # Types
-    separated(regexPatternTokenizer(TokenType.INTEGER, r'\d')),
+    mapValue(separated(regexPatternTokenizer(TokenType.INTEGER, r'\d')), int),
     stringTokenizer,
     noteTokenizer,
     boolTokenizer,
@@ -50,7 +51,9 @@ tokenizers = (
     separated(defaultTokenizer(TokenType.RETURN)),
     separated(defaultTokenizer(TokenType.EXTEND)),
     separated(defaultTokenizer(TokenType.IMPORT)),
+    separated(defaultTokenizer(TokenType.THROW)),
     separated(defaultTokenizer(TokenType.FROM)),
+    separated(defaultTokenizer(TokenType.WITH)),
     separated(defaultTokenizer(TokenType.ELSE)),
     separated(defaultTokenizer(TokenType.AND)),
     separated(defaultTokenizer(TokenType.NOT)),

smnp/token/tokenizers/keyword.py

@@ -3,7 +3,7 @@ from smnp.token.type import TokenType
 from smnp.type.model import Type
 
 
-typeTokenizer = separated(keywordsTokenizer(TokenType.TYPE, *[type.name.lower() for type in Type]))
+typeTokenizer = separated(keywordsTokenizer(TokenType.TYPE, *[type.name.lower() for type in Type], mapKeyword=lambda value: Type[value.upper()]))
 
 
 

smnp/token/tokenizers/note.py

@@ -14,7 +14,7 @@ def noteTokenizer(input, current, line):
     rawValue = ''
     if input[current] == '@':
         rawValue += input[current+consumedChars]
-        consumedChars += 1
+        consumedChars += 1  # TODO: Check if next item does even exist
         if input[current+consumedChars] in ('C', 'c', 'D', 'd', 'E', 'e', 'F', 'f', 'G', 'g', 'A', 'a', 'H', 'h', 'B', 'b'):
             rawValue += input[current + consumedChars]
             notePitch = input[current+consumedChars]

smnp/token/tokenizers/relation.py

@@ -3,4 +3,4 @@ from smnp.token.type import TokenType
 
 
 def relationOperatorTokenizer(input, current, line):
-    return keywordsTokenizer(TokenType.RELATION, "==", "!=", ">=", "<=", ">", "<")(input, current, line)
+    return keywordsTokenizer(TokenType.RELATION, "==", "!=", ">=", "<=")(input, current, line)

smnp/token/tokenizers/string.py

@@ -13,5 +13,5 @@ def stringTokenizer(input, current, line):
             char = input[current + consumedChars]
             value += char
             consumedChars += 1
-        return (consumedChars, Token(TokenType.STRING, value[1:len(value)-1], (line, current)))
+        return (consumedChars, Token(TokenType.STRING, value[1:len(value)-1], (line, current), value))
     return (0, None)

smnp/token/tools.py

@@ -16,10 +16,10 @@ def regexPatternTokenizer(type, pattern):
     return tokenizer
 
 
-def keywordsTokenizer(type, *keywords):
+def keywordsTokenizer(type, *keywords, mapKeyword=lambda x: x):
     def tokenizer(input, current, line):
         for keyword in keywords:
-            result = keywordTokenizer(type, keyword)(input, current, line)
+            result = keywordTokenizer(type, keyword, mapKeyword)(input, current, line)
             if result[0] > 0:
                 return result
         return (0, None)
@@ -27,10 +27,10 @@ def keywordsTokenizer(type, *keywords):
     return tokenizer
 
 
-def keywordTokenizer(type, keyword):
+def keywordTokenizer(type, keyword, mapKeyword=lambda x: x):
     def tokenizer(input, current, line):
         if len(input) >= current+len(keyword) and input[current:current+len(keyword)] == keyword:
-            return (len(keyword), Token(type, keyword, (line, current)))
+            return (len(keyword), Token(type, mapKeyword(keyword), (line, current)))
         return (0, None)
     return tokenizer
 
@@ -50,3 +50,14 @@ def separated(tokenizer, end=r"\W"):
         return (0, None)
 
     return separated
+
+
+def mapValue(tokenizer, mapper):
+    def tokenize(input, current, line):
+        consumedChars, token = tokenizer(input, current, line)
+        if consumedChars > 0:
+            return (consumedChars, Token(token.type, mapper(token.value), token.pos))
+
+        return (0, None)
+
+    return tokenize

smnp/token/type.py

@@ -2,7 +2,7 @@ from enum import Enum
 
 
 class TokenType(Enum):
-    RELATION = 'relation'
+    RELATION = '==, !=, >=, <='
     DOUBLE_ASTERISK = '**'
     OPEN_CURLY = '{'
     CLOSE_CURLY = '}'
@@ -12,6 +12,7 @@ class TokenType(Enum):
     CLOSE_SQUARE = ']'
     OPEN_ANGLE = '<'
     CLOSE_ANGLE = '>'
+    SEMICOLON = ';'
     ASTERISK = '*'
     ASSIGN = '='
     ARROW = '->'
@@ -35,7 +36,9 @@ class TokenType(Enum):
     RETURN = 'return'
     EXTEND = 'extend'
     IMPORT = 'import'
+    THROW = 'throw'
     FROM = 'from'
+    WITH = 'with'
     ELSE = 'else'
     IF = 'if'
     AS = 'as'

smnp/type/model.py

@@ -51,7 +51,7 @@ class Type(Enum):
             "pitch": Type.string(str(value.note)),
             "octave": Type.integer(value.octave),
             "duration": Type.integer(value.duration),
-            "dot": Type.string('.' if value.dot else '')
+            "dot": Type.bool(value.dot)
         })
 
     @staticmethod
@@ -73,6 +73,7 @@ class Type(Enum):
     def void():
         return Value(Type.VOID, None)
 
+
 def _failStringify(t):
     raise RuntimeException(f"Not able to interpret {t.name}'", None)
 

smnp/type/signature/matcher/model.py

@@ -3,6 +3,7 @@ class Matcher:
         self.type = objectType
         self.matcher = matcher
         self.string = string
+        self.optional = False
 
     def match(self, value):
         if self.type is not None and self.type != value.type:

smnp/util/singleton.py

@@ -1,14 +0,0 @@
-from smnp.ast.parser import Parser
-
-
-def SingletonParser(function):
-    def wrapper(*args, **kwargs):
-        if not hasattr(function, 'instance'):
-            function.instance = function(*args, **kwargs)
-
-        if not isinstance(function.instance, Parser):
-            raise RuntimeError(f"Function {function.__name__} haven't returned Parser object")
-
-        return function.instance
-
-    return wrapper