fix(refactoring): Split datatype module into types and literals packa…

…ges (#152)
arxlang · Nov 29, 2024 · 90e828f · 90e828f
1 parent 1997e75
commit 90e828f
Show file tree

Hide file tree

Showing 40 changed files with 1,213 additions and 940 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,9 +2,18 @@ default_stages:
   - pre-commit
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.6.0
     hooks:
+      - id: trailing-whitespace
       - id: end-of-file-fixer
+      - id: check-json
+      - id: check-toml
+      - id: check-xml
+      - id: debug-statements
+      - id: check-builtin-literals
+      - id: check-case-conflict
+      - id: check-docstring-first
+      - id: detect-private-key
 
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: "v3.0.2"

diff --git a/src/astx/__init__.py b/src/astx/__init__.py
@@ -7,12 +7,12 @@
     base,
     blocks,
     callables,
-    datatypes,
     flows,
+    literals,
     mixes,
-    operators,
     packages,
     symbol_table,
+    types,
     variables,
 )
 from astx.base import (
@@ -38,23 +38,17 @@
     FunctionReturn,
     LambdaExpr,
 )
-from astx.datatypes import (
-    Boolean,
-    Complex,
-    Complex32,
-    Complex64,
-    DataTypeOps,
-    Date,
-    DateTime,
-    Float16,
-    Float32,
-    Float64,
-    Floating,
-    Int8,
-    Int16,
-    Int32,
-    Int64,
-    Integer,
+from astx.flows import (
+    ForCountLoopExpr,
+    ForCountLoopStmt,
+    ForRangeLoopExpr,
+    ForRangeLoopStmt,
+    IfExpr,
+    IfStmt,
+    WhileExpr,
+    WhileStmt,
+)
+from astx.literals import (
     Literal,
     LiteralBoolean,
     LiteralComplex,
@@ -79,28 +73,6 @@
     LiteralUInt128,
     LiteralUTF8Char,
     LiteralUTF8String,
-    Number,
-    SignedInteger,
-    Time,
-    Timestamp,
-    UInt8,
-    UInt16,
-    UInt32,
-    UInt64,
-    UInt128,
-    UnsignedInteger,
-    UTF8Char,
-    UTF8String,
-)
-from astx.flows import (
-    ForCountLoopExpr,
-    ForCountLoopStmt,
-    ForRangeLoopExpr,
-    ForRangeLoopStmt,
-    IfExpr,
-    IfStmt,
-    WhileExpr,
-    WhileStmt,
 )
 from astx.mixes import (
     NamedExpr,
@@ -110,10 +82,6 @@
     ScopeKind,
     VisibilityKind,
 )
-from astx.operators import (
-    BinaryOp,
-    UnaryOp,
-)
 from astx.packages import (
     AliasExpr,
     ImportExpr,
@@ -126,7 +94,37 @@
     Target,
 )
 from astx.types import (
+    BinaryOp,
+    Boolean,
+    Complex,
+    Complex32,
+    Complex64,
+    DataTypeOps,
+    Date,
+    DateTime,
+    Float16,
+    Float32,
+    Float64,
+    Floating,
+    Int8,
+    Int16,
+    Int32,
+    Int64,
+    Integer,
+    Number,
+    SignedInteger,
+    Time,
+    Timestamp,
     TypeCastExpr,
+    UInt8,
+    UInt16,
+    UInt32,
+    UInt64,
+    UInt128,
+    UnaryOp,
+    UnsignedInteger,
+    UTF8Char,
+    UTF8String,
 )
 from astx.variables import (
     InlineVariableDeclaration,
@@ -214,7 +212,6 @@ def get_version() -> str:
     "MutabilityKind",
     "NamedExpr",
     "Number",
-    "operators",
     "OperatorType",
     "packages",
     "Package",
@@ -253,6 +250,8 @@ def get_version() -> str:
     "LiteralDateTime",
     "LiteralTimestamp",
     "LiteralTime",
+    "types",
+    "literals",
 ]
 
 

diff --git a/src/astx/callables.py b/src/astx/callables.py
@@ -19,8 +19,8 @@
     Undefined,
 )
 from astx.blocks import Block
-from astx.datatypes import AnyType
 from astx.modifiers import MutabilityKind, ScopeKind, VisibilityKind
+from astx.types import AnyType
 from astx.variables import Variable
 
 UNDEFINED = Undefined()