2023-09-16 04:49:33 +00:00
committed by Git OBS Bridge
parent d37bc05ee4
commit da06c80c3c
2 changed files with 52 additions and 30 deletions

View File

@@ -1,12 +1,12 @@
--- tool/src/main/java/ActionAnalysis.tokens 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/ActionAnalysis.tokens 2023-09-16 06:12:32.370276881 +0200
+++ tool/src/main/java/ActionAnalysis.tokens 2023-09-16 06:48:15.460663565 +0200
@@ -0,0 +1,4 @@
+ID=4
+X=5
+X_Y=6
+Y=7
--- tool/src/main/java/ActionTranslator.tokens 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/ActionTranslator.tokens 2023-09-16 06:12:33.176927225 +0200
+++ tool/src/main/java/ActionTranslator.tokens 2023-09-16 06:48:16.407311173 +0200
@@ -0,0 +1,34 @@
+ACTION=4
+ARG=5
@@ -43,7 +43,7 @@
+UNKNOWN_SYNTAX=36
+WS=37
--- tool/src/main/java/ANTLR.tokens 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/ANTLR.tokens 2023-09-16 06:12:31.633625120 +0200
+++ tool/src/main/java/ANTLR.tokens 2023-09-16 06:48:14.777343989 +0200
@@ -0,0 +1,114 @@
+ACTION=4
+ACTION_CHAR_LITERAL=5
@@ -160,7 +160,7 @@
+'throws'=92
+'tree'=95
--- tool/src/main/java/ANTLRTreePrinter.tokens 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/ANTLRTreePrinter.tokens 2023-09-16 06:12:32.296945031 +0200
+++ tool/src/main/java/ANTLRTreePrinter.tokens 2023-09-16 06:48:15.390664975 +0200
@@ -0,0 +1,114 @@
+ACTION=4
+ACTION_CHAR_LITERAL=5
@@ -277,7 +277,7 @@
+'throws'=92
+'tree'=95
--- tool/src/main/java/ANTLRv3.tokens 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/ANTLRv3.tokens 2023-09-16 06:12:32.643604684 +0200
+++ tool/src/main/java/ANTLRv3.tokens 2023-09-16 06:48:15.730658129 +0200
@@ -0,0 +1,128 @@
+T__67=67
+T__68=68
@@ -408,7 +408,7 @@
+'}'=92
+'~'=93
--- tool/src/main/java/ANTLRv3Tree.tokens 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/ANTLRv3Tree.tokens 2023-09-16 06:12:33.873579794 +0200
+++ tool/src/main/java/ANTLRv3Tree.tokens 2023-09-16 06:48:17.117296878 +0200
@@ -0,0 +1,128 @@
+T__67=67
+T__68=68
@@ -539,7 +539,7 @@
+'}'=92
+'~'=93
--- tool/src/main/java/AssignTokenTypesWalker.tokens 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/AssignTokenTypesWalker.tokens 2023-09-16 06:12:33.660250778 +0200
+++ tool/src/main/java/AssignTokenTypesWalker.tokens 2023-09-16 06:48:16.903967840 +0200
@@ -0,0 +1,115 @@
+ACTION=4
+ACTION_CHAR_LITERAL=5
@@ -657,7 +657,7 @@
+'throws'=92
+'tree'=95
--- tool/src/main/java/CodeGenTreeWalker.tokens 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/CodeGenTreeWalker.tokens 2023-09-16 06:12:33.350257051 +0200
+++ tool/src/main/java/CodeGenTreeWalker.tokens 2023-09-16 06:48:16.583974283 +0200
@@ -0,0 +1,114 @@
+ACTION=4
+ACTION_CHAR_LITERAL=5
@@ -774,7 +774,7 @@
+'throws'=92
+'tree'=95
--- tool/src/main/java/DefineGrammarItemsWalker.tokens 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/DefineGrammarItemsWalker.tokens 2023-09-16 06:12:33.573585865 +0200
+++ tool/src/main/java/DefineGrammarItemsWalker.tokens 2023-09-16 06:48:16.810636386 +0200
@@ -0,0 +1,114 @@
+ACTION=4
+ACTION_CHAR_LITERAL=5
@@ -891,7 +891,7 @@
+'throws'=92
+'tree'=95
--- tool/src/main/java/LeftRecursiveRuleWalker.tokens 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/LeftRecursiveRuleWalker.tokens 2023-09-16 06:12:33.456921559 +0200
+++ tool/src/main/java/LeftRecursiveRuleWalker.tokens 2023-09-16 06:48:16.697305334 +0200
@@ -0,0 +1,114 @@
+ACTION=4
+ACTION_CHAR_LITERAL=5
@@ -1008,7 +1008,7 @@
+'throws'=92
+'tree'=95
--- tool/src/main/java/org/antlr/grammar/v3/ActionAnalysis.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/ActionAnalysis.java 2023-09-16 06:12:32.366943615 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ActionAnalysis.java 2023-09-16 06:48:15.460663565 +0200
@@ -0,0 +1,442 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/ActionAnalysis.g 2023-09-15 00:00:00
+
@@ -1453,7 +1453,7 @@
+
+}
--- tool/src/main/java/org/antlr/grammar/v3/ActionTranslator.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/ActionTranslator.java 2023-09-16 06:12:33.176927225 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ActionTranslator.java 2023-09-16 06:48:16.407311173 +0200
@@ -0,0 +1,3600 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/ActionTranslator.g 2023-09-15 00:00:00
+
@@ -5056,7 +5056,7 @@
+
+}
--- tool/src/main/java/org/antlr/grammar/v3/ANTLRLexer.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRLexer.java 2023-09-16 06:12:32.113615408 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRLexer.java 2023-09-16 06:48:15.220668397 +0200
@@ -0,0 +1,3520 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/ANTLR.g 2023-09-15 00:00:00
+
@@ -8579,7 +8579,7 @@
+
+}
--- tool/src/main/java/org/antlr/grammar/v3/ANTLRParser.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRParser.java 2023-09-16 06:12:31.633625120 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRParser.java 2023-09-16 06:48:14.774010723 +0200
@@ -0,0 +1,10551 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/ANTLR.g 2023-09-15 00:00:00
+
@@ -19133,7 +19133,7 @@
+ public static final BitSet FOLLOW_ruleref_in_synpred1_ANTLR1936 = new BitSet(new long[]{0x0000000000000002L});
+}
--- tool/src/main/java/org/antlr/grammar/v3/ANTLRTreePrinter.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRTreePrinter.java 2023-09-16 06:12:32.293611766 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRTreePrinter.java 2023-09-16 06:48:15.387331708 +0200
@@ -0,0 +1,3622 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/ANTLRTreePrinter.g 2023-09-15 00:00:00
+
@@ -22758,7 +22758,7 @@
+ public static final BitSet FOLLOW_BANG_in_ast_suffix1807 = new BitSet(new long[]{0x0000000000000002L});
+}
--- tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Lexer.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Lexer.java 2023-09-16 06:12:33.070262717 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Lexer.java 2023-09-16 06:48:16.307313186 +0200
@@ -0,0 +1,3357 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/ANTLRv3.g 2023-09-15 00:00:00
+
@@ -26118,7 +26118,7 @@
+
+}
--- tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Parser.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Parser.java 2023-09-16 06:12:32.640271417 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Parser.java 2023-09-16 06:48:15.727324863 +0200
@@ -0,0 +1,9847 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/ANTLRv3.g 2023-09-15 00:00:00
+
@@ -35968,7 +35968,7 @@
+ public static final BitSet FOLLOW_rewrite_tree_alternative_in_synpred2_ANTLRv32659 = new BitSet(new long[]{0x0000000000000002L});
+}
--- tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Tree.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Tree.java 2023-09-16 06:12:33.873579794 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Tree.java 2023-09-16 06:48:17.113963612 +0200
@@ -0,0 +1,3771 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/ANTLRv3Tree.g 2023-09-15 00:00:00
+
@@ -39742,7 +39742,7 @@
+ public static final BitSet FOLLOW_ID_in_qid1436 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000200L});
+}
--- tool/src/main/java/org/antlr/grammar/v3/AssignTokenTypesWalker.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/AssignTokenTypesWalker.java 2023-09-16 06:12:33.656917512 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/AssignTokenTypesWalker.java 2023-09-16 06:48:16.900634574 +0200
@@ -0,0 +1,2936 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/AssignTokenTypesWalker.g 2023-09-15 00:00:00
+
@@ -42681,7 +42681,7 @@
+ public static final BitSet FOLLOW_atom_in_atom1152 = new BitSet(new long[]{0x0000000000000008L});
+}
--- tool/src/main/java/org/antlr/grammar/v3/CodeGenTreeWalker.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/CodeGenTreeWalker.java 2023-09-16 06:12:33.346923785 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/CodeGenTreeWalker.java 2023-09-16 06:48:16.580641016 +0200
@@ -0,0 +1,5305 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/CodeGenTreeWalker.g 2023-09-15 00:00:00
+
@@ -42692,7 +42692,7 @@
+import org.antlr.tool.*;
+import org.antlr.codegen.*;
+
+import java.util.HashSet;
+import java.util.TreeSet;
+import java.util.Set;
+import java.util.Collection;
+import java.util.Collections;
@@ -42868,7 +42868,7 @@
+ protected ST currentBlockST = null;
+ protected boolean currentAltHasASTRewrite = false;
+ protected int rewriteTreeNestingLevel = 0;
+ protected HashSet<Object> rewriteRuleRefs = null;
+ protected TreeSet<Object> rewriteRuleRefs = null;
+
+ public String getCurrentRuleName() {
+ return currentRuleName;
@@ -46532,7 +46532,7 @@
+ case 1 :
+ // org/antlr/grammar/v3/CodeGenTreeWalker.g:1241:5: ^(r= REWRITE (pred= SEMPRED )? alt= rewrite_alternative )
+ {
+ if ( state.backtracking==0 ) {rewriteRuleRefs = new HashSet<Object>();}
+ if ( state.backtracking==0 ) {rewriteRuleRefs = new TreeSet<Object>();}
+ r=(GrammarAST)match(input,REWRITE,FOLLOW_REWRITE_in_rewrite1717); if (state.failed) return retval;
+ match(input, Token.DOWN, null); if (state.failed) return retval;
+ // org/antlr/grammar/v3/CodeGenTreeWalker.g:1242:18: (pred= SEMPRED )?
@@ -47989,7 +47989,7 @@
+ public static final BitSet FOLLOW_element_action_in_synpred2_CodeGenTreeWalker1405 = new BitSet(new long[]{0x0000000000000002L});
+}
--- tool/src/main/java/org/antlr/grammar/v3/DefineGrammarItemsWalker.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/DefineGrammarItemsWalker.java 2023-09-16 06:12:33.573585865 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/DefineGrammarItemsWalker.java 2023-09-16 06:48:16.810636386 +0200
@@ -0,0 +1,4468 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/DefineGrammarItemsWalker.g 2023-09-15 00:00:00
+
@@ -52460,7 +52460,7 @@
+ public static final BitSet FOLLOW_dotLoop_in_synpred1_DefineGrammarItemsWalker1222 = new BitSet(new long[]{0x0000000000000002L});
+}
--- tool/src/main/java/org/antlr/grammar/v3/LeftRecursiveRuleWalker.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/LeftRecursiveRuleWalker.java 2023-09-16 06:12:33.453588293 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/LeftRecursiveRuleWalker.java 2023-09-16 06:48:16.693972068 +0200
@@ -0,0 +1,3240 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/LeftRecursiveRuleWalker.g 2023-09-15 00:00:00
+
@@ -55703,7 +55703,7 @@
+ public static final BitSet FOLLOW_suffix_in_synpred5_LeftRecursiveRuleWalker704 = new BitSet(new long[]{0x0000000000000002L});
+}
--- tool/src/main/java/org/antlr/grammar/v3/TreeToNFAConverter.java 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/org/antlr/grammar/v3/TreeToNFAConverter.java 2023-09-16 06:12:33.780248350 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/TreeToNFAConverter.java 2023-09-16 06:48:17.020632158 +0200
@@ -0,0 +1,4395 @@
+// $ANTLR 3.5.3 org/antlr/grammar/v3/TreeToNFAConverter.g 2023-09-15 00:00:00
+
@@ -60101,7 +60101,7 @@
+ public static final BitSet FOLLOW_testSetElement_in_testSetElement2000 = new BitSet(new long[]{0x0000000000000008L});
+}
--- tool/src/main/java/TreeToNFAConverter.tokens 1970-01-01 01:00:00.000000000 +0100
+++ tool/src/main/java/TreeToNFAConverter.tokens 2023-09-16 06:12:33.783581616 +0200
+++ tool/src/main/java/TreeToNFAConverter.tokens 2023-09-16 06:48:17.023965424 +0200
@@ -0,0 +1,114 @@
+ACTION=4
+ACTION_CHAR_LITERAL=5

