--wip-- [skip ci]

Create almost working proof of concept with new parsers
Create base for future parsers
2019-07-11 19:36:25 +02:00 · 2019-07-11 19:10:13 +02:00 · 2019-07-11 18:24:05 +02:00 · 2019-07-11 17:23:39 +02:00 · 2019-07-11 10:34:10 +02:00 · 2019-07-11 10:23:28 +02:00
42 changed files with 1480 additions and 1029 deletions
--- a/smnp/ast/node/access.py
+++ b/smnp/ast/node/access.py
@@ -1,56 +0,0 @@
-from smnp.ast.node.expression import ExpressionNode
-from smnp.ast.node.ignore import IgnoredNode
-from smnp.ast.parser import Parser
-from smnp.error.syntax import SyntaxException
-from smnp.token.type import TokenType
-
-
-class AccessNode(ExpressionNode):
-    def __init__(self, pos):
-        super().__init__(pos)
-        self.children.append(IgnoredNode(pos))
-
-    @property
-    def left(self):
-        return self[0]
-
-    @left.setter
-    def left(self, value):
-        self[0] = value
-
-    @property
-    def right(self):
-        return self[1]
-
-    @right.setter
-    def right(self, value):
-        self[1] = value
-
-    @classmethod
-    def _parse(cls, input):
-        def createNode(left, right):
-            node = AccessNode(right.pos)
-            node.left = left
-            node.right = right
-            return node
-
-        return Parser.leftAssociativeOperatorParser(
-            cls._literalParser(),
-            TokenType.DOT,
-            cls._parseAccessingProperty(),
-            createNode=createNode
-        )(input)
-
-    @classmethod
-    def _literalParser(cls):
-        pass
-
-    @staticmethod
-    def _parseAccessingProperty():
-        from smnp.ast.node.identifier import IdentifierNode
-
-        return Parser.oneOf(
-            IdentifierNode._literalParser(),
-            IdentifierNode._functionCallParser(),
-            exception=lambda input: SyntaxException(f"Expected property name or method call, found '{input.current().rawValue}'", input.currentPos())
-        )
--- a/smnp/ast/node/assignment.py
+++ b/smnp/ast/node/assignment.py
@@ -1,28 +0,0 @@
-from smnp.ast.node.expression import ExpressionNode
-from smnp.ast.node.none import NoneNode
-
-
-class AssignmentNode(ExpressionNode):
-    def __init__(self, pos):
-        super().__init__(pos)
-        self.children.append(NoneNode())
-
-    @property
-    def target(self):
-        return self[0]
-
-    @target.setter
-    def target(self, value):
-        self[0] = value
-
-    @property
-    def value(self):
-        return self[1]
-
-    @value.setter
-    def value(self, value):
-        self[1] = value
-
-    @classmethod
-    def _parse(cls, input):
-        raise RuntimeError("This class is not supposed to be automatically called")
--- a/smnp/ast/node/asterisk.py
+++ b/smnp/ast/node/asterisk.py
@@ -1,28 +0,0 @@
-from smnp.ast.node.none import NoneNode
-from smnp.ast.node.statement import StatementNode
-
-
-class AsteriskNode(StatementNode):
-    def __init__(self, pos):
-        super().__init__(pos)
-        self.children = [NoneNode(), NoneNode()]
-
-    @property
-    def iterator(self):
-        return self[0]
-
-    @iterator.setter
-    def iterator(self, value):
-        self[0] = value
-
-    @property
-    def statement(self):
-        return self[1]
-
-    @statement.setter
-    def statement(self, value):
-        self[1] = value
-
-    @classmethod
-    def _parse(cls, input):
-        raise RuntimeError("This class is not supposed to be automatically called")
--- a/smnp/ast/node/atom.py
+++ b/smnp/ast/node/atom.py
@@ -0,0 +1,103 @@
+from smnp.ast.node.model import Node
+from smnp.ast.parser import Parsers
+from smnp.token.type import TokenType
+from smnp.util.singleton import SingletonParser
+
+
+class Atom(Node):
+    def __init__(self, pos):
+        super().__init__(pos)
+        self.children = [None]
+
+    @property
+    def value(self):
+        return self[0]
+
+    @value.setter
+    def value(self, value):
+        self[0] = value
+
+    @classmethod
+    def withValue(cls, value, pos):
+        node = cls(pos)
+        node.value = value
+        return node
+
+
+class IntegerLiteral(Atom):
+    pass
+
+
+class StringLiteral(Atom):
+    pass
+
+
+class NoteLiteral(Atom):
+    pass
+
+
+class BoolLiteral(Atom):
+    pass
+
+
+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"
+    )
+
+
+@SingletonParser
+def StringParser():
+    return Parsers.terminal(TokenType.STRING, createNode=StringLiteral.withValue)
+
+
+@SingletonParser
+def NoteParser():
+    return Parsers.terminal(TokenType.NOTE, createNode=NoteLiteral.withValue)
+
+
+@SingletonParser
+def BoolParser():
+    return Parsers.terminal(TokenType.BOOL, createNode=BoolLiteral.withValue)
+
+
+@SingletonParser
+def TypeParser():
+    return Parsers.terminal(TokenType.TYPE, createNode=TypeLiteral.withValue)
+
+
+@SingletonParser
+def LiteralParser():
+    return Parsers.oneOf(
+        IntegerParser(),
+        StringParser(),
+        NoteParser(),
+        BoolParser(),
+        TypeParser(),
+        name="literal"
+    )
+
+
+@SingletonParser
+def AtomParser():
+    from smnp.ast.node.identifier import IdentifierParser
+
+    return Parsers.oneOf(
+        LiteralParser(),
+        IdentifierParser(),
+        name="atom"
+    )
+
+
--- a/smnp/ast/node/block.py
+++ b/smnp/ast/node/block.py
@@ -1,20 +1,19 @@
-from smnp.ast.node.statement import StatementNode
+from smnp.ast.node.model import Node
+from smnp.ast.node.statement import StatementParser
 from smnp.ast.parser import Parser
 from smnp.token.type import TokenType


-class BlockNode(StatementNode):
+class Block(Node):
+    pass

-    @classmethod
-    def _parse(cls, input):
-        def createNode(start, items, end):
-            node = BlockNode(start.pos)
-            node.children = items
-            return node

