feat: update javacc to 7.0.12

.editorconfig

@@ -0,0 +1,29 @@
+root = true
+
+[*]
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+
+[*.md]
+indent_size = 2
+trim_trailing_whitespace = false
+
+[{*.sh,gradlew}]
+end_of_line = lf
+
+[{*.bat,*.cmd}]
+end_of_line = crlf
+
+[{*.kts,*.kt}]
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+ij_kotlin_name_count_to_use_star_import = 999
+ij_kotlin_name_count_to_use_star_import_for_members = 999
+
+[*.java]
+# Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
+#"static ", "java.", "org.javacc.", ""
+ij_java_imports_layout = $*,|,java.**,|,org.javacc.**,|,*
+#ij_java_use_single_class_imports = true
+indent_size = 2

.gitattributes

@@ -0,0 +1,20 @@
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.java   text
+*.jj     text
+*.jjt    text
+*.html   text
+*.css    text
+*.js     text
+*.sql    text
+*.q      text
+
+# Note: executable is a non-standard attribute, and it is used by the release plugin
+*.sh     text eol=lf executable
+*.cgi    text eol=lf executable
+
+*.bat    text eol=crlf
+*.cmd    text eol=crlf
+
+/contributors merge=union

.travis.yml

@@ -0,0 +1,6 @@
+language: java
+jdk: openjdk8
+install:
+  - skip
+script:
+  - mvn test -B -Dgpg.skip=true

src/org/javacc/parser/test/NfaStateTest.java → NfaStateTest.java

@@ -4,6 +4,7 @@
 import java.io.StringWriter;
 
 import org.javacc.JavaCCTestCase;
+import org.javacc.parser.CodeGenerator;
 import org.javacc.parser.JavaCCGlobals;
 import org.javacc.parser.JavaCCParser;
 import org.javacc.parser.LexGen;
