Refs #19960. Update submodule

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
eProsima · Nov 22, 2023 · 75f646c · 75f646c
1 parent 8fe8c80
commit 75f646c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/src/main/java/com/eprosima/fastdds/fastddsgen.java b/src/main/java/com/eprosima/fastdds/fastddsgen.java
@@ -822,36 +822,32 @@ private Project parseIDL(
                         maintemplates.getTemplate("com/eprosima/fastcdr/idl/templates/TypesHeader.stg"),
                         m_replace)))
                 {
-                    if (returnedValue = Utils.writeFile(output_dir + ctx.getFilename() + ".cxx",
-                                    maintemplates.getTemplate("com/eprosima/fastcdr/idl/templates/TypesSource.stg"), m_replace))
-                    {
-                        project.addCommonIncludeFile(relative_dir + ctx.getFilename() + ".hpp");
-
-                        if (m_type_object_files)
-                        {
-                            System.out.println("Generating TypeObject files...");
-                            if (returnedValue = Utils.writeFile(output_dir + ctx.getFilename() + "TypeObject.h",
-                                        maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/TypeObjectHeader.stg"), m_replace))
-                            {
-                                if (returnedValue = Utils.writeFile(output_dir + ctx.getFilename() + "TypeObject.cxx",
-                                            maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/TypeObjectSource.stg"), m_replace))
-                                {
-                                    project.addCommonIncludeFile(relative_dir + ctx.getFilename() + "TypeObject.h");
-                                    project.addCommonSrcFile(relative_dir + ctx.getFilename() + "TypeObject.cxx");
-                                }
-                            }
-                        }
-                        if (m_python)
-                        {
-                            System.out.println("Generating Swig interface files...");
-                            if (returnedValue =
-                                    Utils.writeFile(output_dir + ctx.getFilename() + ".i",
-                                        maintemplates.getTemplate("com/eprosima/fastcdr/idl/templates/TypesSwigInterface.stg"), m_replace))
-                            {
-
-                            }
-                        }
-                    }
+                   project.addCommonIncludeFile(relative_dir + ctx.getFilename() + ".hpp");
+
+                   if (m_type_object_files)
+                   {
+                       System.out.println("Generating TypeObject files...");
+                       if (returnedValue = Utils.writeFile(output_dir + ctx.getFilename() + "TypeObject.h",
+                                   maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/TypeObjectHeader.stg"), m_replace))
+                       {
+                           if (returnedValue = Utils.writeFile(output_dir + ctx.getFilename() + "TypeObject.cxx",
+                                       maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/TypeObjectSource.stg"), m_replace))
+                           {
+                               project.addCommonIncludeFile(relative_dir + ctx.getFilename() + "TypeObject.h");
+                               project.addCommonSrcFile(relative_dir + ctx.getFilename() + "TypeObject.cxx");
+                           }
+                       }
+                   }
+                   if (m_python)
+                   {
+                       System.out.println("Generating Swig interface files...");
+                       if (returnedValue =
+                               Utils.writeFile(output_dir + ctx.getFilename() + ".i",
+                                   maintemplates.getTemplate("com/eprosima/fastcdr/idl/templates/TypesSwigInterface.stg"), m_replace))
+                       {
+
+                       }
+                   }
                 }
 
                 if (m_test)

diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser
+2 −4		src/it/java/com/eprosima/integration/Test.java
+2 −7		src/it/java/com/eprosima/integration/TestManager.java
+5 −22		src/main/antlr/com/eprosima/idl/parser/grammar/IDL.g4
+17 −51		src/main/java/com/eprosima/idl/context/Context.java
+0 −102		src/main/java/com/eprosima/idl/parser/tree/Annotation.java
+0 −3		src/main/java/com/eprosima/idl/parser/tree/AnnotationDeclaration.java
+0 −50		src/main/java/com/eprosima/idl/parser/tree/AnnotationMember.java
+1 −7		src/main/java/com/eprosima/idl/parser/typecode/EnumTypeCode.java
+0 −114		src/main/java/com/eprosima/idl/parser/typecode/MemberAppliedAnnotations.java
+0 −5		src/main/java/com/eprosima/idl/parser/typecode/MemberedTypeCode.java
+0 −84		src/main/java/com/eprosima/idl/parser/typecode/PrimitiveTypeCode.java
+8 −89		src/main/java/com/eprosima/idl/parser/typecode/TypeCode.java
+0 −5		src/main/java/com/eprosima/idl/parser/typecode/UnionMember.java
+0 −12		src/main/java/com/eprosima/solution/Project.java