XX Wrap all the symbols from global scope into a function

Author: Thirumalai-Shaktivel

src/libasr/asr_scopes.cpp

@@ -134,4 +134,26 @@ std::string SymbolTable::get_unique_name(const std::string &name) {
     return unique_name;
 }
 
+void SymbolTable::move_symbols_from_global_scope(SymbolTable *fn_scope,
+        std::vector<std::string> &syms) {
+    for (auto &a : scope) {
+        switch (a.second->type) {
+            case (ASR::symbolType::Variable) : {
+                ASR::Variable_t *v = ASR::down_cast<ASR::Variable_t>(a.second);
+                v->m_parent_symtab = fn_scope;
+                fn_scope->add_symbol(a.first, (ASR::symbol_t *)v);
+                syms.push_back(a.first);
+                break;
+            }
+            case (ASR::symbolType::Function) : {
+                // Pass
+                break;
+            }
+            default : {
+                LCompilersException("Not implemented!");
+            };
+        }
+    }
+}
+
 } // namespace LCompilers

src/libasr/asr_scopes.h

@@ -80,6 +80,9 @@ struct SymbolTable {
         size_t n_scope_names, char **m_scope_names);
 
     std::string get_unique_name(const std::string &name);
+
+    void move_symbols_from_global_scope(SymbolTable *fn_scope,
+        std::vector<std::string> &syms);
 };
 
 } // namespace LCompilers

src/libasr/pass/global_stmts.cpp

@@ -162,4 +162,14 @@ void pass_wrap_global_stmts_into_function(Allocator &al,
     }
 }
 
+void pass_wrap_global_vars_into_function(ASR::TranslationUnit_t &unit) {
+    std::vector<std::string> symbols;
+    ASR::symbol_t *fn = unit.m_global_scope->get_symbol("_lpython_main_program");
+    unit.m_global_scope->move_symbols_from_global_scope(
+        ASR::down_cast<ASR::Function_t>(fn)->m_symtab, symbols);
+    for (auto &a: symbols) {
+        unit.m_global_scope->erase_symbol(a);
+    }
+}
+
 } // namespace LCompilers

src/libasr/pass/global_stmts.h

@@ -8,6 +8,7 @@ namespace LCompilers {
 
     void pass_wrap_global_stmts_into_function(Allocator &al, ASR::TranslationUnit_t &unit,
                                               const LCompilers::PassOptions& pass_options);
+    void pass_wrap_global_vars_into_function(ASR::TranslationUnit_t &unit);
 
 } // namespace LCompilers
 

src/libasr/pass/global_stmts_program.cpp

@@ -26,6 +26,7 @@ void pass_wrap_global_stmts_into_program(Allocator &al,
     prog_body.reserve(al, 1);
     if (unit.n_items > 0) {
         pass_wrap_global_stmts_into_function(al, unit, pass_options);
+        pass_wrap_global_vars_into_function(unit);
         ASR::symbol_t *fn = unit.m_global_scope->get_symbol(program_fn_name);
         if (ASR::is_a<ASR::Function_t>(*fn)
             && ASR::down_cast<ASR::Function_t>(fn)->m_return_var == nullptr) {

tests/reference/asr-bindc_01-6d521a9.json

@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-bindc_01-6d521a9.stdout",
-    "stdout_hash": "35f2201203f83b79c5c537d35037267fd0eea6065948d2cc08631f17",
+    "stdout_hash": "1040f4d6e093e49f3eaf317428bb60e911fa9a50deae0f22684715fa",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0

tests/reference/asr-bindc_01-6d521a9.stdout

@@ -1 +1 @@
-(TranslationUnit (SymbolTable 1 {_lpython_main_program: (Function (SymbolTable 3 {}) _lpython_main_program [] [] [(CPtrToPointer (Var 1 queries) (Var 1 x) ()) (Print () [(Var 1 queries) (Var 1 x)] () ())] () Source Public Implementation () .false. .false. .false. .false. .false. [] [] .false.), main_program: (Program (SymbolTable 2 {}) main_program [] [(SubroutineCall 1 _lpython_main_program () [] ())]), queries: (Variable 1 queries [] Local () () Default (CPtr) Source Public Required .false.), x: (Variable 1 x [] Local () () Default (Pointer (Integer 2 [])) Source Public Required .false.)}) [])
+(TranslationUnit (SymbolTable 1 {_lpython_main_program: (Function (SymbolTable 3 {queries: (Variable 3 queries [] Local () () Default (CPtr) Source Public Required .false.), x: (Variable 3 x [] Local () () Default (Pointer (Integer 2 [])) Source Public Required .false.)}) _lpython_main_program [] [] [(CPtrToPointer (Var 3 queries) (Var 3 x) ()) (Print () [(Var 3 queries) (Var 3 x)] () ())] () Source Public Implementation () .false. .false. .false. .false. .false. [] [] .false.), main_program: (Program (SymbolTable 2 {}) main_program [] [(SubroutineCall 1 _lpython_main_program () [] ())])}) [])

tests/reference/asr-bindc_02-bc1a7ea.json

@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-bindc_02-bc1a7ea.stdout",
-    "stdout_hash": "340427cb095972a4cbc1f394d08a22161da70f1c14d2652ff69b0658",
+    "stdout_hash": "725ebaf473e00bdbf1bf80e13c83ba50f60192f22d54b4b880942e17",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0

tests/reference/asr-bindc_02-bc1a7ea.stdout

@@ -6,7 +6,7 @@
     "outfile": null,
     "outfile_hash": null,
     "stdout": "asr-expr_07-7742668.stdout",
-    "stdout_hash": "387ae27c01005ee7bffb009fe98deacd5d4bdac8bf0710beff8ed697",
+    "stdout_hash": "42e89818ed3238a32ee4b3910239dad4b8e5232617d0a6cf3b3dd7bc",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0