- Removed the field args and replaced everything related with type ar…

…gs from square brackets to round brackets
apache · Oct 22, 2021 · ca05161 · ca05161
1 parent 3e1e1a4
commit ca05161
Show file tree

Hide file tree

Showing 23 changed files with 42 additions and 154 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
@@ -27,14 +27,14 @@ complexTypeDefinition
  ;
 
 complexType
- : 'type' name=idExpression (attributes=attributeList) (LBRACKET params=argumentList RBRACKET)? (fieldDefinition|batchSetDefinition)*
- | 'discriminatedType' name=idExpression (attributes=attributeList) (LBRACKET params=argumentList RBRACKET)? (fieldDefinition|batchSetDefinition)+
- | 'enum' (type=typeReference)? name=idExpression (attributes=attributeList) (LBRACKET params=argumentList RBRACKET)? enumValues=enumValueDefinition+
- | 'dataIo' name=idExpression (attributes=attributeList) (LBRACKET params=argumentList RBRACKET)? dataIoTypeSwitch=dataIoDefinition
+ : 'type' name=idExpression (attributes=attributeList) (LRBRACKET params=argumentList RRBRACKET)? (fieldDefinition|batchSetDefinition)*
+ | 'discriminatedType' name=idExpression (attributes=attributeList) (LRBRACKET params=argumentList RRBRACKET)? (fieldDefinition|batchSetDefinition)+
+ | 'enum' (type=typeReference)? name=idExpression (attributes=attributeList) (LRBRACKET params=argumentList RRBRACKET)? enumValues=enumValueDefinition+
+ | 'dataIo' name=idExpression (attributes=attributeList) (LRBRACKET params=argumentList RRBRACKET)? dataIoTypeSwitch=dataIoDefinition
  ;
 
 fieldDefinition
- : LBRACKET field (attributes=attributeList) (LBRACKET params=multipleExpressions RBRACKET)? RBRACKET
+ : LBRACKET field (attributes=attributeList) RBRACKET
  ;
 
 batchSetDefinition
@@ -138,7 +138,7 @@ enumValueDefinition
  ;
 
 typeReference
- : complexTypeReference=IDENTIFIER_LITERAL (LBRACKET params=multipleExpressions RBRACKET)?
+ : complexTypeReference=IDENTIFIER_LITERAL (LRBRACKET params=multipleExpressions RRBRACKET)?
  | simpleTypeReference=dataType
  ;
 
@@ -210,6 +210,8 @@ idExpression
 TICK : '\'';
 LBRACKET : '[';
 RBRACKET : ']';
+LRBRACKET : '(';
+RRBRACKET : ')';
 LCBRACKET : '{';
 RCBRACKET : '}';
 

diff --git a/.../apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultAbstractField.java b/.../apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultAbstractField.java
@@ -31,13 +31,11 @@ public class DefaultAbstractField extends DefaultField implements AbstractField
 
     private final TypeReference type;
     private final String name;
-    private final List<Term> params;
 
