You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2021/11/26 13:09:17 UTC
[plc4x-build-tools] branch develop updated (8fe7394 -> 40d3992)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x-build-tools.git.
from 8fe7394 fix(.mvn): upgrading mvn wrapper to 3.6.3 (previous LTS version)
new 32cc800 fix: Changed typeSwitch to no longer use expressions as discriminators (Now variableLiterals are required) in const fields now no longer expressions can be used and instead only Literals can be used.
new 40d3992 fix: Changed typeSwitch to no longer use expressions as discriminators (Now variableLiterals are required) in const fields now no longer expressions can be used and instead only Literals can be used.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../codegenerator/types/fields/ConstField.java | 4 +++-
.../codegenerator/types/fields/SwitchField.java | 3 ++-
...Literal.java => DefaultHexadecimalLiteral.java} | 24 +++++++++++-----------
...NumericLiteral.java => HexadecimalLiteral.java} | 4 ++--
.../types/terms/LiteralConversions.java | 14 +++++++++++++
.../plugins/codegenerator/types/terms/Term.java | 2 ++
6 files changed, 35 insertions(+), 16 deletions(-)
copy code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/{DefaultStringLiteral.java => DefaultHexadecimalLiteral.java} (70%)
copy code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/{NumericLiteral.java => HexadecimalLiteral.java} (92%)
[plc4x-build-tools] 02/02: fix: Changed typeSwitch to no longer use expressions as discriminators (Now variableLiterals are required) in const fields now no longer expressions can be used and instead only Literals can be used.
Posted by 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-build-tools.git
commit 40d3992c5897cd07068f28931d7333e5216cd2bc
Author: cdutz <ch...@c-ware.de>
AuthorDate: Fri Nov 26 13:42:42 2021 +0100
fix: Changed typeSwitch to no longer use expressions as discriminators (Now variableLiterals are required) in const fields now no longer expressions can be used and instead only Literals can be used.
---
.../apache/plc4x/plugins/codegenerator/types/fields/SwitchField.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/SwitchField.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/SwitchField.java
index 7010aeb..40c13d6 100644
--- a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/SwitchField.java
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/SwitchField.java
@@ -20,6 +20,7 @@ package org.apache.plc4x.plugins.codegenerator.types.fields;
import org.apache.plc4x.plugins.codegenerator.types.definitions.DiscriminatedComplexTypeDefinition;
import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
+import org.apache.plc4x.plugins.codegenerator.types.terms.VariableLiteral;
import java.util.List;
@@ -29,7 +30,7 @@ public interface SwitchField extends Field {
return "switch";
}
- List<Term> getDiscriminatorExpressions();
+ List<VariableLiteral> getDiscriminatorExpressions();
List<DiscriminatedComplexTypeDefinition> getCases();
[plc4x-build-tools] 01/02: fix: Changed typeSwitch to no longer use expressions as discriminators (Now variableLiterals are required) in const fields now no longer expressions can be used and instead only Literals can be used.
Posted by 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-build-tools.git
commit 32cc80000b13ef6a4e0ab00b4d74c4dbda17f754
Author: cdutz <ch...@c-ware.de>
AuthorDate: Fri Nov 26 13:42:32 2021 +0100
fix: Changed typeSwitch to no longer use expressions as discriminators (Now variableLiterals are required) in const fields now no longer expressions can be used and instead only Literals can be used.
---
.../codegenerator/types/fields/ConstField.java | 4 +-
.../types/terms/DefaultHexadecimalLiteral.java | 59 ++++++++++++++++++++++
.../HexadecimalLiteral.java} | 13 ++---
.../types/terms/LiteralConversions.java | 14 +++++
.../plugins/codegenerator/types/terms/Term.java | 2 +
5 files changed, 85 insertions(+), 7 deletions(-)
diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/ConstField.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/ConstField.java
index 4354eb0..7fc6011 100644
--- a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/ConstField.java
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/ConstField.java
@@ -18,12 +18,14 @@
*/
package org.apache.plc4x.plugins.codegenerator.types.fields;
+import org.apache.plc4x.plugins.codegenerator.types.terms.Literal;
+
public interface ConstField extends PropertyField {
default String getTypeName() {
return "const";
}
- Object getReferenceValue();
+ Literal getReferenceValue();
}
diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/DefaultHexadecimalLiteral.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/DefaultHexadecimalLiteral.java
new file mode 100644
index 0000000..f26f842
--- /dev/null
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/DefaultHexadecimalLiteral.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.plc4x.plugins.codegenerator.types.terms;
+
+import java.util.Objects;
+
+public class DefaultHexadecimalLiteral implements HexadecimalLiteral {
+
+ private final String hexString;
+
+ public DefaultHexadecimalLiteral(String hexString) {
+ this.hexString = hexString;
+ }
+
+ public String getHexString() {
+ return hexString;
+ }
+
+ @Override
+ public String stringRepresentation() {
+ return hexString;
+ }
+
+ @Override
+ public String toString() {
+ return "DefaultHexadecimalLiteral{" +
+ "hexString=" + hexString +
+ '}';
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ DefaultHexadecimalLiteral that = (DefaultHexadecimalLiteral) o;
+ return hexString.equals(that.hexString);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(hexString);
+ }
+}
diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/ConstField.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/HexadecimalLiteral.java
similarity index 78%
copy from code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/ConstField.java
copy to code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/HexadecimalLiteral.java
index 4354eb0..00eb25f 100644
--- a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/fields/ConstField.java
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/HexadecimalLiteral.java
@@ -16,14 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.plc4x.plugins.codegenerator.types.fields;
+package org.apache.plc4x.plugins.codegenerator.types.terms;
-public interface ConstField extends PropertyField {
+public interface HexadecimalLiteral extends Literal {
- default String getTypeName() {
- return "const";
- }
+ String getHexString();
- Object getReferenceValue();
+ @Override
+ default boolean contains(String str) {
+ return false;
+ }
}
diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/LiteralConversions.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/LiteralConversions.java
index bdfedf9..af49702 100644
--- a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/LiteralConversions.java
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/LiteralConversions.java
@@ -68,6 +68,20 @@ public interface LiteralConversions {
}
/**
+ * @return true if {@code this} is instance of {@link NumericLiteral}
+ */
+ default boolean isHexadecimalLiteral() {
+ return this instanceof HexadecimalLiteral;
+ }
+
+ /**
+ * @return a {@link HexadecimalLiteral} if castable.
+ */
+ default Optional<HexadecimalLiteral> asHexadecimalLiteral() {
+ return Optional.of(this).filter(HexadecimalLiteral.class::isInstance).map(HexadecimalLiteral.class::cast);
+ }
+
+ /**
* @return true if {@code this} is instance of {@link StringLiteral}
*/
default boolean isStringLiteral() {
diff --git a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/Term.java b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/Term.java
index 3121b20..2c60c73 100644
--- a/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/Term.java
+++ b/code-generation/types-base/src/main/java/org/apache/plc4x/plugins/codegenerator/types/terms/Term.java
@@ -71,6 +71,8 @@ public interface Term extends TermConversions {
return Boolean.toString(((BooleanLiteral) literal).getValue());
} else if (literal instanceof NumericLiteral) {
return ((NumericLiteral) literal).getNumber().toString();
+ } else if (literal instanceof HexadecimalLiteral) {
+ return ((HexadecimalLiteral) literal).getHexString();
} else if (literal instanceof StringLiteral) {
return ((StringLiteral) literal).getValue();
} else if (literal instanceof VariableLiteral) {