corrected handling of IdentityEscape

uuverifiers · Jan 12, 2023 · fa81324 · fa81324
1 parent 9de37d3
commit fa81324
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/PP-patch b/PP-patch
@@ -64,8 +64,8 @@
 >   private static void pp(Double d, int _i_) { buf_.append(d); }
 >   private static void pp(String s, int _i_) { buf_.append(s); }
 >   private static void pp(Character c, int _i_) { buf_.append("'" + c.toString() + "'"); }
-3492,3495d3445
+3892,3895d3845
 <      while (buf_.length() > 0 && buf_.charAt(0) == ' ')
-<         buf_.deleteCharAt(0); 
+<         buf_.deleteCharAt(0);
 <     while (buf_.length() > 0 && buf_.charAt(buf_.length()-1) == ' ')
 <         buf_.deleteCharAt(buf_.length()-1);
diff --git a/build-publish.sh b/build-publish.sh
@@ -8,4 +8,5 @@ make ecma2020regex/Yylex.java ecma2020regex/sym.java ecma2020regex/parser.java
 patch ecma2020regex/PrettyPrinter.java PP-patch
 sed 's/PrettyPrinter/PrettyPrinterNonStatic/g' <ecma2020regex/PrettyPrinter.java | sed 's/static//g' >ecma2020regex/PrettyPrinterNonStatic.java
 
-mvn deploy
+#mvn deploy
+mvn package
diff --git a/ecma2020regex.cf b/ecma2020regex.cf
@@ -337,6 +337,9 @@ CodepointUniEscapeSequence. RegExpUnicodeEscapeSequenceC ::=
 
 SyntaxIdentifyEscape.        IdentityEscapeC ::= SyntaxCharacter;
 NormalCharIdentifyEscape.    IdentityEscapeC ::= ExtraNormalChar;
+SpecialNormalIdentityEscape. IdentityEscapeC ::= SpecialNormalChar;
+UnderscoreIdentityEscape.    IdentityEscapeC ::= "_";
+DashIdentityEscape.          IdentityEscapeC ::= "-";
 -- DecimalDigitIdentifyEscape.  IdentityEscapeC ::= DecimalDigit;
 
 -- DecimalEscape::
@@ -446,10 +449,12 @@ ClassAtomNoDashNeg4.  ClassAtomNoDashNegC ::= "\\" ClassEscapeC;
 -- CharacterEscape[?U]
 
 BClassEscape.     ClassEscapeC ::= "b";
-DashClassEscape.  ClassEscapeC ::= "-";
 CCEClassEscape.   ClassEscapeC ::= CharacterClassEscapeC;
 CEClassEscapeCE.  ClassEscapeC ::= CharacterEscapeC;
 
+-- Already handled in CharacterEscapeC
+-- DashClassEscape.  ClassEscapeC ::= "-";
+
 -- An as extension, we also handle octal escape strings within character classes
 --
 -- TODO: octal sequences should only be accepted for the range [0, 255]

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>uuverifiers</groupId>
   <artifactId>ecma2020-regex-parser</artifactId>
-  <version>0.6</version>
+  <version>0.7</version>
   <packaging>jar</packaging>
 
   <name>ecma2020-regex-parser</name>

diff --git a/target/ecma2020-regex-parser-0.6.jar b/target/ecma2020-regex-parser-0.6.jar
diff --git a/target/ecma2020-regex-parser-0.7.jar b/target/ecma2020-regex-parser-0.7.jar