-        return Parser.loop(
+def BlockParser(input):
+    parser = Parser.loop(
        Parser.terminalParser(TokenType.OPEN_CURLY),
-            Parser.doAssert(StatementNode.parse, f"statement or '{TokenType.CLOSE_CURLY.key}'"),
+        Parser.doAssert(StatementParser, f"statement or '{TokenType.CLOSE_CURLY.key}'"),
        Parser.terminalParser(TokenType.CLOSE_CURLY),
-            createNode=createNode,
-        )(input)
+        createNode=lambda open, statements, close: Block.withChildren(statements, open.pos)
+    )
+
+    return Parser(parser, "block", [parser])(input)
--- a/smnp/ast/node/bool.py
+++ b/smnp/ast/node/bool.py
@@ -1,13 +0,0 @@
-from smnp.ast.node.access import AccessNode
-from smnp.ast.node.literal import LiteralNode
-from smnp.token.type import TokenType
-
-
-class BoolLiteralNode(LiteralNode, AccessNode):
-    def __init__(self, pos):
-        super().__init__(pos)
-        del self.children[1]
-
-    @classmethod
-    def _getTokenType(cls):
-        return TokenType.BOOL
--- a/smnp/ast/node/chain.py
+++ b/smnp/ast/node/chain.py
@@ -0,0 +1,32 @@
+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"
+    )
+
--- a/smnp/ast/node/condition.py
+++ b/smnp/ast/node/condition.py
@@ -0,0 +1,74 @@
+from smnp.ast.node.expression import MaxPrecedenceExpressionParser
+from smnp.ast.node.model import Node
+from smnp.ast.node.none import NoneNode
+from smnp.ast.node.statement import StatementParser
+from smnp.ast.parser import Parser
+from smnp.token.type import TokenType
+
+
+class IfElse(Node):
+    def __init__(self, pos):
+        super().__init__(pos)
+        self.children = [NoneNode(), NoneNode(), NoneNode()]
+
+    @property
+    def condition(self):
+        return self[0]
+
+    @condition.setter
+    def condition(self, value):
+        self[0] = value
+
+    @property
+    def ifNode(self):
+        return self[1]
+
+    @ifNode.setter
+    def ifNode(self, value):
+        self[1] = value
+
+    @property
+    def elseNode(self):
+        return self[2]
+
+    @elseNode.setter
+    def elseNode(self, value):
+        self[2] = value
+
+    @classmethod
+    def createNode(cls, ifNode, condition, elseNode=NoneNode()):
+        node = cls(ifNode.pos)
+        node.ifNode = ifNode
+        node.condition = condition
+        node.elseNode = elseNode
+        return node
+
+
+def IfElseStatementParser(input):
+    ifStatementParser = Parser.allOf(
+        Parser.terminalParser(TokenType.IF),
+        Parser.terminalParser(TokenType.OPEN_PAREN),
+        MaxPrecedenceExpressionParser,
+        Parser.terminalParser(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,
+        createNode=lambda _, __, condition, ___, ifStatement, ____, elseStatement: IfElse.createNode(ifStatement, condition, elseStatement),
+        name="if-else statement"
+    )
+
+    return Parser.oneOf(
+        ifElseStatementParser,
+        ifStatementParser,
+        name="if-else/if statement"
+    )(input)
--- a/smnp/ast/node/expression.py
+++ b/smnp/ast/node/expression.py
@@ -1,71 +1,63 @@
-from smnp.ast.node.asterisk import AsteriskNode
-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.operator import BinaryOperator
+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 ExpressionNode(Node):
-    def __init__(self, pos):
-        super().__init__(pos, [NoneNode()])
-
-    @property
-    def value(self):
-        return self[0]
+class Expression(Valuable):
+    pass


-    @value.setter
-    def value(self, v):
-        self[0] = v
-
-
-    @classmethod
-    def withValue(cls, val, pos):
-        node = cls(pos)
-        node.value = val
-        return node
-
-    @classmethod
-    def _parse(cls, input):
-        return Parser.oneOf(
-            cls._asteriskParser(),
-            cls._expressionParser(),
+def ExpressionParser(input):
+    return Parser.leftAssociativeOperatorParser(
+        TermParser,
+        [TokenType.PLUS, TokenType.MINUS],
+        TermParser,
+        lambda left, op, right: Expression.withValue(BinaryOperator.withValues(left, op, right))
    )(input)

-    @classmethod
-    def _asteriskParser(cls):
-        def createNode(iterator, asterisk, statement):
-            node = AsteriskNode(asterisk.pos)
-            node.iterator = iterator
-            node.statement = statement
-            return node

-        return Parser.allOf(
-            cls._expressionParser(),
-            Parser.terminalParser(TokenType.ASTERISK),
-            Parser.doAssert(StatementNode.parse, 'statement'),
-            createNode=createNode
+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,
+        [TokenType.AND],
+        Expression2Parser,
+        lambda left, op, right: Expression.withValue(BinaryOperator.withValues(left, op, right))
+    )(input)
+
+
+def Expression4Parser(input):
+    from smnp.ast.node.condition import IfElse
+    exprParser = Parser.leftAssociativeOperatorParser(
+        Expression3Parser,
+        [TokenType.OR],
+        Expression3Parser,
+        lambda left, op, right: Expression.withValue(BinaryOperator.withValues(left, op, right))
    )

-    @classmethod
-    def _expressionParser(cls):
-        from smnp.ast.node.integer import IntegerLiteralNode
-        from smnp.ast.node.string import StringLiteralNode
-        from smnp.ast.node.note import NoteLiteralNode
-        from smnp.ast.node.bool import BoolLiteralNode
-        from smnp.ast.node.identifier import IdentifierNode
-        from smnp.ast.node.list import ListNode
-        from smnp.ast.node.map import MapNode
-        from smnp.ast.node.type import TypeNode
+    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(
-            IntegerLiteralNode.parse,
-            StringLiteralNode.parse,
-            NoteLiteralNode.parse,
-            BoolLiteralNode.parse,
-            IdentifierNode.parse,
-            MapNode.parse,
-            ListNode.parse,
-            TypeNode.parse,
-        )
+        ifElseExpression,
+        exprParser,
+    )(input)
+
+
+MaxPrecedenceExpressionParser = Expression4Parser
--- a/smnp/ast/node/extend.py
+++ b/smnp/ast/node/extend.py
@@ -1,70 +1,70 @@
-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 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
+#         )
--- a/smnp/ast/node/factor.py
+++ b/smnp/ast/node/factor.py
@@ -0,0 +1,64 @@
+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.parser import Parser
+from smnp.token.type import TokenType
+
+
+class Factor(Valuable):
+    pass
+
+
+class NotOperator(UnaryOperator):
+    pass
+
+class Loop(BinaryOperator):
+    pass
+
+
+def FactorParser(input):
+    from smnp.ast.node.expression import MaxPrecedenceExpressionParser
+    from smnp.ast.node.statement import StatementParser
+
+    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),
+        createNode=lambda open, expr, close: expr,
+        name="grouping parentheses"
+    )
+
+    factorParser = Parser.oneOf(
+        powerFactor,
+        exprFactor,
+        name="basic factor"
+    )
+
+    notOperator = Parser.allOf(
+        Parser.terminalParser(TokenType.NOT, Operator.withValue),
+        factorParser,
+        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
+    )(input)
--- a/smnp/ast/node/function.py
+++ b/smnp/ast/node/function.py
@@ -1,128 +1,128 @@
-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 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())
--- a/smnp/ast/node/identifier.py
+++ b/smnp/ast/node/identifier.py
@@ -1,53 +1,75 @@
-from smnp.ast.node.access import AccessNode
-from smnp.ast.node.assignment import AssignmentNode
-from smnp.ast.node.expression import ExpressionNode
-from smnp.ast.node.invocation import FunctionCallNode, ArgumentsListNode
-from smnp.ast.parser import Parser
+from smnp.ast.node.atom import Atom
+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.token.type import TokenType
+from smnp.util.singleton import SingletonParser


