skip trailing spaces in scanner

Related #301
gokcehan · Jul 4, 2020 · e1b939b · e1b939b
1 parent ce4ea6e
commit e1b939b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/eval_test.go b/eval_test.go
@@ -179,6 +179,18 @@ var gEvalTests = []struct {
 		[]expr{&listExpr{[]expr{&setExpr{"ratios", "1:2:3"}}, 1}, &setExpr{"hidden", ""}},
 	},
 
+	{
+		"set ratios 1:2:3\n set hidden",
+		[]string{"set", "ratios", "1:2:3", "\n", "set", "hidden", "\n"},
+		[]expr{&setExpr{"ratios", "1:2:3"}, &setExpr{"hidden", ""}},
+	},
+
+	{
+		"set ratios 1:2:3 \nset hidden",
+		[]string{"set", "ratios", "1:2:3", "\n", "set", "hidden", "\n"},
+		[]expr{&setExpr{"ratios", "1:2:3"}, &setExpr{"hidden", ""}},
+	},
+
 	{
 		"map gh cd ~",
 		[]string{"map", "gh", "cd", "~", "\n"},

diff --git a/scan.go b/scan.go
@@ -177,9 +177,6 @@ scan:
 		s.tok = string(s.buf[beg:s.off])
 		s.cmd = false
 		s.sem = true
-	case s.chr == '\r':
-		s.next()
-		goto scan
 	case s.chr == '\n':
 		if s.sem {
 			s.typ = tokenSemicolon
@@ -196,7 +193,7 @@ scan:
 		}
 		goto scan
 	case isSpace(s.chr):
-		for !s.eof && isSpace(s.chr) {
+		for !s.eof && isSpace(s.chr) && s.chr != '\n' {
 			s.next()
 		}
 		goto scan