Skip to content

[golang] Fix code gen for MetaAttributes. Issue #620. #621

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 1 commit into from
Dec 6, 2018
Merged

[golang] Fix code gen for MetaAttributes. Issue #620. #621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 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 @@ -1341,7 +1341,7 @@ private void generateVarData(
final Token varDataToken = Generators.findFirst("varData", tokens, i);
final String characterEncoding = varDataToken.encoding().characterEncoding();

generateFieldMetaAttributeMethod(sb, typeName, token);
generateFieldMetaAttributeMethod(sb, typeName, propertyName, token);
generateVarDataDescriptors(sb, token, typeName, propertyName, characterEncoding, lengthOfLengthField);

i += token.componentTokenCount();
Expand Down Expand Up @@ -2085,7 +2085,7 @@ private void generateFields(

generateId(sb, containingTypeName, propertyName, signalToken);
generateSinceActingDeprecated(sb, containingTypeName, propertyName, signalToken);
generateFieldMetaAttributeMethod(sb, containingTypeName, signalToken);
generateFieldMetaAttributeMethod(sb, containingTypeName, propertyName, signalToken);

switch (encodingToken.signal())
{
Expand Down Expand Up @@ -2113,6 +2113,7 @@ private void generateFields(
private static void generateFieldMetaAttributeMethod(
final StringBuilder sb,
final String containingTypeName,
final String propertyName,
final Token token)
{
final Encoding encoding = token.encoding();
Expand All @@ -2122,20 +2123,21 @@ private static void generateFieldMetaAttributeMethod(
final String presence = encoding.presence() == null ? "" : encoding.presence().toString().toLowerCase();

sb.append(String.format(
"\nfunc (*%1$s) %3$sMetaAttribute(meta int) string {\n" +
"\nfunc (*%1$s) %2$sMetaAttribute(meta int) string {\n" +
"\tswitch meta {\n" +
"\tcase 1:\n" +
"\t\treturn \"%2$s\"\n" +
"\tcase 2:\n" +
"\t\treturn \"%3$s\"\n" +
"\tcase 3:\n" +
"\tcase 2:\n" +
"\t\treturn \"%4$s\"\n" +
"\tcase 4:\n" +
"\tcase 3:\n" +
"\t\treturn \"%5$s\"\n" +
"\tcase 4:\n" +
"\t\treturn \"%6$s\"\n" +
"\t}\n" +
"\treturn \"\"\n" +
"}\n",
containingTypeName,
propertyName,
epoch,
timeUnit,
semanticType,
Expand Down