You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/02/26 09:03:40 UTC

[plc4x] branch develop updated: fix(codegen): fix lookup for variable literals by considering all fields

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

sruehl 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 f18ae5c  fix(codegen): fix lookup for variable literals by considering all fields
f18ae5c is described below

commit f18ae5ceec19c6bae05f9d13ad0a0b94fcead9b6
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Sat Feb 26 10:03:32 2022 +0100

    fix(codegen): fix lookup for variable literals by considering all fields
---
 .../mspec/expression/ExpressionStringListener.java        | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java
index 59dc7e3..c77185f 100644
--- a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java
+++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/ExpressionStringListener.java
@@ -24,6 +24,7 @@ import org.apache.plc4x.plugins.codegenerator.language.mspec.model.fields.Defaul
 import org.apache.plc4x.plugins.codegenerator.language.mspec.model.terms.*;
 import org.apache.plc4x.plugins.codegenerator.types.definitions.ComplexTypeDefinition;
 import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
+import org.apache.plc4x.plugins.codegenerator.types.fields.NamedField;
 import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
 import org.apache.plc4x.plugins.codegenerator.types.terms.*;
 import org.slf4j.Logger;
@@ -144,11 +145,13 @@ public class ExpressionStringListener extends ExpressionBaseListener {
             Optional<DefaultTypedField> propertyFieldByName = complexTypeDefinition
                 .getPropertyFieldByName(propertyName)
                 .map(DefaultTypedField.class::cast);
-            // Check for virtual fields context
+            // Check for other fields
             if (propertyFieldByName.isEmpty()) {
-                // TODO: do we need all virtual fields (from parent too)
-                propertyFieldByName = complexTypeDefinition.getVirtualFields().stream()
-                    .filter(virtualField -> propertyName.equals(virtualField.getName()))
+                // TODO: do we need all fields from parent too?
+                propertyFieldByName = complexTypeDefinition.getFields().stream()
+                    .filter(NamedField.class::isInstance)
+                    .map(NamedField.class::cast)
+                    .filter(namedField -> propertyName.equals(namedField.getName()))
                     .map(DefaultTypedField.class::cast)
                     .findAny();
             }
@@ -169,6 +172,10 @@ public class ExpressionStringListener extends ExpressionBaseListener {
                     return;
                 }
             }
+            // Handle Builtins
+            if (propertyFieldByName.isEmpty()) {
+                // TODO: handle builtins
+            }
             if (propertyFieldByName.isEmpty()) {
                 typeReferenceFuture.completeExceptionally(new RuntimeException("Field with name " + propertyName + " not found on " + typeName));
                 return;