Remove `lookupLexicalItem`, attach info in AST instead

3 files changed, 150 insertions, 42 deletions

diff --git a/test/golden/calc/generating tasks.golden b/test/golden/calc/generating tasks.golden
index b853856..035ce3d 100644
--- a/test/golden/calc/generating tasks.golden
+++ b/test/golden/calc/generating tasks.golden
@@ -16,7 +16,10 @@
         )
         ( SymbolPredicate
             ( PredicateRelation
-                ( Symbol "=" )
+                ( RelationSymbol
+                    ( Symbol "=" )
+                    ( Marker "eq" )
+                )
             )
         )
         [ TermVar
@@ -41,7 +44,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -72,7 +78,10 @@
         )
         ( SymbolPredicate
             ( PredicateRelation
-                ( Symbol "=" )
+                ( RelationSymbol
+                    ( Symbol "=" )
+                    ( Marker "eq" )
+                )
             )
         )
         [ TermVar
@@ -97,7 +106,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -125,7 +137,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -156,7 +171,10 @@
         )
         ( SymbolPredicate
             ( PredicateRelation
-                ( Symbol "=" )
+                ( RelationSymbol
+                    ( Symbol "=" )
+                    ( Marker "eq" )
+                )
             )
         )
         [ TermVar
@@ -181,7 +199,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -212,7 +233,10 @@
         )
         ( SymbolPredicate
             ( PredicateRelation
-                ( Symbol "=" )
+                ( RelationSymbol
+                    ( Symbol "=" )
+                    ( Marker "eq" )
+                )
             )
         )
         [ TermVar
@@ -237,7 +261,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -265,7 +292,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -291,7 +321,10 @@
                 )
                 ( SymbolPredicate
                     ( PredicateRelation
-                        ( Symbol "=" )
+                        ( RelationSymbol
+                            ( Symbol "=" )
+                            ( Marker "eq" )
+                        )
                     )
                 )
                 [ TermVar
@@ -316,7 +349,10 @@
         )
         ( SymbolPredicate
             ( PredicateRelation
-                ( Symbol "=" )
+                ( RelationSymbol
+                    ( Symbol "=" )
+                    ( Marker "eq" )
+                )
             )
         )
         [ TermVar
@@ -341,7 +377,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -369,7 +408,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -397,7 +439,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -428,7 +473,10 @@
         )
         ( SymbolPredicate
             ( PredicateRelation
-                ( Symbol "=" )
+                ( RelationSymbol
+                    ( Symbol "=" )
+                    ( Marker "eq" )
+                )
             )
         )
         [ TermVar
@@ -453,7 +501,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -484,7 +535,10 @@
         )
         ( SymbolPredicate
             ( PredicateRelation
-                ( Symbol "=" )
+                ( RelationSymbol
+                    ( Symbol "=" )
+                    ( Marker "eq" )
+                )
             )
         )
         [ TermVar
@@ -509,7 +563,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -537,7 +594,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -565,7 +625,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
@@ -592,7 +655,10 @@
                     )
                     ( SymbolPredicate
                         ( PredicateRelation
-                            ( Symbol "=" )
+                            ( RelationSymbol
+                                ( Symbol "=" )
+                                ( Marker "eq" )
+                            )
                         )
                     )
                     [ TermVar
@@ -610,7 +676,10 @@
                     )
                     ( SymbolPredicate
                         ( PredicateRelation
-                            ( Symbol "=" )
+                            ( RelationSymbol
+                                ( Symbol "=" )
+                                ( Marker "eq" )
+                            )
                         )
                     )
                     [ TermVar
@@ -636,7 +705,10 @@
         )
         ( SymbolPredicate
             ( PredicateRelation
-                ( Symbol "=" )
+                ( RelationSymbol
+                    ( Symbol "=" )
+                    ( Marker "eq" )
+                )
             )
         )
         [ TermVar
diff --git a/test/golden/calc/glossing.golden b/test/golden/calc/glossing.golden
index 41e307c..caf6f61 100644
--- a/test/golden/calc/glossing.golden
+++ b/test/golden/calc/glossing.golden
@@ -16,7 +16,10 @@
             )
             ( SymbolPredicate
                 ( PredicateRelation
-                    ( Symbol "=" )
+                    ( RelationSymbol
+                        ( Symbol "=" )
+                        ( Marker "eq" )
+                    )
                 )
             )
             [ TermVar
@@ -44,7 +47,10 @@
             )
             ( SymbolPredicate
                 ( PredicateRelation
-                    ( Symbol "=" )
+                    ( RelationSymbol
+                        ( Symbol "=" )
+                        ( Marker "eq" )
+                    )
                 )
             )
             [ TermVar
@@ -72,7 +78,10 @@
             )
             ( SymbolPredicate
                 ( PredicateRelation
-                    ( Symbol "=" )
+                    ( RelationSymbol
+                        ( Symbol "=" )
+                        ( Marker "eq" )
+                    )
                 )
             )
             [ TermVar
@@ -144,7 +153,10 @@
             )
             ( SymbolPredicate
                 ( PredicateRelation
-                    ( Symbol "=" )
+                    ( RelationSymbol
+                        ( Symbol "=" )
+                        ( Marker "eq" )
+                    )
                 )
             )
             [ TermVar
@@ -184,7 +196,10 @@
                 )
                 ( SymbolPredicate
                     ( PredicateRelation
-                        ( Symbol "=" )
+                        ( RelationSymbol
+                            ( Symbol "=" )
+                            ( Marker "eq" )
+                        )
                     )
                 )
                 [ TermVar
@@ -207,7 +222,10 @@
                         )
                         ( SymbolPredicate
                             ( PredicateRelation
-                                ( Symbol "=" )
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                )
                             )
                         )
                         [ TermVar
diff --git a/test/golden/calc/parsing.golden b/test/golden/calc/parsing.golden
index 2dd7e38..aed7bda 100644
--- a/test/golden/calc/parsing.golden
+++ b/test/golden/calc/parsing.golden
@@ -18,8 +18,11 @@
                     ( ExprVar
                         ( NamedVar "x" ) :| []
                     ) Positive
-                    ( RelationSymbol
-                        ( Symbol "=" ) []
+                    ( Relation
+                        ( RelationSymbol
+                            ( Symbol "=" )
+                            ( Marker "eq" )
+                        ) []
                     )
                     ( ExprVar
                         ( NamedVar "x" ) :| []
@@ -48,8 +51,11 @@
                     ( ExprVar
                         ( NamedVar "z" ) :| []
                     ) Positive
-                    ( RelationSymbol
-                        ( Symbol "=" ) []
+                    ( Relation
+                        ( RelationSymbol
+                            ( Symbol "=" )
+                            ( Marker "eq" )
+                        ) []
                     )
                     ( ExprVar
                         ( NamedVar "z" ) :| []
@@ -78,8 +84,11 @@
                     ( ExprVar
                         ( NamedVar "y" ) :| []
                     ) Positive
-                    ( RelationSymbol
-                        ( Symbol "=" ) []
+                    ( Relation
+                        ( RelationSymbol
+                            ( Symbol "=" )
+                            ( Marker "eq" )
+                        ) []
                     )
                     ( ExprVar
                         ( NamedVar "y" ) :| []
@@ -147,8 +156,11 @@
                     ( ExprVar
                         ( NamedVar "y" ) :| []
                     ) Positive
-                    ( RelationSymbol
-                        ( Symbol "=" ) []
+                    ( Relation
+                        ( RelationSymbol
+                            ( Symbol "=" )
+                            ( Marker "eq" )
+                        ) []
                     )
                     ( ExprVar
                         ( NamedVar "y" ) :| []
@@ -177,8 +189,11 @@
                     ( ExprVar
                         ( NamedVar "y" ) :| []
                     ) Positive
-                    ( RelationSymbol
-                        ( Symbol "=" ) []
+                    ( Relation
+                        ( RelationSymbol
+                            ( Symbol "=" )
+                            ( Marker "eq" )
+                        ) []
                     )
                     ( ExprVar
                         ( NamedVar "y" ) :| []
@@ -195,8 +210,11 @@
                             ( ExprVar
                                 ( NamedVar "y" ) :| []
                             ) Positive
-                            ( RelationSymbol
-                                ( Symbol "=" ) []
+                            ( Relation
+                                ( RelationSymbol
+                                    ( Symbol "=" )
+                                    ( Marker "eq" )
+                                ) []
                             )
                             ( ExprVar
                                 ( NamedVar "y" ) :| []