@@ -55,7 +56,7 @@ protected void setupState() throws Exception {
     JavaCCGlobals.jjtreeGenerated = JavaCCGlobals.isGeneratedBy("JJTree", parserInput);
     JavaCCGlobals.toolNames = JavaCCGlobals.getToolNames(parserInput);
     Semanticize.start();
-    LexGen.start();
+    new LexGen().start();
   }
   /**
    * Test method for {@link org.javacc.parser.NfaState#ReInit()}.
@@ -119,39 +120,37 @@ public void testGenerateInitMoves() {
    *     DumpStateSets(java.io.PrintWriter)}.
    */
   public void testDumpStateSets() {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
-    NfaState.DumpStateSets(contentWriter);
-    assertEquals("static final int[] jjnextStates = {\n};\n" ,
-            output.toString().replaceAll("\r", ""));
+    CodeGenerator cg = new CodeGenerator();
+    NfaState.DumpStateSets(cg);
+    String result = cg.getGeneratedCode().replaceAll("\r", "");
+    assertEquals("static final int[] jjnextStates = {\n};\n\n" , result);
   }
 
   /**
    * Test method for {@link org.javacc.parser.NfaState#
    *     DumpStateSets(java.io.PrintWriter)}.
    */
   public void testDumpStateSetsInitialised() throws Exception {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
+    CodeGenerator cg = new CodeGenerator();
     setupState();
-    NfaState.DumpStateSets(contentWriter);
+    NfaState.DumpStateSets(cg);
     assertEquals("static final int[] jjnextStates = {\n" +
         "   34, 35, 12, 38, 39, 42, 43, 23, 24, 26, 14, 16, 49, 51, 6, 52, \n" +
         "   59, 8, 9, 12, 23, 24, 28, 26, 34, 35, 12, 44, 45, 12, 53, 54, \n" +
         "   60, 61, 62, 10, 11, 17, 18, 20, 25, 27, 29, 36, 37, 40, 41, 46, \n" +
         "   47, 55, 56, 57, 58, 63, 64, \n" +
         "};\n" ,
-        output.toString().replaceAll("\r", ""));
+        cg.getGeneratedCode().replaceAll("\r", ""));
   }
 
   /**
    * Test method for {@link org.javacc.parser.NfaState#
    *     DumpCharAndRangeMoves(java.io.PrintWriter)}.
    */
   public void testDumpCharAndRangeMoves() throws Exception {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
-    NfaState.DumpCharAndRangeMoves(contentWriter);
+    CodeGenerator cg = new CodeGenerator();
+    NfaState.DumpCharAndRangeMoves(cg);
+    String result = cg.getGeneratedCode().replaceAll("\r", "");
     assertEquals(
         "         int i2 = (curChar & 0xff) >> 6;\n" +
         "         long l2 = 1L << (curChar & 077);\n" +
@@ -161,19 +160,18 @@ public void testDumpCharAndRangeMoves() throws Exception {
         "            {\n" +
         "               default : break;\n" +
         "            }\n" +
-        "         } while(i != startsAt);\n"
-        ,output.toString().replaceAll("\r", ""));
+        "         } while(i != startsAt);\n\n"
+        , result);
   }
 
   /**
    * Test method for {@link org.javacc.parser.NfaState#
    *     DumpCharAndRangeMoves(java.io.PrintWriter)}.
    */
   public void testDumpCharAndRangeMovesInitialised() throws Exception {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
+    CodeGenerator cg = new CodeGenerator();
     setupState();
-    NfaState.DumpCharAndRangeMoves(contentWriter);
+    NfaState.DumpCharAndRangeMoves(cg);
     assertEquals(
         "         int hiByte = (int)(curChar >> 8);\n" +
         "         int i1 = hiByte >> 6;\n" +
@@ -187,29 +185,28 @@ public void testDumpCharAndRangeMovesInitialised() throws Exception {
         "               default : break;\n" +
         "            }\n" +
         "         } while(i != startsAt);\n"
-        ,output.toString().replaceAll("\r", ""));
+        ,cg.getGeneratedCode().replaceAll("\r", ""));
   }
 
   /**
    * Test method for {@link org.javacc.parser.NfaState#
    *     DumpNonAsciiMoveMethods(java.io.PrintWriter)}.
    */
   public void testDumpNonAsciiMoveMethods() {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
-    NfaState.DumpNonAsciiMoveMethods(contentWriter);
-    assertEquals("", output.toString());
+    CodeGenerator cg = new CodeGenerator();
+    NfaState.DumpNonAsciiMoveMethods(cg);
+    String result = cg.getGeneratedCode();
+    assertEquals("", result);
   }
 
   /**
    * Test method for {@link org.javacc.parser.NfaState#
    *     DumpNonAsciiMoveMethods(java.io.PrintWriter)}.
    */
   public void testDumpNonAsciiMoveMethodsInitialised() throws Exception {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
+    CodeGenerator cg = new CodeGenerator();
     setupState();
-    NfaState.DumpNonAsciiMoveMethods(contentWriter);
+    NfaState.DumpNonAsciiMoveMethods(cg);
     assertEquals("private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)\n" +
         "{\n" +
         "   switch(hiByte)\n" +
@@ -389,22 +386,22 @@ public void testDumpNonAsciiMoveMethodsInitialised() throws Exception {
         "            return true;\n" +
         "         return false;\n" +
         "   }\n" +
-        "}\n", output.toString().replaceAll("\r", ""));
+        "}\n", cg.getGeneratedCode().replaceAll("\r", ""));
   }
 
   /**
    * Test method for {@link org.javacc.parser.NfaState#DumpMoveNfa(java.io.PrintWriter)}.
    */
   public void testDumpMoveNfa() {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
+    CodeGenerator cg = new CodeGenerator();
     try {
-      NfaState.DumpMoveNfa(contentWriter);
+      NfaState.DumpMoveNfa(cg);
       fail("Should have bombed");
     } catch (ArrayIndexOutOfBoundsException e) {
       e = null;
     }
-    assertEquals("", output.toString());
+    String result = cg.getGeneratedCode();
+    assertEquals("", result);
     /*
      assertEquals("static private final void jjCheckNAdd(int state)\n" +
         "{\n" +
@@ -436,45 +433,43 @@ public void testDumpMoveNfa() {
         "   jjCheckNAdd(jjnextStates[start]);\n" +
         "   jjCheckNAdd(jjnextStates[start + 1]);\n" +
         "}\n" +
-        "", output.toString());
+        "", cg.getGeneratedCode());
         */
   }
 
   /**
    * Test method for {@link org.javacc.parser.NfaState#DumpMoveNfa(java.io.PrintWriter)}.
    */
   public void testDumpMoveNfaInitialised() throws Exception {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
+    CodeGenerator cg = new CodeGenerator();
     setupState();
-    NfaState.DumpMoveNfa(contentWriter);
+    NfaState.DumpMoveNfa(cg);
     assertEquals("private int jjMoveNfa_3(int startState, int curPos)\n" +
         "{\n" +
         "   return curPos;\n" +
-        "}\n", output.toString().replaceAll("\r", ""));
+        "}\n", cg.getGeneratedCode().replaceAll("\r", ""));
   }
 
   /**
    * Test method for {@link org.javacc.parser.NfaState#
    *     DumpStatesForState(java.io.PrintWriter)}.
    */
   public void testDumpStatesForState() throws Exception {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
-    NfaState.DumpStatesForState(contentWriter);
-    assertEquals("protected static final int[][][] statesForState = null;\n" ,
-            output.toString().replaceAll("\r", ""));
+    CodeGenerator cg = new CodeGenerator();
+    NfaState.DumpStatesForState(cg);
+    String result = cg.getGeneratedCode().replaceAll("\r", "");
+    assertEquals("protected static final int[][][] statesForState = null;\n" , result);
   }
 
   /**
    * Test method for {@link org.javacc.parser.NfaState#
    *     DumpStatesForState(java.io.PrintWriter)}.
    */
   public void testDumpStatesForStateInitialised() throws Exception {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
+    CodeGenerator cg = new CodeGenerator();
     setupState();
-    NfaState.DumpStatesForState(contentWriter);
+    NfaState.DumpStatesForState(cg);
+    String result = cg.getGeneratedCode().replaceAll("\r", "");
     assertEquals("protected static final int[][][] statesForState = {\n" +
         " {\n" +
         "   { 0 },\n" +
@@ -552,30 +547,29 @@ public void testDumpStatesForStateInitialised() throws Exception {
         " null,\n" +
         " null,\n" +
         "\n" +
-        "};\n",
-        output.toString().replaceAll("\r", ""));
+        "};\n\n",result
+        );
   }
 
   /**
    * Test method for {@link org.javacc.parser.NfaState#DumpStatesForKind(java.io.PrintWriter)}.
    */
   public void testDumpStatesForKind() {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
-    NfaState.DumpStatesForKind(contentWriter);
+    CodeGenerator cg = new CodeGenerator();
+    NfaState.DumpStatesForKind(cg);
+    String result = cg.getGeneratedCode().replaceAll("\r", "");
     assertEquals("protected static final int[][][] statesForState = null;\n" +
-                 "protected static final int[][] kindForState = null;\n" ,
-            output.toString().replaceAll("\r", ""));
+                 "protected static final int[][] kindForState = null;\n" , result);
   }
 
   /**
    * Test method for {@link org.javacc.parser.NfaState#DumpStatesForKind(java.io.PrintWriter)}.
    */
   public void testDumpStatesForKindInitialised() throws Exception {
-    StringWriter output = new StringWriter();
-    PrintWriter contentWriter = new PrintWriter(output);
+    CodeGenerator cg = new CodeGenerator();
     setupState();
-    NfaState.DumpStatesForKind(contentWriter);
+    NfaState.DumpStatesForKind(cg);
+    String result = cg.getGeneratedCode().replaceAll("\r", "");
     assertEquals("protected static final int[][][] statesForState = {\n" +
         " {\n" +
         "   { 0 },\n" +
@@ -665,8 +659,8 @@ public void testDumpStatesForKindInitialised() throws Exception {
         "{ 23, 23, 23},\n" +
         "null\n,\n" +
         "null\n\n" +
-        "};\n",
-            output.toString().replaceAll("\r", ""));
+        "};\n\n", result
+            );
   }