Fix: Tokens are no longer implicitly defined in antlr parser grammar …

…when they originate from a ConstantGroup
MontiCore · Sep 5, 2023 · debed84 · debed84
1 parent 508e8d8
commit debed84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/monticore-generator/src/main/java/de/monticore/codegen/parser/antlr/Grammar2Antlr.java b/monticore-generator/src/main/java/de/monticore/codegen/parser/antlr/Grammar2Antlr.java
@@ -371,7 +371,7 @@ public void handle(ASTConstantGroup ast) {
         } else if (grammarInfo.getKeywordRules().contains(x.getName())) {
           addToCodeSection(parserHelper.getKeyRuleName(x.getName()));
         } else {
-          addToCodeSection("'" + x.getName() + "'");
+          addToCodeSection(parserHelper.getLexSymbolName(x.getName()));
         }
 
         if (embeddedJavaCode) {

diff --git a/...test/it/src/main/grammars/mc/feature/constantgroups/SpecialLexerTokensInConstantGroup.mc4 b/...test/it/src/main/grammars/mc/feature/constantgroups/SpecialLexerTokensInConstantGroup.mc4
@@ -0,0 +1,7 @@
+/* (c) https://github.com/MontiCore/monticore */
+package mc.feature.constantgroups;
+
+grammar SpecialLexerTokensInConstantGroup {
+    Start = ALTQUESTION bar:["?" | "!"];
+    token ALTQUESTION = '?';
+}