Resolved some remaining chicken and egg when parsing BNF nodes

2020-07-05 11:03:03 +02:00
parent ad8a997942
commit 71f753c925
14 changed files with 310 additions and 56 deletions
@@ -53,13 +53,19 @@ class BaseTest:
                c = Concept(c)

            if c.metadata.definition and c.metadata.definition_type != DEFINITION_TYPE_DEF:
-                bnf_parser = BnfParser()
-                res = bnf_parser.parse(context, c.metadata.definition)
-                if res.status:
-                    c.bnf = res.value.value
-                    c.metadata.definition_type = DEFINITION_TYPE_BNF
-                else:
-                    raise Exception(f"Error in bnf definition '{c.metadata.definition}'", sheerka.get_error(res))
+                desc = f"Resolving BNF {c.metadata.definition}"
+                with context.push(BuiltinConcepts.INIT_BNF,
+                                  c,
+                                  obj=c,
+                                  desc=desc) as sub_context:
+
+                    bnf_parser = BnfParser()
+                    res = bnf_parser.parse(sub_context, c.metadata.definition)
+                    if res.status:
+                        c.bnf = res.value.value
+                        c.metadata.definition_type = DEFINITION_TYPE_BNF
+                    else:
+                        raise Exception(f"Error in bnf definition '{c.metadata.definition}'", sheerka.get_error(res))

            if create_new:
                sheerka.create_new_concept(context, c)