Merge pull request #767 from prometheus/fabxc/cr-fix

promql: fix lexing of \r as whitespaces

promql/lex.go

@@ -724,7 +724,7 @@ Loop:
 }
 
 func isSpace(r rune) bool {
-	return r == ' ' || r == '\t' || r == '\n'
+	return r == ' ' || r == '\t' || r == '\n' || r == '\r'
 }
 
 // isEndOfLine reports whether r is an end-of-line character.

promql/lex_test.go

@@ -42,6 +42,9 @@ var tests = []struct {
 			{itemDuration, 1, `5m`},
 			{itemRightBracket, 3, `]`},
 		},
+	}, {
+		input:    "\r\n\r",
+		expected: []item{},
 	},
 	// Test numbers.
 	{