Merge branch 'master' of github.com:robpike/ivy

griesemer · Jan 8, 2015 · 014600a · 014600a
2 parents 83ea6d3 + e9ae363
commit 014600a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/ivy.go b/ivy.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main
+package main // import "robpike.io/ivy"
 
 import (
 	"bufio"

diff --git a/parse/parse.go b/parse/parse.go
@@ -186,6 +186,9 @@ func (p *Parser) next() scan.Token {
 	} else {
 		tok = <-p.scanner.Tokens
 	}
+	if tok.Type == scan.Error {
+		p.errorf("%q", tok)
+	}
 	p.curTok = tok
 	if tok.Type != scan.Newline {
 		// Show the line number before we hit the newline.
@@ -251,8 +254,6 @@ func (p *Parser) Line() ([]value.Expr, bool) {
 func (p *Parser) expressionList() ([]value.Expr, bool) {
 	tok := p.next()
 	switch tok.Type {
-	case scan.Error:
-		p.errorf("%q", tok)
 	case scan.EOF:
 		return nil, false
 	case scan.Newline:
@@ -264,8 +265,6 @@ func (p *Parser) expressionList() ([]value.Expr, bool) {
 	}
 	tok = p.next()
 	switch tok.Type {
-	case scan.Error:
-		p.errorf("%q", tok)
 	case scan.EOF, scan.Newline:
 	default:
 		p.errorf("unexpected %q", tok)