-class IdentifierNode(AccessNode):
+class Identifier(Atom):
+    pass
+
+
+class FunctionCall(Node):
    def __init__(self, pos):
        super().__init__(pos)
-        del self.children[1]
+        self.children = [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

    @classmethod
-    def _literalParser(cls):
-        return Parser.oneOf(
-            IdentifierNode._functionCallParser(),
-            IdentifierNode._assignmentParser(),
-            IdentifierNode.identifierParser()
-        )
-
-    @staticmethod
-    def _assignmentParser():
-        def createNode(target, assignment, value):
-            node = AssignmentNode(assignment.pos)
-            node.target = target
-            node.value = value
-            return node
-
-        return Parser.allOf(
-            IdentifierNode.identifierParser(),
-            Parser.terminalParser(TokenType.ASSIGN),
-            Parser.doAssert(ExpressionNode.parse, "expression"),
-            createNode=createNode
-        )
-
-    @staticmethod
-    def _functionCallParser():
-        def createNode(name, arguments):
-            node = FunctionCallNode(name.pos)
+    def withChildren(cls, name, arguments):
+        node = cls(name.pos)
        node.name = name
        node.arguments = arguments
        return node

-        return Parser.allOf(
-            IdentifierNode.identifierParser(),
-            ArgumentsListNode.parse,
-            createNode=createNode
+
+class ArgumentsList(Node):
+    pass
+
+
+class Assignment(BinaryOperator):
+    pass
+
+
+@SingletonParser
+def IdentifierParser():
+    identifierLiteralParser = Parsers.terminal(TokenType.IDENTIFIER, createNode=Identifier.withValue)
+
+    functionCallParser = Parsers.allOf(
+        identifierLiteralParser,
+        #abstractIterableParser(ArgumentsList, TokenType.OPEN_PAREN, TokenType.CLOSE_PAREN, MaxPrecedenceExpressionParser),
+        createNode=lambda name, arguments: FunctionCall.withChildren(name, arguments),
+        name="functionCall"
    )

-    @staticmethod
-    def identifierParser():
-        return Parser.terminalParser(TokenType.IDENTIFIER, lambda val, pos: IdentifierNode.withValue(val, pos))
+    assignmentParser = Parsers.allOf(
+        identifierLiteralParser,
+        Parsers.terminal(TokenType.ASSIGN, createNode=Operator.withValue),
+        #MaxPrecedenceExpressionParser,
+        createNode=lambda identifier, assign, expr: Assignment.withValues(identifier, assign, expr),
+        name="assignment"
+    )
+
+    return Parsers.oneOf(
+        assignmentParser,
+        functionCallParser,
+        identifierLiteralParser,
+        name="idExpr"
+    )
--- a/smnp/ast/node/imports.py
+++ b/smnp/ast/node/imports.py
@@ -1,16 +1,21 @@
-from smnp.ast.node.identifier import IdentifierNode
+# 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.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


-class ImportNode(Node):
+class Import(Node):
    def __init__(self, pos):
        super().__init__(pos)
-        self.children = [NoneNode(), NoneNode(), NoneNode()]
+        self.children = [None]

    @property
    def source(self):
@@ -20,57 +25,17 @@ class ImportNode(Node):
    def source(self, value):
        self[0] = value

-    @property
-    def type(self):
-        return self[1]
-
-    @type.setter
-    def type(self, value):
-        self[1] = value
-
-    @property
-    def variable(self):
-        return self[2]
-
-    @variable.setter
-    def variable(self, value):
-        self[2] = value
-
    @classmethod
-    def _parse(cls, input):
-        return Parser.oneOf(
-            cls._literalImportParser(),
-            cls._fileImportParser()
+    def withValue(cls, value):
+        node = cls(value.pos)
+        node.source = value
+        return node
+
+
+def ImportParser(input):
+    return Parser.allOf(
+        Parser.terminalParser(TokenType.IMPORT),
+        StringParser,
+        createNode=lambda imp, source: Import.withValue(source),
+        name="import"
    )(input)
-
-    @classmethod
-    def _literalImportParser(cls):
-        def createNode(importKeyword, type, fromKeyword, source, asKeyword, variable):
-            node = ImportNode(importKeyword.pos)
-            node.source = source
-            node.type = type
-            node.variable = variable
-            return node
-
-        return Parser.allOf(
-            Parser.terminalParser(TokenType.IMPORT),
-            TypeNode.parse,
-            Parser.doAssert(Parser.terminalParser(TokenType.FROM), "'from <source> as <variable name>'"),
-            Parser.doAssert(StringLiteralNode._literalParser(), "source as a string"),
-            Parser.doAssert(Parser.terminalParser(TokenType.AS), "'as <variable name>'"),
-            Parser.doAssert(IdentifierNode.identifierParser(), "variable name"),
-            createNode=createNode
-        )
-
-    @classmethod
-    def _fileImportParser(cls):
-        def createNode(importKeyword, source):
-            node = ImportNode(importKeyword.pos)
-            node.source = source
-            return node
-
-        return Parser.allOf(
-            Parser.terminalParser(TokenType.IMPORT),
-            Parser.doAssert(StringLiteralNode._literalParser(), "source as a string"),
-            createNode=createNode
-        )
--- a/smnp/ast/node/integer.py
+++ b/smnp/ast/node/integer.py
@@ -1,31 +0,0 @@
-from smnp.ast.node.access import AccessNode
-from smnp.ast.parser import Parser
-from smnp.token.type import TokenType
-
-
-class IntegerLiteralNode(AccessNode):
-    def __init__(self, pos):
-        super().__init__(pos)
-        del self.children[1]
-
-    @classmethod
-    def _literalParser(cls):
-        return Parser.oneOf(
-            cls._negativeIntegerParser(),
-            cls._positiveIntegerParser()
-        )
-
-    @classmethod
-    def _negativeIntegerParser(cls):
-        def createNode(minus, integer):
-            return IntegerLiteralNode.withValue(-integer.value, minus.pos)
-
-        return Parser.allOf(
-            Parser.terminalParser(TokenType.MINUS),
-            Parser.doAssert(cls._positiveIntegerParser(), "integer"),
-            createNode=createNode
-        )
-
-    @classmethod
-    def _positiveIntegerParser(cls):
-        return Parser.terminalParser(TokenType.INTEGER, lambda val, pos: IntegerLiteralNode.withValue(int(val), pos))
--- a/smnp/ast/node/invocation.py
+++ b/smnp/ast/node/invocation.py
@@ -1,40 +0,0 @@
-from smnp.ast.node.access import AccessNode
-from smnp.ast.node.expression import ExpressionNode
-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
-
-
-class ArgumentsListNode(Node):
-
-    @classmethod
-    def _parse(cls, input):
-        return abstractIterableParser(ArgumentsListNode, TokenType.OPEN_PAREN, TokenType.CLOSE_PAREN,
-                                      Parser.doAssert(ExpressionNode.parse, "expression"))(input)
-
-
-class FunctionCallNode(AccessNode):
-    def __init__(self, pos):
-        super().__init__(pos)
-
-    @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
-
-    @classmethod
-    def _parse(cls, input):
-        raise RuntimeError("This class is not supposed to be automatically called")
-
--- a/smnp/ast/node/iterable.py
+++ b/smnp/ast/node/iterable.py
@@ -1,17 +1,24 @@
-from smnp.ast.node.expression import ExpressionNode
 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 Parser
+from smnp.ast.parser import Parsers, DecoratorParser
 from smnp.token.type import TokenType


-def abstractIterableParser(iterableNodeType, openTokenType, closeTokenType, itemParser):
-    class AbstractIterableTailNode(ExpressionNode):
+def abstractIterableParser(iterableNodeType, openTokenType, closeTokenType, itemParser, name):
+
+    class AbstractIterable(Node):
        def __init__(self, pos):
            super().__init__(pos)
+            self.children = [NoneNode(), NoneNode()]

-            self.children.append(NoneNode())
+        @property
+        def value(self):
+            return self[0]
+
+        @value.setter
+        def value(self, value):
+            self[0] = value

        @property
        def next(self):
@@ -21,89 +28,77 @@ def abstractIterableParser(iterableNodeType, openTokenType, closeTokenType, item
        def next(self, value):
            self[1] = value

-        @classmethod
-        def _parse(cls, input):
-            return Parser.oneOf(
-                AbstractIterableTailNode._parser1(),
-                AbstractIterableTailNode._parser2(),
-            )(input)
+    class AbstractIterableTail(AbstractIterable):
+        pass

-        @staticmethod
-        def _parser1():
-            return Parser.terminalParser(closeTokenType)
+    def abstractIterableParser():
+        return Parsers.oneOf(
+            emptyIterable(),
+            openIterable(),
+            name=name
+        )

-        @staticmethod
-        def _parser2():
-            def createNode(comma, expr, iterableTail):
-                node = AbstractIterableTailNode(expr.pos)
-                node.value = expr
-                node.next = iterableTail
+    def emptyIterable():
+        def createNode(open, close):
+            node = AbstractIterable(open.pos)
+            node.value = open
+            node.next = close
            return node

-            return Parser.allOf(
-                Parser.terminalParser(TokenType.COMMA, doAssert=True),
+        return Parsers.allOf(
+            Parsers.terminal(openTokenType),
+            Parsers.terminal(closeTokenType),
+            createNode=createNode,
+            name=name+"Empty"
+        )
+
+    def openIterable():
+        def createNode(open, item, tail):
+            node = AbstractIterable(open.pos)
+            node.value = item
+            node.next = tail
+            return node
+
+        return Parsers.allOf(
+            Parsers.terminal(openTokenType),
            itemParser,
-                AbstractIterableTailNode.parse,
+            abstractIterableTailParser(),
+            createNode=createNode,
+            name=name+"Open"
+        )
+
+    def abstractIterableTailParser():
+        return Parsers.oneOf(
+            closeIterable(),
+            nextItem(),
+            name=name+"Tail"
+        )
+
+    def nextItem():
+        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),
+            itemParser,
+            abstractIterableTailParser(),
+            name=name+"NextItem",
            createNode=createNode
        )

-    class AbstractIterableNode(ExpressionNode):
-        def __init__(self, pos):
-            super().__init__(pos)
+    def closeIterable():
+        return Parsers.terminal(closeTokenType)

-            self.children.append(NoneNode())

-        @property
-        def next(self):
-            return self[1]
-
-        @next.setter
-        def next(self, value):
-            self[1] = value
-
-        @classmethod
-        def _parse(cls, input):
-            return Parser.oneOf(
-                AbstractIterableNode._parser1(),
-                AbstractIterableNode._parser2()
-            )(input)
-
-        @staticmethod
-        def _parser1():
-            def emptyIterable(openToken, closeToken):
-                node = AbstractIterableNode(openToken.pos)
-                node.value = openToken
-                node.next = closeToken
-                return node
-
-            return Parser.allOf(
-                Parser.terminalParser(openTokenType),
-                Parser.terminalParser(closeTokenType),
-                createNode=emptyIterable
-            )
-
-        @staticmethod
-        def _parser2():
-            def createNode(openParen, expr, iterableTail):
-                node = AbstractIterableNode(openParen.pos)
-                node.value = expr
-                node.next = iterableTail
-                return node
-
-            return Parser.allOf(
-                Parser.terminalParser(openTokenType, lambda val, pos: Node(pos)),
-                itemParser,
-                AbstractIterableTailNode.parse,
-                createNode=createNode
-            )
-
-    return toFlatDesiredNode(iterableNodeType, AbstractIterableNode.parse)
+    return abstractIterableParser()
+    #return toFlatDesiredNode(iterableNodeType, abstractIterableParser())


 def toFlatDesiredNode(iterableNodeType, parser):
-    def parse(input):
-        result = parser(input)
-
+    def wrapper(result):
        if result.result:
            value = flattenList(result.node)
            node = iterableNodeType(result.node.pos)
@@ -114,7 +109,7 @@ def toFlatDesiredNode(iterableNodeType, parser):

        return ParseResult.FAIL()

-    return parse
+    return DecoratorParser(wrapper, parser)


 def flattenList(node, output=None):
--- a/smnp/ast/node/list.py
+++ b/smnp/ast/node/list.py
@@ -1,13 +1,13 @@
-from smnp.ast.node.access import AccessNode
-from smnp.ast.node.expression import ExpressionNode
+from smnp.ast.node.atom import AtomParser
 from smnp.ast.node.iterable import abstractIterableParser
-from smnp.ast.parser import Parser
+from smnp.ast.node.model import Node
 from smnp.token.type import TokenType


-class ListNode(AccessNode):
+class List(Node):
+    pass

-    @classmethod
-    def _literalParser(cls):
-        return abstractIterableParser(ListNode, TokenType.OPEN_SQUARE, TokenType.CLOSE_SQUARE,
-                                      Parser.doAssert(ExpressionNode.parse, "expression"))
+
+def ListParser():
+    return abstractIterableParser(List, TokenType.OPEN_SQUARE, TokenType.CLOSE_SQUARE, AtomParser(), name="list")
+                                    #MaxPrecedenceExpressionParser)(input)
--- a/smnp/ast/node/literal.py
+++ b/smnp/ast/node/literal.py
@@ -1,18 +0,0 @@
-from smnp.ast.node.expression import ExpressionNode
-from smnp.ast.parser import Parser
-
-
-class LiteralNode(ExpressionNode):
-
-    @classmethod
-    def _getTokenType(cls):
-        pass
-
-    @classmethod
-    def _processValue(cls, value):
-        return value
-
-    @classmethod
-    def _literalParser(cls):
-        createNode = lambda val, pos: cls.withValue(cls._processValue(val), pos)
-        return Parser.terminalParser(cls._getTokenType(), createNode)
--- a/smnp/ast/node/map.py
+++ b/smnp/ast/node/map.py
@@ -1,19 +1,11 @@
-from smnp.ast.node.access import AccessNode
-from smnp.ast.node.bool import BoolLiteralNode
-from smnp.ast.node.expression import ExpressionNode
-from smnp.ast.node.integer import IntegerLiteralNode
 from smnp.ast.node.iterable import abstractIterableParser
-from smnp.ast.node.none import NoneNode
-from smnp.ast.node.note import NoteLiteralNode
-from smnp.ast.node.string import StringLiteralNode
-from smnp.ast.node.type import TypeNode
-from smnp.ast.parser import Parser
+from smnp.ast.node.model import Node
+from smnp.ast.node.operator import BinaryOperator, Operator
+from smnp.ast.parser import Parsers
 from smnp.token.type import TokenType

-class MapEntry(ExpressionNode):
-    def __init__(self, pos):
-        super().__init__(pos)
-        self.children = [NoneNode(), NoneNode()]
+
+class MapEntry(BinaryOperator):

    @property
    def key(self):
@@ -25,39 +17,31 @@ class MapEntry(ExpressionNode):

    @property
    def value(self):
-        return self[1]
+        return self[2]

    @value.setter
    def value(self, value):
-        self[1] = value
+        self[2] = value

-class MapNode(AccessNode):

-    @classmethod
-    def _literalParser(cls):
-        return abstractIterableParser(MapNode, TokenType.OPEN_CURLY, TokenType.CLOSE_CURLY, cls._entryParser())
+class Map(Node):
+    pass

-    @classmethod
-    def _entryParser(cls):
-        def createNode(key, arrow, value):
-            node = MapEntry(key.pos)
-            node.key = key
-            node.value = value
-            return node

-        return Parser.allOf(
-            cls._keyParser(),
-            Parser.terminalParser(TokenType.ARROW),
-            ExpressionNode.parse,
-            createNode=createNode
+def MapParser(input):
+    from smnp.ast.node.atom import LiteralParser
+    #from smnp.ast.node.expression import MaxPrecedenceExpressionParser
+    keyParser = LiteralParser
+    #valueParser = MaxPrecedenceExpressionParser
+
+    mapEntryParser = Parsers.allOf(
+        keyParser,
+        Parsers.terminal(TokenType.ARROW, createNode=Operator.withValue),
+        #valueParser,
+        createNode=MapEntry.withValues,
+        name="mapEntry"
    )

-    @classmethod
-    def _keyParser(cls):
-        return Parser.oneOf(
-            IntegerLiteralNode._literalParser(),
-            StringLiteralNode._literalParser(),
-            NoteLiteralNode._literalParser(),
-            BoolLiteralNode._literalParser(),
-            TypeNode.parse
-        )
+    return abstractIterableParser(Map, TokenType.OPEN_CURLY, TokenType.CLOSE_CURLY, mapEntryParser)
+
+
--- a/smnp/ast/node/model.py
+++ b/smnp/ast/node/model.py
@@ -47,7 +47,7 @@ class Node:
        self._print(first=True)

    def _print(self, prefix="", last=True, first=False):
-        print(prefix, '' if first else '└─' if last else '├─', self.__class__.__name__, sep="")
+        print(prefix, '' if first else '└─' if last else '├─', self.__class__.__name__, f" (line {self.pos[0]+1}, col {self.pos[1]+1})", sep="")
        prefix += '   ' if last else '│  '
        for i, child in enumerate(self.children):
            last = i == len(self.children) - 1
--- a/smnp/ast/node/note.py
+++ b/smnp/ast/node/note.py
@@ -1,13 +0,0 @@
-from smnp.ast.node.access import AccessNode
-from smnp.ast.node.literal import LiteralNode
-from smnp.token.type import TokenType
-
-
-class NoteLiteralNode(LiteralNode, AccessNode):
-    def __init__(self, pos):
-        super().__init__(pos)
-        del self.children[1]
-
-    @classmethod
-    def _getTokenType(cls):
-        return TokenType.NOTE
--- a/smnp/ast/node/operator.py
+++ b/smnp/ast/node/operator.py
@@ -0,0 +1,150 @@
+from smnp.ast.node.model import Node
+from smnp.ast.node.none import NoneNode
+
+
+class UnaryOperator(Node):
+    def __init__(self, pos):
+        super().__init__(pos)
+        self.children=[NoneNode(), NoneNode()]
+
+    @property
+    def operator(self):
+        return self[0]
+
+    @operator.setter
+    def operator(self, value):
+        self[0] = value
+
+    @property
+    def value(self):
+        return self[1]
+
+    @value.setter
+    def value(self, value):
+        self[1] = value
+
+    @classmethod
+    def withValues(cls, operator, value):
+        node = cls(operator.pos)
+        node.operator = operator
+        node.value = value
+        return node
+
+
+class BinaryOperator(Node):
+    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 withValues(cls, left, operator, right):
+        node = cls(operator.pos)
+        node.left = left
+        node.operator = operator
+        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)
+        self.children = [None]
+
+    @property
+    def value(self):
+        return self[0]
+
+    @value.setter
+    def value(self, value):
+        self[0] = value
+
+    @classmethod
+    def withValue(cls, value, pos):
+        node = cls(pos)
+        node.value = value
+        return node
--- a/smnp/ast/node/program.py
+++ b/smnp/ast/node/program.py
@@ -1,32 +1,44 @@
-from smnp.ast.node.expression import ExpressionNode
-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.imports import ImportParser
 from smnp.ast.node.model import Node, ParseResult
-from smnp.ast.node.statement import StatementNode
+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))

-    @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)
-
+def parse(input):
    root = Program()
    while input.hasCurrent():
-            result = parseToken(input)
+        result = Parser.oneOf(
+            # Start Symbol
+            ImportParser,
+            StatementParser,
+            exception=RuntimeError("Nie znam tego wyrazenia")
+        )(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)
--- a/smnp/ast/node/ret.py
+++ b/smnp/ast/node/ret.py
@@ -1,32 +1,32 @@
-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 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)
--- a/smnp/ast/node/statement.py
+++ b/smnp/ast/node/statement.py
@@ -1,17 +1,34 @@
+from smnp.ast.node.expression import MaxPrecedenceExpressionParser
 from smnp.ast.node.model import Node
 from smnp.ast.parser import Parser


-class StatementNode(Node):
+class Statement(Node):
+    pass

-    @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)
+def StatementParser(input):
+    from smnp.ast.node.block import BlockParser
+    from smnp.ast.node.condition import IfElseStatementParser
+
+    parser = Parser.oneOf(
+        IfElseStatementParser,
+        BlockParser,
+        MaxPrecedenceExpressionParser
+    )
+
+    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)
--- a/smnp/ast/node/string.py
+++ b/smnp/ast/node/string.py
@@ -1,13 +0,0 @@
-from smnp.ast.node.access import AccessNode
-from smnp.ast.node.literal import LiteralNode
-from smnp.token.type import TokenType
-
-
-class StringLiteralNode(LiteralNode, AccessNode):
-    def __init__(self, pos):
-        super().__init__(pos)
-        del self.children[1]
-
-    @classmethod
-    def _getTokenType(cls):
-        return TokenType.STRING
--- a/smnp/ast/node/term.py
+++ b/smnp/ast/node/term.py
@@ -0,0 +1,12 @@
+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):
+    pass
+
+TermParser = Parser.leftAssociativeOperatorParser(FactorParser, [TokenType.ASTERISK, TokenType.SLASH], FactorParser,
+                                                    lambda left, op, right: Term.withValue(BinaryOperator.withValues(left, op, right)))
--- a/smnp/ast/node/type.py
+++ b/smnp/ast/node/type.py
@@ -1,63 +1,63 @@
-from smnp.ast.node.access import AccessNode
-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
-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(AccessNode):
-    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.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))
--- a/smnp/ast/node/valuable.py
+++ b/smnp/ast/node/valuable.py
@@ -0,0 +1,22 @@
+from smnp.ast.node.model import Node
+from smnp.ast.node.none import NoneNode
+
+
+class Valuable(Node):
+    def __init__(self, pos):
+        super().__init__(pos)
+        self.children = [NoneNode()]
+
+    @property
+    def value(self):
+        return self[0]
+
+    @value.setter
+    def value(self, value):
+        self[0] = value
+
+    @classmethod
+    def withValue(cls, value):
+        node = cls(value.pos)
+        node.value = value
+        return node
--- a/smnp/ast/parser.py
+++ b/smnp/ast/parser.py
@@ -5,166 +5,286 @@ from smnp.error.syntax import SyntaxException


 def parse(input):
