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/01/05 10:28:46 UTC
[plc4x] branch develop updated: fix(plc4go/codegen): fix build
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 deb4a19 fix(plc4go/codegen): fix build
deb4a19 is described below
commit deb4a19433441de8a92dd8a223106e88996bce6a
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Jan 5 11:28:11 2022 +0100
fix(plc4go/codegen): fix build
---
.../apache/plc4x/language/go/GoLanguageTemplateHelper.java | 12 +++++++++++-
.../src/main/resources/templates/go/model-template.go.ftlh | 2 +-
.../internal/plc4go/bacnetip/readwrite/model/EnclosedTags.go | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java b/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
index 8a56879..8918d9c 100644
--- a/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
+++ b/code-generation/language-go/src/main/java/org/apache/plc4x/language/go/GoLanguageTemplateHelper.java
@@ -483,6 +483,11 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
return tracer + toTypedParseExpression(field, resultType, term, parserArguments);
}
+ public String toParseExpression(Field field, TypeReference resultType, Term term, List<Argument> parserArguments, boolean suppressPointerAccess) {
+ Tracer tracer = Tracer.start("toParseExpression");
+ return tracer + toTypedParseExpression(field, resultType, term, parserArguments, suppressPointerAccess);
+ }
+
public String toSerializationExpression(Field field, TypeReference resultType, Term term, List<Argument> serializerArguments) {
Tracer tracer = Tracer.start("toSerializationExpression");
return tracer + toTypedSerializationExpression(field, resultType, term, serializerArguments);
@@ -513,6 +518,11 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
return tracer + toExpression(field, fieldType, term, parserArguments, null, false, fieldType != null && fieldType.isComplexTypeReference());
}
+ public String toTypedParseExpression(Field field, TypeReference fieldType, Term term, List<Argument> parserArguments, boolean suppressPointerAccess) {
+ Tracer tracer = Tracer.start("toTypedParseExpression");
+ return tracer + toExpression(field, fieldType, term, parserArguments, null, false, suppressPointerAccess);
+ }
+
public String toTypedSerializationExpression(Field field, TypeReference fieldType, Term term, List<Argument> serializerArguments) {
Tracer tracer = Tracer.start("toTypedSerializationExpression");
return tracer + toExpression(field, fieldType, term, null, serializerArguments, true, false);
@@ -530,7 +540,7 @@ public class GoLanguageTemplateHelper extends BaseFreemarkerLanguageTemplateHelp
}
private String toExpression(Field field, TypeReference fieldType, Term term, List<Argument> parserArguments, List<Argument> serializerArguments, boolean serialize, boolean suppressPointerAccess) {
- Tracer tracer = Tracer.start("toExpression");
+ Tracer tracer = Tracer.start("toExpression(suppressPointerAccess="+suppressPointerAccess+")");
if (term == null) {
return "";
}
diff --git a/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh b/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
index 6680776..d5c6028 100644
--- a/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
+++ b/code-generation/language-go/src/main/resources/templates/go/model-template.go.ftlh
@@ -784,7 +784,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
<#elseif field.isTerminatedArrayField()>
// Terminated array
_${manualArrayField.name}List := make([]<#if helper.needsPointerAccess(manualArrayField)>*</#if>${helper.getLanguageTypeNameForField(manualArrayField)}, 0)
- for ;!((bool) (${helper.toParseExpression(manualArrayField, helper.boolTypeReference, manualArrayField.loopExpression, parserArguments)})); {
+ for ;!((bool) (${helper.toParseExpression(manualArrayField, helper.boolTypeReference, manualArrayField.loopExpression, parserArguments, true)})); {
_${manualArrayField.name}List = append(_${manualArrayField.name}List, ((<#if helper.needsPointerAccess(manualArrayField)>*</#if>${helper.getLanguageTypeNameForField(field)}) (${helper.toParseExpression(manualArrayField, manualArrayField.type, manualArrayField.parseExpression, parserArguments)})))
<#-- After parsing, update the current position, but only if it's needed -->
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/EnclosedTags.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/EnclosedTags.go
index d474db4..cc8b6a5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/EnclosedTags.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/EnclosedTags.go
@@ -120,7 +120,7 @@ func EnclosedTagsParse(readBuffer utils.ReadBuffer, openingTagNumber uint8, clos
// Manual Array Field (data)
// Terminated array
_dataList := make([]*BACnetTag, 0)
- for !((bool)(OpeningClosingTerminate(readBuffer, (*openingTag)))) {
+ for !((bool)(OpeningClosingTerminate(readBuffer, (openingTag)))) {
_dataList = append(_dataList, ((*BACnetTag)(ParseTags(readBuffer))))
}