Merge pull request #27 from spekary/Better_error

Improving error message
goradd · Feb 10, 2022 · ac3ee2d · ac3ee2d
2 parents 41f8390 + 6d6c301
commit ac3ee2d
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/internal/got/token.go b/internal/got/token.go
@@ -179,18 +179,17 @@ func (t tokenItem) formatError() (s string) {
 	if t.typ == itemError {
 		s = "*** Error: " + t.val + "\n"
 		for _, c := range t.callStack {
-			s += "    from " + c.formatErrorLine() + "\n"
+			s += "    " + c.formatErrorLine() + "\n"
 		}
 	}
 	return
 }
 
 func (r locationRef) formatErrorLine() (s string) {
-	s += fmt.Sprintf("line: %d, offset: %d ", r.lineNum+1, r.offset)
 	if r.blockName != "" {
-		s += "of block: " + r.blockName
+		s += fmt.Sprintf("Block %s:%d:%d", r.blockName, r.lineNum+1, r.offset)
 	} else {
-		s += "of file: " + r.fileName
+		s += fmt.Sprintf("%s:%d:%d", r.fileName, r.lineNum+1, r.offset)
 	}
 	return
 }