Base expressions on dataclasses

inducer · Jul 18, 2023 · 08b9e4f · 08b9e4f
1 parent 6e9c0a4
commit 08b9e4f
Show file tree

Hide file tree

Showing 4 changed files with 368 additions and 422 deletions.
diff --git a/doc/index.rst b/doc/index.rst
@@ -69,13 +69,13 @@ You can also easily define your own objects to use inside an expression:
 
 .. doctest::
 
-    >>> from pymbolic.primitives import Expression
-    >>> class FancyOperator(Expression):
-    ...     def __init__(self, operand):
-    ...         self.operand = operand
-    ...
-    ...     def __getinitargs__(self):
-    ...         return (self.operand,)
+    >>> from pymbolic.primitives import Expression, augment_expression_dataclass
+    >>> from dataclasses import dataclass
+    >>>
+    >>> @augment_expression_dataclass
+    ... @dataclass(frozen=True)
+    ... class FancyOperator(Expression):
+    ...     operand: Expression
     ...
     ...     mapper_method = "map_fancy_operator"
     ...

diff --git a/pymbolic/parser.py b/pymbolic/parser.py
@@ -20,6 +20,7 @@
 THE SOFTWARE.
 """
 
+import immutables
 import pytools.lex
 from pytools import memoize_method
 from sys import intern
@@ -330,7 +331,8 @@ def parse_postfix(self, pstate, min_precedence, left_exp):
             args, kwargs = self.parse_arglist(pstate)
 
             if kwargs:
-                left_exp = primitives.CallWithKwargs(left_exp, args, kwargs)
+                left_exp = primitives.CallWithKwargs(
+                        left_exp, args, immutables.Map(kwargs))
             else:
                 left_exp = primitives.Call(left_exp, args)