-    public DefaultAbstractField(Map<String, Term> attributes, TypeReference type, String name, List<Term> params) {
+    public DefaultAbstractField(Map<String, Term> attributes, TypeReference type, String name) {
         super(attributes);
         this.type = Objects.requireNonNull(type);
         this.name = Objects.requireNonNull(name);
-        this.params = params;
     }
 
     public TypeReference getType() {
@@ -48,8 +46,4 @@ public String getName() {
         return name;
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.ofNullable(params);
-    }
-
 }
diff --git a/...org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultArrayField.java b/...org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultArrayField.java
@@ -33,15 +33,13 @@ public class DefaultArrayField extends DefaultField implements ArrayField {
     private final String name;
     private final LoopType loopType;
     private final Term loopExpression;
-    private final List<Term> params;
 
-    public DefaultArrayField(Map<String, Term> attributes, TypeReference type, String name, LoopType loopType, Term loopExpression, List<Term> params) {
+    public DefaultArrayField(Map<String, Term> attributes, TypeReference type, String name, LoopType loopType, Term loopExpression) {
         super(attributes);
         this.type = Objects.requireNonNull(type);
         this.name = Objects.requireNonNull(name);
         this.loopType = Objects.requireNonNull(loopType);
         this.loopExpression = Objects.requireNonNull(loopExpression);
-        this.params = params;
     }
 
     public TypeReference getType() {
@@ -60,9 +58,4 @@ public Term getLoopExpression() {
         return loopExpression;
     }
 
-    @Override
-    public Optional<List<Term>> getParams() {
-        return Optional.ofNullable(params);
-    }
-
 }
diff --git a/...rg/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultAssertField.java b/...rg/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultAssertField.java
@@ -32,14 +32,12 @@ public class DefaultAssertField extends DefaultField implements AssertField {
     private final TypeReference type;
     private final String name;
     private final Term conditionExpression;
-    private final List<Term> params;
 
-    public DefaultAssertField(Map<String, Term> attributes, TypeReference type, String name, Term conditionExpression, List<Term> params) {
+    public DefaultAssertField(Map<String, Term> attributes, TypeReference type, String name, Term conditionExpression) {
         super(attributes);
         this.type = Objects.requireNonNull(type);
         this.name = Objects.requireNonNull(name);
         this.conditionExpression = Objects.requireNonNull(conditionExpression);
-        this.params = params;
     }
 
     public TypeReference getType() {
@@ -54,9 +52,4 @@ public Term getConditionExpression() {
         return conditionExpression;
     }
 
-    @Override
-    public Optional<List<Term>> getParams() {
-        return Optional.ofNullable(params);
-    }
-
 }
diff --git a/.../apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultChecksumField.java b/.../apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultChecksumField.java
@@ -49,8 +49,4 @@ public Term getChecksumExpression() {
         return checksumExpression;
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.of(Collections.emptyList());
-    }
-
 }
diff --git a/...org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultConstField.java b/...org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultConstField.java
@@ -49,8 +49,4 @@ public Object getReferenceValue() {
         return referenceValue;
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.of(Collections.emptyList());
-    }
-
 }
diff --git a/...he/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultDiscriminatorField.java b/...he/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultDiscriminatorField.java
@@ -43,8 +43,4 @@ public String getName() {
         return name;
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.of(Collections.emptyList());
-    }
-
 }
diff --git a/.../org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultEnumField.java b/.../org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultEnumField.java
@@ -22,7 +22,6 @@
 import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
 import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -32,14 +31,12 @@ public class DefaultEnumField extends DefaultField implements EnumField {
     private final TypeReference type;
     private final String name;
     private final String fieldName;
-    private final List<Term> params;
 
-    public DefaultEnumField(Map<String, Term> attributes, TypeReference type, String name, String fieldName, List<Term> params) {
+    public DefaultEnumField(Map<String, Term> attributes, TypeReference type, String name, String fieldName) {
         super(attributes);
         this.type = Objects.requireNonNull(type);
         this.name = Objects.requireNonNull(name);
         this.fieldName = fieldName;
-        this.params = params;
     }
 
     public TypeReference getType() {
@@ -54,9 +51,4 @@ public Optional<String> getFieldName() {
         return Optional.ofNullable(fieldName);
     }
 
-    @Override
-    public Optional<List<Term>> getParams() {
-        return Optional.ofNullable(params);
-    }
-
 }
diff --git a/.../apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultImplicitField.java b/.../apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultImplicitField.java
@@ -49,8 +49,4 @@ public Term getSerializeExpression() {
         return serializeExpression;
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.of(Collections.emptyList());
-    }
-
 }
diff --git a/...ache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualArrayField.java b/...ache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualArrayField.java
@@ -22,10 +22,8 @@
 import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
 import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 
 public class DefaultManualArrayField extends DefaultField implements ManualArrayField {
 
@@ -36,9 +34,8 @@ public class DefaultManualArrayField extends DefaultField implements ManualArray
     private final Term parseExpression;
     private final Term serializeExpression;
     private final Term lengthExpression;
-    private final List<Term> params;
 
-    public DefaultManualArrayField(Map<String, Term> attributes, TypeReference type, String name, LoopType loopType, Term loopExpression, Term parseExpression, Term serializeExpression, Term lengthExpression, List<Term> params) {
+    public DefaultManualArrayField(Map<String, Term> attributes, TypeReference type, String name, LoopType loopType, Term loopExpression, Term parseExpression, Term serializeExpression, Term lengthExpression) {
         super(attributes);
         this.type = Objects.requireNonNull(type);
         this.name = Objects.requireNonNull(name);
@@ -47,7 +44,6 @@ public DefaultManualArrayField(Map<String, Term> attributes, TypeReference type,
         this.parseExpression = Objects.requireNonNull(parseExpression);
         this.serializeExpression = Objects.requireNonNull(serializeExpression);
         this.lengthExpression = Objects.requireNonNull(lengthExpression);
-        this.params = params;
     }
 
     public TypeReference getType() {
@@ -78,8 +74,4 @@ public Term getLengthExpression() {
         return lengthExpression;
     }
 
-    @Override
-    public Optional<List<Term>> getParams() {
-        return Optional.ofNullable(params);
-    }
 }
diff --git a/...rg/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualField.java b/...rg/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultManualField.java
@@ -34,16 +34,14 @@ public class DefaultManualField extends DefaultField implements ManualField {
     private final Term parseExpression;
     private final Term serializeExpression;
     private final Term lengthExpression;
-    private final List<Term> params;
 
-    public DefaultManualField(Map<String, Term> attributes, TypeReference type, String name, Term parseExpression, Term serializeExpression, Term lengthExpression, List<Term> params) {
+    public DefaultManualField(Map<String, Term> attributes, TypeReference type, String name, Term parseExpression, Term serializeExpression, Term lengthExpression) {
         super(attributes);
         this.type = Objects.requireNonNull(type);
         this.name = Objects.requireNonNull(name);
         this.parseExpression = Objects.requireNonNull(parseExpression);
         this.serializeExpression = Objects.requireNonNull(serializeExpression);
         this.lengthExpression = Objects.requireNonNull(lengthExpression);
-        this.params = params;
     }
 
     public TypeReference getType() {
@@ -66,8 +64,4 @@ public Term getLengthExpression() {
         return lengthExpression;
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.ofNullable(params);
-    }
-
 }
diff --git a/.../apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultOptionalField.java b/.../apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultOptionalField.java
@@ -32,14 +32,12 @@ public class DefaultOptionalField extends DefaultField implements OptionalField
     private final TypeReference type;
     private final String name;
     private final Term conditionExpression;
-    private final List<Term> params;
 
-    public DefaultOptionalField(Map<String, Term> attributes, TypeReference type, String name, Term conditionExpression, List<Term> params) {
+    public DefaultOptionalField(Map<String, Term> attributes, TypeReference type, String name, Term conditionExpression) {
         super(attributes);
         this.type = Objects.requireNonNull(type);
         this.name = Objects.requireNonNull(name);
         this.conditionExpression = conditionExpression;
-        this.params = params;
     }
 
     public TypeReference getType() {
@@ -54,8 +52,4 @@ public Optional<Term> getConditionExpression() {
         return Optional.ofNullable(conditionExpression);
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.ofNullable(params);
-    }
-
 }
diff --git a/...g/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultPaddingField.java b/...g/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultPaddingField.java
@@ -33,15 +33,13 @@ public class DefaultPaddingField extends DefaultField implements PaddingField {
     private final String name;
     private final Term paddingValue;
     private final Term paddingCondition;
-    private final List<Term> params;
 
-    public DefaultPaddingField(Map<String, Term> attributes, TypeReference type, String name, Term paddingValue, Term paddingCondition, List<Term> params) {
+    public DefaultPaddingField(Map<String, Term> attributes, TypeReference type, String name, Term paddingValue, Term paddingCondition) {
         super(attributes);
         this.type = Objects.requireNonNull(type);
         this.name = Objects.requireNonNull(name);
         this.paddingValue = Objects.requireNonNull(paddingValue);
         this.paddingCondition = Objects.requireNonNull(paddingCondition);
-        this.params = params;
     }
 
     public TypeReference getType() {
@@ -60,8 +58,4 @@ public Term getPaddingCondition() {
         return paddingCondition;
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.ofNullable(params);
-    }
-
 }
diff --git a/.../apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultReservedField.java b/.../apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultReservedField.java
@@ -43,8 +43,4 @@ public Object getReferenceValue() {
         return referenceValue;
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.of(Collections.emptyList());
-    }
-
 }
diff --git a/...rg/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSimpleField.java b/...rg/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSimpleField.java
@@ -31,13 +31,11 @@ public class DefaultSimpleField extends DefaultField implements SimpleField {
 
     private final TypeReference type;
     private final String name;
-    private final List<Term> params;
 
-    public DefaultSimpleField(Map<String, Term> attributes, TypeReference type, String name, List<Term> params) {
+    public DefaultSimpleField(Map<String, Term> attributes, TypeReference type, String name) {
         super(attributes);
         this.type = Objects.requireNonNull(type);
         this.name = Objects.requireNonNull(name);
-        this.params = params;
     }
 
     public TypeReference getType() {
@@ -48,8 +46,4 @@ public String getName() {
         return name;
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.ofNullable(params);
-    }
-
 }
diff --git a/...rg/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSwitchField.java b/...rg/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultSwitchField.java
@@ -53,8 +53,4 @@ public Optional<Term> getAttribute(String attributeName) {
         return Optional.empty();
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.of(Collections.emptyList());
-    }
-
 }
diff --git a/...g/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultUnknownField.java b/...g/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultUnknownField.java
@@ -37,8 +37,4 @@ public TypeReference getType() {
         return type;
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.of(Collections.emptyList());
-    }
-
 }
diff --git a/...g/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultVirtualField.java b/...g/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/DefaultVirtualField.java
@@ -49,8 +49,4 @@ public Term getValueExpression() {
         return valueExpression;
     }
 
-    public Optional<List<Term>> getParams() {
-        return Optional.of(Collections.emptyList());
-    }
-
 }