wip

Author: czgdp1807

src/lpython/semantics/python_ast_to_asr.cpp

@@ -423,6 +423,10 @@ ASR::Module_t* load_module(Allocator &al, SymbolTable *symtab,
 ASR::symbol_t* import_from_module(Allocator &al, ASR::Module_t *m, SymbolTable *current_scope,
                 std::string mname, std::string cur_sym_name, std::string new_sym_name,
                 const Location &loc, bool skip_current_scope_check=false) {
+    // std::cout<<"module_name: "<<m->m_name<<std::endl;
+    // for( auto& itr: m->m_symtab->get_scope() ) {
+    //     std::cout<<"itr.first: "<<itr.first<<std::endl;
+    // }
     ASR::symbol_t *t = m->m_symtab->resolve_symbol(cur_sym_name);
     if (!t) {
         throw SemanticError("The symbol '" + cur_sym_name + "' not found in the module '" + mname + "'",
@@ -481,11 +485,20 @@ ASR::symbol_t* import_from_module(Allocator &al, ASR::Module_t *m, SymbolTable *
     } else if (ASR::is_a<ASR::ExternalSymbol_t>(*t)) {
         ASR::ExternalSymbol_t *es = ASR::down_cast<ASR::ExternalSymbol_t>(t);
         SymbolTable *symtab = current_scope;
-        while (symtab->parent != nullptr) symtab = symtab->parent;
-        ASR::symbol_t *sym = symtab->get_symbol(es->m_module_name);
+        // while (symtab->parent != nullptr) symtab = symtab->parent;
+        ASR::symbol_t *sym = symtab->resolve_symbol(es->m_module_name);
         ASR::Module_t *m = ASR::down_cast<ASR::Module_t>(sym);
-        return import_from_module(al, m, symtab, es->m_name,
+        return import_from_module(al, m, symtab, es->m_module_name,
                             cur_sym_name, new_sym_name, loc);
+    } else if (ASR::is_a<ASR::Module_t>(*t)) {
+        ASR::Module_t* mt = ASR::down_cast<ASR::Module_t>(t);
+        std::string mangled_cur_sym_name = ASRUtils::get_mangled_name(mt, new_sym_name);
+        // std::cout<<"names: "<<mt->m_name<<" "<<cur_sym_name<<" "<<mangled_cur_sym_name<<" "<<new_sym_name<<" "<<mname<<std::endl;
+        if( cur_sym_name == mangled_cur_sym_name ) {
+            throw SemanticError("Importing modules isn't supported yet.", loc);
+        }
+        return import_from_module(al, mt, current_scope, std::string(mt->m_name),
+                                  cur_sym_name, new_sym_name, loc);
     } else {
         throw SemanticError("Only Subroutines, Functions, Variables and "
             "ExternalSymbol are currently supported in 'import'", loc);
@@ -3566,10 +3579,19 @@ class SymbolTableVisitor : public CommonVisitor<SymbolTableVisitor> {
         for (auto &mod_sym : mods) {
             bool ltypes, enum_py;
             set_module_symbol(mod_sym, paths);
+            // std::cout<<"msym: "<<mod_sym<<" ";
+            // for( auto path: paths ) {
+            //     std::cout<<path<<", ";
+            // }
+            // std::cout<<std::endl;
             t = (ASR::symbol_t*)(load_module(al, st,
                 mod_sym, x.base.base.loc, diag, lm, false, paths, ltypes, enum_py,
                 [&](const std::string &msg, const Location &loc) { throw SemanticError(msg, loc); },
                 allow_implicit_casting));
+            // std::cout<<"module_name.imported: "<<ASRUtils::symbol_name(t)<<std::endl;
+            // for( auto& itr: ASRUtils::symbol_symtab(t)->get_scope() ) {
+            //     std::cout<<"itr.first: "<<itr.first<<std::endl;
+            // }
             if (ltypes || enum_py) {
                 // TODO: For now we skip ltypes import completely. Later on we should note what symbols
                 // got imported from it, and give an error message if an annotation is used without
@@ -5898,7 +5920,13 @@ Result<ASR::TranslationUnit_t*> python_ast_to_asr(Allocator &al, LocationManager
         } else {
             return res2.error;
         }
-        LFORTRAN_ASSERT(asr_verify(*tu, true, diagnostics));
+#if defined(WITH_LFORTRAN_ASSERT)
+        diag::Diagnostics diagnostics;
+        if (!asr_verify(*tu, true, diagnostics)) {
+            std::cerr << diagnostics.render2();
+            throw LCompilersException("Verify failed");
+        };
+#endif
     }
 
     if (main_module) {