From de28a715b3f849a5ea2a1a6e1fa13fc2e0a48971 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 13 May 2017 12:03:33 +1000 Subject: [PATCH] Fix error's line numbers for nested statements. --- lang/check/check.go | 4 ++-- lang/check/type.go | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lang/check/check.go b/lang/check/check.go index 72f48c44..44971aad 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -127,14 +127,14 @@ func (c *Checker) checkFuncBody(n *a.Node) error { // https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Statements/var for _, m := range f.Body() { if err := tc.checkVars(m); err != nil { - return fmt.Errorf("%v at %s:%d", err, m.Raw().Filename(), m.Raw().Line()) + return fmt.Errorf("%v at %s:%d", err, tc.errFilename, tc.errLine) } } // Assign ConstValue's (if applicable) and MType's to each Expr. for _, m := range f.Body() { if err := tc.checkStatement(m); err != nil { - return fmt.Errorf("%v at %s:%d", err, m.Raw().Filename(), m.Raw().Line()) + return fmt.Errorf("%v at %s:%d", err, tc.errFilename, tc.errLine) } } if err := f.Node().Walk(func(n *a.Node) error { diff --git a/lang/check/type.go b/lang/check/type.go index 153172ec..5e402723 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -15,9 +15,14 @@ type typeChecker struct { c *Checker idMap *t.IDMap typeMap TypeMap + + errFilename string + errLine uint32 } func (c *typeChecker) checkVars(n *a.Node) error { + c.errFilename, c.errLine = n.Raw().FilenameLine() + if n.Kind() == a.KVar { v := n.Var() name := v.Name() @@ -44,6 +49,8 @@ func (c *typeChecker) checkVars(n *a.Node) error { } func (c *typeChecker) checkStatement(n *a.Node) error { + c.errFilename, c.errLine = n.Raw().FilenameLine() + switch n.Kind() { case a.KAssert: o := n.Assert()