Skip to content

Commit

Permalink
fix(plc4go/codegen): fixed argument handling of complex argument types
Browse files Browse the repository at this point in the history
  • Loading branch information
sruehl committed Jun 9, 2022
1 parent d97c819 commit d9a1c5d
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ type ${type.name} struct {

// Arguments.
<#list filteredParserArguments as parserArgument>
${parserArgument.name?cap_first} ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}
${parserArgument.name?cap_first} <#if parserArgument.type.isNonSimpleTypeReference() && !parserArgument.type.isEnumTypeReference()>*</#if>${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}
</#list>
</#if>
<#if type.isDiscriminatedParentTypeDefinition()>
Expand Down Expand Up @@ -313,7 +313,7 @@ func New${type.name}(
<#if filteredParserArguments?has_content>
<#if type.allPropertyFields?has_content>, </#if>
<#list filteredParserArguments as parserArgument>
${parserArgument.name} ${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}
${parserArgument.name} <#if parserArgument.type.isNonSimpleTypeReference() && !parserArgument.type.isEnumTypeReference()>*</#if>${helper.getLanguageTypeNameForTypeReference(parserArgument.type)}
<#sep>, </#sep>
</#list>
</#if>
Expand Down Expand Up @@ -1482,7 +1482,7 @@ func ${type.name}Parse(readBuffer utils.ReadBuffer<#if hasParserArguments>, ${pa
return _child, nil
<#else>
// Create the instance
return New${type.name}(<#list type.propertyFields as field>${field.name}<#sep>, </#sep></#list><#if filteredParserArguments?has_content><#if type.propertyFields?has_content>, </#if><#list filteredParserArguments as arg><#if arg.type.isNonSimpleTypeReference() && !arg.type.isEnumTypeReference()>*</#if>${arg.name}<#sep>, </#sep></#list></#if>), nil
return New${type.name}(<#list type.propertyFields as field>${field.name}<#sep>, </#sep></#list><#if filteredParserArguments?has_content><#if type.propertyFields?has_content>, </#if><#list filteredParserArguments as arg>${arg.name}<#sep>, </#sep></#list></#if>), nil
</#if>
}

Expand Down
2 changes: 1 addition & 1 deletion plc4go/internal/s7/Connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ func (m *Connection) createIdentifyRemoteMessage() *readWriteModel.TPKTPacket {
readWriteModel.DataTransportSize_OCTET_STRING,
).GetParent(),
},
*readWriteModel.NewS7Parameter(),
nil,
).GetParent(),
).GetParent()
cotpPacketData := readWriteModel.NewCOTPPacketData(true, 2, nil, identifyRemoteMessage, 0).GetParent()
Expand Down
2 changes: 1 addition & 1 deletion plc4go/internal/s7/Writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func (m Writer) Write(writeRequest model.PlcWriteRequest) <-chan model.PlcWriteR
s7MessageRequest := readWriteModel.NewS7MessageRequest(
tpduId,
readWriteModel.NewS7ParameterWriteVarRequest(parameterItems).GetParent(),
readWriteModel.NewS7PayloadWriteVarRequest(payloadItems, *readWriteModel.NewS7Parameter()).GetParent(),
readWriteModel.NewS7PayloadWriteVarRequest(payloadItems, nil).GetParent(),
).GetParent()

// Assemble the finished paket
Expand Down
4 changes: 2 additions & 2 deletions plc4go/internal/s7/s7Io_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func TestS7MessageBytes(t *testing.T) {
[]byte{1},
),
},
*model.NewS7Parameter(),
nil,
).GetParent(),
).GetParent(),
0,
Expand Down Expand Up @@ -414,7 +414,7 @@ func TestS7MessageBytes(t *testing.T) {
},
),
},
*model.NewS7Parameter()).GetParent(),
nil).GetParent(),
).GetParent(),
0,
).GetParent(),
Expand Down
4 changes: 2 additions & 2 deletions plc4go/protocols/s7/readwrite/model/S7Payload.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions plc4go/protocols/s7/readwrite/model/S7PayloadUserData.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d9a1c5d

Please sign in to comment.