Update generator to reflect updated grammar

FormalLanguageConstrainedPathQuerying · May 6, 2024 · 7df453f · 7df453f
1 parent 546b831
commit 7df453f
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 12 deletions.
diff --git a/tests/autotests/ProgramGenerator.py b/tests/autotests/ProgramGenerator.py
@@ -272,18 +272,31 @@ def v_filter(self, parent=None):
     def NUM(self, parent=None):
         with UnlexerRuleContext(self, "NUM", parent) as rule:
             current = rule.current
-            current.src += self._model.charset(
-                current, 0, ProgramGenerator._charsets[1]
-            )
-            with QuantifierContext(
-                rule, 0, 0, inf, ProgramGenerator._quant_sizes[0], 0
-            ) as quant0:
-                while quant0():
-                    with QuantifiedContext(rule):
-                        current = rule.current
-                        current.src += self._model.charset(
-                            current, 1, ProgramGenerator._charsets[2]
-                        )
+            with AlternationContext(
+                rule,
+                0,
+                ProgramGenerator._alt_sizes[0],
+                0,
+                ProgramGenerator._alt_conds[0],
+            ) as alt0:
+                current = rule.current
+                choice0 = alt0()
+                if choice0 == 0:
+                    current.src += "0"
+                elif choice0 == 1:
+                    current.src += self._model.charset(
+                        current, 0, ProgramGenerator._charsets[1]
+                    )
+                    with QuantifierContext(
+                        rule, 0, 0, inf, ProgramGenerator._quant_sizes[0], 0
+                    ) as quant0:
+                        while quant0():
+                            with QuantifiedContext(rule):
+                                current = rule.current
+                                current.src += self._model.charset(
+                                    current, 1, ProgramGenerator._charsets[2]
+                                )
+                    current = rule.current
             current = rule.current
             return current
 

diff --git a/...e_1.b6d574ba6e3744549705c4dd1b892163.grtp → ...e_1.ac36fe75aed14aaf9dbf5a095d1e0f54.grtp b/...e_1.b6d574ba6e3744549705c4dd1b892163.grtp → ...e_1.ac36fe75aed14aaf9dbf5a095d1e0f54.grtp
diff --git a/..._10.51278e06b363443d907e875b6a1d89cf.grtp → ..._10.dd8eda2a68bd4f7eacca6db35984e5ef.grtp b/..._10.51278e06b363443d907e875b6a1d89cf.grtp → ..._10.dd8eda2a68bd4f7eacca6db35984e5ef.grtp
diff --git a/..._11.56f26bf0cfe84b7fb948dbd28fc3ac5c.grtp → ..._11.99692263ce9f4a27ae06db82880dd5ed.grtp b/..._11.56f26bf0cfe84b7fb948dbd28fc3ac5c.grtp → ..._11.99692263ce9f4a27ae06db82880dd5ed.grtp
diff --git a/..._12.e5cc3681687c4b66be3b7f6d910e4e11.grtp → ..._12.cb66f2c27dce427cb3ef857a033c04de.grtp b/..._12.e5cc3681687c4b66be3b7f6d910e4e11.grtp → ..._12.cb66f2c27dce427cb3ef857a033c04de.grtp
diff --git a/..._13.a99354c6bd9b4ec38ee942167910c02d.grtp → ..._13.3b5c36a9a11240f798443665eabbc39e.grtp b/..._13.a99354c6bd9b4ec38ee942167910c02d.grtp → ..._13.3b5c36a9a11240f798443665eabbc39e.grtp
diff --git a/..._14.cb45b8b67a8b4edd884f149683e6299b.grtp → ..._14.a44edfd713cb429b8ef60dbe3e2a3499.grtp b/..._14.cb45b8b67a8b4edd884f149683e6299b.grtp → ..._14.a44edfd713cb429b8ef60dbe3e2a3499.grtp
diff --git a/..._15.f1948ed6b08448639f80d3e2bb78b098.grtp → ..._15.759a2056fea6465e913deafa2acf6735.grtp b/..._15.f1948ed6b08448639f80d3e2bb78b098.grtp → ..._15.759a2056fea6465e913deafa2acf6735.grtp
diff --git a/..._16.f96233933ea340ca9d84c5ffec771066.grtp → ..._16.2a29e19d5635406e89e88e89d062a1d2.grtp b/..._16.f96233933ea340ca9d84c5ffec771066.grtp → ..._16.2a29e19d5635406e89e88e89d062a1d2.grtp
diff --git a/...e_2.dd97be1cd3bc4685b4512ecf1ee39752.grtp → ...e_2.10027d27b1fe44d1a5f7b67e36e1be4d.grtp b/...e_2.dd97be1cd3bc4685b4512ecf1ee39752.grtp → ...e_2.10027d27b1fe44d1a5f7b67e36e1be4d.grtp
diff --git a/...e_3.caf8086a2a284fcd92b4a1579f47b9fa.grtp → ...e_3.6b5d6506d9ee4e06b8f1fe7a6df4f408.grtp b/...e_3.caf8086a2a284fcd92b4a1579f47b9fa.grtp → ...e_3.6b5d6506d9ee4e06b8f1fe7a6df4f408.grtp
diff --git a/...e_4.236ac59c0b644dbb8a4e3dbb491e0346.grtp → ...e_4.812eb6125e1347ac8a2337d43be8f4e8.grtp b/...e_4.236ac59c0b644dbb8a4e3dbb491e0346.grtp → ...e_4.812eb6125e1347ac8a2337d43be8f4e8.grtp
diff --git a/...e_5.ca14fadc0f544a4fbb163ff5e8aba085.grtp → ...e_5.26caac5c8604430abdd5dbdf49358f02.grtp b/...e_5.ca14fadc0f544a4fbb163ff5e8aba085.grtp → ...e_5.26caac5c8604430abdd5dbdf49358f02.grtp
diff --git a/...e_6.c4b6d1bfd23b46be83be2d5c821416ae.grtp → ...e_6.a7391a181bdb4cb59fc172fe760becb1.grtp b/...e_6.c4b6d1bfd23b46be83be2d5c821416ae.grtp → ...e_6.a7391a181bdb4cb59fc172fe760becb1.grtp
diff --git a/...e_7.88cf938e6d844b22a101f0f2a1861b28.grtp → ...e_7.06818e72bb014b47b3e4dcd1457bcdae.grtp b/...e_7.88cf938e6d844b22a101f0f2a1861b28.grtp → ...e_7.06818e72bb014b47b3e4dcd1457bcdae.grtp
diff --git a/...e_8.239b5ee593d148a08106156316ac488f.grtp → ...e_8.518b39be43534596b088aa151b2dc1f9.grtp b/...e_8.239b5ee593d148a08106156316ac488f.grtp → ...e_8.518b39be43534596b088aa151b2dc1f9.grtp
diff --git a/...e_9.a9624020b7cc408b9fbf68e151e2c86f.grtp → ...e_9.100fd4999b124566afdd7b0da134d840.grtp b/...e_9.a9624020b7cc408b9fbf68e151e2c86f.grtp → ...e_9.100fd4999b124566afdd7b0da134d840.grtp