fix: set loc don't use line from group of declaration

gnolang · May 29, 2024 · eaab6e1 · eaab6e1
1 parent 0fa39be
commit eaab6e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/gnovm/pkg/gnolang/debugger_test.go b/gnovm/pkg/gnolang/debugger_test.go
@@ -103,7 +103,7 @@ func TestDebug(t *testing.T) {
 		{in: "p \"xxxx\"\n", out: `("xxxx" string)`},
 		{in: "si\n", out: "sample.gno:14"},
 		{in: "s\ns\n", out: `=>   14: var global = "test"`},
-		{in: "s\n\n", out: "=>   16: type T struct {"},
+		{in: "s\n\n", out: "=>   33: 	num := 5"},
 		{in: "foo", out: "command not available: foo"},
 		{in: "\n\n", out: "dbg> "},
 		{in: "#\n", out: "dbg> "},

diff --git a/gnovm/pkg/gnolang/go2gno.go b/gnovm/pkg/gnolang/go2gno.go
@@ -767,6 +767,7 @@ func toDecls(fs *token.FileSet, gd *ast.GenDecl) (ds Decls) {
 					Const:     true,
 				}
 				cd.SetAttribute(ATTR_IOTA, si)
+				setLoc(fs, s.Pos(), cd)
 				ds = append(ds, cd)
 			} else {
 				var names []NameExpr
@@ -785,30 +786,27 @@ func toDecls(fs *token.FileSet, gd *ast.GenDecl) (ds Decls) {
 					Values:    values,
 					Const:     false,
 				}
+				setLoc(fs, s.Pos(), vd)
 				ds = append(ds, vd)
 			}
 		case *ast.ImportSpec:
 			path, err := strconv.Unquote(s.Path.Value)
 			if err != nil {
 				panic("unexpected import spec path type")
 			}
-			ds = append(ds, &ImportDecl{
+			im := &ImportDecl{
 				NameExpr: *Nx(toName(s.Name)),
 				PkgPath:  path,
-			})
+			}
+			setLoc(fs, s.Pos(), im)
+			ds = append(ds, im)
 		default:
 			panic(fmt.Sprintf(
 				"unexpected decl spec %v",
 				reflect.TypeOf(s)))
 		}
 	}
 
-	if fs != nil {
-		for _, d := range ds {
-			setLoc(fs, gd.Pos(), d)
-		}
-	}
-
 	return ds
 }
 

diff --git a/gnovm/tests/files/const9.gno b/gnovm/tests/files/const9.gno
@@ -14,4 +14,4 @@ func main() {
 }
 
 // Error:
-// main/files/const9.gno:3: constant definition loop with b
+// main/files/const9.gno:5: constant definition loop with b