Skip to content

[C++] Var length string simplifications and improvements #758

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 3 commits into from
Feb 26, 2020
Merged

[C++] Var length string simplifications and improvements #758

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10e9bf2
[C++] Put std::string to var length string using overload.
denizevrenci Feb 26, 2020
2f698d2
[C++] Add method to put var length string from std::string_view.
denizevrenci Feb 26, 2020
b54a9af
[C++] Check the length passed to put method for var length strings.
denizevrenci Feb 26, 2020
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
39 changes: 24 additions & 15 deletions sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,12 @@ private void generateVarData(
indent + " %3$s lengthFieldValue = %4$s(length);\n" +
indent + " sbePosition(lengthPosition + lengthOfLengthField);\n" +
indent + " std::memcpy(m_buffer + lengthPosition, &lengthFieldValue, sizeof(%3$s));\n" +
indent + " std::uint64_t pos = sbePosition();\n" +
indent + " sbePosition(pos + length);\n" +
indent + " std::memcpy(m_buffer + pos, src, length);\n" +
indent + " if (length != %3$s(0))" +
indent + " {" +
indent + " std::uint64_t pos = sbePosition();\n" +
indent + " sbePosition(pos + length);\n" +
indent + " std::memcpy(m_buffer + pos, src, length);\n" +
indent + " }" +
indent + " return *this;\n" +
indent + " }\n",
propertyName,
Expand Down Expand Up @@ -591,25 +594,31 @@ private void generateVarData(
new Formatter(sb).format("\n" +
indent + " %1$s &put%2$s(const std::string& str)\n" +
indent + " {\n" +
indent + " if (str.length() > %6$d)\n" +
indent + " if (str.length() > %4$d)\n" +
indent + " {\n" +
indent + " throw std::runtime_error(\"std::string too long for length type [E109]\");\n" +
indent + " }\n" +
indent + " std::uint64_t lengthOfLengthField = %3$d;\n" +
indent + " std::uint64_t lengthPosition = sbePosition();\n" +
indent + " %4$s lengthFieldValue = %5$s(static_cast<%4$s>(str.length()));\n" +
indent + " sbePosition(lengthPosition + lengthOfLengthField);\n" +
indent + " std::memcpy(m_buffer + lengthPosition, &lengthFieldValue, sizeof(%4$s));\n" +
indent + " std::uint64_t pos = sbePosition();\n" +
indent + " sbePosition(pos + str.length());\n" +
indent + " std::memcpy(m_buffer + pos, str.c_str(), str.length());\n" +
indent + " return *this;\n" +
indent + " return put%2$s(str.data(), static_cast<%3$s>(str.length()));" +
indent + " }\n",
className,
propertyName,
lengthOfLengthField,
lengthCppType,
lengthByteOrderStr,
lengthToken.encoding().applicableMaxValue().longValue());

new Formatter(sb).format("\n" +
indent + " #if __cplusplus >= 201703L\n" +
indent + " %1$s &put%2$s(const std::string_view str)\n" +
indent + " {\n" +
indent + " if (str.length() > %4$d)\n" +
indent + " {\n" +
indent + " throw std::runtime_error(\"std::string too long for length type [E109]\");\n" +
indent + " }\n" +
indent + " return put%2$s(str.data(), static_cast<%3$s>(str.length()));" +
indent + " }\n" +
indent + " #endif\n",
className,
propertyName,
lengthCppType,
lengthToken.encoding().applicableMaxValue().longValue());

i += token.componentTokenCount();
Expand Down