Renamed ConceptMatch into ConceptExpression and added unit tests

2020-01-15 19:44:32 +01:00
parent 8152f82c6b
commit 3789ef25d1
12 changed files with 109 additions and 88 deletions
@@ -5,7 +5,7 @@ from core.builtin_concepts import BuiltinConcepts
 from core.sheerka import ExecutionContext
 from core.tokenizer import Tokenizer, Token, TokenKind, LexerError
 from parsers.BaseParser import BaseParser, ErrorNode, UnexpectedTokenErrorNode
-from parsers.ConceptLexerParser import OrderedChoice, Sequence, Optional, ZeroOrMore, OneOrMore, ConceptMatch, StrMatch
+from parsers.ConceptLexerParser import OrderedChoice, Sequence, Optional, ZeroOrMore, OneOrMore, ConceptExpression, StrMatch


@dataclass()
@@ -231,7 +231,7 @@ class BnfParser(BaseParser):

        if token.type == TokenKind.IDENTIFIER:
            self.next_token()
-            return ConceptMatch(token.value)
+            return ConceptExpression(token.value)
            # concept = self.sheerka.get(str(token.value))
            # if hasattr(concept, "__iter__") or self.sheerka.isinstance(concept, BuiltinConcepts.UNKNOWN_CONCEPT):
            #     self.add_error(CannotResolveConceptNode(str(token.value)))