Added set of set handling (thru concept ISA)

src/parsers/BnfParser.py

@@ -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
 

src/parsers/ConceptLexerParser.py

@@ -318,7 +318,7 @@ class ConceptGroupExpression(ConceptExpression):
         self.concept = to_match  # Memoize
 
         if to_match not in parser.concepts_grammars:
-            concepts_in_group = parser.sheerka.get_set_elements(self.concept)
+            concepts_in_group = parser.sheerka.get_set_elements(parser.context, self.concept)
             nodes = [ConceptExpression(c, rule_name=c.name) for c in concepts_in_group]
             expr = OrderedChoice(nodes)
             expr.nodes = nodes
@@ -697,7 +697,7 @@ class ConceptLexerParser(BaseParser):
         # A copy must be created
         def inner_get_model(expression):
             if isinstance(expression, Concept):
-                if self.sheerka.isaset(expression):
+                if self.sheerka.isaset(self.context, expression):
                     ret = ConceptGroupExpression(expression, rule_name=expression.name)
                 else:
                     ret = ConceptExpression(expression, rule_name=expression.name)

src/parsers/DefaultParser.py

@@ -246,7 +246,7 @@ class DefaultParser(BaseParser):
 
         # the definition of a concept consists of several parts
         # Keywords.CONCEPT to get the name of the concept
-        # Keywords.FROM [Keywords.REGEX] to get the definition of the concept
+        # Keywords.FROM [Keywords.BNF] to get the definition of the concept
         # Keywords.AS to get the body
         # Keywords.WHERE to get the conditions to recognize for the variables
         # Keywords.PRE to know if the conditions to evaluate the concept