(plc4x) branch develop updated: refactor: Renamed the paddingField paddingCondition to timesPadding

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new d05711ab38 refactor: Renamed the paddingField paddingCondition to timesPadding
d05711ab38 is described below

commit d05711ab383c4d7af5cd72bd12fd4ef779f99cf9
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Fri Mar 22 22:29:10 2024 +0100

    refactor: Renamed the paddingField paddingCondition to timesPadding
---
 .../apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4 | 10 +++++-----
 .../language/mspec/parser/MessageFormatListener.java           |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code-generation/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4 b/code-generation/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4
index 8aedc30262..9272c0cb6a 100644
--- a/code-generation/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4
+++ b/code-generation/protocol-base-mspec/src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/MSpec.g4
@@ -76,6 +76,10 @@ arrayField
  : 'array' type=typeReference name=idExpression loopType=ARRAY_LOOP_TYPE loopExpression=expression
  ;
 
+assertField
+ : 'assert' type=typeReference name=idExpression condition=expression
+ ;
+
 checksumField
  : 'checksum' type=dataType name=idExpression checksumExpression=expression
  ;
@@ -96,10 +100,6 @@ implicitField
  : 'implicit' type=dataType name=idExpression serializeExpression=expression
  ;
 
-assertField
- : 'assert' type=typeReference name=idExpression condition=expression
- ;
-
 manualArrayField
  : 'manualArray' type=typeReference name=idExpression loopType=ARRAY_LOOP_TYPE loopExpression=expression parseExpression=expression serializeExpression=expression lengthExpression=expression
  ;
@@ -113,7 +113,7 @@ optionalField
  ;
 
 paddingField
- : 'padding' type=dataType name=idExpression paddingValue=expression paddingCondition=expression
+ : 'padding' type=dataType name=idExpression paddingValue=expression timesPadding=expression
  ;
 
 reservedField
diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
index d65001180d..93aecc7984 100644
--- a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
+++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/parser/MessageFormatListener.java
@@ -426,8 +426,8 @@ public class MessageFormatListener extends MSpecBaseListener implements LazyType
         SimpleTypeReference type = getSimpleTypeReference(ctx.type);
         String name = getIdString(ctx.name);
         Term paddingValue = getExpressionTerm(ctx.paddingValue);
-        Term paddingCondition = getExpressionTerm(ctx.paddingCondition);
-        Field field = new DefaultPaddingField(getAttributes(ctx), type, name, paddingValue, paddingCondition);
+        Term timesPadding = getExpressionTerm(ctx.timesPadding);
+        Field field = new DefaultPaddingField(getAttributes(ctx), type, name, paddingValue, timesPadding);
         if (parserContexts.peek() != null) {
             parserContexts.peek().add(field);
         }