Fix class control value (#9)

Author: Protryon

src/index.js

@@ -45,7 +45,10 @@ class PatternAcceptorState {
     if (this.empty()) {
       return null;
     }
-    return String.fromCodePoint(this.pattern.codePointAt(this.index));
+    if (this.unicode) {
+      return String.fromCodePoint(this.pattern.codePointAt(this.index));
+    }
+    return this.pattern.charAt(this.index);
   }
 
   skipCodePoint() {
@@ -344,7 +347,7 @@ const acceptCharacterEscape = anyOf(
     if (character === null) {
       return { matched: false };
     }
-    return { matched: true, value: character.codePointAt(0) % 32 };
+    return { matched: true, value: character.charCodeAt(0) % 32 };
   }),
   backtrackOnFailure(state => {
     if (!state.eat('0') || state.eatAny(...decimalDigits)) {
@@ -395,7 +398,7 @@ const acceptCharacterEscape = anyOf(
     if (value === null) {
       return { matched: false };
     }
-    return { matched: true, value: value.codePointAt(0) };
+    return { matched: true, value: value.charCodeAt(0) };
   }),
   state => {
     if (!state.unicode || !state.eat('/')) {
@@ -432,34 +435,43 @@ 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) };
     },
     backtrackOnFailure(subState => {
       if (subState.unicode || !subState.eat('c')) {
         return { matched: false };
       }
-      let eaten = subState.eatAny(...decimalDigits, '_');
-      return { matched: !!eaten, value: eaten };
+      let character = subState.eatAny(...decimalDigits, '_');
+      if (character === null) {
+        return { matched: false };
+      }
+      return { matched: true, value: character.charCodeAt(0) % 32 };
     }),
     acceptCharacterClassEscape,
     acceptCharacterEscape
   );
 
   const acceptClassAtomNoDash = localState => {
-    if (localState.eat('\\')) {
-      return anyOf(
-        acceptClassEscape,
-        backtrackOnFailure(subState => {
-          if (subState.match('c')) {
-            return { matched: true, value: 0x005C }; // reverse solidus
-          }
-          return { matched: false };
-        })
-      )(localState);
+    if (localState.match('\\')) {
+      let ret = backtrackOnFailure(subState => {
+        subState.eat('\\');
+        return acceptClassEscape(subState);
+      })(localState);
+      if (ret.matched) {
+        return ret;
+      } else if (!localState.match('\\c') || localState.unicode) {
+        return { matched: false };
+      }
     }
     let nextCodePoint = localState.nextCodePoint();
-    if (nextCodePoint === null) {
+    if (nextCodePoint === null || nextCodePoint === ']' || nextCodePoint === '-') {
       return { matched: false };
     }
     localState.skipCodePoint();
@@ -468,7 +480,7 @@ const acceptCharacterClass = backtrackOnFailure(state => {
 
   const acceptClassAtom = localState => {
     if (localState.eat('-')) {
-      return { matched: true, value: '-'.codePointAt(0) };
+      return { matched: true, value: '-'.charCodeAt(0) };
     }
     return acceptClassAtomNoDash(localState);
   };
@@ -499,7 +511,6 @@ const acceptCharacterClass = backtrackOnFailure(state => {
       return { matched: true };
     }
     return acceptNonEmptyClassRangesNoDash(localState);
-
   };
 
   const acceptNonEmptyClassRanges = localState => {

test/literal-regexp-expression.js

@@ -138,7 +138,7 @@ suite('Parser', () => {
       /{5,X}/
       /{5,10X}/
       /[\c5]/
-      /[\c10]/u
+      /[\c10]/
       /[\${'\\5'}]/
       /(?:)/
       /(?:X)/
@@ -161,7 +161,9 @@ suite('Parser', () => {
       /t{5/
       /[💩-💫]/u
       /[\u{1F4A9}-\u{1F4AB}]/u
-      /\c/`);
+      /[\c0-\c9]/
+      /\c/
+      /[\c]/`);
     const regexToFail = preprocessRegexList(String.raw`/[/
       /(?<=t|v|X|.|$||)/
       /(?<!t|v|X|.|$||)/
@@ -207,7 +209,12 @@ suite('Parser', () => {
       /5{5,1G}/u
       /\k/u
       /[💫-💩]/u
-      /[\u{1F4AB}-\u{1F4A9}]/u`);
+      /[\u{1F4AB}-\u{1F4A9}]/u
+      /[\c9-\c0]/
+      /[\c]/u
+      /[\c1]/u
+      /[\c10]/u
+      /[🌷-🌸]/`);
     regexToPass.forEach(args => testRegexSuccess(...args));
     regexToFail.forEach(args => testRegexFailure(...args));
   });