-    from smnp.ast.node.program import Program
-    return Program.parse(input).node
+    from smnp.ast.node.program import ProgramParser
+    return ProgramParser(input).node


-class Parser:
+class Parser(object):
+    def __init__(self, name):
+        self.name = name
+
+    def parse(self, input):
+        result = self._parse(input)
+        if result is None:
+            return ParseResult.FAIL()
+
+        if not isinstance(result, ParseResult):
+            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)
+
+    def __str__(self):
+        return self.name
+
+    def __repr__(self):
+        return self.__str__()
+
+
+class Parsers:

-    # a -> A
    @staticmethod
-    def terminalParser(expectedType, createNode=None, doAssert=False):
-        def provideNode(value, pos):
-            if createNode is None:
-                return IgnoredNode(pos)
-            return createNode(value, pos)
+    def terminal(expectedType, createNode=lambda val, pos: IgnoredNode(pos), doAssert=False):
+        return TerminalParser(expectedType, createNode, doAssert)

-        def parse(input):
-            if input.hasCurrent() and input.current().type == expectedType:
+    @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):
            token = input.current()
            input.ahead()
-                return ParseResult.OK(provideNode(token.value, token.pos))
-            elif doAssert:
+            return ParseResult.OK(self.createNode(token.value, token.pos))
+        elif self.doAssert:
            found = f", found '{input.current().rawValue}'" if input.hasCurrent() else ""
