Bump egglog version which adds span tracking

Author: saulshanabrook

Cargo.lock

@@ -32,7 +32,7 @@ class EGraph:
         record: bool = False,
     ) -> None: ...
     def commands(self) -> str | None: ...
-    def parse_program(self, __input: str, /) -> list[_Command]: ...
+    def parse_program(self, __input: str, /, filename: str | None = None) -> list[_Command]: ...
     def run_program(self, *commands: _Command) -> list[str]: ...
     def extract_report(self) -> _ExtractReport | None: ...
     def run_report(self) -> RunReport | None: ...
@@ -56,6 +56,25 @@ class EGraph:
 class EggSmolError(Exception):
     context: str
 
+##
+# Spans
+##
+
+@final
+class SrcFile:
+    def __init__(self, name: str, contents: str | None = None) -> None: ...
+    name: str
+    contents: str | None
+
+@final
+class Span:
+    def __init__(self, file: SrcFile, start: int, end: int) -> None: ...
+    file: SrcFile
+    start: int
+    end: int
+
+DUMMY_SPAN: Span = ...
+
 ##
 # Literals
 ##
@@ -92,17 +111,20 @@ _Literal: TypeAlias = Int | F64 | String | Bool | Unit
 
 @final
 class Lit:
-    def __init__(self, value: _Literal) -> None: ...
+    def __init__(self, span: Span, value: _Literal) -> None: ...
+    span: Span
     value: _Literal
 
 @final
 class Var:
-    def __init__(self, name: str) -> None: ...
+    def __init__(self, span: Span, name: str) -> None: ...
+    span: Span
     name: str
 
 @final
 class Call:
-    def __init__(self, name: str, args: list[_Expr]) -> None: ...
+    def __init__(self, span: Span, name: str, args: list[_Expr]) -> None: ...
+    span: Span
     name: str
     args: list[_Expr]
 
@@ -142,7 +164,8 @@ class TermDag:
 
 @final
 class Eq:
-    def __init__(self, exprs: list[_Expr]) -> None: ...
+    def __init__(self, span: Span, exprs: list[_Expr]) -> None: ...
+    span: Span
     exprs: list[_Expr]
 
 @final
@@ -172,43 +195,50 @@ _Change: TypeAlias = Delete | Subsume
 
 @final
 class Let:
-    def __init__(self, lhs: str, rhs: _Expr) -> None: ...
+    def __init__(self, span: Span, lhs: str, rhs: _Expr) -> None: ...
+    span: Span
     lhs: str
     rhs: _Expr
 
 @final
 class Set:
-    def __init__(self, lhs: str, args: list[_Expr], rhs: _Expr) -> None: ...
+    def __init__(self, span: Span, lhs: str, args: list[_Expr], rhs: _Expr) -> None: ...
+    span: Span
     lhs: str
     args: list[_Expr]
     rhs: _Expr
 
 @final
 class Change:
+    span: Span
     change: _Change
     sym: str
     args: list[_Expr]
-    def __init__(self, change: _Change, sym: str, args: list[_Expr]) -> None: ...
+    def __init__(self, span: Span, change: _Change, sym: str, args: list[_Expr]) -> None: ...
 
 @final
 class Union:
-    def __init__(self, lhs: _Expr, rhs: _Expr) -> None: ...
+    def __init__(self, span: Span, lhs: _Expr, rhs: _Expr) -> None: ...
+    span: Span
     lhs: _Expr
     rhs: _Expr
 
 @final
 class Panic:
-    def __init__(self, msg: str) -> None: ...
+    def __init__(self, span: Span, msg: str) -> None: ...
+    span: Span
     msg: str
 
 @final
 class Expr_:  # noqa: N801
-    def __init__(self, expr: _Expr) -> None: ...
+    def __init__(self, span: Span, expr: _Expr) -> None: ...
+    span: Span
     expr: _Expr
 
 @final
 class Extract:
-    def __init__(self, expr: _Expr, variants: _Expr) -> None: ...
+    def __init__(self, span: Span, expr: _Expr, variants: _Expr) -> None: ...
+    span: Span
     expr: _Expr
     variants: _Expr
 
@@ -256,17 +286,19 @@ class Schema:
 
 @final
 class Rule:
+    span: Span
     head: list[_Action]
     body: list[_Fact]
-    def __init__(self, head: list[_Action], body: list[_Fact]) -> None: ...
+    def __init__(self, span: Span, head: list[_Action], body: list[_Fact]) -> None: ...
 
 @final
 class Rewrite:
+    span: Span
     lhs: _Expr
     rhs: _Expr
     conditions: list[_Fact]
 
-    def __init__(self, lhs: _Expr, rhs: _Expr, conditions: list[_Fact] = []) -> None: ...  # noqa: B006
+    def __init__(self, span: Span, lhs: _Expr, rhs: _Expr, conditions: list[_Fact] = []) -> None: ...  # noqa: B006
 
 @final
 class RunConfig:
@@ -322,24 +354,28 @@ _ExtractReport: TypeAlias = Variants | Best
 
 @final
 class Saturate:
