diff --git a/spec/parser/javascript/charset_range_spec.js b/spec/parser/javascript/charset_range_spec.js
index 329524e..e4d1b03 100644
--- a/spec/parser/javascript/charset_range_spec.js
+++ b/spec/parser/javascript/charset_range_spec.js
@@ -1,6 +1,7 @@
 import javascript from 'src/js/parser/javascript/parser.js';
 import util from 'src/js/util.js';
 import Q from 'q';
+import _ from 'lodash';
 
 describe('parser/javascript/charset_range.js', function() {
 
@@ -17,6 +18,20 @@ describe('parser/javascript/charset_range.js', function() {
     }));
   });
 
+  _.each([
+    '\\d-a',
+    '\\D-a',
+    '\\s-a',
+    '\\S-a',
+    '\\w-a',
+    '\\W-a'
+  ], str => {
+    it(`does not parse "${str}" as a CharsetRange`, function() {
+      var parser = new javascript.Parser(str);
+      expect(parser.__consume__charset_range()).toEqual(null);
+    });
+  });
+
   it('throws an exception when the range is out of order', function() {
     var parser = new javascript.Parser('z-a');
     expect(() => {
diff --git a/src/js/parser/javascript/grammar.peg b/src/js/parser/javascript/grammar.peg
index a4c739a..073fc7b 100644
--- a/src/js/parser/javascript/grammar.peg
+++ b/src/js/parser/javascript/grammar.peg
@@ -17,9 +17,11 @@ grammar JavascriptRegexp
   subexp_positive_lookahead <- "?="
   subexp_negative_lookahead <- "?!"
   charset <- "[" invert:"^"? parts:( charset_range / charset_terminal )* "]" <Charset>
-  charset_range <- first:charset_terminal "-" last:charset_terminal <CharsetRange>
+  charset_range <- first:charset_range_terminal "-" last:charset_range_terminal <CharsetRange>
   charset_terminal <- charset_escape <CharsetEscape>
                     / charset_literal <Literal>
+  charset_range_terminal <- charset_range_escape <CharsetEscape>
+                          / charset_literal <Literal>
   charset_escape <- "\\" esc:(
          code:[bdDfnrsStvwW] arg:""?
        / code:"c" arg:[a-zA-Z]
@@ -27,7 +29,16 @@ grammar JavascriptRegexp
        / code:"x" arg:( [0-9a-fA-F] [0-9a-fA-F] )
        / code:"u" arg:( [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] )
        / code:"0" arg:""? )
-  charset_literal <- ( ""? literal:[^\\\]] ) / ( literal:"\\" &"c" ) / ( "\\" literal:. )
+  charset_range_escape <- "\\" esc:(
+         code:[bfnrtv] arg:""?
+       / code:"c" arg:[a-zA-Z]
+       / code:"0" arg:[0-7]+
+       / code:"x" arg:( [0-9a-fA-F] [0-9a-fA-F] )
+       / code:"u" arg:( [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] )
+       / code:"0" arg:""? )
+  charset_literal <- ( ""? literal:[^\\\]] )
+                   / ( literal:"\\" &"c" )
+                   / ( "\\" literal:[^bdDfnrsStvwW] )
   terminal <- "." <AnyCharacter>
             / escape <Escape>
             / literal <Literal>
@@ -38,4 +49,6 @@ grammar JavascriptRegexp
        / code:"x" arg:( [0-9a-fA-F] [0-9a-fA-F] )
        / code:"u" arg:( [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] )
        / code:"0" arg:""? )
-  literal <- ( ""? literal:[^|\\/.\[\(\)?+*$^] ) / ( literal:"\\" &"c" ) / ( "\\" literal:. )
+  literal <- ( ""? literal:[^|\\/.\[\(\)?+*$^] )
+           / ( literal:"\\" &"c" )
+           / ( "\\" literal:. )