chore: shorten diff between main and simplifier_pass

lfortran · certik · Sep 12, 2024 · Sep 12, 2024 · Sep 14, 2024 · Sep 14, 2024
commit ca8c732ec8ac83d4b762430aefaf2d9f3a72f8cb
diff --git a/src/libasr/asdl_cpp.py b/src/libasr/asdl_cpp.py
@@ -1342,7 +1342,7 @@ def visitField(self, field):
                     self.emit("    head.m_v = duplicate_expr(x->m_head[i].m_v);", level)
                     self.emit("    head.m_start = duplicate_expr(x->m_head[i].m_start);", level)
                     self.emit("    head.m_end = duplicate_expr(x->m_head[i].m_end);", level)
-                    self.emit("    head.m_increment = duplicate_expr(x->m_head[i].m_increment);", level)
+                    self.emit("    head.m_increment = duplicate_expr(x->m_head[i].m_increment);", level) 
                     self.emit("    m_%s.push_back(al, head);" % (field.name), level)
                 else:
                     self.emit("    m_%s.push_back(al, self().duplicate_%s(x->m_%s[i]));" % (field.name, field.type, field.name), level)

diff --git a/src/libasr/intrinsic_func_registry_util_gen.py b/src/libasr/intrinsic_func_registry_util_gen.py
@@ -186,7 +186,7 @@
     "Logical": [
         {
             "args": [("bool", )],
-            "ret_type_arg_idx": 0,
+            "ret_type_arg_idx": 0, 
             "kind_arg": True
         }
     ],
@@ -767,7 +767,7 @@
             "ret_type_arg_idx": 0,
             "same_kind_arg": 3
         }
