diff --git a/antlr3-generated_sources.patch b/antlr3-generated_sources.patch
index bcfb028..57ae0fc 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 07:07:33.484142088 +0200
++++ tool/src/main/java/ActionAnalysis.tokens	2023-09-16 07:24:37.353550331 +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 07:07:34.314125482 +0200
++++ tool/src/main/java/ActionTranslator.tokens	2023-09-16 07:24:38.166867305 +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 07:07:32.747490159 +0200
++++ tool/src/main/java/ANTLR.tokens	2023-09-16 07:24:36.620231748 +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 07:07:33.407476955 +0200
++++ tool/src/main/java/ANTLRTreePrinter.tokens	2023-09-16 07:24:37.273551941 +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 07:07:33.787469352 +0200
++++ tool/src/main/java/ANTLRv3.tokens	2023-09-16 07:24:37.636877965 +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 07:07:34.994111877 +0200
++++ tool/src/main/java/ANTLRv3Tree.tokens	2023-09-16 07:24:38.943518349 +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 07:07:34.787449346 +0200
++++ tool/src/main/java/AssignTokenTypesWalker.tokens	2023-09-16 07:24:38.693523378 +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 07:07:34.480788814 +0200
++++ tool/src/main/java/CodeGenTreeWalker.tokens	2023-09-16 07:24:38.350196951 +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 07:07:34.704117679 +0200
++++ tool/src/main/java/DefineGrammarItemsWalker.tokens	2023-09-16 07:24:38.596858656 +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 07:07:34.587453347 +0200
++++ tool/src/main/java/LeftRecursiveRuleWalker.tokens	2023-09-16 07:24:38.470194537 +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 07:07:33.484142088 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/ActionAnalysis.java	2023-09-16 07:24:37.353550331 +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 07:07:34.314125482 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/ActionTranslator.java	2023-09-16 07:24:38.166867305 +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 07:07:33.220814023 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRLexer.java	2023-09-16 07:24:37.100222094 +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 07:07:32.744156892 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRParser.java	2023-09-16 07:24:36.616898482 +0200
 @@ -0,0 +1,10551 @@
 +// $ANTLR 3.5.3 org/antlr/grammar/v3/ANTLR.g 2023-09-15 00:00:00
 +
@@ -9264,7 +9264,7 @@
 +			// AST REWRITE
 +			// elements: a, cmt, gid, gr, ig, optionsSpec, r, scopes, ts
 +			// token labels: cmt
-+			// rule labels: a, r, gid, gr, scopes, ig, retval, ts
++			// rule labels: a, r, gid, scopes, gr, 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_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_gr=new RewriteRuleSubtreeStream(adaptor,"rule gr",gr!=null?gr.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);
@@ -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 07:07:33.404143688 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRTreePrinter.java	2023-09-16 07:24:37.273551941 +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 07:07:34.207460949 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Lexer.java	2023-09-16 07:24:38.060202784 +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 07:07:33.784136086 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Parser.java	2023-09-16 07:24:37.633544699 +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 07:07:34.994111877 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/ANTLRv3Tree.java	2023-09-16 07:24:38.943518349 +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 07:07:34.787449346 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/AssignTokenTypesWalker.java	2023-09-16 07:24:38.693523378 +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 07:07:34.477455548 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/CodeGenTreeWalker.java	2023-09-16 07:24:38.350196951 +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 07:07:34.700784413 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/DefineGrammarItemsWalker.java	2023-09-16 07:24:38.596858656 +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 07:07:34.587453347 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/LeftRecursiveRuleWalker.java	2023-09-16 07:24:38.466861270 +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 07:07:34.904113678 +0200
++++ tool/src/main/java/org/antlr/grammar/v3/TreeToNFAConverter.java	2023-09-16 07:24:38.846853627 +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 07:07:34.907446945 +0200
++++ tool/src/main/java/TreeToNFAConverter.tokens	2023-09-16 07:24:38.846853627 +0200
 @@ -0,0 +1,114 @@
 +ACTION=4
 +ACTION_CHAR_LITERAL=5