Merge pull request #675 from dm3/rust-enum-nullval

mjpt777 · web-flow · commit c723b6388757 · 2019-05-03T12:59:12.000+01:00
[Rust] Generate NullVal enum values
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/rust/RustGenerator.java
@@ -1356,6 +1356,16 @@ private static void generateEnum(final List<Token> enumTokens, final OutputManag
                     .append(",\n");
             }
 
+            // null value
+            final Token token = messageBody.get(0);
+            final Encoding encoding = token.encoding();
+            final CharSequence nullVal = generateRustLiteral(
+                encoding.primitiveType(), encoding.applicableNullValue().toString());
+            indent(writer, 1).append("NullVal")
+                .append(" = ")
+                .append(nullVal)
+                .append(",\n");
+
             writer.append("}\n");
         }
     }
diff --git a/sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/rust/RustGeneratorTest.java b/sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/rust/RustGeneratorTest.java
@@ -124,6 +124,7 @@ private void assertContainsNumericEnum(final String generatedRust)
             "pub enum ENUM {\n" +
             "  Value1 = 1u8,\n" +
             "  Value10 = 10u8,\n" +
+            "  NullVal = 255u8,\n" +
             "}\n";
         assertTrue(generatedRust.contains(expectedDeclaration));
     }
@@ -144,6 +145,7 @@ public void fullGenerateBroadUseCase() throws IOException, InterruptedException
             "pub enum BooleanType {\n" +
             "  F = 0u8,\n" +
             "  T = 1u8,\n" +
+            "  NullVal = 255u8,\n" +
             "}\n";
         assertTrue(generatedRust.contains(expectedBooleanTypeDeclaration));
         final String expectedCharTypeDeclaration =
@@ -153,6 +155,7 @@ public void fullGenerateBroadUseCase() throws IOException, InterruptedException
             "  A = 65i8,\n" +
             "  B = 66i8,\n" +
             "  C = 67i8,\n" +
+            "  NullVal = 0i8,\n" +
             "}\n";
         assertTrue(generatedRust.contains(expectedCharTypeDeclaration));
         assertRustBuildable(generatedRust, Optional.of("example-schema"));
@@ -283,6 +286,7 @@ public void constantEnumFields() throws IOException, InterruptedException
             "  A = 65i8,\n" +
             "  B = 66i8,\n" +
             "  C = 67i8,\n" +
+            "  NullVal = 0i8,\n" +
             "}\n";
         assertContains(rust, expectedCharTypeDeclaration);
         assertContains(rust, "pub struct ConstantEnumsFields {\n}");
@@ -313,6 +317,7 @@ public void constantFieldsCase() throws IOException, InterruptedException
             "  A = 65i8,\n" +
             "  B = 66i8,\n" +
             "  C = 67i8,\n" +
+            "  NullVal = 0i8,\n" +
             "}\n";
         assertContains(rust, expectedCharTypeDeclaration);
         final String expectedComposite =

Original file line number	Diff line number	Diff line change
`@@ -1356,6 +1356,16 @@ private static void generateEnum(final List<Token> enumTokens, final OutputManag`
`1356`	`1356`	`.append(",\n");`
`1357`	`1357`	`}`
`1358`	`1358`
	`1359`	`+ // null value`
	`1360`	`+ final Token token = messageBody.get(0);`
	`1361`	`+ final Encoding encoding = token.encoding();`
	`1362`	`+ final CharSequence nullVal = generateRustLiteral(`
	`1363`	`+ encoding.primitiveType(), encoding.applicableNullValue().toString());`
	`1364`	`+ indent(writer, 1).append("NullVal")`
	`1365`	`+ .append(" = ")`
	`1366`	`+ .append(nullVal)`
	`1367`	`+ .append(",\n");`
	`1368`	`+`
`1359`	`1369`	`writer.append("}\n");`
`1360`	`1370`	`}`
`1361`	`1371`	`}`