Fix #3: Detect CR Line Endings (\r) as line endings

andygrunwald · Aug 12, 2016 · a578923 · a578923
1 parent 3db9f0f
commit a578923
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lexer.go b/lexer.go
@@ -113,7 +113,7 @@ func (s *Scanner) scanIdent() (tok Token, lit string) {
 }
 
 func isWhitespace(ch rune) bool {
-	return ch == ' ' || ch == '\t' || ch == '\n'
+	return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r'
 }
 
 func isLetter(ch rune) bool {

diff --git a/lexer_test.go b/lexer_test.go
@@ -20,6 +20,7 @@ func TestScanner_Scan(t *testing.T) {
 		{s: ` `, tok: vdf.WS, lit: " "},
 		{s: "\t", tok: vdf.WS, lit: "\t"},
 		{s: "\n", tok: vdf.WS, lit: "\n"},
+		{s: "\r", tok: vdf.WS, lit: "\r"},
 
 		// Misc characters
 		{s: `{`, tok: vdf.CurlyBraceOpen, lit: "{"},