fix id init

Author: hikettei

caten/isl/specs/__init__.py

@@ -2,7 +2,7 @@
 from .aff import Aff
 from .aff_list import AffList
 from .ast_build import ASTBuild
-from .ast_expr import ASTExpr
+from .ast_expr import expr, ASTExpr
 from .ast_node import ASTNode, ASTUserNode
 from .ast_node_list import AstNodeList
 from .ast_print_options import ASTPrintOptions
@@ -99,6 +99,7 @@
     "ScheduleConstraints",
     "ScheduleNode",
     "ASTBuild",
+    "expr",
     "ASTExpr",
     "ASTNode",
     "StrideInfo",
@@ -132,4 +133,4 @@
     "ASTPrintOptions",
     "AstNodeList",
     "ASTUserNode",
-]
+]

caten/isl/specs/ast_expr.py

@@ -20,15 +20,22 @@
 
 _lib = load_libisl()
 
+# handle is an integer, to prevent the confusion vs val, use I.expr instead of I.ASTExpr
+def expr(id_or_val: Any) -> "ASTExpr":
+    if isinstance(id_or_val, int):
+        from .val import Val
+        return ASTExpr.from_val(Val.int_from_si(id_or_val))
+    elif isinstance(id_or_val, str):
+        from .id import Id
+        return ASTExpr.from_id(Id(id_or_val))
+    else:
+        raise TypeError("I.expr can only accept int or str")
+
 class ASTExpr(ISLObject, ISLObjectMixin):
     __slots__ = ()
 
     def __init__(self, handle_or_spec: Any) -> None:
-        if isinstance(handle_or_spec, str):
-            handle = _isl_ast_expr_read_from_str(handle_or_spec, return_raw_pointer=True)
-            super().__init__(handle)
-        else:
-            super().__init__(handle_or_spec)
+        super().__init__(handle_or_spec)
 
     def get_type_name(self) -> str:
         """Helper to get the string name of the expr type."""

caten/isl/specs/val.py

@@ -20,13 +20,7 @@ class Val(ISLObject, ISLObjectMixin):
     __slots__ = ()
 
     def __init__(self, handle_or_spec: Any) -> None:
-        if isinstance(handle_or_spec, str):
-            handle = _isl_val_read_from_str(handle_or_spec, return_raw_pointer=True)
-            super().__init__(handle)
-        if isinstance(handle_or_spec, int):
-            handle = _isl_val_int_from_si(handle_or_spec, return_raw_pointer=True)
-        else:
-            super().__init__(handle_or_spec)
+        super().__init__(handle_or_spec)
 
     @classmethod
     def from_str(cls, spec: str) -> Any: