Skip to content

Commit 16d875d

Browse files
committed
[golang] Fix code gen for MetaAttributes. Issue #620.
1 parent ad844ad commit 16d875d

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/GolangGenerator.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,7 @@ private void generateVarData(
13411341
final Token varDataToken = Generators.findFirst("varData", tokens, i);
13421342
final String characterEncoding = varDataToken.encoding().characterEncoding();
13431343

1344-
generateFieldMetaAttributeMethod(sb, typeName, token);
1344+
generateFieldMetaAttributeMethod(sb, typeName, propertyName, token);
13451345
generateVarDataDescriptors(sb, token, typeName, propertyName, characterEncoding, lengthOfLengthField);
13461346

13471347
i += token.componentTokenCount();
@@ -2085,7 +2085,7 @@ private void generateFields(
20852085

20862086
generateId(sb, containingTypeName, propertyName, signalToken);
20872087
generateSinceActingDeprecated(sb, containingTypeName, propertyName, signalToken);
2088-
generateFieldMetaAttributeMethod(sb, containingTypeName, signalToken);
2088+
generateFieldMetaAttributeMethod(sb, containingTypeName, propertyName, signalToken);
20892089

20902090
switch (encodingToken.signal())
20912091
{
@@ -2113,6 +2113,7 @@ private void generateFields(
21132113
private static void generateFieldMetaAttributeMethod(
21142114
final StringBuilder sb,
21152115
final String containingTypeName,
2116+
final String propertyName,
21162117
final Token token)
21172118
{
21182119
final Encoding encoding = token.encoding();
@@ -2122,20 +2123,21 @@ private static void generateFieldMetaAttributeMethod(
21222123
final String presence = encoding.presence() == null ? "" : encoding.presence().toString().toLowerCase();
21232124

21242125
sb.append(String.format(
2125-
"\nfunc (*%1$s) %3$sMetaAttribute(meta int) string {\n" +
2126+
"\nfunc (*%1$s) %2$sMetaAttribute(meta int) string {\n" +
21262127
"\tswitch meta {\n" +
21272128
"\tcase 1:\n" +
2128-
"\t\treturn \"%2$s\"\n" +
2129-
"\tcase 2:\n" +
21302129
"\t\treturn \"%3$s\"\n" +
2131-
"\tcase 3:\n" +
2130+
"\tcase 2:\n" +
21322131
"\t\treturn \"%4$s\"\n" +
2133-
"\tcase 4:\n" +
2132+
"\tcase 3:\n" +
21342133
"\t\treturn \"%5$s\"\n" +
2134+
"\tcase 4:\n" +
2135+
"\t\treturn \"%6$s\"\n" +
21352136
"\t}\n" +
21362137
"\treturn \"\"\n" +
21372138
"}\n",
21382139
containingTypeName,
2140+
propertyName,
21392141
epoch,
21402142
timeUnit,
21412143
semanticType,

0 commit comments

Comments
 (0)