Update tests, mirror shift-java acceptDecimalEscape (#18)

Author: Protryon

src/index.js

@@ -60,7 +60,7 @@ class PatternAcceptorState {
     this.pattern = pattern;
     this.unicode = unicode;
     this.index = 0;
-    this.backreferences = [];
+    this.largestBackreference = 0;
     this.backreferenceNames = [];
     this.groupingNames = [];
     this.capturingGroups = 0;
@@ -70,6 +70,12 @@ class PatternAcceptorState {
     return this.index >= this.pattern.length;
   }
 
+  backreference(ref) {
+    if (ref > this.largestBackreference) {
+      this.largestBackreference = ref;
+    }
+  }
+
   nextCodePoint() {
     if (this.empty()) {
       return null;
@@ -190,10 +196,8 @@ export default (pattern, { unicode = false } = {}) => {
   let accepted = acceptDisjunction(state);
   if (accepted.matched) {
     if (state.unicode) {
-      for (let backreference of state.backreferences) {
-        if (backreference > state.capturingGroups) {
-          return false;
-        }
+      if (state.largestBackreference > state.capturingGroups) {
+        return false;
       }
     }
     if (state.groupingNames.length > 0 || state.unicode) {
@@ -209,12 +213,12 @@ export default (pattern, { unicode = false } = {}) => {
 
 const backtrackOnFailure = func => state => {
   let savedIndex = state.index;
-  let oldBackreferences = state.backreferences.slice(0);
+  let oldBackreference = state.largestBackreference;
   let oldCapturingGroups = state.capturingGroups;
   let val = func(state);
   if (!val.matched) {
     state.index = savedIndex;
-    state.backreferences = oldBackreferences;
+    state.largestBackreference = oldBackreference;
     state.capturingGroups = oldCapturingGroups;
   }
   return val;
@@ -428,13 +432,16 @@ const acceptGrouping = backtrackOnFailure(state => {
 });
 
 const acceptDecimalEscape = backtrackOnFailure(state => {
-  let firstDecimal = state.eatAny(...decimalDigits.slice(1));
+  let firstDecimal = state.eatAny(...decimalDigits);
   if (firstDecimal === null) {
     return { matched: false };
   }
+  if (firstDecimal === '0') {
+    return { matched: true };
+  }
   // we also accept octal escapes here, but it is impossible to tell if it is a octal escape until all parsing is complete.
   // octal escapes are handled in acceptCharacterEscape for classes
-  state.backreferences.push(parseInt(firstDecimal + (state.eatNaturalNumber() || '')));
+  state.backreference(parseInt(firstDecimal + (state.eatNaturalNumber() || '')));
   return { matched: true };
 });
 
@@ -648,12 +655,6 @@ const acceptCharacterClass = backtrackOnFailure(state => {
     subState => {
       return { matched: !!subState.eat('b'), value: 0x0008 };
     },
-    subState => {
-      if (!subState.unicode) {
-        return { matched: false };
-      }
-      return acceptDecimalEscape(subState);
-    },
     subState => {
       return { matched: subState.unicode && !!subState.eat('-'), value: '-'.charCodeAt(0) };
     },

test/literal-regexp-expression.js

@@ -183,7 +183,16 @@ suite('Parser', () => {
       /\k/
       /\k</
       /\k<x/
-      /\k<x>/`);
+      /\k<x>/
+      /[${'\\'}1-${'\\'}127]/
+      /[${'\\'}128-9]/
+      /[${'\\'}99-${'\\'}100]/
+      /[${'\\'}1279991-9]/
+      /[${'\\'}128-9]/
+      /[${'\\'}99-${'\\'}98]/
+      /[${'\\'}99-${'\\'}100]/
+      /${'\\'}10(1)(2)(3)(4)(5)(6)(7)(8)(9)/
+      /${'\\'}10(1)(2)(3)(4)(5)(6)(7)(8)(9)(10)/u`);
     const regexToFail = preprocessRegexList(String.raw`/[/
       /(?<=t|v|X|.|$||)*/
       /(?<!t|v|X|.|$||)*/
@@ -239,7 +248,11 @@ suite('Parser', () => {
       /(?<a>a)\k<x>/
       /\p{Script_Extensions}/u
       /\p{Ahom}/u
-      /\p{gc}/u`);
+      /\p{gc}/u
+      /[${'\\'}2-${'\\'}1]/
+      /[${'\\'}127-${'\\'}1]/
+      /[${'\\'}100-${'\\'}99]/
+      /${'\\'}10(1)(2)(3)(4)(5)(6)(7)(8)(9)/u`);
     regexToPass.forEach(args => testRegexSuccess(...args));
     regexToFail.forEach(args => testRegexFailure(...args));
   });