Merge pull request aeron-io#658 from denizevrenci/c_and_cpp_fixes

Various fixes to C and C++ generators

Author: mjpt777

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c/CGenerator.java

@@ -555,9 +555,11 @@ private CharSequence generateVarData(
  " if (!%5$s_set_sbe_position(\n" +
  " codec, %5$s_sbe_position(codec) + %3$d + length_field_value))\n" +
  " {\n" +
- " return {NULL, 0};\n" +
+ " struct %6$s_string_view ret = {NULL, 0};\n" +
+ " return ret;\n" +
  " }\n" +
- " return {field_ptr, length_field_value};\n" +
+ " struct %6$s_string_view ret = {field_ptr, length_field_value};\n" +
+ " return ret;\n" +
  "}\n",
  propertyName,
  generateStringViewNotPresentCondition(token.version()),
@@ -679,27 +681,6 @@ private void generateChoiceSet(final CharSequence[] scope, final List<Token> tok
  final String bitSetName = formatScopedName(scope, bitsetToken.applicableTypeName());
  out.append(generateFileHeader(bitSetName, null));
  out.append(generateFixedFlyweightStruct(bitSetName));
- out.append(String.format("\n" +
- "enum %1$s_meta_attribute\n" +
- "{\n" +
- " %1$s_meta_attribute_EPOCH,\n" +
- " %1$s_meta_attribute_TIME_UNIT,\n" +
- " %1$s_meta_attribute_SEMANTIC_TYPE,\n" +
- " %1$s_meta_attribute_PRESENCE\n" +
- "};\n\n" +
-
- "union %1$s_float_as_uint\n" +
- "{\n" +
- " float fp_value;\n" +
- " uint32_t uint_value;\n" +
- "};\n\n" +
-
- "union %1$s_double_as_uint\n" +
- "{\n" +
- " double fp_value;\n" +
- " uint64_t uint_value;\n" +
- "};\n",
- bitSetName));
  out.append(generateFixedFlyweightCodeFunctions(bitSetName, bitsetToken.encodedLength()));
 
  out.append(String.format("\n" +
@@ -2231,7 +2212,7 @@ private static void generateBitsetPropertyFunctions(
  final int offset = token.offset();
 
  sb.append(String.format("\n" +
- "struct %1$s *%4$s_%2$s(struct %4$s *const codec, struct %1$s *const bitset)\n" +
+ "SBE_ONE_DEF struct %1$s *%4$s_%2$s(struct %4$s *const codec, struct %1$s *const bitset)\n" +
  "{\n" +
  " return %1$s_wrap(\n" +
  " bitset,\n" +
@@ -2246,10 +2227,11 @@ private static void generateBitsetPropertyFunctions(
  containingStructName));
 
  sb.append(String.format("\n" +
- "SBE_ONE_DEF size_t %1$s_encoding_length(void)\n" +
+ "SBE_ONE_DEF size_t %s_%s_encoding_length(void)\n" +
  "{\n" +
- " return %2$d;\n" +
+ " return %d;\n" +
  "}\n",
+ containingStructName,
  propertyName,
  token.encoding().primitiveType().size()));
  }

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java

@@ -212,7 +212,7 @@ private static void generateGroupClassHeader(
  indent + "public:\n",
  formatClassName(groupName), dimensionsClassName));
 
- sb.append(String.format("\n" +
+ sb.append(String.format(
  indent + " inline void wrapForDecode(char *buffer, std::uint64_t *pos," +
  " const std::uint64_t actingVersion, const std::uint64_t bufferLength)\n" +
  indent + " {\n" +
@@ -356,7 +356,7 @@ private static CharSequence generateGroupProperty(
  className,
  propertyName));
 
- sb.append(String.format("\n" +
+ sb.append(String.format(
  indent + " static SBE_CONSTEXPR std::uint16_t %1$sId() SBE_NOEXCEPT\n" +
  indent + " {\n" +
  indent + " return %2$d;\n" +
@@ -640,7 +640,7 @@ private void generateChoiceSet(final List<Token> tokens) throws IOException
  out.append(generateClassDeclaration(bitSetName));
  out.append(generateFixedFlyweightCode(bitSetName, tokens.get(0).encodedLength()));
 
- out.append(String.format(
+ out.append(String.format("\n" +
  " %1$s &clear()\n" +
  " {\n" +
  " %2$s zero = 0;\n" +
@@ -679,8 +679,8 @@ private void generateEnum(final List<Token> tokens) throws IOException
 
  out.append(generateEnumLookupMethod(tokens.subList(1, tokens.size() - 1), enumToken));
 
- out.append("};\n");
- out.append(CppUtil.closingBraces(ir.namespaces().length)).append("#endif\n");
+ out.append("};\n\n");
+ out.append(CppUtil.closingBraces(ir.namespaces().length)).append("\n#endif\n");
  }
  }
 
@@ -698,8 +698,8 @@ private void generateComposite(final List<Token> tokens) throws IOException
  out.append(generateCompositePropertyElements(
  compositeName, tokens.subList(1, tokens.size() - 1), BASE_INDENT));
 
- out.append("};\n");
- out.append(CppUtil.closingBraces(ir.namespaces().length)).append("#endif\n");
+ out.append("};\n\n");
+ out.append(CppUtil.closingBraces(ir.namespaces().length)).append("\n#endif\n");
  }
  }
 
@@ -793,7 +793,7 @@ private CharSequence generateEnumValues(final List<Token> tokens, final Token en
  final Encoding encoding = encodingToken.encoding();
 
  sb.append(
- " enum Value \n" +
+ " enum Value\n" +
  " {\n");
 
  for (final Token token : tokens)
@@ -1040,7 +1040,7 @@ private static CharSequence generateClassDeclaration(final String className)
 
  private static CharSequence generateEnumDeclaration(final String name)
  {
- return "class " + name + "\n{\npublic:\n\n";
+ return "class " + name + "\n{\npublic:\n";
  }
 
  private CharSequence generateCompositePropertyElements(
@@ -1322,7 +1322,7 @@ private CharSequence generateArrayProperty(
  indent);
 
  sb.append(String.format("\n" +
- indent + " %1$s %2$s(std::uint64_t index) const\n" +
+ indent + " %1$s %2$s(const std::uint64_t index) const\n" +
  indent + " {\n" +
  indent + " if (index >= %3$d)\n" +
  indent + " {\n" +
@@ -1344,7 +1344,7 @@ private CharSequence generateArrayProperty(
  indent);
 
  sb.append(String.format("\n" +
- indent + " %1$s %2$s(std::uint64_t index, %3$s value)\n" +
+ indent + " %1$s &%2$s(const std::uint64_t index, const %3$s value)\n" +
  indent + " {\n" +
  indent + " if (index >= %4$d)\n" +
  indent + " {\n" +
@@ -1361,7 +1361,7 @@ private CharSequence generateArrayProperty(
  storeValue));
 
  sb.append(String.format("\n" +
- indent + " std::uint64_t get%1$s(char *dst, std::uint64_t length) const\n" +
+ indent + " std::uint64_t get%1$s(char *const dst, const std::uint64_t length) const\n" +
  indent + " {\n" +
  indent + " if (length > %2$d)\n" +
  indent + " {\n" +
@@ -1379,7 +1379,7 @@ private CharSequence generateArrayProperty(
  cppTypeName));
 
  sb.append(String.format("\n" +
- indent + " %1$s &put%2$s(const char *src) SBE_NOEXCEPT\n" +
+ indent + " %1$s &put%2$s(const char *const src) SBE_NOEXCEPT\n" +
  indent + " {\n" +
  indent + " std::memcpy(m_buffer + m_offset + %3$d, src, sizeof(%4$s) * %5$d);\n" +
  indent + " return *this;\n" +
@@ -1426,7 +1426,7 @@ private CharSequence generateArrayProperty(
 
  sb.append(String.format("\n" +
  indent + " #if __cplusplus >= 201703L\n" +
- indent + " %1$s &put%2$s(std::string_view str)\n" +
+ indent + " %1$s &put%2$s(const std::string_view str)\n" +
  indent + " {\n" +
  indent + " const size_t srcLength = str.length();\n" +
  indent + " if (srcLength > %4$d)\n" +
@@ -2085,7 +2085,7 @@ private static Object generateBitsetProperty(final String propertyName, final To
  bitsetName,
  propertyName));
 
- sb.append(String.format("\n" +
+ sb.append(String.format(
  indent + " %1$s &%2$s()\n" +
  indent + " {\n" +
  indent + " m_%2$s.wrap(m_buffer, m_offset + %3$d, m_actingVersion, m_bufferLength);\n" +
@@ -2121,7 +2121,7 @@ private static Object generateCompositeProperty(final String propertyName, final
  compositeName,
  propertyName));
 
- sb.append(String.format("\n" +
+ sb.append(String.format(
  indent + " %1$s &%2$s()\n" +
  indent + " {\n" +
  indent + " m_%2$s.wrap(m_buffer, m_offset + %3$d, m_actingVersion, m_bufferLength);\n" +

sbe-tool/src/test/c/CComplianceTest.c

@@ -0,0 +1,10 @@
+#include <code_generation_test/car.h>
+#include <code_generation_test/messageHeader.h>
+
+#include <group_with_data/testMessage1.h>
+#include <group_with_data/testMessage2.h>
+#include <group_with_data/testMessage3.h>
+#include <group_with_data/testMessage4.h>
+
+int main() {
+}

sbe-tool/src/test/c/CMakeLists.txt

@@ -55,3 +55,12 @@ add_custom_target(c_codecs DEPENDS ${GENERATED_CODECS})
 sbe_test(BoundsCheckTest c_codecs)
 sbe_test(CodeGenTest c_codecs)
 sbe_test(GroupWithDataTest c_codecs)
+
+# Compile a dummy C source to test C compliance of generated headers.
+add_executable(CComplianceTest CComplianceTest.c)
+
+target_include_directories(CComplianceTest
+ PRIVATE ${C_CODEC_TARGET_DIR}
+)
+
+add_dependencies(CComplianceTest c_codecs)