+    span: Span
     schedule: _Schedule
-    def __init__(self, schedule: _Schedule) -> None: ...
+    def __init__(self, span: Span, schedule: _Schedule) -> None: ...
 
 @final
 class Repeat:
+    span: Span
     length: int
     schedule: _Schedule
-    def __init__(self, length: int, schedule: _Schedule) -> None: ...
+    def __init__(self, span: Span, length: int, schedule: _Schedule) -> None: ...
 
 @final
 class Run:
+    span: Span
     config: RunConfig
-    def __init__(self, config: RunConfig) -> None: ...
+    def __init__(self, span: Span, config: RunConfig) -> None: ...
 
 @final
 class Sequence:
+    span: Span
     schedules: list[_Schedule]
-    def __init__(self, schedules: list[_Schedule]) -> None: ...
+    def __init__(self, span: Span, schedules: list[_Schedule]) -> None: ...
 
 _Schedule: TypeAlias = Saturate | Repeat | Run | Sequence
 
@@ -361,9 +397,10 @@ class Datatype:
 
 @final
 class Declare:
+    span: Span
     name: str
     sort: str
-    def __init__(self, name: str, sort: str) -> None: ...
+    def __init__(self, span: Span, name: str, sort: str) -> None: ...
 
 @final
 class Sort:
@@ -421,9 +458,10 @@ class Simplify:
 
 @final
 class Calc:
+    span: Span
     identifiers: list[IdentSort]
     exprs: list[_Expr]
-    def __init__(self, identifiers: list[IdentSort], exprs: list[_Expr]) -> None: ...
+    def __init__(self, span: Span, identifiers: list[IdentSort], exprs: list[_Expr]) -> None: ...
 
 @final
 class QueryExtract:
@@ -433,14 +471,16 @@ class QueryExtract:
 
 @final
 class Check:
+    span: Span
     facts: list[_Fact]
-    def __init__(self, facts: list[_Fact]) -> None: ...
+    def __init__(self, span: Span, facts: list[_Fact]) -> None: ...
 
 @final
 class PrintFunction:
+    span: Span
     name: str
     length: int
-    def __init__(self, name: str, length: int) -> None: ...
+    def __init__(self, span: Span, name: str, length: int) -> None: ...
 
 @final
 class PrintSize:

python/egglog/bindings.pyi

@@ -84,7 +84,7 @@ def implies(self, other: BoolLike) -> Bool: ...
 converter(bool, Bool, Bool)
 
 # The types which can be convertered into an i64
-i64Like = Union["i64", int]  # noqa: N816
+i64Like: TypeAlias = Union["i64", int]  # noqa: N816, PYI042
 
 
 class i64(Expr, builtin=True):  # noqa: N801
@@ -186,7 +186,7 @@ def bool_ge(self, other: i64Like) -> Bool: ...
 def count_matches(s: StringLike, pattern: StringLike) -> i64: ...
 
 
-f64Like = Union["f64", float]  # noqa: N816
+f64Like: TypeAlias = Union["f64", float]  # noqa: N816, PYI042
 
 
 class f64(Expr, builtin=True):  # noqa: N801
@@ -518,7 +518,8 @@ def _convert_function(a: FunctionType) -> UnstableFn:
     return_tp, *arg_tps = get_type_args()
     a.__annotations__ = {
         "return": return_tp,
-        **dict(zip(a.__code__.co_varnames, arg_tps, strict=True)),
+        # The first varnames should always be the arg names
+        **dict(zip(a.__code__.co_varnames, arg_tps, strict=False)),
     }
     # Modify name to make it unique
     # a.__name__ = f"{a.__name__} {hash(a.__code__)}"

python/egglog/builtins.py

@@ -1188,7 +1188,7 @@ def _facts_to_check(self, fact_likes: Iterable[FactLike]) -> bindings.Check:
         facts = _fact_likes(fact_likes)
         self._add_decls(*facts)
         egg_facts = [self._state.fact_to_egg(f.fact) for f in _fact_likes(facts)]
-        return bindings.Check(egg_facts)
+        return bindings.Check(bindings.DUMMY_SPAN, egg_facts)
 
     @overload
     def extract(self, expr: EXPR, /, include_cost: Literal[False] = False) -> EXPR: ...
@@ -1232,7 +1232,11 @@ def extract_multiple(self, expr: EXPR, n: int) -> list[EXPR]:
 
     def _run_extract(self, typed_expr: TypedExprDecl, n: int) -> bindings._ExtractReport:
         expr = self._state.typed_expr_to_egg(typed_expr)
-        self._egraph.run_program(bindings.ActionCommand(bindings.Extract(expr, bindings.Lit(bindings.Int(n)))))
+        self._egraph.run_program(
+            bindings.ActionCommand(
+                bindings.Extract(bindings.DUMMY_SPAN, expr, bindings.Lit(bindings.DUMMY_SPAN, bindings.Int(n)))
+            )
+        )
         extract_report = self._egraph.extract_report()
         if not extract_report:
             msg = "No extract report saved"