Fix positioning after quotes

ScrambleShell · Jan 23, 2016 · 9900ec8 · 9900ec8
1 parent 80fe241
commit 9900ec8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/parse.go b/parse.go
@@ -139,6 +139,7 @@ func (p *parser) next() {
 		if p.tok == EOF {
 			return
 		}
+		p.col--
 		p.tok = WORD
 		return
 	}
@@ -171,8 +172,17 @@ func (p *parser) next() {
 
 func (p *parser) strContent(delim byte) {
 	v := []string{string(delim)}
+	p.col++
 	for {
 		s, err := p.r.ReadString(delim)
+		for _, r := range s {
+			if r == '\n' {
+				p.line++
+				p.col = 0
+			} else {
+				p.col++
+			}
+		}
 		if err == io.EOF {
 			p.tok = EOF
 			p.errWanted(rune(delim))
@@ -189,14 +199,6 @@ func (p *parser) strContent(delim byte) {
 		break
 	}
 	p.val = strings.Join(v, "")
-	for _, r := range p.val {
-		if r == '\n' {
-			p.line++
-			p.col = 0
-		} else {
-			p.col++
-		}
-	}
 }
 
 func (p *parser) discardUpTo(delim byte) {

diff --git a/sh_test.go b/sh_test.go
@@ -37,11 +37,11 @@ func TestParseErr(t *testing.T) {
 	}{
 		{
 			in:   "'",
-			want: `1:1: unexpected token EOF, wanted '\''`,
+			want: `1:2: unexpected token EOF, wanted '\''`,
 		},
 		{
 			in:   "\"",
-			want: `1:1: unexpected token EOF, wanted '"'`,
+			want: `1:2: unexpected token EOF, wanted '"'`,
 		},
 		{
 			in:   "'\\''",
@@ -125,11 +125,11 @@ func TestParseErr(t *testing.T) {
 		},
 		{
 			in:   "foo'",
-			want: `1:4: unexpected token EOF, wanted '\''`,
+			want: `1:5: unexpected token EOF, wanted '\''`,
 		},
 		{
 			in:   "foo\"",
-			want: `1:4: unexpected token EOF, wanted '"'`,
+			want: `1:5: unexpected token EOF, wanted '"'`,
 		},
 		{
 			in:   "foo()",