♻️ refactor: remove_named_expr -> inline_named_expr

Author: SigureMo

.vscode/settings.json

@@ -5,6 +5,5 @@
   "python.analysis.inlayHints.variableTypes": true,
   "[python]": {
     "editor.defaultFormatter": "charliermarsh.ruff"
-  },
-  "ruff.interpreter": ["${workspaceFolder}/.venv/bin/python"]
+  }
 }

src/expr_simplifier/transforms/__init__.py

@@ -2,4 +2,4 @@
 
 from expr_simplifier.transforms.constant_folding import apply_constant_folding as apply_constant_folding
 from expr_simplifier.transforms.cse import apply_cse as apply_cse
-from expr_simplifier.transforms.remove_named_expr import apply_remove_named_expr as apply_remove_named_expr
+from expr_simplifier.transforms.inline_named_expr import apply_inline_named_expr as apply_inline_named_expr

src/expr_simplifier/transforms/constant_folding.py

@@ -4,7 +4,7 @@
 
 from typing_extensions import TypeAlias
 
-from expr_simplifier.transforms.remove_named_expr import apply_remove_named_expr
+from expr_simplifier.transforms.inline_named_expr import apply_inline_named_expr
 
 SubExpressionTable: TypeAlias = dict[str, tuple[str, int]]
 
@@ -35,7 +35,7 @@ def visit(self, node: ast.AST) -> ast.AST:
 
 def apply_constant_folding(expr: ast.AST) -> ast.AST:
     # Constant propagation
-    expr = apply_remove_named_expr(expr, constant_only=True)
+    expr = apply_inline_named_expr(expr, constant_only=True)
     # Constant folding
     expr = ConstantFolding().visit(expr)
     return expr

src/expr_simplifier/transforms/cse.py

@@ -5,7 +5,7 @@
 from typing_extensions import TypeAlias
 
 from expr_simplifier.symbol_table import SymbolTable
-from expr_simplifier.transforms.remove_named_expr import apply_remove_named_expr
+from expr_simplifier.transforms.inline_named_expr import apply_inline_named_expr
 
 SubExpressionTable: TypeAlias = dict[str, tuple[str, int]]
 
@@ -57,7 +57,7 @@ def show_subexpressions(subexpressions: SubExpressionTable) -> None:
 
 
 def apply_cse(expr: ast.AST) -> ast.AST:
-    expr = apply_remove_named_expr(expr)
+    expr = apply_inline_named_expr(expr)
     cse_pre_analyzer = CSEPreAnalyzer()
     cse_pre_analyzer.visit(expr)
     cse = CommonSubexpressionElimination(cse_pre_analyzer.subexpressions)

…mplifier/transforms/remove_named_expr.py …mplifier/transforms/inline_named_expr.pysrc/expr_simplifier/transforms/remove_named_expr.py renamed to src/expr_simplifier/transforms/inline_named_expr.py src/expr_simplifier/transforms/remove_named_expr.py renamed to src/expr_simplifier/transforms/inline_named_expr.py

@@ -4,7 +4,7 @@
 import copy
 
 
-class RemoveNamedExpr(ast.NodeTransformer):
+class InlineNamedExpr(ast.NodeTransformer):
     def __init__(self, constant_only: bool = False) -> None:
         super().__init__()
         self.named_expressions = dict[str, ast.expr]()
@@ -29,6 +29,6 @@ def visit_Name(self, node: ast.Name) -> ast.expr:
         return node
 
 
-def apply_remove_named_expr(expr: ast.AST, constant_only: bool = False) -> ast.AST:
-    remove_named_expr = RemoveNamedExpr(constant_only)
-    return remove_named_expr.visit(expr)
+def apply_inline_named_expr(expr: ast.AST, constant_only: bool = False) -> ast.AST:
+    inline_named_expr = InlineNamedExpr(constant_only)
+    return inline_named_expr.visit(expr)

…est_transforms/test_remove_named_expr.py …est_transforms/test_inline_named_expr.pytests/test_transforms/test_remove_named_expr.py renamed to tests/test_transforms/test_inline_named_expr.py tests/test_transforms/test_remove_named_expr.py renamed to tests/test_transforms/test_inline_named_expr.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from expr_simplifier.transforms import apply_remove_named_expr
+from expr_simplifier.transforms import apply_inline_named_expr
 
 
 @pytest.mark.parametrize(
@@ -17,9 +17,9 @@
         ("(___y := (___x := a.b).c) + ___x.d.e + ___y.f.g", "a.b.c + a.b.d.e + a.b.c.f.g"),
     ],
 )
-def test_remove_named_expr(expr: str, expected: str):
+def test_inline_named_expr(expr: str, expected: str):
     tree = ast.parse(expr, mode="eval")
-    transformed_tree = apply_remove_named_expr(tree)
+    transformed_tree = apply_inline_named_expr(tree)
     transformed_expr = ast.unparse(transformed_tree)
     assert transformed_expr == expected
 
@@ -37,6 +37,6 @@ def test_remove_named_expr(expr: str, expected: str):
 )
 def test_constant_propagation(expr: str, expected: str):
     tree = ast.parse(expr, mode="eval")
-    transformed_tree = apply_remove_named_expr(tree, constant_only=True)
+    transformed_tree = apply_inline_named_expr(tree, constant_only=True)
     transformed_expr = ast.unparse(transformed_tree)
     assert transformed_expr == expected