View File

@@ -1,13 +1,26 @@
--- antlr3-3.5.3/tool/src/main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g 2023-09-15 20:06:39.620275234 +0200
+++ antlr3-3.5.3/tool/src/main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g 2023-09-15 20:07:19.236138007 +0200
@@ -56,6 +56,7 @@
import java.util.HashSet;
+++ antlr3-3.5.3/tool/src/main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g 2023-09-16 06:38:17.929360459 +0200
@@ -53,9 +53,10 @@
import org.antlr.tool.*;
import org.antlr.codegen.*;
-import java.util.HashSet;
+import java.util.TreeSet;
import java.util.Set;
import java.util.Collection;
+import java.util.Collections;
import org.antlr.runtime.BitSet;
import org.antlr.runtime.DFA;
import org.stringtemplate.v4.ST;
@@ -73,7 +74,7 @@
protected ST currentBlockST = null;
protected boolean currentAltHasASTRewrite = false;
protected int rewriteTreeNestingLevel = 0;
-protected HashSet<Object> rewriteRuleRefs = null;
+protected TreeSet<Object> rewriteRuleRefs = null;
public String getCurrentRuleName() {
return currentRuleName;
@@ -284,6 +285,7 @@
}
labels.add( label );
@@ -16,6 +29,15 @@
return labels;
}
@@ -1236,7 +1236,7 @@
}
: ^( REWRITES
(
- {rewriteRuleRefs = new HashSet<Object>();}
+ {rewriteRuleRefs = new TreeSet<Object>();}
^( r=REWRITE (pred=SEMPRED)? alt=rewrite_alternative)
{
rewriteBlockNestingLevel = OUTER_REWRITE_NESTING_LEVEL;
--- antlr3-3.5.3/tool/src/main/java/org/antlr/codegen/ACyclicDFACodeGenerator.java 2023-09-15 20:06:39.623608500 +0200
+++ antlr3-3.5.3/tool/src/main/java/org/antlr/codegen/ACyclicDFACodeGenerator.java 2023-09-16 06:04:09.530338104 +0200
@@ -33,6 +33,7 @@