Merge pull request #716 from trozen/cpp-char-field-print

mjpt777 · web-flow · commit d5f80a562633 · 2019-09-14T08:10:23.000+01:00
[C++] Non-printable CHAR printed as int
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
@@ -2532,7 +2532,12 @@ private CharSequence writeTokenDisplay(
                     // have to duplicate because of checkstyle :/
                     if (typeToken.encoding().primitiveType() == PrimitiveType.CHAR)
                     {
-                        sb.append(indent + "builder << '\"' << (char)" + fieldName + "() << '\"';\n");
+                        sb.append(
+                            indent + "if (std::isprint(" + fieldName + "())) {\n" +
+                            indent + "    builder << '\"' << (char)" + fieldName + "() << '\"';\n" +
+                            indent + "} else {\n" +
+                            indent + "    builder << (int)" + fieldName + "();\n" +
+                            indent + "}\n");
                     }
                     else
                     {

Original file line number	Diff line number	Diff line change
`@@ -2532,7 +2532,12 @@ private CharSequence writeTokenDisplay(`
`2532`	`2532`	`// have to duplicate because of checkstyle :/`
`2533`	`2533`	`if (typeToken.encoding().primitiveType() == PrimitiveType.CHAR)`
`2534`	`2534`	`{`
`2535`		`- sb.append(indent + "builder << '\"' << (char)" + fieldName + "() << '\"';\n");`
	`2535`	`+ sb.append(`
	`2536`	`+ indent + "if (std::isprint(" + fieldName + "())) {\n" +`
	`2537`	`+ indent + " builder << '\"' << (char)" + fieldName + "() << '\"';\n" +`
	`2538`	`+ indent + "} else {\n" +`
	`2539`	`+ indent + " builder << (int)" + fieldName + "();\n" +`
	`2540`	`+ indent + "}\n");`
`2536`	`2541`	`}`
`2537`	`2542`	`else`
`2538`	`2543`	`{`