From a4f831bc60ce2d4694ecff35f52948d1e25a4130 Mon Sep 17 00:00:00 2001 From: Jeff Avallone Date: Mon, 22 Dec 2014 16:28:46 -0500 Subject: [PATCH] Cleaning up some messy code in the grammar --- src/js/parser/javascript/grammar.peg | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/js/parser/javascript/grammar.peg b/src/js/parser/javascript/grammar.peg index d7fe88b..b05babe 100644 --- a/src/js/parser/javascript/grammar.peg +++ b/src/js/parser/javascript/grammar.peg @@ -12,10 +12,7 @@ grammar JavascriptRegexp repeat_spec <- ( "{" min:[0-9]+ "," max:[0-9]+ "}" / "{" min:[0-9]+ ",}" / "{" exact:[0-9]+ "}" ) - subexp <- "(" capture:( subexp_no_capture / subexp_positive_lookahead / subexp_negative_lookahead )? regexp ")" - subexp_no_capture <- "?:" - subexp_positive_lookahead <- "?=" - subexp_negative_lookahead <- "?!" + subexp <- "(" capture:( "?:" / "?=" / "?!" )? regexp ")" charset <- "[" invert:"^"? parts:( charset_range / charset_terminal )* "]" charset_range <- first:charset_range_terminal "-" last:charset_range_terminal charset_terminal <- charset_escape