Skip to content

Fixes for Rust Composites #921

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

Closed
wants to merge 1 commit into from
Closed

Fixes for Rust Composites #921

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/LibRsDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void generate() throws IOException
// add re-export of modules
for (final String module : modules)
{
indent(libRs, 0, "pub use %s::*;\n", toLowerSnakeCase(module));
indent(libRs, 0, "pub use crate::%s::*;\n", toLowerSnakeCase(module));
}
indent(libRs, 0, "\n");

Expand Down
20 changes: 11 additions & 9 deletions sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ private static void generateCompositeDecoder(
decoderName,
decoderTypeName);

indent(sb, level + 1, "if self.acting_version < %d {\n", fieldToken.version());
indent(sb, level + 1, "if self.acting_version > 0 && self.acting_version < %d {\n", fieldToken.version());
indent(sb, level + 2, "return Either::Left(self);\n");
indent(sb, level + 1, "}\n\n");

Expand Down Expand Up @@ -576,7 +576,7 @@ private static void generateBitSetDecoder(

if (bitsetToken.version() > 0)
{
indent(sb, level + 1, "if self.acting_version < %d {\n", bitsetToken.version());
indent(sb, level + 1, "if self.acting_version > 0 && self.acting_version < %d {\n", bitsetToken.version());
indent(sb, level + 2, "return %s::default();\n", structTypeName);
indent(sb, level + 1, "}\n\n");
}
Expand Down Expand Up @@ -636,8 +636,8 @@ private static void generatePrimitiveArrayDecoder(

if (fieldToken.version() > 0)
{
indent(sb, level + 1, "if self.acting_version < %d {\n", fieldToken.version());
indent(sb, level + 2, "return [%s, %d];\n", encoding.applicableNullValue(), arrayLength);
indent(sb, level + 1, "if self.acting_version > 0 && self.acting_version < %d {\n", fieldToken.version());
indent(sb, level + 2, "return [%s; %d];\n", encoding.applicableNullValue(), arrayLength);
indent(sb, level + 1, "}\n\n");
}

Expand Down Expand Up @@ -737,7 +737,7 @@ private static void generatePrimitiveOptionalDecoder(

if (fieldToken.version() > 0)
{
indent(sb, level + 1, "if self.acting_version < %d {\n", fieldToken.version());
indent(sb, level + 1, "if self.acting_version > 0 && self.acting_version < %d {\n", fieldToken.version());
indent(sb, level + 2, "return None;\n");
indent(sb, level + 1, "}\n\n");
}
Expand Down Expand Up @@ -790,7 +790,7 @@ private static void generatePrimitiveRequiredDecoder(

if (fieldToken.version() > 0)
{
indent(sb, level + 1, "if self.acting_version < %d {\n", fieldToken.version());
indent(sb, level + 1, "if self.acting_version > 0 && self.acting_version < %d {\n", fieldToken.version());
indent(sb, level + 2, "return %s;\n",
generateRustLiteral(encoding.primitiveType(), encoding.applicableNullValue().toString()));
indent(sb, level + 1, "}\n\n");
Expand Down Expand Up @@ -939,7 +939,7 @@ static void generateDecoderVarData(
{
if (varDataToken.version() > 0)
{
indent(sb, level + 1, "if self.acting_version < %d {\n", varDataToken.version());
indent(sb, level + 1, "if self.acting_version > 0 && self.acting_version < %d {\n", varDataToken.version());
indent(sb, level + 2, "return (self.parent.as_ref().unwrap().get_limit(), 0);\n");
indent(sb, level + 1, "}\n\n");
}
Expand All @@ -954,7 +954,7 @@ static void generateDecoderVarData(
{
if (varDataToken.version() > 0)
{
indent(sb, level + 1, "if self.acting_version < %d {\n", varDataToken.version());
indent(sb, level + 1, "if self.acting_version > 0 && self.acting_version < %d {\n", varDataToken.version());
indent(sb, level + 2, "return (self.get_limit(), 0);\n");
indent(sb, level + 1, "}\n\n");
}
Expand All @@ -973,7 +973,7 @@ static void generateDecoderVarData(

if (varDataToken.version() > 0)
{
indent(sb, level + 1, "if self.acting_version < %d {\n", varDataToken.version());
indent(sb, level + 1, "if self.acting_version > 0 && self.acting_version < %d {\n", varDataToken.version());
indent(sb, level + 2, "return &[] as &[u8];\n");
indent(sb, level + 1, "}\n\n");
}
Expand Down Expand Up @@ -1354,6 +1354,7 @@ private static void generateCompositeEncoder(
indent(out, 1, "pub struct %s<P> {\n", encoderName);
indent(out, 2, "parent: Option<P>,\n");
indent(out, 2, "offset: usize,\n");
indent(out, 2, "acting_version: usize,\n");
indent(out, 1, "}\n\n");

appendImplWriterForComposite(out, 1, encoderName);
Expand Down Expand Up @@ -1413,6 +1414,7 @@ private static void generateCompositeDecoder(
indent(out, 1, "pub struct %s<P> {\n", decoderName);
indent(out, 2, "parent: Option<P>,\n");
indent(out, 2, "offset: usize,\n");
indent(out, 2, "acting_version: usize,\n");
indent(out, 1, "}\n\n");

appendImplReaderForComposite(out, 1, decoderName);
Expand Down
4 changes: 2 additions & 2 deletions sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ private static String sanitizeMethodOrProperty(final String name)
{
if (shadowsKeyword(name))
{
return name + "_";
return "r#" + name;
}
else
{
Expand Down Expand Up @@ -310,7 +310,7 @@ enum ReservedKeyword
{
for (final ReservedKeyword value : ReservedKeyword.values())
{
LOWER_CASE_NAMES.add(value.name());
LOWER_CASE_NAMES.add(value.name().toLowerCase());
}
}

Expand Down
2 changes: 2 additions & 0 deletions sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/rust/RustUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ void functionNameCasing()
assertEquals("pricenull_9", formatFunctionName("PRICENULL9"));
assertEquals("price_9_book", formatFunctionName("PRICE9Book"));
assertEquals("issue_435", formatFunctionName("issue435"));
assertEquals("r#type", formatFunctionName("type"));

assertEquals("upper_case", formatFunctionName("UPPERCase"));
assertEquals("no_md_entries", formatFunctionName("NoMDEntries"));
assertEquals("md_entry_type_book", formatFunctionName("MD_EntryTYPEBook"));
Expand Down