-                raise SyntaxException(f"Expected '{expectedType.key}'{found}", input.currentPos())
+            raise SyntaxException(f"Expected '{self.expectedType.key}'{found}", input.currentPos())

        return ParseResult.FAIL()

-        return parse

-    # oneOf -> a | b | c | ...
-    @staticmethod
-    def oneOf(*parsers, exception=None):
-        def combinedParser(input):
+
+class OneOfParser(Parser):
+    def __init__(self, *parsers, name, exception=None):
+        super().__init__(name)
+        self.parsers = parsers
+        self.exception = exception
+
+    def _parse(self, input):
        snap = input.snapshot()
-            for parser in parsers:
-                value = parser(input)
+        for parser in self.parsers:
+            value = parser.parse(input)
            if value.result:
                return value
+            input.reset(snap) # TODO sprawdzic, czy koneiczne !!!!!

-            if exception is not None:
-                if callable(exception):
-                    raise exception(input)
+        if self.exception is not None:
+            if callable(self.exception):
+                raise self.exception(input)
            else:
-                    raise exception
+                raise self.exception

-
-            input.reset(snap)
        return ParseResult.FAIL()

-        return combinedParser
+    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)

-    # allOf -> a b c ...
-    @staticmethod
-    def allOf(*parsers, createNode, exception=None):
        if len(parsers) == 0:
            raise RuntimeError("Pass one parser at least")

-        def extendedParser(input):
+        self.parsers = parsers
+        self.createNode = createNode
+        self.exception = exception
+
+    def _parse(self, input):
        snap = input.snapshot()
+        parsedItems = []

-            results = []
-
-            for parser in parsers:
-                result = parser(input)
+        for parser in self.parsers:
+            result = parser.parse(input)

            if not result.result:
-                    if exception is not None:
-                        if callable(exception):
-                            raise exception(input)
+                if self.exception is not None:
+                    if callable(self.exception):
+                        raise self.exception(input)
                    else:
-                            raise exception
+                        raise self.exception

                input.reset(snap)
                return ParseResult.FAIL()

-                results.append(result.node)
+            parsedItems.append(result.node)

-            node = createNode(*results)
+        node = self.createNode(*parsedItems)
        if not isinstance(node, Node):
-                raise RuntimeError("Function 'createNode' haven't returned a Node object. Probably forget to pass 'return'")
+            raise RuntimeError(f"Method 'createNode' of class '{self.__class__.__name__}' 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 extendedParser
+class LeftAssociativeOperatorParser(Parser):
+    def __init__(self, leftParser, operatorTokenTypes, rightParser, createNode, name):
+        from smnp.ast.node.operator import Operator

+        super().__init__(name)
+        self.leftParser = leftParser
+        self.rightParser = rightParser
+        self.createNode = createNode
+        self.operators = operatorTokenTypes

-    # leftAssociative -> left | left OP right
-    @staticmethod
-    def leftAssociativeOperatorParser(leftParser, operatorTokenType, rightParser, createNode):
-        def parse(input):
-            left = leftParser(input)
+        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)
        if left.result:
-                while Parser.terminalParser(operatorTokenType)(input).result:
-                    right = rightParser(input)
-                    left = ParseResult.OK(createNode(left.node, right.node))
-
+            operator = self.operatorParser.parse(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)
            return left

        return ParseResult.FAIL()

-        return parse

-    # loop -> start item* end
-    @staticmethod
-    def loop(startParser, itemParser, endParser, createNode):
-        def parse(input):
+    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)
+
+
+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):
        items = []
-            start = startParser(input)
+        start = self.startParser.parse(input)
        if start.result:
            while True:
-                    end = endParser(input)
+                end = self.endParser.parse(input)
                if end.result:
-                        return ParseResult.OK(createNode(start.node, items, end.node))
-                    item = itemParser(input)
+                    return ParseResult.OK(self.createNode(start.node, items, end.node))
+                item = self.itemParser.parse(input)
                if not item.result:
                    return ParseResult.FAIL()
                items.append(item.node)

        return ParseResult.FAIL()

-        return parse
+    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)

