Fix API for TypeObject code generation (#110)

* Refs #19595: code style Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: return annotation default value Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: add Alias API for container types aliased Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: fix typos in primitive API Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #19595: explictly override Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> --------- Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
eProsima · Nov 28, 2023 · a11f9ca · a11f9ca
1 parent e385a8e
commit a11f9ca
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 11 deletions.
diff --git a/src/main/java/com/eprosima/idl/parser/tree/Annotation.java b/src/main/java/com/eprosima/idl/parser/tree/Annotation.java
@@ -106,7 +106,9 @@ public String getROS2Scopedname()
     public boolean addValue(String value)
     {
         if(m_members.size() != 1)
+        {
             return false;
+        }
 
         ((AnnotationMember)m_members.values().toArray()[0]).setValue(value);
 
@@ -125,14 +127,19 @@ public boolean addValue(String attribute, String value)
             member.getEnumStringValue();
         }
         else
+        {
             return false;
+        }
 
         return true;
     }
 
     public String getValue()
     {
-        if(m_members.size() != 1) return null;
+        if(m_members.size() != 1)
+        {
+            return null;
+        }
 
         return ((AnnotationMember)m_members.values().toArray()[0]).getValue();
     }

diff --git a/src/main/java/com/eprosima/idl/parser/tree/AnnotationMember.java b/src/main/java/com/eprosima/idl/parser/tree/AnnotationMember.java
@@ -52,20 +52,26 @@ public TypeCode getTypecode()
 
     public String getValue()
     {
-        if (m_typecode.isIsType_c()) // Enum
+        if (m_typecode.isIsEnumType())
         {
             EnumTypeCode enumTC = (EnumTypeCode)m_typecode;
             int idx = 0;
+            int default_idx = 0;
             for (Member m : enumTC.getMembers())
             {
                 if (m.getName().equals(m_value))
                 {
                     return Integer.toString(idx);
                 }
+                else if (m.isAnnotationDefaultLiteral())
+                {
+                    default_idx = idx;
+                }
                 idx++;
             }
+            return Integer.toString(default_idx);
         }
-        if (m_typecode.isIsType_d()) // String
+        else if (m_typecode.isIsStringType() || m_typecode.isIsWStringType())
         {
             if (m_value != null)
             {
@@ -74,6 +80,19 @@ public String getValue()
                     return m_value.substring(1, m_value.length() - 1);
                 }
             }
+            if (m_typecode.isIsWStringType())
+            {
+                return "L\"\"";
+            }
+            return "";
+        }
+        else if (m_typecode.isPrimitive())
+        {
+            if (m_value != null)
+            {
+                return m_value;
+            }
+            return m_typecode.getInitialValue();
         }
         return m_value;
     }

diff --git a/src/main/java/com/eprosima/idl/parser/typecode/AliasTypeCode.java b/src/main/java/com/eprosima/idl/parser/typecode/AliasTypeCode.java
@@ -316,6 +316,11 @@ public String getSize()
         return super.getContentTypeCode().getSize();
     }
 
+    public String getEvaluatedMaxsize()
+    {
+        return super.getContentTypeCode().getEvaluatedMaxsize();
+    }
+
     public List<String> getDimensions()
     {
         if (super.getContentTypeCode() instanceof ArrayTypeCode)
@@ -326,6 +331,16 @@ public List<String> getDimensions()
         return null;
     }
 
+    public List<String> getEvaluatedDimensions()
+    {
+        if (super.getContentTypeCode() instanceof ArrayTypeCode)
+        {
+            return ((ArrayTypeCode) super.getContentTypeCode()).getEvaluatedDimensions();
+        }
+
+        return null;
+    }
+
     /*** End of functions that alias has to export because some typecodes have them*/
 
     private String m_name = null;

diff --git a/src/main/java/com/eprosima/idl/parser/typecode/MapTypeCode.java b/src/main/java/com/eprosima/idl/parser/typecode/MapTypeCode.java
@@ -92,6 +92,7 @@ public String getIdlTypename()
         return st.render();
     }
 
+    @Override
     public String getMaxsize()
     {
         if (m_maxsize == null)
@@ -102,6 +103,7 @@ public String getMaxsize()
         return m_maxsize;
     }
 
+    @Override
     public String getEvaluatedMaxsize()
     {
         if (evaluated_maxsize_ == null)

diff --git a/src/main/java/com/eprosima/idl/parser/typecode/PrimitiveTypeCode.java b/src/main/java/com/eprosima/idl/parser/typecode/PrimitiveTypeCode.java
@@ -249,25 +249,25 @@ public boolean isIsInt64Type()
     }
 
     @Override
-    public boolean isIsUint64Tpe()
+    public boolean isIsUint64Type()
     {
         return getKind() == Kind.KIND_ULONGLONG;
     }
 
     @Override
-    public boolean isIsFloat32()
+    public boolean isIsFloat32Type()
     {
         return getKind() == Kind.KIND_FLOAT;
     }
 
     @Override
-    public boolean isIsFloat64()
+    public boolean isIsFloat64Type()
     {
         return getKind() == Kind.KIND_DOUBLE;
     }
 
     @Override
-    public boolean isIsFloat128()
+    public boolean isIsFloat128Type()
     {
         return getKind() == Kind.KIND_LONGDOUBLE;
     }

diff --git a/src/main/java/com/eprosima/idl/parser/typecode/SequenceTypeCode.java b/src/main/java/com/eprosima/idl/parser/typecode/SequenceTypeCode.java
@@ -119,6 +119,7 @@ public String getMaxsize()
         return m_maxsize;
     }
 
+    @Override
     public String getEvaluatedMaxsize()
     {
         if (evaluated_maxsize_ == null)

diff --git a/src/main/java/com/eprosima/idl/parser/typecode/StringTypeCode.java b/src/main/java/com/eprosima/idl/parser/typecode/StringTypeCode.java
@@ -96,6 +96,7 @@ public String getIdlTypename()
         return getIdlTypenameFromStringTemplate().toString();
     }
 
+    @Override
     public String getMaxsize()
     {
         if (m_maxsize == null)
@@ -106,6 +107,7 @@ public String getMaxsize()
         return m_maxsize;
     }
 
+    @Override
     public String getEvaluatedMaxsize()
     {
         if (evaluated_maxsize_ == null)

diff --git a/src/main/java/com/eprosima/idl/parser/typecode/TypeCode.java b/src/main/java/com/eprosima/idl/parser/typecode/TypeCode.java
@@ -161,6 +161,11 @@ public String getMaxsize()
         return null;
     }
 
+    public String getEvaluatedMaxsize()
+    {
+        return null;
+    }
+
     /*!
      * @brief This function returns the size of the datatype. By default is null string.
      * @return The size of the datatype.
@@ -267,22 +272,22 @@ public boolean isIsInt64Type()
         return false;
     }
 
-    public boolean isIsUint64Tpe()
+    public boolean isIsUint64Type()
     {
         return false;
     }
 
-    public boolean isIsFloat32()
+    public boolean isIsFloat32Type()
     {
         return false;
     }
 
-    public boolean isIsFloat64()
+    public boolean isIsFloat64Type()
     {
         return false;
     }
 
-    public boolean isIsFloat128()
+    public boolean isIsFloat128Type()
     {
         return false;
     }