Fixed handling of empty lists when rendering the Python3 generated files

Signed-off-by: Phil Elson <[email protected]>
antlr · Oct 30, 2024 · b5e3997 · b5e3997
1 parent 7a89e15
commit b5e3997
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Python3/Python3.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Python3/Python3.stg
@@ -84,6 +84,7 @@ def exit<lname; format="cap">(self, ctx: <file.parserName>.<lname; format="cap">
 }; separator="\n">
 
 del <file.parserName>
+
 >>
 
 
@@ -108,6 +109,7 @@ def visit<lname; format="cap">(self, ctx: <file.parserName>.<lname; format="cap"
 }; separator="\n">
 
 del <file.parserName>
+
 >>
 
 
@@ -141,19 +143,19 @@ class <parser.name>(<if(superClass)><superClass><else>Parser<endif>):
     sharedContextCache = PredictionContextCache()
 
     literalNames = [
-        <parser.literalNames:{t | <t>}; null="\"\<INVALID>\"", separator=",\n", anchor>,
+        <parser.literalNames:{t | <t>};  null="\"\<INVALID>\"", separator=",\n", anchor><if(parser.literalNames)>,<endif>
     ]
 
     symbolicNames = [
-        <parser.symbolicNames:{t | <t>}; null="\"\<INVALID>\"", separator=",\n", anchor>,
+        <parser.symbolicNames:{t | <t>};  null="\"\<INVALID>\"", separator=",\n", anchor><if(parser.symbolicNames)>,<endif>
     ]
 
     <if(parser.rules)>
     <parser.rules:{r | RULE_<r.name> = <r.index>}; separator="\n", wrap, anchor>
     <endif>
 
     ruleNames = [
-        <parser.ruleNames:{r | "<r>"}; separator=",\n", wrap, anchor>,
+        <parser.ruleNames:{r | "<r>"}; separator=",\n", wrap, anchor><if(parser.ruleNames)>,<endif>
     ]
 
     EOF = <TokenLabelType()>.EOF
@@ -825,22 +827,21 @@ class <lexer.name>(<if(superClass)><superClass><else>Lexer<endif>):
     channelNames = [
         "DEFAULT_TOKEN_CHANNEL",
         "HIDDEN"<if (lexer.channelNames)>,
-        <lexer.channelNames:{c| "<c>"}; separator=",\n", anchor>
-        <endif>,
+        <lexer.channelNames:{c| "<c>"}; separator=",\n", anchor><endif>,
     ]
 
     modeNames = [
         <lexer.modes:{m| "<m>"}; separator=",\n", anchor>,
     ]
 
     literalNames = [
-        "\<INVALID>",
-        <lexer.literalNames:{t | <t>}; separator=",\n", anchor>,
+        "\<INVALID>"<if (lexer.literalNames)>,
+        <lexer.literalNames:{t | <t>}; separator=",\n", anchor><endif>,
     ]
 
     symbolicNames = [
-        "\<INVALID>",
-        <lexer.symbolicNames:{t | <t>}; separator=",\n", anchor>,
+        "\<INVALID>"<if (lexer.symbolicNames)>,
+        <lexer.symbolicNames:{t | <t>}; separator=",\n", anchor><endif>,
     ]
 
     ruleNames = [