diff --git a/antlr3-generated_sources.patch b/antlr3-generated_sources.patch index 33c4b0f..4a041f3 100644 --- a/antlr3-generated_sources.patch +++ b/antlr3-generated_sources.patch @@ -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 05:23:38.223945064 +0200 ++++ tool/src/main/java/ActionAnalysis.tokens 2023-09-16 05:51:02.782812914 +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 05:23:39.073938099 +0200 ++++ tool/src/main/java/ActionTranslator.tokens 2023-09-16 05:51:03.629462714 +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 05:23:37.500617658 +0200 ++++ tool/src/main/java/ANTLR.tokens 2023-09-16 05:51:02.066160525 +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 05:23:38.153945638 +0200 ++++ tool/src/main/java/ANTLRTreePrinter.tokens 2023-09-16 05:51:02.712814309 +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 05:23:38.530609217 +0200 ++++ tool/src/main/java/ANTLRv3.tokens 2023-09-16 05:51:03.046141001 +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 05:23:39.777247910 +0200 ++++ tool/src/main/java/ANTLRv3Tree.tokens 2023-09-16 05:51:04.369447971 +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 05:23:39.563928036 +0200 ++++ tool/src/main/java/AssignTokenTypesWalker.tokens 2023-09-16 05:51:04.139452554 +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 05:23:39.237270093 +0200 ++++ tool/src/main/java/CodeGenTreeWalker.tokens 2023-09-16 05:51:03.802792594 +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 05:23:39.470600591 +0200 ++++ tool/src/main/java/DefineGrammarItemsWalker.tokens 2023-09-16 05:51:04.049454346 +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 05:23:39.353935804 +0200 ++++ tool/src/main/java/LeftRecursiveRuleWalker.tokens 2023-09-16 05:51:03.916123669 +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 05:23:38.223945064 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/ActionAnalysis.java 2023-09-16 05:51:02.782812914 +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 05:23:39.073938099 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/ActionTranslator.java 2023-09-16 05:51:03.629462714 +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 05:23:37.983947030 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRLexer.java 2023-09-16 05:51:02.532817895 +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 05:23:37.497284351 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRParser.java 2023-09-16 05:51:02.062827258 +0200 @@ -0,0 +1,10551 @@ +// $ANTLR 3.5.3 org/antlr/grammar/v3/ANTLR.g 2023-09-15 00:00:00 + @@ -9262,9 +9262,9 @@ + + + // AST REWRITE -+ // elements: a, cmt, gid, ig, optionsSpec, r, scopes, ts, gr ++ // elements: a, cmt, gid, gr, ig, optionsSpec, r, scopes, ts + // token labels: cmt -+ // rule labels: a, r, gid, scopes, gr, ig, retval, ts ++ // rule labels: a, r, gid, gr, scopes, ig, retval, ts + // token list labels: + // rule list labels: + // wildcard labels: @@ -9274,8 +9274,8 @@ + RewriteRuleSubtreeStream stream_a=new RewriteRuleSubtreeStream(adaptor,"rule a",a!=null?a.getTree():null); + RewriteRuleSubtreeStream stream_r=new RewriteRuleSubtreeStream(adaptor,"rule r",r!=null?r.getTree():null); + RewriteRuleSubtreeStream stream_gid=new RewriteRuleSubtreeStream(adaptor,"rule gid",gid!=null?gid.getTree():null); -+ RewriteRuleSubtreeStream stream_scopes=new RewriteRuleSubtreeStream(adaptor,"rule scopes",scopes!=null?scopes.getTree():null); + RewriteRuleSubtreeStream stream_gr=new RewriteRuleSubtreeStream(adaptor,"rule gr",gr!=null?gr.getTree():null); ++ RewriteRuleSubtreeStream stream_scopes=new RewriteRuleSubtreeStream(adaptor,"rule scopes",scopes!=null?scopes.getTree():null); + RewriteRuleSubtreeStream stream_ig=new RewriteRuleSubtreeStream(adaptor,"rule ig",ig!=null?ig.getTree():null); + RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null); + RewriteRuleSubtreeStream stream_ts=new RewriteRuleSubtreeStream(adaptor,"rule ts",ts!=null?ts.getTree():null); @@ -11251,7 +11251,7 @@ + + + // AST REWRITE -+ // elements: aa, ex, optionsSpec, p1, p2, p4, rt, ruleActions, ruleAltList, ruleName, scopes, throwsSpec, p3 ++ // elements: aa, ex, optionsSpec, p1, p2, p3, p4, rt, ruleActions, ruleAltList, ruleName, scopes, throwsSpec + // token labels: aa, p1, p2, rt, p3, p4 + // rule labels: ex, ruleName, scopes, retval + // token list labels: @@ -11975,7 +11975,7 @@ + if ( state.backtracking==0 ) {if (LA(1)==OR||(LA(2)==QUESTION||LA(2)==PLUS||LA(2)==STAR)) prefixWithSynPred((a2!=null?((GrammarAST)a2.getTree()):null));} + + // AST REWRITE -+ // elements: r2, ruleAltList, a2 ++ // elements: a2, r2, ruleAltList + // token labels: + // rule labels: r2, a2, retval + // token list labels: @@ -12294,7 +12294,7 @@ + + + // AST REWRITE -+ // elements: alternative, block, optionsSpec, ruleActions, ACTION ++ // elements: ACTION, alternative, block, optionsSpec, ruleActions + // token labels: + // rule labels: retval + // token list labels: @@ -14675,7 +14675,7 @@ + + + // AST REWRITE -+ // elements: block, ROOT ++ // elements: ROOT, block + // token labels: + // rule labels: retval + // token list labels: @@ -14910,7 +14910,7 @@ + + + // AST REWRITE -+ // elements: c2, c1 ++ // elements: c1, c2 + // token labels: c1, c2 + // rule labels: retval + // token list labels: @@ -16596,7 +16596,7 @@ + if ( state.backtracking==0 ) stream_rewrite_alternative.add(rewrite_alternative166.getTree()); + + // AST REWRITE -+ // elements: rewrite_alternative, rewrite_with_sempred, REWRITE ++ // elements: REWRITE, rewrite_alternative, rewrite_with_sempred + // token labels: + // rule labels: retval + // token list labels: @@ -18343,7 +18343,7 @@ + + + // AST REWRITE -+ // elements: rewrite_template_args, id ++ // elements: id, rewrite_template_args + // token labels: + // rule labels: retval + // token list labels: @@ -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 05:23:38.153945638 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRTreePrinter.java 2023-09-16 05:51:02.709481042 +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 05:23:38.967272306 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Lexer.java 2023-09-16 05:51:03.522798172 +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 05:23:38.530609217 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Parser.java 2023-09-16 05:51:03.042807735 +0200 @@ -0,0 +1,9847 @@ +// $ANTLR 3.5.3 org/antlr/grammar/v3/ANTLRv3.g 2023-09-15 00:00:00 + @@ -26554,7 +26554,7 @@ + + + // AST REWRITE -+ // elements: DOC_COMMENT, attrScope, id, optionsSpec, rule, tokensSpec, action ++ // elements: DOC_COMMENT, action, attrScope, id, optionsSpec, rule, tokensSpec + // token labels: + // rule labels: retval + // token list labels: @@ -26865,7 +26865,7 @@ + + + // AST REWRITE -+ // elements: TOKEN_REF, lit, LABEL_ASSIGN ++ // elements: LABEL_ASSIGN, TOKEN_REF, lit + // token labels: lit + // rule labels: retval + // token list labels: @@ -27133,7 +27133,7 @@ + + + // AST REWRITE -+ // elements: AT, actionScopeName, id, ACTION ++ // elements: ACTION, AT, actionScopeName, id + // token labels: + // rule labels: retval + // token list labels: @@ -27410,7 +27410,7 @@ + + + // AST REWRITE -+ // elements: option, OPTIONS ++ // elements: OPTIONS, option + // token labels: + // rule labels: retval + // token list labels: @@ -28232,7 +28232,7 @@ + + + // AST REWRITE -+ // elements: AT, id, ACTION ++ // elements: ACTION, AT, id + // token labels: + // rule labels: retval + // token list labels: @@ -28522,7 +28522,7 @@ + + + // AST REWRITE -+ // elements: SCOPE, ACTION ++ // elements: ACTION, SCOPE + // token labels: + // rule labels: retval + // token list labels: @@ -28596,7 +28596,7 @@ + + + // AST REWRITE -+ // elements: id, SCOPE ++ // elements: SCOPE, id + // token labels: + // rule labels: retval + // token list labels: @@ -28683,7 +28683,7 @@ + + + // AST REWRITE -+ // elements: ACTION, id, SCOPE ++ // elements: ACTION, SCOPE, id + // token labels: + // rule labels: retval + // token list labels: @@ -29458,7 +29458,7 @@ + + + // AST REWRITE -+ // elements: 81, ARG_ACTION, ACTION ++ // elements: 81, ACTION, ARG_ACTION + // token labels: + // rule labels: retval + // token list labels: @@ -30004,7 +30004,7 @@ + { + + // AST REWRITE -+ // elements: id, labelOp, atom ++ // elements: atom, id, labelOp + // token labels: labelOp + // rule labels: retval + // token list labels: @@ -30177,7 +30177,7 @@ + { + + // AST REWRITE -+ // elements: id, labelOp, block ++ // elements: block, id, labelOp + // token labels: labelOp + // rule labels: retval + // token list labels: @@ -30249,7 +30249,7 @@ + if ( state.backtracking==0 ) stream_ebnfSuffix.add(ebnfSuffix97.getTree()); + + // AST REWRITE -+ // elements: ebnfSuffix, atom ++ // elements: atom, ebnfSuffix + // token labels: + // rule labels: retval + // token list labels: @@ -30872,7 +30872,7 @@ + + + // AST REWRITE -+ // elements: op, notSet ++ // elements: notSet, op + // token labels: op + // rule labels: retval + // token list labels: @@ -31018,7 +31018,7 @@ + + + // AST REWRITE -+ // elements: RULE_REF, op, ARG_ACTION ++ // elements: ARG_ACTION, RULE_REF, op + // token labels: op + // rule labels: retval + // token list labels: @@ -31202,7 +31202,7 @@ + + + // AST REWRITE -+ // elements: elementOptions, notTerminal, 93 ++ // elements: 93, elementOptions, notTerminal + // token labels: + // rule labels: retval + // token list labels: @@ -31267,7 +31267,7 @@ + + + // AST REWRITE -+ // elements: block, elementOptions, 93 ++ // elements: 93, block, elementOptions + // token labels: + // rule labels: retval + // token list labels: @@ -31693,7 +31693,7 @@ + if ( state.backtracking==0 ) stream_optionValue.add(optionValue124.getTree()); + + // AST REWRITE -+ // elements: LABEL_ASSIGN, optionValue, id ++ // elements: LABEL_ASSIGN, id, optionValue + // token labels: + // rule labels: retval + // token list labels: @@ -32098,7 +32098,7 @@ + + + // AST REWRITE -+ // elements: elementOptions, CHAR_LITERAL ++ // elements: CHAR_LITERAL, elementOptions + // token labels: + // rule labels: retval + // token list labels: @@ -32178,7 +32178,7 @@ + + + // AST REWRITE -+ // elements: TOKEN_REF, elementOptions, ARG_ACTION ++ // elements: ARG_ACTION, TOKEN_REF, elementOptions + // token labels: + // rule labels: retval + // token list labels: @@ -32246,7 +32246,7 @@ + + + // AST REWRITE -+ // elements: elementOptions, STRING_LITERAL ++ // elements: STRING_LITERAL, elementOptions + // token labels: + // rule labels: retval + // token list labels: @@ -32308,7 +32308,7 @@ + + + // AST REWRITE -+ // elements: elementOptions, 73 ++ // elements: 73, elementOptions + // token labels: + // rule labels: retval + // token list labels: @@ -32400,7 +32400,7 @@ + + + // AST REWRITE -+ // elements: terminal, BANG ++ // elements: BANG, terminal + // token labels: + // rule labels: retval + // token list labels: @@ -33025,7 +33025,7 @@ + if ( state.backtracking==0 ) stream_rewrite_alternative.add(last.getTree()); + + // AST REWRITE -+ // elements: predicated, preds, rew, rew2, last ++ // elements: last, predicated, preds, rew, rew2 + // token labels: rew2 + // rule labels: last, retval + // token list labels: rew, preds @@ -33043,7 +33043,7 @@ + // 357:9: -> ( ^( $rew $preds $predicated) )* ^( $rew2 $last) + { + // org/antlr/grammar/v3/ANTLRv3.g:357:12: ( ^( $rew $preds $predicated) )* -+ while ( stream_predicated.hasNext()||stream_rew.hasNext()||stream_preds.hasNext() ) { ++ while ( stream_predicated.hasNext()||stream_preds.hasNext()||stream_rew.hasNext() ) { + // org/antlr/grammar/v3/ANTLRv3.g:357:12: ^( $rew $preds $predicated) + { + CommonTree root_1 = (CommonTree)adaptor.nil(); @@ -33055,8 +33055,8 @@ + + } + stream_predicated.reset(); -+ stream_rew.reset(); + stream_preds.reset(); ++ stream_rew.reset(); + + // org/antlr/grammar/v3/ANTLRv3.g:357:40: ^( $rew2 $last) + { @@ -34144,7 +34144,7 @@ + if ( state.backtracking==0 ) stream_ebnfSuffix.add(ebnfSuffix156.getTree()); + + // AST REWRITE -+ // elements: rewrite_tree, ebnfSuffix ++ // elements: ebnfSuffix, rewrite_tree + // token labels: + // rule labels: retval + // token list labels: @@ -35076,7 +35076,7 @@ + + + // AST REWRITE -+ // elements: rewrite_template_args, ACTION ++ // elements: ACTION, rewrite_template_args + // token labels: + // rule labels: retval + // token list labels: @@ -35334,7 +35334,7 @@ + + + // AST REWRITE -+ // elements: id, ACTION ++ // elements: ACTION, id + // token labels: + // rule labels: retval + // token list labels: @@ -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 05:23:39.777247910 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Tree.java 2023-09-16 05:51:04.369447971 +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 05:23:39.563928036 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/AssignTokenTypesWalker.java 2023-09-16 05:51:04.139452554 +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 05:23:39.237270093 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/CodeGenTreeWalker.java 2023-09-16 05:51:03.799459327 +0200 @@ -0,0 +1,5305 @@ +// $ANTLR 3.5.3 org/antlr/grammar/v3/CodeGenTreeWalker.g 2023-09-15 00:00:00 + @@ -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 05:23:39.470600591 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/DefineGrammarItemsWalker.java 2023-09-16 05:51:04.046121079 +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 05:23:39.350602498 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/LeftRecursiveRuleWalker.java 2023-09-16 05:51:03.916123669 +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 05:23:39.683920465 +0200 ++++ tool/src/main/java/org/antlr/grammar/v3/TreeToNFAConverter.java 2023-09-16 05:51:04.272783231 +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 05:23:39.683920465 +0200 ++++ tool/src/main/java/TreeToNFAConverter.tokens 2023-09-16 05:51:04.272783231 +0200 @@ -0,0 +1,114 @@ +ACTION=4 +ACTION_CHAR_LITERAL=5 diff --git a/reproducible-order.patch b/reproducible-order.patch index ef3e1b7..be22997 100644 --- a/reproducible-order.patch +++ b/reproducible-order.patch @@ -1,5 +1,5 @@ ---- antlr3-3.5.3/tool/src/main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g 2023-09-15 17:54:38.044172037 +0200 -+++ antlr3-3.5.3/tool/src/main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g 2023-09-15 17:58:10.758972706 +0200 +--- 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; import java.util.Set; @@ -16,3 +16,31 @@ return labels; } +--- 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 labels = edge.label.getSet().toList(); ++ Collections.sort(labels); + List targetLabels = new ArrayList(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];