Merge pull request #2431 from Thirumalai-Shaktivel/symbolic_03

[ASR Pass] Symbolic: Simplify the symbolic pass handling
lcompilers · Nov 26, 2023 · 8982537 · 8982537
2 parents 7899add + 6a7b2cd
commit 8982537
Show file tree

Hide file tree

Showing 2 changed files with 802 additions and 1,172 deletions.
diff --git a/src/libasr/pass/intrinsic_function_registry.h b/src/libasr/pass/intrinsic_function_registry.h
@@ -251,11 +251,11 @@ class ASRBuilder {
         false, nullptr, 0, false, false, false));
 
     // Types -------------------------------------------------------------------
-    #define int32        TYPE(ASR::make_Integer_t(al, loc, 4))
+    #define int32        ASRUtils::TYPE(ASR::make_Integer_t(al, loc, 4))
     #define int64        TYPE(ASR::make_Integer_t(al, loc, 8))
     #define real32       TYPE(ASR::make_Real_t(al, loc, 4))
     #define real64       TYPE(ASR::make_Real_t(al, loc, 8))
-    #define logical      TYPE(ASR::make_Logical_t(al, loc, 4))
+    #define logical      ASRUtils::TYPE(ASR::make_Logical_t(al, loc, 4))
     #define character(x) TYPE(ASR::make_Character_t(al, loc, 1, x, nullptr))
     #define List(x)      TYPE(ASR::make_List_t(al, loc, x))
 
@@ -285,7 +285,7 @@ class ASRBuilder {
 
     // Expressions -------------------------------------------------------------
     #define i(x, t)   EXPR(ASR::make_IntegerConstant_t(al, loc, x, t))
-    #define i32(x)   EXPR(ASR::make_IntegerConstant_t(al, loc, x, int32))
+    #define i32(x)   ASRUtils::EXPR(ASR::make_IntegerConstant_t(al, loc, x, int32))
     #define i32_n(x) EXPR(ASR::make_IntegerUnaryMinus_t(al, loc, i32(abs(x)),   \
         int32, i32(x)))
     #define i32_neg(x, t) EXPR(ASR::make_IntegerUnaryMinus_t(al, loc, x, t, nullptr))
@@ -414,7 +414,7 @@ class ASRBuilder {
     }
 
     // Compare -----------------------------------------------------------------
-    #define iEq(x, y) EXPR(ASR::make_IntegerCompare_t(al, loc, x,               \
+    #define iEq(x, y) ASRUtils::EXPR(ASR::make_IntegerCompare_t(al, loc, x,     \
         ASR::cmpopType::Eq, y, logical, nullptr))
     #define iNotEq(x, y) EXPR(ASR::make_IntegerCompare_t(al, loc, x,            \
         ASR::cmpopType::NotEq, y, logical, nullptr))