[21397] Parse IDL string for xtypes

CMakeLists.txt

@@ -62,7 +62,7 @@ if(MSVC OR MSVC_IDE)
     # C4715: 'Test': not all control paths return a value
     # C5038 data member 'member1' will be initialized after data member 'member2'
     # C4100 'identifier' : unreferenced formal parameter (matches clang -Wunused-lambda-capture)
-    add_compile_options(/w34101 /w34189 /w34555 /w34715 /w35038 /w44100)
+    add_compile_options(/w34101 /w34189 /w34555 /w34715 /w35038 /w44100 /bigobj)
 
     if(EPROSIMA_BUILD)
         string(REPLACE "/DNDEBUG" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")

include/fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp

@@ -145,9 +145,15 @@ class DynamicTypeBuilderFactory : public std::enable_shared_from_this<DynamicTyp
     FASTDDS_EXPORTED_API virtual traits<DynamicTypeBuilder>::ref_type create_bitmask_type(
             uint32_t bound) = 0;
 
+    /*!
+     * Sets the path to the preprocessor executable to be used when parsing type descriptions.
+     * @param [in] preprocessor path to the preprocessor executable.
+     */
+    FASTDDS_EXPORTED_API virtual void set_preprocessor(
+            const std::string& preprocessor) = 0;
+
     /*!
      * Creates a new @ref DynamicTypeBuilder reference by parsing the type description at the given URL.
-     * @remark Not implemented yet.
      * @param [in] document_url pointing to the url containing the type description.
      * @param [in] type_name Fully qualified name of the type to be loaded from the document.
      * @param [in] include_paths A collection of URLs to directories to be searched for additional type description

src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderFactoryImpl.cpp

@@ -31,12 +31,24 @@
 #include <fastdds/xtypes/type_representation/TypeObjectRegistry.hpp>
 #include <rtps/RTPSDomainImpl.hpp>
 
+#include "idl_parser/Idl.hpp"
+
 namespace eprosima {
 namespace fastdds {
 namespace dds {
 
 traits<DynamicTypeBuilderFactoryImpl>::ref_type DynamicTypeBuilderFactoryImpl::instance_;
 
+//{{{ Utility functions
+
+void DynamicTypeBuilderFactoryImpl::set_preprocessor(
+        const std::string& preprocessor)
+{
+    preprocessor_ = preprocessor;
+}
+
+//}}}
+
 //{{{ Functions to create types
 
 traits<DynamicTypeBuilder>::ref_type DynamicTypeBuilderFactoryImpl::create_type(
@@ -175,11 +187,20 @@ traits<DynamicTypeBuilder>::ref_type DynamicTypeBuilderFactoryImpl::create_type_
         const std::string& type_name,
         const IncludePathSeq& include_paths) noexcept
 {
-    traits<DynamicTypeBuilder>::ref_type nil;
-    static_cast<void>(document_url);
-    static_cast<void>(type_name);
-    static_cast<void>(include_paths);
-    return nil;
+    traits<DynamicTypeBuilder>::ref_type ret_val;
+
+    try
+    {
+        idlparser::Context context = idlparser::parse_file(document_url, type_name, include_paths, preprocessor_);
+        ret_val = context.builder;
+    }
+    catch (const std::exception& e)
+    {
+        EPROSIMA_LOG_ERROR(IDLPARSER, e.what());
+        ret_val.reset();
+    }
+
+    return ret_val;
 }
 
 //}}}

src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderFactoryImpl.hpp

@@ -41,6 +41,13 @@ class DynamicTypeBuilderFactoryImpl : public traits<DynamicTypeBuilderFactory>::
 {
 public:
 
+    //{{{ Utility functions
+
+    void set_preprocessor(
+            const std::string& preprocessor) override;
+
+    //}}}
+
     //{{{ Functions to create types
 
     traits<DynamicTypeBuilder>::ref_type create_type(
@@ -197,6 +204,9 @@ class DynamicTypeBuilderFactoryImpl : public traits<DynamicTypeBuilderFactory>::
     traits<DynamicTypeImpl>::ref_type char16_type_ {std::make_shared<DynamicTypeImpl>(TypeDescriptorImpl{TK_CHAR16,
                                                                                                          ""})};
     //}}}
+
+    //! Path to the preprocessor executable to be used when parsing type descriptions.
+    std::string preprocessor_{};
 };
 
 } // namespace dds

src/cpp/fastdds/xtypes/dynamic_types/idl_parser/Idl.hpp

@@ -0,0 +1,100 @@
+// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef FASTDDS_XTYPES_DYNAMIC_TYPES_IDL_PARSER_IDL_HPP
+#define FASTDDS_XTYPES_DYNAMIC_TYPES_IDL_PARSER_IDL_HPP
+
+#include "IdlParser.hpp"
+
+#include <sstream>
+
+namespace eprosima {
+namespace fastdds {
+namespace dds {
+namespace idlparser {
+
+/// \brief Parse IDL string input, conforming to IDL specification V4.2.
+/// \param[in] idl An IDL string to parse into DynamicTypes
+/// \return A Context object with data related to the parse output
+inline Context parse(
+        const std::string& idl)
+{
+    return Parser::instance()->parse_string(idl);
+}
+
+/// \brief Parse IDL string input with an existent context, conforming to IDL specification V4.2.
+/// \param[in] idl An IDL string to parse into DynamicTypes
+/// \param[in] context An existent Context object
+/// \return A Context object with data related to the parse output
+inline Context& parse(
+        const std::string& idl,
+        Context& context)
+{
+    Parser::instance()->parse_string(idl, context);
+    return context;
+}
+
+/// \brief Parse IDL file input, conforming to IDL specification V4.2.
+/// \param[in] idl_file Path to the IDL file
+/// \return A Context object with data related to the parse output
+inline Context parse_file(
+        const std::string& idl_file)
+{
+    return Parser::instance()->parse_file(idl_file);
+}
+
+/// \brief Parse IDL file input with an existent context, conforming to IDL specification V4.2.
+/// \param[in] idl_file Path to the IDL file
+/// \param[in] context An existent Context object
+/// \return A Context object with data related to the parse output
+inline Context& parse_file(
+        const std::string& idl_file,
+        Context& context)
+{
+    Parser::instance()->parse_file(idl_file, context);
+    return context;
+}
+
+/// \brief Parse IDL file input and save the DynamicTypeBuilder object corresponding to the given target type name,
+/// conforming to IDL specification V4.2.
+/// \param[in] idl_file Path to the IDL file
+/// \param[in] type_name Fully qualified target type name to load from the IDL file
+/// \param[in] include_paths A collection of directories to search for additional type description
+/// \return A Context object with data related to the parse output
+inline Context parse_file(
+        const std::string& idl_file,
+        const std::string& type_name,
+        const IncludePathSeq& include_paths,
+        const std::string& preprocessor)
+{
+    return Parser::instance()->parse_file(idl_file, type_name, include_paths, preprocessor);
+}
+
+/// \brief Preprocess IDL file.
+/// \param[in] idl_file Path to the IDL file
+/// \param[in] includes A collection of directories to search for additional type description
+/// \return Preprocessed IDL string
+inline std::string preprocess(
+        const std::string& idl_file,
+        const std::vector<std::string>& includes)
+{
+    return Parser::preprocess(idl_file, includes);
+}
+
+} //namespace idlparser
+} //namespace dds
+} //namespace fastdds
+} //namespace eprosima
+
+#endif //FASTDDS_XTYPES_DYNAMIC_TYPES_IDL_PARSER_IDL_HPP