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:44:49 UTC

[plc4x] branch develop updated: fix(codegen): fix issue with double scheduling by removing unused code

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 080a248  fix(codegen): fix issue with double scheduling by removing unused code
080a248 is described below

commit 080a24826528e7702b48554149484dce3ff4a68d
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Sat Feb 26 10:44:41 2022 +0100

    fix(codegen): fix issue with double scheduling by removing unused code
---
 .../language/mspec/expression/ExpressionStringListener.java       | 8 +-------
 .../language/mspec/model/terms/DefaultVariableLiteral.java        | 5 -----
 2 files changed, 1 insertion(+), 12 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 a5a3782..ee558b2 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
@@ -232,13 +232,7 @@ public class ExpressionStringListener extends ExpressionBaseListener {
                 LOGGER.error("Error setting type", throwable);
                 return;
             }
-            if (typeReference.isSimpleTypeReference()) {
-                variableLiteral.setTypeReference(typeReference);
-            } else {
-                variableLiteral.setTypeReference(typeReference);
-                String typeName = typeReference.asNonSimpleTypeReference().orElseThrow().getName();
-                lazyTypeDefinitionConsumer.setOrScheduleTypeDefinitionConsumer(typeName, variableLiteral::setTypeDefinition);
-            }
+            variableLiteral.setTypeReference(typeReference);
         });
         if (futureStack.empty()) {
             futureStack = null;
diff --git a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/terms/DefaultVariableLiteral.java b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/terms/DefaultVariableLiteral.java
index 7b5d745..0c0d8b4 100644
--- a/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/terms/DefaultVariableLiteral.java
+++ b/code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/terms/DefaultVariableLiteral.java
@@ -18,7 +18,6 @@
  */
 package org.apache.plc4x.plugins.codegenerator.language.mspec.model.terms;
 
-import org.apache.plc4x.plugins.codegenerator.types.definitions.TypeDefinition;
 import org.apache.plc4x.plugins.codegenerator.types.references.TypeReference;
 import org.apache.plc4x.plugins.codegenerator.types.terms.Term;
 import org.apache.plc4x.plugins.codegenerator.types.terms.VariableLiteral;
@@ -61,10 +60,6 @@ public class DefaultVariableLiteral implements VariableLiteral {
         this.typeReference = typeReference;
     }
 
-    public void setTypeDefinition(TypeDefinition typeDefinition) {
-        // TODO: handle type definition
-    }
-
     @Override
     public Optional<List<Term>> getArgs() {
         return Optional.ofNullable(args);