From 70789258abac085bda1f5644b0e395621e070488 Mon Sep 17 00:00:00 2001 From: Jeff Avallone Date: Fri, 19 Dec 2014 20:23:32 -0500 Subject: [PATCH] Removing CharsetLiteral It was no different from just Literal (and most likely won't be any different) --- src/js/parser/javascript.js | 2 -- src/js/parser/javascript/charset_literal.js | 6 ------ src/js/parser/javascript/grammar.peg | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 src/js/parser/javascript/charset_literal.js diff --git a/src/js/parser/javascript.js b/src/js/parser/javascript.js index c62baac..b5c3a3c 100644 --- a/src/js/parser/javascript.js +++ b/src/js/parser/javascript.js @@ -9,7 +9,6 @@ import Match from './javascript/match.js'; import MatchFragment from './javascript/match_fragment.js'; import Subexp from './javascript/subexp.js'; import Charset from './javascript/charset.js'; -import CharsetLiteral from './javascript/charset_literal.js'; import CharsetEscape from './javascript/charset_escape.js'; import CharsetRange from './javascript/charset_range.js'; import Literal from './javascript/literal.js'; @@ -28,7 +27,6 @@ parser.Parser.Match = { module: Match }; parser.Parser.MatchFragment = { module: MatchFragment }; parser.Parser.Subexp = { module: Subexp }; parser.Parser.Charset = { module: Charset }; -parser.Parser.CharsetLiteral = { module: CharsetLiteral }; parser.Parser.CharsetEscape = { module: CharsetEscape }; parser.Parser.CharsetRange = { module: CharsetRange }; parser.Parser.Literal = { module: Literal }; diff --git a/src/js/parser/javascript/charset_literal.js b/src/js/parser/javascript/charset_literal.js deleted file mode 100644 index a418d1b..0000000 --- a/src/js/parser/javascript/charset_literal.js +++ /dev/null @@ -1,6 +0,0 @@ -import _ from 'lodash'; -import Literal from './literal.js'; - -export default _.extend({}, Literal, { - type: 'literal' -}); diff --git a/src/js/parser/javascript/grammar.peg b/src/js/parser/javascript/grammar.peg index 12faf31..d9c0f6d 100644 --- a/src/js/parser/javascript/grammar.peg +++ b/src/js/parser/javascript/grammar.peg @@ -22,7 +22,7 @@ grammar JavascriptRegexp charset <- "[" invert:"^"? parts:( charset_range / charset_terminal )* "]" charset_range <- first:charset_terminal "-" last:charset_terminal charset_terminal <- charset_escape - / charset_literal + / charset_literal charset_escape <- "\\" esc:( code:[bdDfnrsStvwW] arg:""? / code:"0" arg:[0-7]+