mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Fix error's line numbers for nested statements.
This commit is contained in:
1 parent
57598bee41
commit
de28a715b3
2 files changed
+9
-2
No files matched your search
+2
-2
@@ -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 {
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in new issue
Block a user