BaseExpr -> Expr

Author: saulshanabrook

docs/changelog.md

@@ -32,7 +32,7 @@ _This project uses semantic versioning. Before 1.0.0, this means that every brea
 
 - Fix bug calling methods on paramterized types (e.g. `Map[i64, i64].empty().insert(i64(0), i64(1))`)
 - Fix bug for Unit type (egg name is `Unit` not `unit`)
-- Use `@class_` decorator to force subclassing `BaseExpr`
+- Use `@class_` decorator to force subclassing `Expr`
 - Workaround extracting definitions until [upstream is fixed](https://github.com/egraphs-good/egglog/pull/140)
 - Rename `Map.map_remove` to `Map.remove`.
 - Add lambda calculus example

docs/explanation/2023_07_presentation.ipynb

@@ -825,7 +825,7 @@
     "egraph = EGraph()\n",
     "\n",
     "@egraph.class_\n",
-    "class Structure(BaseExpr): ...\n",
+    "class Structure(Expr): ...\n",
     "\n",
     "a = egraph.constant('a', Structure)\n",
     "b = egraph.constant('b', Structure)\n",
@@ -2118,7 +2118,7 @@
     "egraph = EGraph()\n",
     "\n",
     "@egraph.class_\n",
-    "class Num(BaseExpr):\n",
+    "class Num(Expr):\n",
     "    \n",
     "    @classmethod\n",
     "    def var(cls, name: StringLike) -> Num: ...\n",
@@ -4172,7 +4172,7 @@
    "outputs": [],
    "source": [
     "@ndarray_mod.class_\n",
-    "class Value(BaseExpr):\n",
+    "class Value(Expr):\n",
     "    def __init__(self, v: i64Like) -> None:\n",
     "        ...\n",
     "\n",
@@ -4191,7 +4191,7 @@
     "\n",
     "\n",
     "@ndarray_mod.class_\n",
-    "class Values(BaseExpr):\n",
+    "class Values(Expr):\n",
     "    def __init__(self, v: Vec[Value]) -> None:\n",
     "        ...\n",
     "\n",
@@ -4226,7 +4226,7 @@
    "outputs": [],
    "source": [
     "@ndarray_mod.class_\n",
-    "class NDArray(BaseExpr):\n",
+    "class NDArray(Expr):\n",
     "    def __getitem__(self, idx: Values) -> Value: ...\n",
     "    def shape(self) -> Values: ...\n",
     "\n",

docs/explanation/compared_to_rust.md

@@ -107,7 +107,7 @@ from egglog import *
 egraph = EGraph()
 
 @egraph.class_
-class Math(BaseExpr):
+class Math(Expr):
     def __init__(self, value: i64Like) -> None:
         ...
 

docs/explanation/pldi_2023_presentation.ipynb

@@ -597,7 +597,7 @@
    "outputs": [],
    "source": [
     "@ndarray_mod.class_\n",
-    "class Value(BaseExpr):\n",
+    "class Value(Expr):\n",
     "    def __init__(self, v: i64Like) -> None:\n",
     "        ...\n",
     "\n",
@@ -616,7 +616,7 @@
     "\n",
     "\n",
     "@ndarray_mod.class_\n",
-    "class Values(BaseExpr):\n",
+    "class Values(Expr):\n",
     "    def __init__(self, v: Vec[Value]) -> None:\n",
     "        ...\n",
     "\n",
@@ -651,7 +651,7 @@
    "outputs": [],
    "source": [
     "@ndarray_mod.class_\n",
-    "class NDArray(BaseExpr):\n",
+    "class NDArray(Expr):\n",
     "    def __getitem__(self, idx: Values) -> Value: ...\n",
     "    def shape(self) -> Values: ...\n",
     "\n",
@@ -2989,7 +2989,7 @@
     "egraph = EGraph()\n",
     "\n",
     "@egraph.class_\n",
-    "class Num(BaseExpr):\n",
+    "class Num(Expr):\n",
     "    \n",
     "    @classmethod\n",
     "    def var(cls, name: StringLike) -> Num: ...\n",

docs/reference/egglog-translation.md

@@ -58,18 +58,18 @@ The `!=` function in egglog works on any two types with the same sort. In Python
 i64(10) != i64(2)
 ```
 
-This is checked statically, based on the `__ne__` definition in `BaseExpr`, so that only sorts that have the same sort can be compared.
+This is checked statically, based on the `__ne__` definition in `Expr`, so that only sorts that have the same sort can be compared.
 
 ## Declaring Sorts
 
-Users can declare their own sorts in Python by subclassing the `BaseExpr` class and decorating with `@egraph.class_` to register it with the e-graph:
+Users can declare their own sorts in Python by subclassing the `Expr` class and decorating with `@egraph.class_` to register it with the e-graph:
 
 ```{code-cell} python
 egraph = EGraph()
 
 # egg: (datatype Math)
 @egraph.class_
-class Math(BaseExpr):
+class Math(Expr):
     pass
 ```
 
@@ -80,7 +80,7 @@ egraph = EGraph()
 
 # egg: (datatype Math2)
 @egraph.class_(egg_sort="Math2")
-class Math(BaseExpr):
+class Math(Expr):
     pass
 ```
 
@@ -148,7 +148,7 @@ Note that by default, the egg name for any method is the Python class name combi
 #   (Mul Math Math))
 
 @egraph.class_
-class Math(BaseExpr):
+class Math(Expr):
     @egraph.method(egg_fn="Num")
     def __init__(self, v: i64Like):
         ...

docs/tutorials/array-api.ipynb

@@ -216,11 +216,11 @@
     "\n",
     "egraph = EGraph()\n",
     "\n",
-    "T = TypeVar(\"T\", bound=BaseExpr)\n",
+    "T = TypeVar(\"T\", bound=Expr)\n",
     "\n",
     "runtime_ruleset = egraph.ruleset(\"runtime\")\n",
     "\n",
-    "def extract_py(e: BaseExpr) -> Any:\n",
+    "def extract_py(e: Expr) -> Any:\n",
     "    print(e)\n",
     "    egraph.register(e)\n",
     "    egraph.run(run(limit=10).saturate())\n",
@@ -233,7 +233,7 @@
     "        return res\n",
     "\n",
     "@egraph.class_\n",
-    "class Bool(BaseExpr):\n",
+    "class Bool(Expr):\n",
     "    @egraph.method(preserve=True)\n",
     "    def __bool__(self) -> bool:\n",
     "        return extract_py(self)\n",
@@ -260,7 +260,7 @@
     "\n",
     "\n",
     "@egraph.class_\n",
-    "class DType(BaseExpr):\n",
+    "class DType(Expr):\n",
     "    float64: ClassVar[DType]\n",
     "    float32: ClassVar[DType]\n",
     "    int64: ClassVar[DType]\n",
@@ -285,7 +285,7 @@
     "\n",
     "\n",
     "@egraph.class_\n",
-    "class IsDtypeKind(BaseExpr):\n",
+    "class IsDtypeKind(Expr):\n",
     "    NULL: ClassVar[IsDtypeKind]\n",
     "\n",
     "    @classmethod\n",
@@ -343,7 +343,7 @@
     "\n",
     "\n",
     "@egraph.class_\n",
-    "class Int(BaseExpr):\n",
+    "class Int(Expr):\n",
     "    def __init__(self, value: i64Like) -> None:\n",
     "        ...\n",
     "\n",
@@ -417,7 +417,7 @@
     "assert expr_parts(egraph.simplify(Int(2) >= Int(1), 10)) == expr_parts(TRUE)\n",
     "\n",
     "@egraph.class_\n",
-    "class TupleInt(BaseExpr):\n",
+    "class TupleInt(Expr):\n",
     "    EMPTY: ClassVar[TupleInt]\n",
     "\n",
     "    def __init__(self, head: Int) -> None:\n",
@@ -458,7 +458,7 @@
     "# HANDLED_FUNCTIONS = {}\n",
     "\n",
     "@egraph.class_\n",
-    "class IndexKey(BaseExpr):\n",
+    "class IndexKey(Expr):\n",
     "    @classmethod\n",
     "    def tuple_int(cls, ti: TupleInt) -> IndexKey:\n",
     "        ...\n",
@@ -472,7 +472,7 @@
     "converter(Int, IndexKey, lambda x: IndexKey.int(x))\n",
     "\n",
     "@egraph.class_\n",
-    "class NDArray(BaseExpr):\n",
+    "class NDArray(Expr):\n",
     "    def __init__(self, py_array: PyObject) -> None:\n",
     "        ...\n",
     "\n",
@@ -539,7 +539,7 @@
     "\n",
     "\n",
     "@egraph.class_\n",
-    "class OptionalBool(BaseExpr):\n",
+    "class OptionalBool(Expr):\n",
     "    none: ClassVar[OptionalBool]\n",
     "\n",
     "    @classmethod\n",
@@ -553,7 +553,7 @@
     "\n",
     "\n",
     "@egraph.class_\n",
-    "class OptionalDType(BaseExpr):\n",
+    "class OptionalDType(Expr):\n",
     "    none: ClassVar[OptionalDType]\n",
     "\n",
     "    @classmethod\n",

docs/tutorials/getting-started.ipynb

@@ -84,7 +84,7 @@
       "outputs": [],
       "source": [
         "@egraph.class_\n",
-        "class Dim(BaseExpr):\n",
+        "class Dim(Expr):\n",
         "    \"\"\"\n",
         "    A dimension of a matix.\n",
         "\n",
@@ -267,7 +267,7 @@
       "outputs": [],
       "source": [
         "@egraph.class_\n",
-        "class Matrix(BaseExpr):\n",
+        "class Matrix(Expr):\n",
         "    @classmethod\n",
         "    def identity(cls, dim: Dim) -> Matrix:\n",
         "        \"\"\"\n",

python/egglog/builtins.py

@@ -7,7 +7,7 @@
 
 from typing import Generic, TypeVar, Union
 
-from .egraph import BUILTINS, BaseExpr, Unit
+from .egraph import BUILTINS, Expr, Unit
 from .runtime import converter
 
 __all__ = [
@@ -33,7 +33,7 @@
 
 
 @BUILTINS.class_(egg_sort="i64")
-class i64(BaseExpr):
+class i64(Expr):
     def __init__(self, value: int):
         ...
 
@@ -105,7 +105,7 @@ def max(self, other: i64Like) -> i64:  # type: ignore[empty-body]
 
 
 @BUILTINS.class_(egg_sort="f64")
-class f64(BaseExpr):
+class f64(Expr):
     def __init__(self, value: float):
         ...
 
@@ -161,7 +161,7 @@ def max(self, other: f64Like) -> f64:  # type: ignore[empty-body]
 
 
 @BUILTINS.class_
-class String(BaseExpr):
+class String(Expr):
     def __init__(self, value: str):
         ...
 
@@ -173,12 +173,12 @@ def join(*strings: StringLike) -> String:  # type: ignore[empty-body]
 
 converter(str, String, String)
 
-T = TypeVar("T", bound=BaseExpr)
-V = TypeVar("V", bound=BaseExpr)
+T = TypeVar("T", bound=Expr)
+V = TypeVar("V", bound=Expr)
 
 
 @BUILTINS.class_(egg_sort="Map")
-class Map(BaseExpr, Generic[T, V]):
+class Map(Expr, Generic[T, V]):
     @BUILTINS.method(egg_fn="map-empty")
     @classmethod
     def empty(cls) -> Map[T, V]:  # type: ignore[empty-body]
@@ -206,7 +206,7 @@ def remove(self, key: T) -> Map[T, V]:  # type: ignore[empty-body]
 
 
 @BUILTINS.class_(egg_sort="Set")
-class Set(BaseExpr, Generic[T]):
+class Set(Expr, Generic[T]):
     @BUILTINS.method(egg_fn="set-of")
     def __init__(self, *args: T) -> None:
         ...
@@ -246,7 +246,7 @@ def __and__(self, other: Set[T]) -> Set[T]:  # type: ignore[empty-body]
 
 
 @BUILTINS.class_(egg_sort="Rational")
-class Rational(BaseExpr):
+class Rational(Expr):
     @BUILTINS.method(egg_fn="rational")
     def __init__(self, num: i64Like, den: i64Like):
         ...
@@ -317,7 +317,7 @@ def cbrt(self) -> Rational:  # type: ignore[empty-body]
 
 
 @BUILTINS.class_(egg_sort="Vec")
-class Vec(BaseExpr, Generic[T]):
+class Vec(Expr, Generic[T]):
     @BUILTINS.method(egg_fn="vec-of")
     def __init__(self, *args: T) -> None:
         ...
@@ -357,7 +357,7 @@ def __getitem__(self, index: i64Like) -> T:  # type: ignore[empty-body]
 
 
 @BUILTINS.class_(egg_sort="PyObject")
-class PyObject(BaseExpr):
+class PyObject(Expr):
     @BUILTINS.method(egg_fn="py-object")
     def __init__(self, *hashes: i64) -> None:
         ...
@@ -380,6 +380,7 @@ def dict_update(dict, *keys_and_values: PyObject) -> PyObject:  # type: ignore[e
     def from_int(cls, i: i64Like) -> PyObject:  # type: ignore[empty-body]
         ...
 
+
 # TODO: Maybe move to static method if we implement those?
 @BUILTINS.function(egg_fn="py-eval")
 def py_eval(code: StringLike, locals: PyObject, globals: PyObject) -> PyObject:  # type: ignore[empty-body]