clean up code and added test

Signed-off-by: Ron Nuriel <[email protected]>

Author: ronnuriel

integration_tests/CMakeLists.txt

@@ -275,6 +275,7 @@ RUN(NAME generics_list_01    LABELS cpython llvm)
 RUN(NAME test_statistics     LABELS cpython llvm)
 RUN(NAME test_str_attributes LABELS cpython llvm)
 RUN(NAME kwargs_01           LABELS cpython llvm)
+RUN(NAME test_01_goto      LABELS  c)
 
 RUN(NAME func_inline_01 LABELS llvm wasm)
 RUN(NAME func_static_01 LABELS cpython llvm c wasm)

src/libasr/asr_utils.h

@@ -1779,7 +1779,6 @@ class LabelGenerator {
             if (labelname2id.find(label) == labelname2id.end() ){
                 int id = label_generator->get_unique_id();
                 labelname2id[label] = id ;
-                std::cout << " GOT ID = " + label_generator->get_unique_id() << std::endl;
             }
             return labelname2id[label];
         }

src/libasr/codegen/asr_to_c.cpp

@@ -846,26 +846,11 @@ R"(
     }
 
     void visit_GoTo(const ASR::GoTo_t &x) {
-        //seems like there is no data /? 
-        // this->visit_stmt(x.base);
-
-        // std::ostringstream sid;
-        // sid << x.m_target_id;
-
-        // std::cout << "In Goto = " << x.m_target_id <<std::endl ;
-        // std::string s << x.m_target_id;
-        src =  "label "  + std::to_string(x.m_target_id) ;
+        src =  x.m_label + ":\n";
     }
 
     void visit_GoToTarget(const ASR::GoToTarget_t &x) {
-        //seems like there is no data /? 
-        // this->visit_stmt(x.base);
-        // std::cout << "In Goto = " + src;
-         std::cout << "In Goto Target = " << x.m_id <<std::endl ;
-
-        src =  "goto "  + std::to_string(x.m_id) ;
-
-        // src =  " goto " << x.m_target_id << std::endl;
+        src =  "goto "  + x.m_label + ";\n";
     }
 };
 

src/lpython/semantics/python_ast_to_asr.cpp

@@ -2843,7 +2843,7 @@ class SymbolTableVisitor : public CommonVisitor<SymbolTableVisitor> {
         bool current_procedure_interface = false;
         bool overload = false;
         bool vectorize = false, is_inline = false, is_static = false;
-
+        bool is_goto = false;
         Vec<ASR::ttype_t*> tps;
         tps.reserve(al, x.m_args.n_args);
         bool is_restriction = false;
@@ -2866,6 +2866,8 @@ class SymbolTableVisitor : public CommonVisitor<SymbolTableVisitor> {
                         vectorize = true;
                     } else if (name == "restriction") {
                         is_restriction = true;
+                    } else if (name == "with_goto") {
+                        is_goto = true;
                     } else if (name == "inline") {
                         is_inline = true;
                     } else if (name == "static") {
@@ -3985,40 +3987,19 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
         if (AST::is_a<AST::Name_t>(*x.m_value)) {
             std::string value = AST::down_cast<AST::Name_t>(x.m_value)->m_id;
             if( value == "label" ) {
-                // Label name has to be converted into an ID
-                // Now each label must be mapped to a unique ID
-                // because ASR doesn't care about the label names
-                // it just cares about IDs. Now if we don't map
-                // label names to unique IDs then we won't be able
-                // to create backend code correctly.
-                // How to generate IDs? We have a generator for that.
                 std::string labelname = std::string(x.m_attr);
-                // std::cout << "ATTRIB NAME = " + labelname <<std::endl;
                ASRUtils::LabelGenerator* label_generator = ASRUtils::LabelGenerator::get_instance();
                int id = label_generator->get_id_by_label(labelname);
-               std::cout << " ID IS ="   << id << std::endl;
-            //    tmp = ASR::make_GoToTarget_t(al, x.base.base.loc, id); ??
-                tmp = ASR::make_GoTo_t(al, x.base.base.loc, id);      //  #looks like i want to create goto label .
+                tmp = ASR::make_GoTo_t(al, x.base.base.loc, id, labelname);
                 return ;
             }
 
              if (value == "goto"){
                  std::string labelname = std::string(x.m_attr);
-                // std::cout << "ATTRIB NAME = " +  std::string(x.m_attr) <<std::endl;
+
                  ASRUtils::LabelGenerator* label_generator =ASRUtils::LabelGenerator::get_instance();
                  int id = label_generator->get_id_by_label(labelname);
-                // int id = label_generator->get_unique_id();
-                // std::string labelname = std::string(x.m_attr);
-                // std::cout << "INSiDE NAME = " + labelname <<std::endl;
-                // label_generator->add_node_with_unique_label(labelname, id);
-
-                //why empty block ? Ondrej advise GoTo_target
-
-
-                // set_empty_block(current_scope, x.base.base.loc);
-                // tmp = ASR::make_BlockCall_t(al, x.base.base.loc, id,  empty_block);
-
-                 tmp = ASR::make_GoToTarget_t(al, x.base.base.loc, id);
+                 tmp = ASR::make_GoToTarget_t(al, x.base.base.loc, id, labelname);
                 return;
             }
 

test_goto.py

@@ -0,0 +1,14 @@
+# from goto import with_goto #TODO: need to be supported for cpython integration_tests
+
+@with_goto
+def func() -> i16:
+    i:i16
+    for i in range(10):
+        goto .end
+        i = 10
+
+    label .end
+    assert i == 0
+    return i
+
+