feat(plc4x/codegen): remove traces from single ticks on literals

apache · Nov 4, 2021 · 8580b51 · 8580b51
1 parent ecb4bb0
commit 8580b51
Show file tree

Hide file tree

Showing 29 changed files with 2,421 additions and 2,434 deletions.
diff --git a/...base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4 b/...base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4
@@ -202,12 +202,8 @@ innerExpression
  ;
 
 idExpression
- // TODO: remove the old superfluos ticks ASAP
- : TICK id=IDENTIFIER_LITERAL TICK
- | id=IDENTIFIER_LITERAL
+ : id=IDENTIFIER_LITERAL
  // Explicitly allow the loop type keywords in id-expressions
- // TODO: remove the old superfluos ticks ASAP
- | TICK id=ARRAY_LOOP_TYPE TICK
  | id=ARRAY_LOOP_TYPE
  ;
 

diff --git a/...a/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java b/...a/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
@@ -437,7 +437,6 @@ public void enterEnumValueDefinition(MSpecParser.EnumValueDefinitionContext ctx)
             for (int i = 0; i < numConstantValues; i++) {
                 MSpecParser.ArgumentContext argumentContext = parentCtx.params.argument(i);
                 String constantName = argumentContext.name.getText();
-                constantName = constantName.substring(1, constantName.length() - 1);
                 MSpecParser.ExpressionContext expression = ctx.constantValueExpressions.expression(i);
                 String constant = unquoteString(expression.getText());
                 // String expressions are double escaped

diff --git a/code-generation/protocol-base-mspec/src/test/resources/mspec.example b/code-generation/protocol-base-mspec/src/test/resources/mspec.example