SHA-1: 34233d9a278fba3bf65e427336a33ac50d188e5d

* Added fix for when grammar file leaves some (invisible) whitespace on the empty lines between lexer rules: previously, the lexer would, depending on the exact input, barf an inexplicable hairball or (worse!) fail silently. Unit tests to verify the success of the fix have been included.

Conflicts:
	lex.l
	tests/all-tests.js

Author: GerHobbelt

lex.l

@@ -23,6 +23,7 @@ BR                \r\n|\n|\r
 <conditions>"*"                       return '*';
 
 <rules>{BR}+                          /* */
+<rules>\s+{BR}+                       /* */
 <rules>\s+                            this.begin('indented')
 <rules>"%%"                           this.begin('code'); return '%%'
 <rules>[a-zA-Z0-9_]+                  return 'CHARACTER_LIT'

lex.y

@@ -204,7 +204,7 @@ range_regex
 
 string
     : STRING_LIT
-        { $$ = prepareString(yytext.substr(1, yytext.length-2)); }
+        { $$ = prepareString(yytext.substr(1, yytext.length - 2)); }
     | CHARACTER_LIT
     ;
 
@@ -220,3 +220,4 @@ function prepareString (s) {
     s = encodeRE(s);
     return s;
 };
+

tests/all-tests.js

@@ -356,6 +356,18 @@ exports["test rules with trailing escapes"] = function () {
     assert.deepEqual(lex.parse(lexgrammar), expected, "grammar should be parsed correctly");
 };
 
+exports["test no brace action with surplus whitespace between rules"] = function () {
+    var lexgrammar = '%%\n"a" return true;\n  \n"b" return 1;\n   \n';
+    var expected = {
+        rules: [
+            ["a\\b", "return true;"],
+            ["b\\b", "return 1;"]
+        ]
+    };
+
+    assert.deepEqual(lex.parse(lexgrammar), expected, "grammar should be parsed correctly");
+};
+
 exports["test windows line endings"] = function () {
     var lexgrammar = '%%\r\n"["[^\\]]"]" %{\r\nreturn true;\r\n%}\r\n';
     var expected = {
@@ -367,5 +379,18 @@ exports["test windows line endings"] = function () {
     assert.deepEqual(lex.parse(lexgrammar), expected, "grammar should be parsed correctly");
 };
 
+exports["test braced action with surplus whitespace between rules"] = function () {
+    var lexgrammar = '%%\n"a" %{  \nreturn true;\n%}  \n  \n"b" %{    return 1;\n%}  \n   \n';
+    var expected = {
+        rules: [
+            ["a\\b", "  \nreturn true;\n"],
+            ["b\\b", "    return 1;\n"]
+        ]
+    };
+
+    assert.deepEqual(lex.parse(lexgrammar), expected, "grammar should be parsed correctly");
+};
+
+
 if (require.main === module)
     require("test").run(exports);