Fix grammars in tasks 7-9

Fix typo in G3 and allow epsilon in G4
FormalLanguageConstrainedPathQuerying · May 8, 2024 · 39691b0 · 39691b0
1 parent 44d41e6
commit 39691b0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/tests/autotests/test_task7.py b/tests/autotests/test_task7.py
@@ -87,10 +87,10 @@
 
 GRAMMARS_DIFFERENT = [
     cfg.CFG.from_text(
-        "S -> S1 | S2\nS1 -> Sab | S1 c\nSab -> $ | a Sab b\nS2 -> Sbc | a S2\nSbc -> b Sbc c"
+        "S -> S1 | S2\nS1 -> Sab | S1 c\nSab -> $ | a Sab b\nS2 -> Sbc | a S2\nSbc -> $ | b Sbc c"
     ),
     cfg.CFG.from_text("S -> a | b | S c S | S d S | e S f | g S"),
-    cfg.CFG.from_text("S -> $ | a S b | b S a | e S f | S S | c S d | f S c | f S e"),
+    cfg.CFG.from_text("S -> $ | a S b | b S a | e S f | S S | c S d | d S c | f S e"),
 ]
 
 LABELS = ["a", "b", "c", "d", "e", "f", "g", "h"]

diff --git a/tests/autotests/test_task8.py b/tests/autotests/test_task8.py
@@ -88,16 +88,16 @@
 
 GRAMMARS_DIFFERENT = [
     cfg.CFG.from_text(
-        "S -> S1 | S2\nS1 -> Sab | S1 c\nSab -> $ | a Sab b\nS2 -> Sbc | a S2\nSbc -> b Sbc c"
+        "S -> S1 | S2\nS1 -> Sab | S1 c\nSab -> $ | a Sab b\nS2 -> Sbc | a S2\nSbc -> $ | b Sbc c"
     ),
     cfg.CFG.from_text("S -> a | b | S c S | S d S | e S f | g S"),
-    cfg.CFG.from_text("S -> $ | a S b | b S a | e S f | S S | c S d | f S c | f S e"),
+    cfg.CFG.from_text("S -> $ | a S b | b S a | e S f | S S | c S d | d S c | f S e"),
 ]
 
 EBNF_GRAMMARS = [
     """S -> ( Sab c* ) | ( a* Sbc )
-    Sab -> a ( Sab | $ ) b
-    Sbc -> b ( Sbc | $ ) c""",
+    Sab -> (a Sab b) | $
+    Sbc -> (b Sbc c) | $""",
     "S -> a | b | (S ( c | d ) S ) | ( e S f ) | ( g S )",
     "S -> ( ( a S b ) | ( b S a ) | ( c S d ) | ( d S c ) | ( e S f ) | (f S e) )*",
 ]

diff --git a/tests/autotests/test_task9.py b/tests/autotests/test_task9.py
@@ -89,16 +89,16 @@
 
 GRAMMARS_DIFFERENT = [
     cfg.CFG.from_text(
-        "S -> S1 | S2\nS1 -> Sab | S1 c\nSab -> $ | a Sab b\nS2 -> Sbc | a S2\nSbc -> b Sbc c"
+        "S -> S1 | S2\nS1 -> Sab | S1 c\nSab -> $ | a Sab b\nS2 -> Sbc | a S2\nSbc -> $ | b Sbc c"
     ),
     cfg.CFG.from_text("S -> a | b | S c S | S d S | e S f | g S"),
-    cfg.CFG.from_text("S -> $ | a S b | b S a | e S f | S S | c S d | f S c | f S e"),
+    cfg.CFG.from_text("S -> $ | a S b | b S a | e S f | S S | c S d | d S c | f S e"),
 ]
 
 EBNF_GRAMMARS = [
     """S -> ( Sab c* ) | ( a* Sbc )
-    Sab -> a ( Sab | $ ) b
-    Sbc -> b ( Sbc | $ ) c""",
+    Sab -> (a Sab b) | $
+    Sbc -> (b Sbc c) | $""",
     "S -> a | b | (S ( c | d ) S ) | ( e S f ) | ( g S )",
     "S -> ( ( a S b ) | ( b S a ) | ( c S d ) | ( d S c ) | ( e S f ) | (f S e) )*",
 ]