-    ],
+    ], 
     "Ishftc": [
         {
             "args": [("int", "int", "int")],
@@ -1061,7 +1061,7 @@ def add_create_func_return_src(func_name):
         src += indent * 4 +         "return nullptr;\n"
         src += indent * 3 +     "}\n"
         src += indent * 3 +     "set_kind_to_ttype_t(return_type, kind);\n"
-        src += indent * 2 + "}\n"
+        src += indent * 2 + "}\n"        
     src += indent * 2 + "ASR::expr_t *m_value = nullptr;\n"
     src += indent * 2 + f"Vec<ASR::expr_t*> m_args; m_args.reserve(al, {no_of_args});\n"
     for _i in range(no_of_args):

diff --git a/src/libasr/pass/intrinsic_function.cpp b/src/libasr/pass/intrinsic_function.cpp
@@ -43,7 +43,7 @@ class ReplaceIntrinsicFunctions: public ASR::BaseExprReplacer<ReplaceIntrinsicFu
     void replace_IntrinsicElementalFunction(ASR::IntrinsicElementalFunction_t* x) {
         if (x->m_value) {
             *current_expr = x->m_value;
-            return ;
+            return;
         }
 
         Vec<ASR::call_arg_t> new_args; new_args.reserve(al, x->n_args);
@@ -96,7 +96,7 @@ class ReplaceIntrinsicFunctions: public ASR::BaseExprReplacer<ReplaceIntrinsicFu
         std::string intrinsic_name_ = std::string(ASRUtils::get_array_intrinsic_name(x->m_arr_intrinsic_id));
         if (x->m_value) {
             *current_expr = x->m_value;
-            return ;
+            return;
         }
 
         replace_ttype(x->m_type);

diff --git a/src/libasr/pass/pass_manager.h b/src/libasr/pass/pass_manager.h
@@ -17,6 +17,8 @@
 #include <libasr/pass/replace_do_loops.h>
 #include <libasr/pass/replace_for_all.h>
 #include <libasr/pass/while_else.h>
+#include <libasr/pass/replace_init_expr.h>
+#include <libasr/pass/replace_implied_do_loops.h>
 #include <libasr/pass/replace_array_op.h>
 #include <libasr/pass/replace_array_op_simplifier.h>
 #include <libasr/pass/replace_select_case.h>
@@ -55,9 +57,7 @@
 #include <libasr/pass/replace_print_struct_type.h>
 #include <libasr/pass/promote_allocatable_to_nonallocatable.h>
 #include <libasr/pass/replace_function_call_in_declaration.h>
-#include <libasr/pass/replace_init_expr.h>
 #include <libasr/pass/replace_openmp.h>
-#include <libasr/pass/replace_implied_do_loops.h>
 #include <libasr/codegen/asr_to_fortran.h>
 #include <libasr/asr_verify.h>
 #include <libasr/pickle.h>
@@ -74,6 +74,7 @@ namespace LCompilers {
 
     class PassManager {
         private:
+
         std::vector<std::string> _passes_with_experimental_simplifier;
         std::vector<std::string> _with_optimization_passes_for_experimental_simplifier;
         std::vector<std::string> _passes;
@@ -111,6 +112,7 @@ namespace LCompilers {
             {"subroutine_from_function", &pass_create_subroutine_from_function},
             {"subroutine_from_function_simplifier", &pass_create_subroutine_from_function_simplifier},
             {"transform_optional_argument_functions", &pass_transform_optional_argument_functions},
+            {"init_expr", &pass_replace_init_expr},
             {"nested_vars", &pass_nested_vars},
             {"where", &pass_replace_where},
             {"where_simplifier", &pass_replace_where_simplifier},
@@ -120,8 +122,7 @@ namespace LCompilers {
             {"unique_symbols", &pass_unique_symbols},
             {"insert_deallocate", &pass_insert_deallocate},
             {"promote_allocatable_to_nonallocatable", &pass_promote_allocatable_to_nonallocatable},
-            {"simplifier", &pass_simplifier},
-            {"init_expr", &pass_replace_init_expr}
+            {"simplifier", &pass_simplifier}
         };
 
         bool apply_default_passes;
@@ -365,6 +366,7 @@ namespace LCompilers {
                 "insert_deallocate",
                 "promote_allocatable_to_nonallocatable"
             };
+
             // These are re-write passes which are already handled
             // appropriately in C backend.
             _c_skip_passes = {

diff --git a/src/libasr/pass/pass_utils.cpp b/src/libasr/pass/pass_utils.cpp
@@ -149,10 +149,10 @@ namespace LCompilers {
                 ai.m_step = nullptr;
                 args.push_back(al, ai);
             }
+            ASR::expr_t* array_ref = nullptr;
             ASR::expr_t* arr_expr_copy = arr_expr;
             ASR::expr_t** original_arr_expr =&arr_expr_copy;
             ASR::expr_t** array_ref_container_node = nullptr; // If we have a structInstanceMember hierarch, It'd be used to emplace the resulting array_ref in the correct node.
-            ASR::expr_t* array_ref = nullptr;
             ASR::StructInstanceMember_t* tmp = nullptr;
 
             // if first depth of hierarchy contains array, don't set array_ref_container_node and return array_ref directly.

diff --git a/src/libasr/pass/pass_utils.h b/src/libasr/pass/pass_utils.h
@@ -942,7 +942,6 @@ namespace LCompilers {
             bool perform_cast=false, ASR::cast_kindType cast_kind=ASR::cast_kindType::IntegerToInteger,
             ASR::ttype_t* casted_type=nullptr) {
             LCOMPILERS_ASSERT(result_var != nullptr);
-
             const Location& loc = x->base.base.loc;
             LCOMPILERS_ASSERT(ASR::is_a<ASR::Var_t>(*result_var));
             [[maybe_unused]] ASR::ttype_t* result_var_type = ASRUtils::expr_type(result_var);

diff --git a/src/libasr/pass/while_else.cpp b/src/libasr/pass/while_else.cpp
@@ -17,13 +17,13 @@ class ExitVisitor : public ASR::StatementWalkVisitor<ExitVisitor> {
 
     std::unordered_map<ASR::stmt_t*, ASR::symbol_t*> flag_map;
     std::stack<ASR::stmt_t*> loop_stack;
-
+    
     ExitVisitor(Allocator &al)
         : StatementWalkVisitor(al) {}
 
     void visit_WhileLoop(const ASR::WhileLoop_t &x) {
         ASR::stmt_t *while_stmt = (ASR::stmt_t*)(&x);
-
+            
         loop_stack.push(while_stmt);
         ASR::WhileLoop_t &xx = const_cast<ASR::WhileLoop_t&>(x);
         transform_stmts(xx.m_body, xx.n_body);

diff --git a/src/libasr/pass/while_else.h b/src/libasr/pass/while_else.h
@@ -6,9 +6,8 @@
 
 namespace LCompilers {
 
-    void pass_while_else(Allocator &al, ASR::TranslationUnit_t &unit,
-                                const PassOptions &pass_options);
-
+void pass_while_else(Allocator &al, ASR::TranslationUnit_t &unit,
+                            const PassOptions &pass_options);
 } // namespace LCompilers
 
 #endif // LIBASR_PASS_WHILE_ELSE_H