From cabc091ee43d0203525f1e437221a14407aa0049 Mon Sep 17 00:00:00 2001
From: John Doty <john@d0ty.me>
Date: Sun, 2 Jun 2024 08:10:18 -0700
Subject: [PATCH] Start extracting better expressions

---
 grammar.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/grammar.py b/grammar.py
index f57c85b..754f2e9 100644
--- a/grammar.py
+++ b/grammar.py
@@ -1,7 +1,8 @@
 # This is an example grammar.
 import re
 
-from parser import Assoc, GenerateLALR, GenerateLR1, Grammar, Nothing, Terminal, rule, seq, Rule
+import parser
+from parser import Assoc, Grammar, Nothing, Terminal, rule, seq, Rule
 
 ARROW = Terminal("Arrow")
 AS = Terminal("As")
@@ -54,7 +55,7 @@ RSQUARE = Terminal("RightBracket")
 
 
 class FineGrammar(Grammar):
-    generator = GenerateLALR
+    # generator = parser.GenerateLR1
     start = "File"
 
     def __init__(self):
@@ -254,7 +255,7 @@ class FineGrammar(Grammar):
     @rule
     def primary_expression(self) -> Rule:
         return (
-            IDENTIFIER
+            self.identifier_expression
             | SELF
             | NUMBER
             | STRING
@@ -273,6 +274,10 @@ class FineGrammar(Grammar):
             | seq(LPAREN, self.expression, RPAREN)
         )
 
+    @rule("IdentifierExpression")
+    def identifier_expression(self):
+        return IDENTIFIER
+
     @rule("ConditionalExpression")
     def conditional_expression(self) -> Rule:
         return (
@@ -318,7 +323,6 @@ class FineGrammar(Grammar):
         return (
             seq(self.variable_binding, self._pattern_core, self.pattern_predicate)
             | seq(self.variable_binding, self._pattern_core)
-            | seq(self._pattern_core, self.pattern_predicate)
             | self._pattern_core
         )
 
@@ -534,3 +538,7 @@ class FineTokens:
             column_index = start - col_start
             value = self.src[start : start + length]
             print(f"{start:04} {kind.value:12} {value} ({line_index}, {column_index})")
+
+
+if __name__ == "__main__":
+    FineGrammar().build_table()