Merge pull request #1476 from Smit-create/i-1472

C: Generalize handing of extra codegen

Author: Smit-create

integration_tests/CMakeLists.txt

@@ -410,7 +410,7 @@ RUN(NAME generics_02         LABELS cpython llvm c)
 RUN(NAME generics_array_01   LABELS cpython llvm)
 RUN(NAME generics_array_02   LABELS cpython llvm)
 RUN(NAME generics_array_03   LABELS cpython llvm)
-RUN(NAME generics_list_01    LABELS cpython llvm)
+RUN(NAME generics_list_01    LABELS cpython llvm c)
 RUN(NAME test_statistics     LABELS cpython llvm)
 RUN(NAME test_str_attributes LABELS cpython llvm c)
 RUN(NAME kwargs_01           LABELS cpython llvm c)

integration_tests/print_list_tuple.py

@@ -20,4 +20,17 @@ def test_print_list():
     print(x, y, z, t)
 
 
-test_print_list()
+def f(y: list[i32]) -> list[i32]:
+    y.append(4)
+    return y
+
+def g():
+    print(f([1,2,3]))
+
+
+def check():
+    g()
+    test_print_list()
+
+
+check()

src/libasr/codegen/asr_to_c.cpp

@@ -1016,7 +1016,7 @@ R"(
     void visit_Assert(const ASR::Assert_t &x) {
         std::string indent(indentation_level*indentation_spaces, ' ');
         std::string out = indent;
-        tmp_src.clear();
+        bracket_open++;
         if (x.m_msg) {
             out += "ASSERT_MSG(";
             visit_expr(*x.m_test);
@@ -1028,12 +1028,8 @@ R"(
             visit_expr(*x.m_test);
             out += src + ");\n";
         }
-        src = "";
-        if (!tmp_src.empty()) {
-            for (auto &s: tmp_src) src += s;
-        }
-        src += out;
-        tmp_src.clear();
+        bracket_open--;
+        src = check_tmp_buffer() + out;
     }
 
     void visit_CPtrToPointer(const ASR::CPtrToPointer_t& x) {
@@ -1069,6 +1065,7 @@ R"(
     void visit_Print(const ASR::Print_t &x) {
         std::string indent(indentation_level*indentation_spaces, ' ');
         std::string tmp_gen = indent + "printf(\"", out = "";
+        bracket_open++;
         std::vector<std::string> v;
         std::string separator;
         if (x.m_separator) {
@@ -1093,11 +1090,6 @@ R"(
                 }
                 tmp_gen += ");\n";
                 out += tmp_gen;
-                if (ASR::is_a<ASR::ListConstant_t>(*x.m_values[i]) ||
-                        ASR::is_a<ASR::TupleConstant_t>(*x.m_values[i])) {
-                    out += src;
-                    src = const_var_names[get_hash((ASR::asr_t*)x.m_values[i])];
-                }
                 tmp_gen = indent + "printf(\"";
                 v.clear();
                 std::string p_func = c_ds_api->get_print_func(value_type);
@@ -1129,8 +1121,9 @@ R"(
             }
         }
         tmp_gen += ");\n";
+        bracket_open--;
         out += tmp_gen;
-        src = out;
+        src = this->check_tmp_buffer() + out;
     }
 
     void visit_ArraySize(const ASR::ArraySize_t& x) {