wip

Author: czgdp1807

src/lpython/semantics/python_ast_to_asr.cpp

@@ -3213,7 +3213,7 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
 
 public:
     ASR::asr_t *asr;
-    std::map<std::string, std::pair<int64_t, bool>> goto_name2id;
+    std::map<std::string, std::tuple<int64_t, bool, Location>> goto_name2id;
     int64_t gotoids;
 
 
@@ -3329,10 +3329,9 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
         tmp = nullptr;
 
         for( auto itr: goto_name2id ) {
-            if( !itr.second.second ) {
-                throw SemanticError("Label " + itr.first + " is not defined in "
-                                    + std::string(x.m_name),
-                                    x.base.base.loc);
+            if( !std::get<1>(itr.second) ) {
+                throw SemanticError("Label '" + itr.first + "' is not defined in '"
+                                    + std::string(x.m_name) + "'", std::get<2>(itr.second));
             }
         }
     }
@@ -3987,23 +3986,27 @@ class BodyVisitor : public CommonVisitor<BodyVisitor> {
             if( value == "label" ) {
                 std::string labelname = x.m_attr;
                 if( goto_name2id.find(labelname) == goto_name2id.end() ) {
-                    goto_name2id[labelname] = std::make_pair(gotoids, true);
+                    goto_name2id[labelname] = std::make_tuple(gotoids, true, x.base.base.loc);
                     gotoids += 1;
-                } else if( !goto_name2id[labelname].second ) {
-                    goto_name2id[labelname] = std::make_pair(goto_name2id[labelname].first, true);
+                } else if( !std::get<1>(goto_name2id[labelname]) ) {
+                    goto_name2id[labelname] = std::make_tuple(
+                        std::get<0>(goto_name2id[labelname]),
+                        true,
+                        std::get<2>(goto_name2id[labelname])
+                    );
                 }
-                int id = goto_name2id[labelname].first;
+                int id = std::get<0>(goto_name2id[labelname]);
                 tmp = ASR::make_GoToTarget_t(al, x.base.base.loc, id, x.m_attr);
                 return ;
             }
 
              if (value == "goto"){
                 std::string labelname = std::string(x.m_attr);
                 if( goto_name2id.find(labelname) == goto_name2id.end() ) {
-                    goto_name2id[labelname] = std::make_pair(gotoids, false);
+                    goto_name2id[labelname] = std::make_tuple(gotoids, false, x.base.base.loc);
                     gotoids += 1;
                 }
-                int id = goto_name2id[labelname].first;
+                int id = std::get<0>(goto_name2id[labelname]);
                 tmp = ASR::make_GoTo_t(al, x.base.base.loc, id, x.m_attr);
                 return ;
             }

tests/errors/test_goto.py

@@ -0,0 +1,12 @@
+from ltypes import with_goto, goto, label, i32
+
+@with_goto
+def f():
+    i:i32
+    for i in range(10):
+        if i == 5:
+            goto .end
+
+    assert i == 5
+
+f()

tests/reference/asr-test_goto-ba9fd22.json

@@ -0,0 +1,13 @@
+{
+    "basename": "asr-test_goto-ba9fd22",
+    "cmd": "lpython --show-asr --no-color {infile} -o {outfile}",
+    "infile": "tests/errors/test_goto.py",
+    "infile_hash": "8b81c2245b3ca31576ac41f49247b3781d1759ac6be61e8512bfd0f1",
+    "outfile": null,
+    "outfile_hash": null,
+    "stdout": null,
+    "stdout_hash": null,
+    "stderr": "asr-test_goto-ba9fd22.stderr",
+    "stderr_hash": "a1e26c1edcd8784938199af965004496663f071968ff7d58a33be725",
+    "returncode": 2
+}

tests/reference/asr-test_goto-ba9fd22.stderr

@@ -0,0 +1,5 @@
+semantic error: Label 'end' is not defined in 'f'
+ --> tests/errors/test_goto.py:8:13
+  |
+8 |             goto .end
+  |             ^^^^^^^^^ 

tests/tests.toml

@@ -906,3 +906,7 @@ asr = true
 [[test]]
 filename = "errors/enum_02.py"
 asr = true
+
+[[test]]
+filename = "errors/test_goto.py"
+asr = true