pool/antlr3
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=36

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-16 05:08:52 +00:00 committed by Git OBS Bridge
parent 17ba13e91e
commit c20f4aaabd
2 changed files with 29 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
antlr3-generated_sources.patch
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:54:52.092708677 +0200
+++ tool/src/main/java/ActionAnalysis.tokens 2023-09-16 07:07:33.484142088 +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:54:52.936025139 +0200
+++ tool/src/main/java/ActionTranslator.tokens 2023-09-16 07:07:34.314125482 +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:54:51.359390016 +0200
+++ tool/src/main/java/ANTLR.tokens 2023-09-16 07:07:32.747490159 +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:54:52.016043545 +0200
+++ tool/src/main/java/ANTLRTreePrinter.tokens 2023-09-16 07:07:33.407476955 +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:54:52.362703276 +0200
+++ tool/src/main/java/ANTLRv3.tokens 2023-09-16 07:07:33.787469352 +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:54:53.769341800 +0200
+++ tool/src/main/java/ANTLRv3Tree.tokens 2023-09-16 07:07:34.994111877 +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:54:53.502680469 +0200
+++ tool/src/main/java/AssignTokenTypesWalker.tokens 2023-09-16 07:07:34.787449346 +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:54:53.136021137 +0200
+++ tool/src/main/java/CodeGenTreeWalker.tokens 2023-09-16 07:07:34.480788814 +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:54:53.399349202 +0200
+++ tool/src/main/java/DefineGrammarItemsWalker.tokens 2023-09-16 07:07:34.704117679 +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:54:53.266018537 +0200
+++ tool/src/main/java/LeftRecursiveRuleWalker.tokens 2023-09-16 07:07:34.587453347 +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:54:52.092708677 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ActionAnalysis.java 2023-09-16 07:07:33.484142088 +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:54:52.936025139 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ActionTranslator.java 2023-09-16 07:07:34.314125482 +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:54:51.816047547 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRLexer.java 2023-09-16 07:07:33.220814023 +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:54:51.359390016 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRParser.java 2023-09-16 07:07:32.744156892 +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:54:52.012710278 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRTreePrinter.java 2023-09-16 07:07:33.404143688 +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:54:52.799361206 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Lexer.java 2023-09-16 07:07:34.207460949 +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:54:52.362703276 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Parser.java 2023-09-16 07:07:33.784136086 +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:54:53.766008534 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Tree.java 2023-09-16 07:07:34.994111877 +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:54:53.502680469 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/AssignTokenTypesWalker.java 2023-09-16 07:07:34.787449346 +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:54:53.132687871 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/CodeGenTreeWalker.java 2023-09-16 07:07:34.477455548 +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.TreeSet;
+import java.util.HashSet;
+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 TreeSet<Object> rewriteRuleRefs = null;
+ protected HashSet<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 TreeSet<Object>();}
+ if ( state.backtracking==0 ) {rewriteRuleRefs = new HashSet<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:54:53.396015935 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/DefineGrammarItemsWalker.java 2023-09-16 07:07:34.700784413 +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:54:53.266018537 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/LeftRecursiveRuleWalker.java 2023-09-16 07:07:34.587453347 +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:54:53.649344201 +0200
+++ tool/src/main/java/org/antlr/grammar/v3/TreeToNFAConverter.java 2023-09-16 07:07:34.904113678 +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:54:53.649344201 +0200
+++ tool/src/main/java/TreeToNFAConverter.tokens 2023-09-16 07:07:34.907446945 +0200
@@ -0,0 +1,114 @@
+ACTION=4
+ACTION_CHAR_LITERAL=5

54
reproducible-order.patch
View File

@ -1,26 +1,13 @@
--- 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-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;
@@ -56,6 +56,7 @@
import java.util.HashSet;
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 );
@ -29,40 +16,3 @@
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 @@
import org.stringtemplate.v4.ST;
import org.stringtemplate.v4.STGroup;
+import java.util.Collections;
import java.util.List;
public class ACyclicDFACodeGenerator {
@@ -114,6 +115,7 @@
// If the template wants all the label values delineated, do that
if ( edgeST.impl.formalArguments.get("labels")!=null ) {
List<Integer> labels = edge.label.getSet().toList();
+ Collections.sort(labels);
List<String> targetLabels = new ArrayList<String>(labels.size());
for (int j = 0; j < labels.size(); j++) {
Integer vI = labels.get(j);
--- antlr3-3.5.3/tool/src/main/java/org/antlr/codegen/CodeGenerator.java 2023-09-15 20:06:39.623608500 +0200
+++ antlr3-3.5.3/tool/src/main/java/org/antlr/codegen/CodeGenerator.java 2023-09-16 06:02:44.522033399 +0200
@@ -587,6 +588,7 @@
BitSet bits = BitSet.of(follow.tokenTypeSet);
words = bits.toPackedArray();
tokenTypeList = follow.tokenTypeSet.toList();
+ Collections.sort(tokenTypeList);
}
// use the target to convert to hex strings (typically)
String[] wordStrings = new String[words.length];