-    @staticmethod
-    def doAssert(parser, expected):
-        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 parse
-
-    @staticmethod
-    def optional(parser):
-        def parse(input):
-            result = parser(input)
-            if result.result:
-                return result
-
-            return ParseResult.OK(NoneNode())
-
-        return parse
-
-    @staticmethod
-    def many(parser, createNode):
-        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 parse
--- a/smnp/calc.py
+++ b/smnp/calc.py
@@ -0,0 +1,66 @@
+from smnp.ast.node.model import Node
+from smnp.ast.parser import Parser
+from smnp.token.tokenizer import tokenize
+from smnp.token.type import TokenType
+
+
+class Atom(Node):
+    def __init__(self, value, pos):
+        super().__init__(pos)
+        self.children = [value]
+
+    @property
+    def value(self):
+        return self[0]
+
+class Operation(Node):
+    def __init__(self, left, op, right, pos):
+        super().__init__(pos)
+        self.children = [left, op, right]
+
+    @property
+    def left(self):
+        return self[0]
+
+    @property
+    def operator(self):
+        return self[1]
+
+    @property
+    def right(self):
+        return self[2]
+
+def atom():
+    return Parser.oneOfTerminals(TokenType.INTEGER, TokenType.NOTE, TokenType.STRING, createNode=lambda val, pos: Atom(val, pos))
+
+def chain():
+    return Parser.leftAssociativeOperatorParser(atom(), [TokenType.DOT], atom(), lambda left, op, right: Operation(left, op, right, op.pos), name="chain")
+
+def factor():
+    return Parser.leftAssociativeOperatorParser(chain(), [TokenType.DOUBLE_ASTERISK], chain(), lambda left, op, right: Operation(left, op, right, op.pos), name="factor")
+
+def term():
+    return Parser.leftAssociativeOperatorParser(factor(), [TokenType.ASTERISK, TokenType.SLASH], factor(), lambda left, op, right: Operation(left, op, right, op.pos), name="term")
+
+def expr():
+    return Parser.leftAssociativeOperatorParser(term(), [TokenType.PLUS, TokenType.MINUS], term(), lambda left, op, right: Operation(left, op, right, op.pos), name="expr")
+#
+def evaluate(node):
+    if type(node) == Atom:
+        return node.value
+    lhs = evaluate(node.left)
+    rhs = evaluate(node.right)
+    return {
+        "+": int(lhs) + int(rhs),
+        "*": int(lhs) * int(rhs),
+        "-": int(lhs) - int(rhs),
+        "/": int(lhs) / int(rhs),
+        "**": int(lhs) ** int(rhs)
+    }[node.operator.value]
+
+def draft():
+
+    tokens = tokenize(['"fesf fe" + "fsefsef" + "fsefs"'])
+    e = expr()
+    node = e(tokens).node
+    node.print()
--- a/smnp/main.py
+++ b/smnp/main.py
@@ -1,14 +1,32 @@
-import sys
-
+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
 from smnp.error.base import SmnpException
-from smnp.library.loader import loadStandardLibrary
-from smnp.program.interpreter import Interpreter
+from smnp.token.tokenizer import tokenize


 def main():
    try:
-        stdLibraryEnv = loadStandardLibrary()
-        Interpreter.interpretFile(sys.argv[1], printTokens=False, printAst=True, baseEnvironment=stdLibraryEnv)
+        # 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")

    except SmnpException as e:
        print(e.message())
--- a/smnp/program/interpreter.py
+++ b/smnp/program/interpreter.py
@@ -1,26 +1,25 @@
 from smnp.ast.parser import parse
-from smnp.environment.factory import createEnvironment
+#from smnp.environment.factory import createEnvironment
 from smnp.error.runtime import RuntimeException
 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, baseEnvironment=None):
-        return Interpreter._interpret(string.splitlines(), printTokens, printAst, baseEnvironment)
+    def interpretString(string, printTokens=False, printAst=False, execute=True, baseEnvironment=None):
+        return Interpreter._interpret(string.splitlines(), printTokens, printAst, execute, baseEnvironment)

    @staticmethod
-    def interpretFile(file, printTokens=False, printAst=False, baseEnvironment=None):
-        return Interpreter._interpret(readLines(file), printTokens, printAst, baseEnvironment)
+    def interpretFile(file, printTokens=False, printAst=False, execute=True, baseEnvironment=None):
+        return Interpreter._interpret(readLines(file), printTokens, printAst, execute, baseEnvironment)

    @staticmethod
-    def _interpret(lines, printTokens=False, printAst=False, baseEnvironment=None):
-        environment = createEnvironment()
-        if baseEnvironment is not None:
-            environment.extend(baseEnvironment)
+    def _interpret(lines, printTokens=False, printAst=False, execute=True, baseEnvironment=None):
+        #environment = createEnvironment()
+        #if baseEnvironment is not None:
+        #    environment.extend(baseEnvironment)

        try:
            tokens = tokenize(lines)
@@ -31,9 +30,10 @@ class Interpreter:
            if printAst:
                ast.print()

-            evaluate(ast, environment)
+            #if execute:
+            #    evaluate(ast, environment)

-            return environment
+            #return environment
        except RuntimeException as e:
-            e.environment = environment
+            #e.environment = environment
            raise e
--- a/smnp/runtime/evaluators/access.py
+++ b/smnp/runtime/evaluators/access.py
@@ -1,4 +1,4 @@
-from smnp.ast.node.identifier import IdentifierNode
+from smnp.ast.node.identifier import Identifier
 from smnp.ast.node.invocation import FunctionCallNode
 from smnp.error.runtime import RuntimeException
 from smnp.runtime.evaluator import Evaluator
@@ -14,7 +14,7 @@ class AccessEvaluator(Evaluator):
        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) == IdentifierNode:
+        if type(right) == Identifier:
            try:
                return left.properties[right.value]
            except KeyError:
--- a/smnp/runtime/evaluators/asterisk.py
+++ b/smnp/runtime/evaluators/asterisk.py
@@ -1,4 +1,4 @@
-from smnp.ast.node.identifier import IdentifierNode
+from smnp.ast.node.identifier import Identifier
 from smnp.runtime.evaluator import evaluate, Evaluator, EvaluationResult
 from smnp.runtime.evaluators.expression import expressionEvaluator
 from smnp.type.model import Type
@@ -40,7 +40,7 @@ class AsteriskEvaluator(Evaluator):

    @classmethod
    def _automaticNamedVariable(cls, iteratorNode, environment, prefix=''):
-        if type(iteratorNode) == IdentifierNode:
+        if type(iteratorNode) == Identifier:
            return cls._automaticVariableName(environment, prefix, iteratorNode.value, False)
        else:
            return cls._automaticVariableName(environment, prefix, '', True)
--- a/smnp/runtime/evaluators/expression.py
+++ b/smnp/runtime/evaluators/expression.py
@@ -1,13 +1,13 @@
-from smnp.ast.node.access import AccessNode
 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 IdentifierNode
+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 ListNode
+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.error.runtime import RuntimeException
@@ -37,9 +37,9 @@ def expressionEvaluator(doAssert=False):
                Evaluator.forNodes(NoteEvaluator.evaluate, NoteLiteralNode),
                Evaluator.forNodes(BoolEvaluator.evaluate, BoolLiteralNode),
                Evaluator.forNodes(TypeEvaluator.evaluate, TypeNode),
