tests is now more consistent with Python version, Grammar and RuleName fixes (underscore, numbers)

Author: obenjiro

.editorconfig

@@ -4,7 +4,7 @@ root = true
 # Unix-style newlines with a newline ending every file
 [*]
 end_of_line = lf
-insert_final_newline = true
+insert_final_newline = false
 
 # Matches multiple files with brace expansion notation
 # Set default charset

src/speg_parser.js

@@ -40,8 +40,8 @@ function parsing_rule() {
 
 function parsing_rule_name() {
     return rd.action('noop', rd.sequence([
-        rd.regex_char('[a-zA-Z]'),
-        rd.zero_or_more(rd.regex_char('[a-zA-Z_]'))
+        rd.regex_char('[a-zA-Z_]'),
+        rd.zero_or_more(rd.regex_char('[a-zA-Z0-9_]'))
     ]));
 }
 

test/speg.fixtures.js

@@ -2,16 +2,19 @@ var SPEG = require('./../src/speg').SPEG;
 var fs = require('fs');
 var path = require('path');
 var recursiveReadSync = require('recursive-readdir-sync');
-var valid_files = recursiveReadSync('./test/speg_fixtures/grammar');
+var valid_files = recursiveReadSync('./test/speg_fixtures');
 
 describe('speg - fixtures - ', function() {
+    valid_files = valid_files.filter(function(filename) {
+        return filename.endsWith('.peg');
+    })
     for (var i = 0, len = valid_files.length; i < len; i++) {
         it('should parse - ' + valid_files[i], (function (filename) {
             return function () {
                 var name = path.basename(filename);
                 var grammar = fs.readFileSync(filename, "utf8");
-                var text = fs.readFileSync(path.join('./test/speg_fixtures/text', name + '.txt'), "utf8");
-                var result = fs.readFileSync(path.join('./test/speg_fixtures/result', name + '.json'), "utf8");
+                var text = fs.readFileSync(path.join('./test/speg_fixtures/', name + '.txt'), "utf8");
+                var result = fs.readFileSync(path.join('./test/speg_fixtures/', name + '.json'), "utf8");
                 var speg = new SPEG();
                 var ast = speg.parse(grammar, text);
                 ast.should.deep.equal(JSON.parse(result));

test/speg_fixtures/pegjs_example.peg

@@ -0,0 +1,13 @@
+GRAMMAR Math_Expression_Grammar
+
+Math -> Expression EOF;
+
+Expression -> Term (_ ("+" / "-") _ Term)*;
+
+Term -> Factor (_ ("*" / "/") _ Factor)*;
+
+Factor -> ("(" _ Expression _ ")") / Integer;
+
+Integer -> [0-9]+;
+
+_ -> [ \t\n\r]*;

test/speg_fixtures/pegjs_example.peg.json

@@ -0,0 +1 @@
+2 * (3 + 4)

test/speg_fixtures/pegjs_example.peg.txt

@@ -0,0 +1,4 @@
+GRAMMAR test
+
+a -> _;
+_ -> "A";

test/speg_fixtures/grammar/simple_and_predicate.peg renamed to test/speg_fixtures/simple_and_predicate.peg

@@ -0,0 +1,6 @@
+{
+  "type": "string", 
+  "start_position": 0, 
+  "match": "A", 
+  "end_position": 1
+}

test/speg_fixtures/result/simple_and_predicate.peg.json renamed to test/speg_fixtures/simple_and_predicate.peg.json

@@ -0,0 +1 @@
+A

test/speg_fixtures/text/simple_and_predicate.peg.txt renamed to test/speg_fixtures/simple_and_predicate.peg.txt

@@ -0,0 +1,3 @@
+GRAMMAR 123numbers
+
+test -> "test";

test/speg_fixtures/grammar/simple_eof.peg renamed to test/speg_fixtures/simple_eof.peg

@@ -0,0 +1,7 @@
+GRAMMAR numbers_at_start
+
+a -> 1b b2 b3 b999;
+1b -> "test";
+b2 -> "test";
+b3 -> "test";
+b999 -> "test";

test/speg_fixtures/result/simple_eof.peg.json renamed to test/speg_fixtures/simple_eof.peg.json

@@ -0,0 +1,3 @@
+GRAMMAR CamelCase
+
+test -> "test";

test/speg_fixtures/text/simple_eof.peg.txt renamed to test/speg_fixtures/simple_eof.peg.txt

@@ -0,0 +1,3 @@
+GRAMMAR numbers123
+
+test -> "test";

test/speg_fixtures/grammar/simple_not_predicate.peg renamed to test/speg_fixtures/simple_not_predicate.peg

@@ -0,0 +1,3 @@
+GRAMMAR lower_case_underscore
+
+test -> "test";

test/speg_fixtures/result/simple_not_predicate.peg.json renamed to test/speg_fixtures/simple_not_predicate.peg.json

@@ -0,0 +1,7 @@
+GRAMMAR url
+
+a -> b1 b2 b3 b999;
+b1 -> "test";
+b2 -> "test";
+b3 -> "test";
+b999 -> "test";

test/speg_fixtures/text/simple_not_predicate.peg.txt renamed to test/speg_fixtures/simple_not_predicate.peg.txt

@@ -0,0 +1,4 @@
+GRAMMAR url
+
+a -> _;
+_ -> "test";