Added set of set handling (thru concept ISA)

2020-02-17 21:07:06 +01:00
parent 7481b458e1
commit 86c2ff58d4
33 changed files with 635 additions and 232 deletions
@@ -236,7 +236,8 @@ class BnfParser(BaseParser):
        if token.type == TokenKind.CONCEPT:
            self.next_token()
            concept = self.sheerka.new((token.value[0], token.value[1]))
-            expr = ConceptGroupExpression(concept) if self.sheerka.isaset(concept) else ConceptExpression(concept)
+            expr = ConceptGroupExpression(concept) if self.sheerka.isaset(self.context, concept) \
+                else ConceptExpression(concept)
            return self.eat_rule_name_if_needed(expr)

        if token.type == TokenKind.IDENTIFIER:
@@ -260,7 +261,8 @@ class BnfParser(BaseParser):
                                     body=("key", concept_name)))
                return None
            else:
-                expr = ConceptGroupExpression(concept) if self.sheerka.isaset(concept) else ConceptExpression(concept)
+                expr = ConceptGroupExpression(concept) if self.sheerka.isaset(self.context, concept) \
+                    else ConceptExpression(concept)
                expr.rule_name = concept.name
                return expr