Added ZeroAndMore and OneAndMore to BNF. BNF expressions can now be captured

2019-12-18 12:01:51 +01:00
parent 88cd3162be
commit 8dbe2e1b20
9 changed files with 425 additions and 91 deletions
@@ -254,13 +254,14 @@ class Sheerka(Concept):
        # group the evaluators by priority and sort them
        # The first one to be applied will be the one with the highest priority
        grouped_evaluators = {}
-        for item in [e() for e in self.evaluators]:
-            grouped_evaluators.setdefault(item.priority, []).append(item)
+        all_evaluators = [e() for e in self.evaluators]
+        for evaluator in [e for e in all_evaluators if e.enabled]:
+            grouped_evaluators.setdefault(evaluator.priority, []).append(evaluator)
        sorted_priorities = sorted(grouped_evaluators.keys(), reverse=True)

        # process
        while True:
-            simple_digest = return_values[:]  # set(id(r) for r in return_values)
+            simple_digest = return_values[:]

            for priority in sorted_priorities:
                # log.debug("Processing priority " + str(priority))