Merge pull request DmitrySoshnikov#73 from silentroach/feature-check-range-boundaries

check for correct boundaries in char class range

Author: DmitrySoshnikov

src/parser/__tests__/parser-test262-test.js

@@ -33,7 +33,8 @@ describe('test262', () => {
 
   it('invalid char range', () => {
     // 15.10.2.15-6-1
-    // TODO: /^[z-a]$/ - should throw, 'a' is less than 'z'
+    invalid('/^[z-a]$/', 'out of order');
+    invalid('/^[-z-a]$/', 'out of order');
   });
 
   it('invalid quantifier range', () => {

src/parser/generated/regexp-tree.js

@@ -274,6 +274,8 @@ const productions = [[-1,1,(_1,_1loc) => { __loc = yyloc(_1loc, _1loc);__ = _1 }
 [19,1,(_1,_1loc) => { __loc = yyloc(_1loc, _1loc); __ = [_1]  }],
 [19,2,(_1,_2,_1loc,_2loc) => { __loc = yyloc(_1loc, _2loc); __ = [_1].concat(_2)  }],
 [19,4,(_1,_2,_3,_4,_1loc,_2loc,_3loc,_4loc) => { __loc = yyloc(_1loc, _4loc);
+      checkClassRange(_1.value, _3.value);
+
       __ = [
         Node({
           type: 'ClassRange',
@@ -289,6 +291,8 @@ const productions = [[-1,1,(_1,_1loc) => { __loc = yyloc(_1loc, _1loc);__ = _1 }
 [20,1,(_1,_1loc) => { __loc = yyloc(_1loc, _1loc);__ = _1 }],
 [20,2,(_1,_2,_1loc,_2loc) => { __loc = yyloc(_1loc, _2loc); __ = [_1].concat(_2)  }],
 [20,4,(_1,_2,_3,_4,_1loc,_2loc,_3loc,_4loc) => { __loc = yyloc(_1loc, _4loc);
+      checkClassRange(_1.value, _3.value);
+
       __ = [
         Node({
           type: 'ClassRange',
@@ -845,6 +849,15 @@ function getRange(text) {
   return range;
 }
 
+/**
+ * Checks class range
+ */
+function checkClassRange(from, to) {
+  if (from > to) {
+    throw new SyntaxError(`Range ${from}-${to} out of order in character class`);
+  }
+}
+
 /**
  * Creates a character node.
  */

src/parser/regexp.bnf

@@ -174,6 +174,15 @@ function getRange(text) {
   return range;
 }
 
+/**
+ * Checks class range
+ */
+function checkClassRange(from, to) {
+  if (from > to) {
+    throw new SyntaxError(`Range ${from}-${to} out of order in character class`);
+  }
+}
+
 /**
  * Creates a character node.
  */
@@ -694,6 +703,8 @@ NonemptyClassRanges
 
   | ClassAtom DASH ClassAtom ClassRanges
     {
+      checkClassRange($1.value, $3.value);
+
       $$ = [
         Node({
           type: 'ClassRange',
@@ -715,6 +726,8 @@ NonemptyClassRangesNoDash
 
   | ClassAtomNoDash DASH ClassAtom ClassRanges
     {
+      checkClassRange($1.value, $3.value);
+
       $$ = [
         Node({
           type: 'ClassRange',