refactor: Change AST types from class type to instance

arxlang · Nov 27, 2024 · c4fa854 · c4fa854
1 parent 3daf628
commit c4fa854
Show file tree

Hide file tree

Showing 21 changed files with 143 additions and 259 deletions.
diff --git a/README.md b/README.md
@@ -72,8 +72,8 @@ import astx
 
 # Define a simple function `add(x, y): return x + y`
 args = astx.Arguments(
-    astx.Argument(name="x", type_=astx.Int32),
-    astx.Argument(name="y", type_=astx.Int32),
+    astx.Argument(name="x", type_=astx.Int32()),
+    astx.Argument(name="y", type_=astx.Int32()),
 )
 fn_body = astx.Block()
 fn_body.append(

diff --git a/docs/tutorials/context.ipynb b/docs/tutorials/context.ipynb
@@ -94,9 +94,9 @@
     "module = astx.Module()\n",
     "\n",
     "# Declare variables 'a', 'b', and 'c' with initial values\n",
-    "decl_a = astx.VariableDeclaration(name=\"a\", type_=astx.Int32, value=astx.LiteralInt32(1))\n",
-    "decl_b = astx.VariableDeclaration(name=\"b\", type_=astx.Int32, value=astx.LiteralInt32(2))\n",
-    "decl_c = astx.VariableDeclaration(name=\"c\", type_=astx.Int32, value=astx.LiteralInt32(1))\n",
+    "decl_a = astx.VariableDeclaration(name=\"a\", type_=astx.Int32(), value=astx.LiteralInt32(1))\n",
+    "decl_b = astx.VariableDeclaration(name=\"b\", type_=astx.Int32(), value=astx.LiteralInt32(2))\n",
+    "decl_c = astx.VariableDeclaration(name=\"c\", type_=astx.Int32(), value=astx.LiteralInt32(1))\n",
     "\n",
     "# Reassign a new value to variable 'c'\n",
     "assign_c = astx.VariableAssignment(name=\"c\", value=astx.LiteralInt32(3))\n",
@@ -182,9 +182,9 @@
     "main_fn = astx.Function(prototype=main_proto, body=main_block, parent=module)\n",
     "\n",
     "# Declare variables 'a', 'b', and 'c' with initial values\n",
-    "decl_a = astx.VariableDeclaration(name=\"a\", type_=astx.Int32, value=astx.LiteralInt32(1), parent=main_block)\n",
-    "decl_b = astx.VariableDeclaration(name=\"b\", type_=astx.Int32, value=astx.LiteralInt32(2), parent=main_block)\n",
-    "decl_c = astx.VariableDeclaration(name=\"c\", type_=astx.Int32, value=astx.LiteralInt32(1), parent=main_block)\n",
+    "decl_a = astx.VariableDeclaration(name=\"a\", type_=astx.Int32(), value=astx.LiteralInt32(1), parent=main_block)\n",
+    "decl_b = astx.VariableDeclaration(name=\"b\", type_=astx.Int32(), value=astx.LiteralInt32(2), parent=main_block)\n",
+    "decl_c = astx.VariableDeclaration(name=\"c\", type_=astx.Int32(), value=astx.LiteralInt32(1), parent=main_block)\n",
     "\n",
     "# Reassign a new value to variable 'c'\n",
     "assign_c = astx.VariableAssignment(name=\"c\", value=astx.LiteralInt32(3), parent=main_block)\n",

diff --git a/docs/tutorials/for-loop.ipynb b/docs/tutorials/for-loop.ipynb
@@ -78,7 +78,7 @@
     "# Declare a loop variable\n",
     "decl_a = astx.InlineVariableDeclaration(\n",
     "    \"a\",\n",
-    "    type_=astx.Int32,\n",
+    "    type_=astx.Int32(),\n",
     ")\n",
     "\n",
     "# Create a block for loop body\n",
@@ -141,7 +141,7 @@
    ],
    "source": [
     "# Declare and initialize the loop variable\n",
-    "decl_a = astx.InlineVariableDeclaration(\"a\", type_=astx.Int32, value=astx.LiteralInt32(0))\n",
+    "decl_a = astx.InlineVariableDeclaration(\"a\", type_=astx.Int32(), value=astx.LiteralInt32(0))\n",
     "var_a = astx.Variable(\"a\")\n",
     "\n",
     "# Create a block for loop body\n",

diff --git a/docs/tutorials/functions.ipynb b/docs/tutorials/functions.ipynb
@@ -65,9 +65,9 @@
    ],
    "source": [
     "# Define function arguments\n",
-    "arg_a = astx.Argument(name=\"a\", type_=astx.Int32)\n",
-    "arg_b = astx.Argument(name=\"b\", type_=astx.Int32)\n",
-    "arg_c = astx.Argument(name=\"c\", type_=astx.Int32)\n",
+    "arg_a = astx.Argument(name=\"a\", type_=astx.Int32())\n",
+    "arg_b = astx.Argument(name=\"b\", type_=astx.Int32())\n",
+    "arg_c = astx.Argument(name=\"c\", type_=astx.Int32())\n",
     "\n",
     "# Create ASTx Variable objects\n",
     "a = astx.Variable(name=\"a\")\n",

diff --git a/docs/tutorials/get-started.ipynb b/docs/tutorials/get-started.ipynb
@@ -81,9 +81,9 @@
     "module = astx.Module()\n",
     "\n",
     "# Declare variables\n",
-    "decl_a = astx.VariableDeclaration(name=\"a\", type_=astx.Int32, value=astx.LiteralInt32(1))\n",
-    "decl_b = astx.VariableDeclaration(name=\"b\", type_=astx.Int32, value=astx.LiteralInt32(2))\n",
-    "decl_c = astx.VariableDeclaration(name=\"c\", type_=astx.Int32, value=astx.LiteralInt32(4))\n",
+    "decl_a = astx.VariableDeclaration(name=\"a\", type_=astx.Int32(), value=astx.LiteralInt32(1))\n",
+    "decl_b = astx.VariableDeclaration(name=\"b\", type_=astx.Int32(), value=astx.LiteralInt32(2))\n",
+    "decl_c = astx.VariableDeclaration(name=\"c\", type_=astx.Int32(), value=astx.LiteralInt32(4))\n",
     "\n",
     "a = astx.Variable(name=\"a\")\n",
     "b = astx.Variable(name=\"b\")\n",

diff --git a/docs/tutorials/variables.ipynb b/docs/tutorials/variables.ipynb
@@ -96,9 +96,9 @@
     "module = astx.Module()\n",
     "\n",
     "# Declare variables 'a', 'b', and 'c' with initial values\n",
-    "decl_a = astx.VariableDeclaration(name=\"a\", type_=astx.Int32, value=astx.LiteralInt32(1))\n",
-    "decl_b = astx.VariableDeclaration(name=\"b\", type_=astx.Int32, value=astx.LiteralInt32(2))\n",
-    "decl_c = astx.VariableDeclaration(name=\"c\", type_=astx.Int32, value=astx.LiteralInt32(4))\n",
+    "decl_a = astx.VariableDeclaration(name=\"a\", type_=astx.Int32(), value=astx.LiteralInt32(1))\n",
+    "decl_b = astx.VariableDeclaration(name=\"b\", type_=astx.Int32(), value=astx.LiteralInt32(2))\n",
+    "decl_c = astx.VariableDeclaration(name=\"c\", type_=astx.Int32(), value=astx.LiteralInt32(4))\n",
     "\n",
     "# Reassign a new value to variable 'c'\n",
     "assign_c = astx.VariableAssignment(name=\"c\", value=astx.LiteralInt32(3))\n",

diff --git a/src/astx/base.py b/src/astx/base.py
@@ -7,7 +7,7 @@
 from abc import abstractmethod
 from enum import Enum
 from hashlib import sha256
-from typing import ClassVar, Dict, List, Optional, Type, Union, cast
+from typing import ClassVar, Dict, List, Optional, Union, cast
 
 from typeguard import typechecked
 
@@ -306,7 +306,17 @@ class Expr(AST):
     nbytes: int = 0
 
 
-ExprType: TypeAlias = Type[Expr]
+@public
+@typechecked
+class ExprType(Expr):
+    """ExprType expression class."""
+
+    nbytes: int = 0
+
+    def get_struct(self, simplified: bool = False) -> ReprStruct:
+        """Return a structure that represents the node object."""
+        return {"Type": self.__class__.__name__}
+
 
 PrimitivesStruct: TypeAlias = Union[
     int,
@@ -340,7 +350,7 @@ def get_struct(self, simplified: bool = False) -> ReprStruct:
 
 @public
 @typechecked
-class DataType(Expr):
+class DataType(ExprType):
     """AST main expression class."""
 
     type_: ExprType
@@ -356,7 +366,7 @@ def __init__(
         self.name = f"temp_{DataType._tmp_id}"
         DataType._tmp_id += 1
         # set it as a generic data type
-        self.type_: ExprType = DataType
+        self.type_: ExprType = ExprType()
         self.parent = parent
 
     def __str__(self) -> str:

diff --git a/src/astx/callables.py b/src/astx/callables.py
@@ -54,7 +54,7 @@ def __init__(
 
     def __str__(self) -> str:
         """Return a string that represents the object."""
-        type_ = self.type_.__name__
+        type_ = self.type_.__class__.__name__
         return f"Argument[{self.name}, {type_}]"
 
     def get_struct(self, simplified: bool = False) -> ReprStruct: