Rename type aliases for consistency

Author: inducer

doc/conf.py

@@ -28,8 +28,8 @@
         ("https://immutabledict.corenting.fr/", None)
 }
 autodoc_type_aliases = {
-    "ExpressionT": "ExpressionT",
-    "ArithmeticExpressionT": "ArithmeticExpressionT",
+    "ExpressionOrData": "ExpressionOrData",
+    "ArithmeticExpression": "ArithmeticExpression",
 }
 
 import sys

pymbolic/__init__.py

@@ -62,15 +62,25 @@
 from .mapper.distributor import distribute as expand
 from .mapper.distributor import distribute
 from .mapper.flattener import flatten
-from .typing import NumberT, ScalarT, ArithmeticExpressionT, ExpressionT, BoolT
+from .typing import (
+    Number, Scalar, ArithmeticExpression, ExpressionOrData, Bool,
+    ArithmeticExpressionT, ExpressionT, BoolT, ScalarT)
+
+
+# TODO ExpressionT, ArithmeticExpressionT, BoolT, and ScalarT are deprecated and should
+# go away in 2H2025.
 
 
 __all__ = (
+    "ArithmeticExpression",
     "ArithmeticExpressionT",
+    "Bool",
     "BoolT",
     "Expression",
+    "ExpressionOrData",
     "ExpressionT",
-    "NumberT",
+    "Number",
+    "Scalar",
     "ScalarT",
     "Variable",
     "compile",

pymbolic/geometric_algebra/__init__.py

@@ -33,7 +33,7 @@
 from pytools import memoize, memoize_method
 
 from pymbolic.primitives import expr_dataclass, is_zero
-from pymbolic.typing import ArithmeticExpressionT, T
+from pymbolic.typing import ArithmeticExpression, T
 
 
 __doc__ = """
@@ -293,7 +293,7 @@ def get_euclidean_space(n: int) -> Space:
 # }}}
 
 
-CoeffT = TypeVar("CoeffT", bound=ArithmeticExpressionT)
+CoeffT = TypeVar("CoeffT", bound=ArithmeticExpression)
 
 
 # {{{ blade product weights

pymbolic/geometric_algebra/primitives.py

@@ -30,7 +30,7 @@
 from typing import ClassVar
 
 from pymbolic.primitives import Expression, Variable, expr_dataclass
-from pymbolic.typing import ExpressionT
+from pymbolic.typing import ExpressionOrData
 
 
 class MultiVectorVariable(Variable):
@@ -58,7 +58,7 @@ class Nabla(_GeometricCalculusExpression):
 
 @expr_dataclass()
 class DerivativeSource(_GeometricCalculusExpression):
-    operand: ExpressionT
+    operand: ExpressionOrData
     nabla_id: Hashable
 
 

pymbolic/interop/ast.py

@@ -31,7 +31,7 @@
 
 import pymbolic.primitives as p
 from pymbolic.mapper import CachedMapper
-from pymbolic.typing import ExpressionT
+from pymbolic.typing import ExpressionOrData
 
 
 __doc__ = r'''
@@ -263,7 +263,7 @@ def map_variable(self, expr) -> ast.expr:
         return ast.Name(id=expr.name)
 
     def _map_multi_children_op(self,
-                               children: tuple[ExpressionT, ...],
+                               children: tuple[ExpressionOrData, ...],
                                op_type: ast.operator) -> ast.expr:
         rec_children = [self.rec(child) for child in children]
         result = rec_children[-1]
@@ -435,7 +435,7 @@ def to_python_ast(expr) -> ast.expr:
     return PymbolicToASTMapper()(expr)
 
 
-def to_evaluatable_python_function(expr: ExpressionT,
+def to_evaluatable_python_function(expr: ExpressionOrData,
                                    fn_name: str
                                    ) -> str:
     """

pymbolic/interop/matchpy/__init__.py

@@ -57,7 +57,7 @@
 )
 
 import pymbolic.primitives as p
-from pymbolic.typing import ScalarT
+from pymbolic.typing import Scalar as PbScalar
 
 
 ExprT: TypeAlias = Expression
@@ -95,7 +95,7 @@ def __lt__(self, other):
 
 
 @op_dataclass
-class Scalar(_Constant[ScalarT]):
+class Scalar(_Constant[PbScalar]):
     _mapper_method: str = "map_scalar"
 
 
@@ -364,7 +364,7 @@ def match(subject: p.Expression,
           pattern: p.Expression,
           to_matchpy_expr: ToMatchpyT | None = None,
           from_matchpy_expr: FromMatchpyT | None = None
-          ) -> Iterator[Mapping[str, p.Expression | ScalarT]]:
+          ) -> Iterator[Mapping[str, p.Expression | PbScalar]]:
     from matchpy import Pattern, match
 
     from .tofrom import FromMatchpyExpressionMapper, ToMatchpyExpressionMapper
@@ -387,8 +387,8 @@ def match_anywhere(subject: p.Expression,
                    pattern: p.Expression,
                    to_matchpy_expr: ToMatchpyT | None = None,
                    from_matchpy_expr: FromMatchpyT | None = None
-                   ) -> Iterator[tuple[Mapping[str, p.Expression | ScalarT],
-                                       p.Expression | ScalarT]
+                   ) -> Iterator[tuple[Mapping[str, p.Expression | PbScalar],
+                                       p.Expression | PbScalar]
                                  ]:
     from matchpy import Pattern, match_anywhere
 

pymbolic/interop/matchpy/tofrom.py

@@ -12,6 +12,7 @@
 import pymbolic.primitives as p
 from pymbolic.interop.matchpy.mapper import Mapper as BaseMatchPyMapper
 from pymbolic.mapper import Mapper as BasePymMapper
+from pymbolic.typing import Scalar as PbScalar
 
 
 # {{{ to matchpy
@@ -117,7 +118,7 @@ def map_star_wildcard(self, expr: p.StarWildcard) -> m.Wildcard:
 # {{{ from matchpy
 
 class FromMatchpyExpressionMapper(BaseMatchPyMapper):
-    def map_scalar(self, expr: m.Scalar) -> m.ScalarT:
+    def map_scalar(self, expr: m.Scalar) -> PbScalar:
         return expr.value
 
     def map_variable(self, expr: m.Variable) -> p.Variable: