Update to ANTLR 4.2.2

sharwell · sharwell · commit e2c2ac64bf21 · 2014-04-08T07:45:08.000-05:00
diff --git a/org-antlr-netbeans/nbproject/project.xml b/org-antlr-netbeans/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>4</release-version>
-                        <specification-version>4.2.1</specification-version>
+                        <specification-version>4.2.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/org-antlr-v4-annotations/build.xml b/org-antlr-v4-annotations/build.xml
@@ -8,7 +8,7 @@
 
     <target name="init-artifact">
         <property name="artifact.name" value="antlr4_annotations"/>
-        <property name="artifact.commit" value="4.2.1"/>
+        <property name="artifact.commit" value="4.2.2"/>
         <property name="modules.ext.dir" value="release/modules/ext"/>
         <property name="artifact.file" value="${modules.ext.dir}/${artifact.name}.jar"/>
     </target>
diff --git a/org-antlr-v4-annotations/manifest.mf b/org-antlr-v4-annotations/manifest.mf
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.antlr.v4.annotations/4
 OpenIDE-Module-Localizing-Bundle: org/antlr/v4/annotations/Bundle.properties
-OpenIDE-Module-Specification-Version: 4.2.1
+OpenIDE-Module-Specification-Version: 4.2.2
 
diff --git a/org-antlr-v4-runtime/build.xml b/org-antlr-v4-runtime/build.xml
@@ -8,7 +8,7 @@
 
     <target name="init-artifact">
         <property name="artifact.name" value="antlr4_runtime"/>
-        <property name="artifact.commit" value="4.2.1"/>
+        <property name="artifact.commit" value="4.2.2"/>
         <property name="modules.ext.dir" value="release/modules/ext"/>
         <property name="artifact.file" value="${modules.ext.dir}/${artifact.name}.jar"/>
     </target>
diff --git a/org-antlr-v4-runtime/manifest.mf b/org-antlr-v4-runtime/manifest.mf
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.antlr.v4.runtime/4
 OpenIDE-Module-Localizing-Bundle: org/antlr/v4/runtime/Bundle.properties
-OpenIDE-Module-Specification-Version: 4.2.1
+OpenIDE-Module-Specification-Version: 4.2.2
 
diff --git a/org-antlr-v4-runtime/nbproject/project.xml b/org-antlr-v4-runtime/nbproject/project.xml
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>4</release-version>
-                        <specification-version>4.2.1</specification-version>
+                        <specification-version>4.2.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/org-antlr-v4/build.xml b/org-antlr-v4/build.xml
@@ -8,7 +8,7 @@
 
     <target name="init-artifact">
         <property name="artifact.name" value="antlr4"/>
-        <property name="artifact.commit" value="4.2.1"/>
+        <property name="artifact.commit" value="4.2.2"/>
         <property name="modules.ext.dir" value="release/modules/ext"/>
         <property name="artifact.file" value="${modules.ext.dir}/${artifact.name}.jar"/>
     </target>
diff --git a/org-antlr-v4/manifest.mf b/org-antlr-v4/manifest.mf
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.antlr.v4/4
 OpenIDE-Module-Localizing-Bundle: org/antlr/v4/Bundle.properties
-OpenIDE-Module-Specification-Version: 4.2.1
+OpenIDE-Module-Specification-Version: 4.2.2
 
diff --git a/org-antlr-v4/nbproject/project.xml b/org-antlr-v4/nbproject/project.xml
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>4</release-version>
-                        <specification-version>4.2.1</specification-version>
+                        <specification-version>4.2.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/org-antlr-works-editor/build.xml b/org-antlr-works-editor/build.xml
@@ -8,7 +8,7 @@
 
     <target name="init-complete-artifact">
         <property name="artifact.name" value="antlr4-complete"/>
-        <property name="artifact.commit" value="4.2.1"/>
+        <property name="artifact.commit" value="4.2.2"/>
         <property name="grammar.resources.dir" value="src/org/antlr/works/editor/grammar/resources"/>
         <property name="modules.cache.dir" value="lib/cache"/>
         <property name="artifact.intermediatefile" value="${modules.cache.dir}/${artifact.name}-${artifact.commit}.jar"/>
diff --git a/org-antlr-works-editor/nbproject/project.xml b/org-antlr-works-editor/nbproject/project.xml
@@ -48,7 +48,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>4</release-version>
-                        <specification-version>4.2.1</specification-version>
+                        <specification-version>4.2.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -57,7 +57,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>4</release-version>
-                        <specification-version>4.2.1</specification-version>
+                        <specification-version>4.2.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -66,7 +66,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>4</release-version>
-                        <specification-version>4.2.1</specification-version>
+                        <specification-version>4.2.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/works.editor.antlr3/nbproject/project.xml b/works.editor.antlr3/nbproject/project.xml
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>4</release-version>
-                        <specification-version>4.2.1</specification-version>
+                        <specification-version>4.2.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/works.editor.antlr4/nbproject/project.xml b/works.editor.antlr4/nbproject/project.xml
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>4</release-version>
-                        <specification-version>4.2.1</specification-version>
+                        <specification-version>4.2.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/works.editor.antlr4/src/org/antlr/works/editor/antlr4/completion/AbstractCompletionParserATNSimulator.java b/works.editor.antlr4/src/org/antlr/works/editor/antlr4/completion/AbstractCompletionParserATNSimulator.java
@@ -130,8 +130,8 @@ protected DFAState createDFAState(ATNConfigSet configs) {
     }
 
     @Override
-    protected void closure(ATNConfigSet sourceConfigs, ATNConfigSet configs, boolean collectPredicates, boolean hasMoreContext, PredictionContextCache contextCache) {
-        super.closure(sourceConfigs, configs, collectPredicates, hasMoreContext, contextCache);
+    protected void closure(ATNConfigSet sourceConfigs, ATNConfigSet configs, boolean collectPredicates, boolean hasMoreContext, PredictionContextCache contextCache, boolean treatEofAsEpsilon) {
+        super.closure(sourceConfigs, configs, collectPredicates, hasMoreContext, contextCache, treatEofAsEpsilon);
     }
 
     protected abstract IntervalSet getWordlikeTokenTypes();
diff --git a/works.editor.antlr4/src/org/antlr/works/editor/antlr4/completion/CodeCompletionErrorStrategy.java b/works.editor.antlr4/src/org/antlr/works/editor/antlr4/completion/CodeCompletionErrorStrategy.java
@@ -119,7 +119,7 @@ public Token recoverInline(Parser recognizer) throws RecognitionException {
 
             final boolean collectPredicates = false;
             final boolean hasMoreContext = true;
-            interp.closure(intermediate, closure, collectPredicates, hasMoreContext, PredictionContextCache.UNCACHED);
+            interp.closure(intermediate, closure, collectPredicates, hasMoreContext, PredictionContextCache.UNCACHED, false);
 
             if (!state.onlyHasEpsilonTransitions()) {
                 for (int i = 0; i < state.getNumberOfTransitions(); i++) {
