Fixed initialisation issue for concepts with BNF definition

parsers/ConceptLexerParser.py

@@ -463,16 +463,31 @@ class ConceptMatch(Match):
 
         return self.concept == other.concept
 
+    @staticmethod
+    def get_parsing_expression_from_name(name):
+        tokens = Tokenizer(name)
+        nodes = [StrMatch(core.utils.strip_quotes(token.value)) for token in list(tokens)[:-1]]
+        if len(nodes) == 1:
+            return nodes[0]
+        else:
+            sequence = Sequence(nodes)
+            sequence.nodes = nodes
+            return sequence
+
     def _parse(self, parser):
         to_match = parser.get_concept(self.concept) if isinstance(self.concept, str) else self.concept
         if parser.sheerka.isinstance(to_match, BuiltinConcepts.UNKNOWN_CONCEPT):
             return None
 
-        if to_match not in parser.concepts_grammars:
-            return None
-
         self.concept = to_match  # Memoize
-        node = parser.concepts_grammars[to_match].parse(parser)
+
+        if to_match not in parser.concepts_grammars:
+            # Try to match the concept using its name
+            expr = self.get_parsing_expression_from_name(to_match.name)
+            node = expr.parse(parser)
+        else:
+            node = parser.concepts_grammars[to_match].parse(parser)
+
         if node is None:
             return None
 
@@ -616,7 +631,7 @@ class ConceptLexerParser(BaseParser):
                 isinstance(expression, OneOrMore) or \
                 isinstance(expression, Optional):
                 ret = expression
-                ret.nodes.extend([inner_get_model(e) for e in ret.elements])
+                ret.nodes = [inner_get_model(e) for e in ret.elements]
             else:
                 ret = self.add_error(GrammarErrorNode(f"Unrecognized grammar element '{expression}'."), False)