[grammar] make keywords always have type str

fixes #335
neogeny · Mar 18, 2024 · 9b5b142 · 9b5b142
1 parent f6f6ec0
commit 9b5b142
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/grammar/tatsu.ebnf b/grammar/tatsu.ebnf
@@ -65,7 +65,7 @@ keywords
 
 keyword
     =
-    '@@keyword' ~ '::' ~ {@+:literal !(':'|'=')}
+    '@@keyword' ~ '::' ~ {@+:(word|string) !(':'|'=')}
     ;
 
 

diff --git a/tatsu/bootstrap.py b/tatsu/bootstrap.py
@@ -238,7 +238,16 @@ def _keyword_(self):
         self._cut()
 
         def block0():
-            self._literal_()
+            with self._group():
+                with self._choice():
+                    with self._option():
+                        self._word_()
+                    with self._option():
+                        self._string_()
+                    self._error(
+                        'expecting one of: '
+                        '<string> <word>'
+                    )
             self.add_last_node_to_name('@')
             with self._ifnot():
                 with self._group():
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,7 @@ keywords @@
     keyword
         =
-        '@@keyword' ~ '::' ~ {@+:literal !(':'|'=')}
+        '@@keyword' ~ '::' ~ {@+:(word|string) !(':'|'=')}
         ;
@@ Expand Down @@