We can now use concept sets in BNF definitions

parsers/DefaultParser.py

@@ -210,12 +210,13 @@ class DefaultParser(BaseParser):
         if self.has_error and isinstance(self.error_sink[0], CannotHandleErrorNode):
             body = self.sheerka.new(BuiltinConcepts.NOT_FOR_ME, body=self.error_sink)
         else:
-            body = self.sheerka.new(
-                BuiltinConcepts.PARSER_RESULT,
-                parser=self,
-                source=text,
-                body=self.error_sink if self.has_error else tree,
-                try_parsed=tree)
+            body = self.get_return_value_body(context.sheerka, text, tree, tree)
+            # body = self.sheerka.new(
+            #     BuiltinConcepts.PARSER_RESULT,
+            #     parser=self,
+            #     source=text,
+            #     body=self.error_sink if self.has_error else tree,
+            #     try_parsed=tree)
 
         ret = self.sheerka.ret(
             self.name,
@@ -261,7 +262,7 @@ class DefaultParser(BaseParser):
         concept_found.name = self.get_concept_name(first_token, tokens_found_by_parts)
 
         # get the definition
-        concept_found.definition = self.get_concept_definition(tokens_found_by_parts)
+        concept_found.definition = self.get_concept_definition(concept_found, tokens_found_by_parts)
 
         # get the ASTs for the remaining parts
         asts_found_by_parts = self.get_concept_parts(tokens_found_by_parts)
@@ -359,7 +360,7 @@ class DefaultParser(BaseParser):
         name_node = NameNode(name_tokens[name_first_token_index:])  # skip the first token
         return name_node
 
-    def get_concept_definition(self, tokens_found_by_parts):
+    def get_concept_definition(self, current_concept_def, tokens_found_by_parts):
         if tokens_found_by_parts[Keywords.FROM] is None:
             return NotInitializedNode()
 
@@ -373,7 +374,7 @@ class DefaultParser(BaseParser):
             return NotInitializedNode()
 
         regex_parser = BnfParser()
-        with self.context.push(self.name) as sub_context:
+        with self.context.push(self.name, obj=current_concept_def) as sub_context:
             parsing_result = regex_parser.parse(sub_context, tokens)
             sub_context.add_values(return_values=parsing_result)