Skip to content

[Go] Fix tokens passed to generateComposite (#849) #850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 14, 2021
Merged

[Go] Fix tokens passed to generateComposite (#849) #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e46b1e
[Go] Fix tokens passed to generateComposite (#849)
neomantra May 13, 2021
9a811c1
[Go] Fix Group decoder style warning
neomantra May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ task generateGolangCodecsWithXSD(type: JavaExec) {
'sbe-tool/src/test/resources/issue661.xml',
'sbe-tool/src/test/resources/issue847.xml',
'sbe-tool/src/test/resources/issue848.xml',
'sbe-tool/src/test/resources/issue849.xml',
'sbe-tool/src/test/resources/since-deprecated-test-schema.xml',
'sbe-tool/src/test/resources/example-bigendian-test-schema.xml',
'gocode/resources/example-composite.xml',
Expand Down
2 changes: 1 addition & 1 deletion gocode/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ test: $(DEP)
go install \
;done))
(export GOPATH=$(GOPATH) && \
(for t in baseline-bigendian mktdata group_with_data group_with_data_extension composite_elements composite since-deprecated simple issue435 issue472 issue483 issue488 issue560 issue847 issue848; do \
(for t in baseline-bigendian mktdata group_with_data group_with_data_extension composite_elements composite since-deprecated simple issue435 issue472 issue483 issue488 issue560 issue847 issue848 issue849; do \
cd $(GOPATH)/src/$$t && \
go build && \
go fmt && \
Expand Down
9 changes: 9 additions & 0 deletions gocode/src/issue849/issue849_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package issue849

import (
"testing"
)

func TestNothing(t *testing.T) {
// placeholder, really just looking for clean builds
}
6 changes: 3 additions & 3 deletions sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/GolangGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,7 @@ private int generateGroupEncodeDecode(
"\t\t\t%1$s.%2$s = make([]%3$s%2$s, %2$sNumInGroup)\n" +
"\t\t}\n" +
"\t\t%1$c.%2$s = %1$c.%2$s[:%2$sNumInGroup]\n" +
"\t\tfor i, _ := range %1$s.%2$s {\n" +
"\t\tfor i := range %1$s.%2$s {\n" +
"\t\t\tif err := %1$s.%2$s[i].Decode(_m, _r, actingVersion, uint(%4$sBlockLength)); err != nil {\n" +
"\t\t\t\treturn err\n" +
"\t\t\t}\n" +
Expand Down Expand Up @@ -2045,8 +2045,8 @@ private void generateTypeBodyComposite(

case BEGIN_COMPOSITE:
// recurse
generateComposite(tokens.subList(i, tokens.size()), typeName);
i += token.componentTokenCount() - 2;
generateComposite(tokens.subList(i, i + token.componentTokenCount()), typeName);
i += token.componentTokenCount() - 1;

sb.append("\t").append(propertyName)
.append(generateWhitespace(longest - propertyName.length() + 1))
Expand Down
43 changes: 43 additions & 0 deletions sbe-tool/src/test/resources/issue849.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<sbe:messageSchema xmlns:sbe="http://fixprotocol.io/2016/sbe"
package="issue849"
id="1"
version="0"
semanticVersion="1.0"
description="test case 849 20210512"
byteOrder="littleEndian">
<types>
<composite name="Comp1" description="Comp1">
<type name="abc" primitiveType="uint32"/>
<type name="wxyz" primitiveType="uint32"/>
</composite>
<composite name="Comp2" description="Comp2">
<type name="eenie" primitiveType="uint32"/>
<ref name="c1" type="Comp1"/>
<type name="meanie" primitiveType="uint32"/>
</composite>
<composite name="Comp3" description="Comp3">
<type name="moe" primitiveType="uint32"/>
<ref name="c2" type="Comp2"/>
<type name="roe" primitiveType="uint32"/>
</composite>
<composite name="Comp4" description="Comp4">
<type name="roe" primitiveType="uint32"/>
</composite>
<composite name="messageHeader" description="MH">
<type name="blockLength" primitiveType="uint16"/>
<type name="templateId" primitiveType="uint16"/>
<type name="schemaId" primitiveType="uint16"/>
<type name="version" primitiveType="uint16"/>
<ref name="c1" type="Comp1"/>
<type name="lmn" primitiveType="uint32"/>
<ref name="c2" type="Comp2"/>
<type name="opq" primitiveType="uint32"/>
</composite>
</types>
<sbe:message name="barmsg" id="4">
<field name="header" id="1" type="messageHeader"/>
<field name="c3" id="2" type="Comp3"/>
<field name="c4" id="3" type="Comp4"/>
</sbe:message>
</sbe:messageSchema>