-                Evaluator.forNodes(IdentifierEvaluator.evaluate, IdentifierNode),
-                Evaluator.forNodes(ListEvaluator.evaluate, ListNode),
-                Evaluator.forNodes(AccessEvaluator.evaluate, AccessNode),
+                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)
--- a/smnp/token/tokenizer.py
+++ b/smnp/token/tokenizer.py
@@ -5,12 +5,19 @@ from smnp.token.tokenizers.comment import commentTokenizer
 from smnp.token.tokenizers.identifier import identifierTokenizer
 from smnp.token.tokenizers.keyword import typeTokenizer
 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.type import TokenType

 tokenizers = (
+    defaultTokenizer(TokenType.ARROW),
+
+    # Double-character operators
+    relationOperatorTokenizer,
+    defaultTokenizer(TokenType.DOUBLE_ASTERISK),
+
    # Characters
    defaultTokenizer(TokenType.OPEN_CURLY),
    defaultTokenizer(TokenType.CLOSE_CURLY),
@@ -22,9 +29,11 @@ tokenizers = (
    defaultTokenizer(TokenType.CLOSE_ANGLE),
    defaultTokenizer(TokenType.ASTERISK),
    defaultTokenizer(TokenType.ASSIGN),
-    defaultTokenizer(TokenType.ARROW),
    defaultTokenizer(TokenType.COMMA),
+    defaultTokenizer(TokenType.SLASH),
    defaultTokenizer(TokenType.MINUS),
+    defaultTokenizer(TokenType.PLUS),
+    defaultTokenizer(TokenType.DASH),
    defaultTokenizer(TokenType.DOTS),
    defaultTokenizer(TokenType.AMP),
    defaultTokenizer(TokenType.DOT),
@@ -42,7 +51,12 @@ tokenizers = (
    separated(defaultTokenizer(TokenType.EXTEND)),
    separated(defaultTokenizer(TokenType.IMPORT)),
    separated(defaultTokenizer(TokenType.FROM)),
+    separated(defaultTokenizer(TokenType.ELSE)),
+    separated(defaultTokenizer(TokenType.AND)),
+    separated(defaultTokenizer(TokenType.NOT)),
    separated(defaultTokenizer(TokenType.AS)),
+    separated(defaultTokenizer(TokenType.IF)),
+    separated(defaultTokenizer(TokenType.OR)),

    # Identifier (couldn't be before keywords!)
    identifierTokenizer,
--- a/smnp/token/tokenizers/relation.py
+++ b/smnp/token/tokenizers/relation.py
@@ -0,0 +1,6 @@
+from smnp.token.tools import keywordsTokenizer
+from smnp.token.type import TokenType
+
+
+def relationOperatorTokenizer(input, current, line):
+    return keywordsTokenizer(TokenType.RELATION, "==", "!=", ">=", "<=", ">", "<")(input, current, line)
--- a/smnp/token/type.py
+++ b/smnp/token/type.py
@@ -2,6 +2,8 @@ from enum import Enum


 class TokenType(Enum):
+    RELATION = 'relation'
+    DOUBLE_ASTERISK = '**'
    OPEN_CURLY = '{'
    CLOSE_CURLY = '}'
    OPEN_PAREN = '('
@@ -14,10 +16,16 @@ class TokenType(Enum):
    ASSIGN = '='
    ARROW = '->'
    COMMA = ','
+    SLASH = '/'
    MINUS = '-'
+    PLUS = '+'
+    DASH = '^'
    DOTS = '...'
    AMP = '&'
    DOT = '.'
+    AND = 'and'
+    OR = 'or'
+    NOT = 'not'
    INTEGER = 'integer'
    STRING = 'string'
    NOTE = 'note'
@@ -28,6 +36,8 @@ class TokenType(Enum):
    EXTEND = 'extend'
    IMPORT = 'import'
    FROM = 'from'
+    ELSE = 'else'
+    IF = 'if'
    AS = 'as'
    IDENTIFIER = 'identifier'
    COMMENT = 'comment'
--- a/smnp/util/init.py
+++ b/smnp/util/init.py
--- a/smnp/util/singleton.py
+++ b/smnp/util/singleton.py
@@ -0,0 +1,14 @@
+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
Author	SHA1	Message	Date
Bartłomiej Pluta	49e4c4487e	--wip-- [skip ci]	2019-07-11 19:36:25 +02:00
Bartłomiej Pluta	e7674a4834	Create almost working proof of concept with new parsers	2019-07-11 19:10:13 +02:00
Bartłomiej Pluta	ed2c8dc6dd	Create base for future parsers	2019-07-11 18:24:05 +02:00
Bartłomiej Pluta	f91e2a75de	Create oneOf and allOf parsers	2019-07-11 17:23:39 +02:00
Bartłomiej Pluta	b80710798b	Remove unnecessary old code	2019-07-11 10:34:10 +02:00
Bartłomiej Pluta	3e506354cd	Add imports statements	2019-07-11 10:23:28 +02:00
Bartłomiej Pluta	610266a9d2	Add 'not' operator	2019-07-11 10:08:18 +02:00
Bartłomiej Pluta	60b54c357d	Create if-else statement	2019-07-11 09:32:05 +02:00
Bartłomiej Pluta	a13c87db14	Create if-else expression	2019-07-11 09:16:09 +02:00
Bartłomiej Pluta	101ce862b0	Create statements and block nodes	2019-07-11 00:18:40 +02:00
Bartłomiej Pluta	5a25ec6ffe	Little code refactor	2019-07-11 00:12:00 +02:00
Bartłomiej Pluta	3bbacad83b	Add support for maps	2019-07-11 00:08:12 +02:00
Bartłomiej Pluta	10c701ecbf	Create loop (dash '^') operator (older asterisk '*')	2019-07-10 23:56:21 +02:00
Bartłomiej Pluta	e115c6e33a	Fix ARROW operator	2019-07-10 23:21:51 +02:00
Bartłomiej Pluta	18884eb5d9	Add support for assignments, function calls and pure identifiers	2019-07-10 23:19:46 +02:00
Bartłomiej Pluta	24b1012c7c	Improve list to make use of max precedence expression parser	2019-07-10 22:49:20 +02:00
Bartłomiej Pluta	175bea6e5c	Create expression3 (logic 'and') and expression4 (logic 'or') precedence	2019-07-10 22:46:58 +02:00
Bartłomiej Pluta	3058293b7e	Create expression2 precendence level (relation operators)	2019-07-10 22:39:22 +02:00
Bartłomiej Pluta	4018bcddc7	Create expression precendence level	2019-07-10 22:27:44 +02:00
Bartłomiej Pluta	1d573c8c80	Create term precendence level	2019-07-10 22:05:45 +02:00
Bartłomiej Pluta	29820fb2ee	Create factor level	2019-07-10 22:00:01 +02:00
Bartłomiej Pluta	9dc8d5a650	Add lists to base items	2019-07-10 21:56:38 +02:00
Bartłomiej Pluta	ab990f3071	Create parser for chain (dot operator)	2019-07-10 21:31:02 +02:00
Bartłomiej Pluta	e31dab52f6	Create parsers for literals (atoms)	2019-07-10 21:23:45 +02:00
Bartłomiej Pluta	66554f6c37	Improve parser to contain name and subparsers	2019-07-10 20:53:36 +02:00
Bartłomiej Pluta	aefa8e8f3c	Create simple calc as test draft	2019-07-10 20:14:05 +02:00
Bartłomiej Pluta	76eabbff0e	Refactor LeftAssociativeOperatorNode	2019-07-10 17:02:18 +02:00
Bartłomiej Pluta	214eec0e7a	Rename 'access.py' to 'operator.py'	2019-07-10 16:55:37 +02:00
Bartłomiej Pluta	88b245dc05	Make access node more generic	2019-07-10 16:51:11 +02:00