refactor: fix code generation

Author: lppedd

antlr-kotlin-target/src/main/kotlin/org/antlr/v4/codegen/target/KotlinTarget.kt

@@ -5,7 +5,6 @@ package org.antlr.v4.codegen.target
 import org.antlr.v4.codegen.CodeGenerator
 import org.antlr.v4.codegen.Target
 import org.antlr.v4.codegen.UnicodeEscapes
-import org.antlr.v4.tool.Grammar
 
 public class KotlinTarget(codeGenerator: CodeGenerator) : JavaTarget(codeGenerator) {
   private companion object {
@@ -70,6 +69,7 @@ public class KotlinTarget(codeGenerator: CodeGenerator) : JavaTarget(codeGenerat
     addAll(kotlinKeywords)
     add("rule")
     add("parserRule")
+    add("ruleIndex")
   }
 
   override fun getVersion(): String =
@@ -92,13 +92,6 @@ public class KotlinTarget(codeGenerator: CodeGenerator) : JavaTarget(codeGenerat
   override fun appendUnicodeEscapedCodePoint(codePoint: Int, sb: StringBuilder): Unit =
     UnicodeEscapes.appendEscapedCodePoint(sb, codePoint, "Java")
 
-  override fun getTokenTypeAsTargetLabel(g: Grammar, ttype: Int): String {
-    // All tokens are namespaced inside a Tokens object.
-    // Here we simply force the qualification
-    val label = super.getTokenTypeAsTargetLabel(g, ttype)
-    return "Tokens.$label"
-  }
-
   override fun getTargetStringLiteralFromANTLRStringLiteral(
     generator: CodeGenerator,
     literal: String,

antlr-kotlin-target/src/main/resources/org/antlr/v4/tool/templates/codegen/Kotlin/Kotlin.stg

@@ -57,6 +57,7 @@ import org.antlr.v4.kotlinruntime.atn.ATN.Companion.INVALID_ALT_NUMBER
 import org.antlr.v4.kotlinruntime.dfa.*
 import org.antlr.v4.kotlinruntime.misc.*
 import org.antlr.v4.kotlinruntime.tree.*
+import kotlin.jvm.JvmField
 
 <parser>
 >>
@@ -416,11 +417,11 @@ LeftRecursiveRuleFunction(currentRule, args, code, locals, ruleCtx, altLabelCtxs
 <ruleCtx>
 <altLabelCtxs:{l | <altLabelCtxs.(l)>}; separator="\n">
 
-<if(currentRule.modifiers)><currentRule.modifiers:{f | <f> }><else>public<endif> fun <currentRule.name>(<args; separator=", ">): <currentRule.ctxType> {
-    return <currentRule.name>(0<currentRule.args:{a | , <a.name>}>)
+<if(currentRule.modifiers)><currentRule.modifiers:{f | <f> }><else>public<endif> fun <currentRule.escapedName>(<args; separator=", ">): <currentRule.ctxType> {
+    return <currentRule.escapedName>(0<currentRule.args:{a | , <a.name>}>)
 }
 
-private fun <currentRule.name>(_p: Int<args:{a | , <a>}>): <currentRule.ctxType> {
+private fun <currentRule.escapedName>(_p: Int<args:{a | , <a>}>): <currentRule.ctxType> {
     var _parentctx = context
     var _parentState = state
     var _localctx = <currentRule.ctxType>(context, _parentState<currentRule.args:{a | , <a.name>}>)
@@ -625,11 +626,11 @@ offsetShift(shiftAmount, offset) ::= <%
 
 // produces more efficient bytecode when bits.tokens contains at most two items
 bitsetInlineComparison(s, bits) ::= <%
-<bits.tokens:{t | <s.varName> == <t.name>}; separator=" || ">
+<bits.tokens:{t | <s.varName> == Tokens.<t.name>}; separator=" || ">
 %>
 
 cases(tokens) ::= <<
-<tokens:{t | <t.name>}; separator=", "> -> >>
+<tokens:{t | Tokens.<t.name>}; separator=", "> -> >>
 
 InvokeRule(r, argExprsChunks) ::= <<
 this.state = <r.stateNumber>
@@ -644,10 +645,10 @@ _ctx = <r.escapedName>(<if(r.ast.options.p)><r.ast.options.p><if(argExprsChunks)
 MatchToken(m) ::= <<
 this.state = <m.stateNumber>
 <if(m.labels)>
-_token = match(<m.name>)
+_token = match(Tokens.<m.name>)
 <m.labels:{l | <labelref(l)> = _token}; separator="\n">
 <else>
-match(<m.name>)
+match(Tokens.<m.name>)
 <endif>
 >>
 
@@ -726,13 +727,13 @@ ActionText(t) ::= "<t.text>"
 ActionTemplate(t) ::= "<t.st>"
 ArgRef(a) ::= "_localctx.<a.name>"
 LocalRef(a) ::= "_localctx.<a.name>"
-RetValueRef(a) ::= "_localctx.<a.name>"
+RetValueRef(a) ::= "_localctx.<a.escapedName>"
 QRetValueRef(a) ::= "<ctx(a)>.<a.dict>!!.<a.name>"
 
 /** How to translate $tokenLabel */
 TokenRef(t) ::= "<ctx(t)>.<t.name>"
 LabelRef(t) ::= "<ctx(t)>.<t.name>"
-ListLabelRef(t) ::= "<ctx(t)>.<ListLabelName(t.name)>"
+ListLabelRef(t) ::= "<ctx(t)>.<ListLabelName(t.escapedName)>"
 SetAttr(s, rhsChunks) ::= "<ctx(s)>.<s.name> = <rhsChunks>"
 
 TokenLabelType() ::= "<file.TokenLabelType; null={Token}>"
@@ -748,13 +749,13 @@ TokenPropertyRef_int(t) ::= "(<ctx(t)>.<t.label>?.text!!.toInt() ?: 0)"
 
 RulePropertyRef_start(r) ::= "(<ctx(r)>.<r.label>?.start)"
 RulePropertyRef_stop(r)	::= "(<ctx(r)>.<r.label>?.stop)"
-RulePropertyRef_text(r)	::= "(<ctx(r)>.<r.label>?.let { _input.getText(it.start!!, it.stop!!) })"
+RulePropertyRef_text(r)	::= "(<ctx(r)>.<r.label>?.let { _input.getText(it.start, it.stop) })"
 RulePropertyRef_ctx(r) ::= "<ctx(r)>.<r.label>"
 RulePropertyRef_parser(r) ::= "this"
 
 ThisRulePropertyRef_start(r) ::= "_localctx.start"
 ThisRulePropertyRef_stop(r) ::= "_localctx.stop"
-ThisRulePropertyRef_text(r) ::= "_input.getText(_localctx.start!!, _input.LT(-1)!!)"
+ThisRulePropertyRef_text(r) ::= "_input.getText(_localctx.start, _input.LT(-1))"
 ThisRulePropertyRef_ctx(r) ::= "_localctx"
 ThisRulePropertyRef_parser(r) ::= "this"
 
@@ -805,11 +806,11 @@ StructDecl(struct, ctorAttrs, attrs, getters, dispatchMethods, interfaces, exten
 public open class <struct.name> : <if(contextSuperClass)><contextSuperClass><else>ParserRuleContext<endif><if(interfaces)> : <interfaces; separator=", "><endif> {
     override val ruleIndex: Int = Rules.<struct.derivedFromName; format="cap">
 
-    <attrs:{a | public var <a>}; separator="\n">
+    <attrs:{a | @JvmField public var <a>}; separator="\n">
     <getters:{g | <g>}; separator="\n">
 
     public constructor(parent: ParserRuleContext?, invokingState: Int<ctorAttrs:{a | , <a>}>) : super(parent, invokingState) {
-        <struct.ctorAttrs:{a | this.<a.name> = <a.name>}; separator="\n">
+        <struct.ctorAttrs:{a | this.<a.escapedName> = <a.escapedName>}; separator="\n">
     }
 
     <! Don't need copy unless we have subclasses !>
@@ -818,7 +819,7 @@ public open class <struct.name> : <if(contextSuperClass)><contextSuperClass><els
 
     public fun copyFrom(ctx: <struct.name>) {
         super.copyFrom(ctx)
-        <struct.attrs:{a | this.<a.name> = ctx.<a.name>}; separator="\n">
+        <struct.attrs:{a | this.<a.escapedName> = ctx.<a.escapedName>}; separator="\n">
     }
     <endif>
     <dispatchMethods; separator="\n\n">
@@ -829,7 +830,7 @@ public open class <struct.name> : <if(contextSuperClass)><contextSuperClass><els
 
 AltLabelStructDecl(struct, attrs, getters, dispatchMethods) ::= <<
 public open class <struct.name> : <currentRule.name; format="cap">Context {
-    <attrs:{a | public var <a>}; separator="\n">
+    <attrs:{a | @JvmField public var <a>}; separator="\n">
     <getters:{g | <g>}; separator="\n">
 
     public constructor(ctx: <currentRule.name; format="cap">Context) {
@@ -963,7 +964,7 @@ public open class <lexer.name>(input: CharStream) : <superClass; null="Lexer">(i
     public object Modes {
         public const val DEFAULT_MODE: Int = 0
         <if(rest(lexer.modes))>
-        <rest(lexer.modes):{m | public const val <m>: Int = <i>}; separator="\n">
+        <rest(lexer.modes):{m | public const val <m; format="upper">: Int = <i>}; separator="\n">
         <endif>
     }