Release v2.1

commschamp · Jul 21, 2019 · 69a498d · 69a498d
2 parents 0a68f7c + a9393b8
commit 69a498d
Show file tree

Hide file tree

Showing 73 changed files with 1,518 additions and 492 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -138,7 +138,7 @@ endwhile ()
 include(GNUInstallDirs)
 
 if ("${CC_TAG}" STREQUAL "")
-    set (CC_TAG "v1.3")
+    set (CC_TAG "v2.0")
 endif()
 
 add_subdirectory(lib)

diff --git a/README.md b/README.md
@@ -137,9 +137,6 @@ versions of the compilers:
 - **Clang**: >=3.8
 - **MSVC**: >= 2015
 
-In some occasions **gcc** as early as v4.7 can be used to compile protocol
-code definition.
-
 # Branching Model
 This repository will follow the 
 [Successful Git Branching Model](http://nvie.com/posts/a-successful-git-branching-model/).

diff --git a/app/commsdsl2comms/src/AllMessages.h b/app/commsdsl2comms/src/AllMessages.h
@@ -30,7 +30,6 @@ class AllMessages
     bool writeProtocolDefinition() const;
     bool writePluginDefinition() const;
 
-private:
     Generator& m_generator;
 };
 

diff --git a/app/commsdsl2comms/src/BitfieldField.cpp b/app/commsdsl2comms/src/BitfieldField.cpp
@@ -44,7 +44,8 @@ const std::string MembersDefTemplate =
     "};\n";
 
 const std::string MembersOptionsTemplate =
-    "/// @brief Extra options for all the member fields of @ref #^#SCOPE#$##^#CLASS_NAME#$# bitfield.\n"
+    "/// @brief Extra options for all the member fields of\n"
+    "///     @ref #^#SCOPE#$##^#CLASS_NAME#$# bitfield.\n"
     "struct #^#CLASS_NAME#$#Members\n"
     "{\n"
     "    #^#OPTIONS#$#\n"

diff --git a/app/commsdsl2comms/src/BundleField.cpp b/app/commsdsl2comms/src/BundleField.cpp
@@ -46,7 +46,8 @@ const std::string MembersDefTemplate =
     "};\n";
 
 const std::string MembersOptionsTemplate =
-    "/// @brief Extra options for all the member fields of @ref #^#SCOPE#$##^#CLASS_NAME#$# bitfield.\n"
+    "/// @brief Extra options for all the member fields of\n"
+    "///     @ref #^#SCOPE#$##^#CLASS_NAME#$# bitfield.\n"
     "struct #^#CLASS_NAME#$#Members\n"
     "{\n"
     "    #^#OPTIONS#$#\n"
@@ -325,8 +326,8 @@ std::string BundleField::getFieldOpts(const std::string& scope) const
             });
 
     if (membersHaveCustomReadRefresh) {
-        common::addToList("comms::option::HasCustomRead", options);
-        common::addToList("comms::option::HasCustomRefresh", options);
+        common::addToList("comms::option::def::HasCustomRead", options);
+        common::addToList("comms::option::def::HasCustomRefresh", options);
     }
 
     auto lengthFieldIter = 
@@ -339,7 +340,7 @@ std::string BundleField::getFieldOpts(const std::string& scope) const
 
     if (lengthFieldIter != m_members.end()) {
         auto idx = static_cast<unsigned>(std::distance(m_members.begin(), lengthFieldIter));
-        auto optStr = "comms::option::RemLengthMemberField<" + common::numToString(idx) + '>';
+        auto optStr = "comms::option::def::RemLengthMemberField<" + common::numToString(idx) + '>';
         common::addToList(optStr, options);
     }
 

diff --git a/app/commsdsl2comms/src/CMakeLists.txt b/app/commsdsl2comms/src/CMakeLists.txt
@@ -30,6 +30,7 @@ set (
     "MsgId.cpp"
     "Interface.cpp"
     "AllMessages.cpp"
+    "Dispatch.cpp"
     "Frame.cpp"
     "Layer.cpp"
     "PayloadLayer.cpp"

diff --git a/app/commsdsl2comms/src/ChecksumLayer.cpp b/app/commsdsl2comms/src/ChecksumLayer.cpp
@@ -106,7 +106,7 @@ std::string ChecksumLayer::getClassDefinitionImpl(
 
     if (obj.verifyBeforeRead()) {
         replacements.insert(std::make_pair("COMMA", ","));
-        replacements.insert(std::make_pair("EXTRA_OPT", "comms::option::ChecksumLayerVerifyBeforeRead"));
+        replacements.insert(std::make_pair("EXTRA_OPT", "comms::option::def::ChecksumLayerVerifyBeforeRead"));
     }
 
     prevLayer = common::nameToClassCopy(name());

diff --git a/app/commsdsl2comms/src/DataField.cpp b/app/commsdsl2comms/src/DataField.cpp
@@ -203,10 +203,10 @@ std::string DataField::getBareMetalOptionStrImpl() const
     auto obj = dataFieldDslObj();
     auto fixedLength = obj.fixedLength();
     if (fixedLength != 0U) {
-        return "comms::option::SequenceFixedSizeUseFixedSizeStorage";
+        return "comms::option::app::SequenceFixedSizeUseFixedSizeStorage";
     }
 
-    return "comms::option::FixedSizeStorage<" + common::seqDefaultSizeStr() + '>';
+    return "comms::option::app::FixedSizeStorage<" + common::seqDefaultSizeStr() + '>';
 }
 
 std::string DataField::getCompareToValueImpl(
@@ -450,7 +450,7 @@ void DataField::checkFixedLengthOpt(DataField::StringsList& list) const
     }
 
     auto str =
-        "comms::option::SequenceFixedSize<" +
+        "comms::option::def::SequenceFixedSize<" +
         common::numToString(static_cast<std::uintmax_t>(fixedLen)) +
         ">";
     list.push_back(std::move(str));
@@ -487,7 +487,7 @@ void DataField::checkPrefixOpt(DataField::StringsList& list) const
         static_cast<void>(fieldPtr);
     }
 
-    list.push_back("comms::option::SequenceSerLengthFieldPrefix<" + prefixName + '>');
+    list.push_back("comms::option::def::SequenceSerLengthFieldPrefix<" + prefixName + '>');
 }
 
 void DataField::checkForcingOpt(StringsList& list) const
@@ -498,7 +498,7 @@ void DataField::checkForcingOpt(StringsList& list) const
         return;
     }
 
-    common::addToList("comms::option::SequenceLengthForcingEnabled", list);
+    common::addToList("comms::option::def::SequenceLengthForcingEnabled", list);
 }
 
 std::string DataField::getExtraOptions(const std::string& scope, GetExtraOptionsFunc func) const
@@ -515,7 +515,8 @@ std::string DataField::getExtraOptions(const std::string& scope, GetExtraOptions
     }
 
     const std::string Templ =
-        "/// @brief Extra options for all the member fields of @ref #^#SCOPE#$##^#CLASS_NAME#$# string.\n"
+        "/// @brief Extra options for all the member fields of\n"
+        "///     @ref #^#SCOPE#$##^#CLASS_NAME#$# string.\n"
         "struct #^#CLASS_NAME#$#Members\n"
         "{\n"
         "    #^#OPTIONS#$#\n"