Fix variable decl order

lcompilers · Mar 16, 2023 · b89fadf · b89fadf
1 parent 56bd232
commit b89fadf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/bin/lpython.cpp b/src/bin/lpython.cpp
@@ -1248,7 +1248,7 @@ EMSCRIPTEN_KEEPALIVE char* emit_cpp_from_source(char *input) {
         out = diagnostics.render(lm, compiler_options);
         if (asr.ok) {
             auto res = LCompilers::asr_to_cpp(al, *asr.result, diagnostics,
-                compiler_options.platform, 0);
+                compiler_options, 0);
             out = diagnostics.render(lm, compiler_options);
             if (res.ok) {
                 out += res.result;

diff --git a/src/libasr/codegen/asr_to_c_cpp.h b/src/libasr/codegen/asr_to_c_cpp.h
@@ -242,6 +242,7 @@ R"(#include <stdio.h>
             if (ASR::is_a<ASR::Variable_t>(*var_sym)) {
                 ASR::Variable_t *v = ASR::down_cast<ASR::Variable_t>(var_sym);
                 std::string decl = self().convert_variable_decl(*v);
+                decl = check_tmp_buffer() + decl;
                 bool used_define_for_const = (ASR::is_a<ASR::Const_t>(*v->m_type) &&
                         v->m_intent == ASRUtils::intent_local);
                 if (used_define_for_const) {
@@ -300,11 +301,12 @@ R"(#include <stdio.h>
             ASR::symbol_t* var_sym = x.m_symtab->get_symbol(item);
             if (ASR::is_a<ASR::Variable_t>(*var_sym)) {
                 ASR::Variable_t *v = ASR::down_cast<ASR::Variable_t>(var_sym);
-                decl += self().convert_variable_decl(*v);
+                std::string d = self().convert_variable_decl(*v);
                 if( !ASR::is_a<ASR::Const_t>(*v->m_type) ||
                     v->m_intent == ASRUtils::intent_return_var ) {
-                    decl += ";\n";
+                    d += ";\n";
                 }
+                decl += check_tmp_buffer() + d;
             }
         }
 
@@ -336,11 +338,12 @@ R"(#include <stdio.h>
             ASR::symbol_t* var_sym = block->m_symtab->get_symbol(item);
             if (ASR::is_a<ASR::Variable_t>(*var_sym)) {
                 ASR::Variable_t *v = ASR::down_cast<ASR::Variable_t>(var_sym);
-                decl += indent + self().convert_variable_decl(*v);
+                std::string d = indent + self().convert_variable_decl(*v);
                 if( !ASR::is_a<ASR::Const_t>(*v->m_type) ||
                     v->m_intent == ASRUtils::intent_return_var ) {
-                    decl += ";\n";
+                    d += ";\n";
                 }
+                decl += check_tmp_buffer() + d;
             }
         }
         for (size_t i=0; i<block->n_body; i++) {
@@ -539,11 +542,12 @@ R"(#include <stdio.h>
                     ASR::Variable_t *v = ASR::down_cast<ASR::Variable_t>(var_sym);
                     if (v->m_intent == ASRUtils::intent_local ||
                         v->m_intent == ASRUtils::intent_return_var) {
-                        decl += indent + self().convert_variable_decl(*v);
+                        std::string d = indent + self().convert_variable_decl(*v);
                         if( !ASR::is_a<ASR::Const_t>(*v->m_type) ||
                             v->m_intent == ASRUtils::intent_return_var ) {
-                            decl += ";\n";
+                            d += ";\n";
                         }
+                        decl += check_tmp_buffer() + d;
                     }
                     if (ASR::is_a<ASR::TypeParameter_t>(*v->m_type)) {
                         has_typevar = true;