Fixed usage of const as literals (#248)

* Refs #13731. Separate literal evaluation and maximum size Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #13731. Fix generation of constants inside modules Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #13731. Update submodule Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #13731. Apply suggestion Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> --------- Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
eProsima · Oct 9, 2023 · 7df0be7 · 7df0be7
1 parent 187aafd
commit 7df0be7
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 26 deletions.
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
@@ -98,10 +98,11 @@ $definitions; separator="\n"$
 $"\n"$
 >>
 
-// TODO name -> module
 module(ctx, parent, module, definition_list) ::= <<
 namespace $module.name$ {
-    $definition_list$
+
+$definition_list$
+
 } // namespace $module.name$
 >>
 

diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSource.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSource.stg
@@ -61,7 +61,11 @@ $endif$
 >>
 
 module(ctx, parent, module, definition_list) ::= <<
+namespace $module.name$ {
+
 $definition_list$
+
+} // namespace $module.name$
 >>
 
 definition_list(definitions) ::= <<

diff --git a/src/main/java/com/eprosima/fastdds/idl/grammar/Context.java b/src/main/java/com/eprosima/fastdds/idl/grammar/Context.java
@@ -122,7 +122,7 @@ public EnumTypeCode createEnumTypeCode(
     public MapTypeCode createMapTypeCode(
             String maxsize)
     {
-        return new MapTypeCode(maxsize);
+        return new MapTypeCode(maxsize, evaluate_literal(maxsize));
     }
 
     @Override
@@ -136,22 +136,22 @@ public PrimitiveTypeCode createPrimitiveTypeCode(
     public SequenceTypeCode createSequenceTypeCode(
             String maxsize)
     {
-        return new SequenceTypeCode(maxsize);
+        return new SequenceTypeCode(maxsize, evaluate_literal(maxsize));
     }
 
     @Override
     public SetTypeCode createSetTypeCode(
             String maxsize)
     {
-        return new SetTypeCode(maxsize);
+        return new SetTypeCode(maxsize, evaluate_literal(maxsize));
     }
 
     @Override
     public StringTypeCode createStringTypeCode(
             int kind,
             String maxsize)
     {
-        return new StringTypeCode(kind, maxsize);
+        return new StringTypeCode(kind, maxsize, evaluate_literal(maxsize));
     }
 
     @Override

diff --git a/src/main/java/com/eprosima/fastdds/idl/parser/typecode/ArrayTypeCode.java b/src/main/java/com/eprosima/fastdds/idl/parser/typecode/ArrayTypeCode.java
@@ -34,9 +34,9 @@ public long maxSerializedSize(
         }
 
         long size = 1;
-        for (int count = 0; count < getDimensions().size(); ++count)
+        for (int count = 0; count < getEvaluatedDimensions().size(); ++count)
         {
-            size *= Long.parseLong(getDimensions().get(count), 10);
+            size *= Long.parseLong(getEvaluatedDimensions().get(count), 10);
         }
 
         if (0 < size)
@@ -61,9 +61,9 @@ public long maxPlainTypeSerializedSize(
         long initial_alignment = current_alignment;
 
         long size = 1;
-        for (int count = 0; count < getDimensions().size(); ++count)
+        for (int count = 0; count < getEvaluatedDimensions().size(); ++count)
         {
-            size *= Long.parseLong(getDimensions().get(count), 10);
+            size *= Long.parseLong(getEvaluatedDimensions().get(count), 10);
         }
 
         if (0 < size)
@@ -85,9 +85,9 @@ public long maxPlainTypeSerializedSize(
     public boolean isNotZeroArray()
     {
         long size = 1;
-        for (int count = 0; count < getDimensions().size(); ++count)
+        for (int count = 0; count < getEvaluatedDimensions().size(); ++count)
         {
-            size *= Long.parseLong(getDimensions().get(count), 10);
+            size *= Long.parseLong(getEvaluatedDimensions().get(count), 10);
         }
         return 0 != size;
     }

diff --git a/src/main/java/com/eprosima/fastdds/idl/parser/typecode/MapTypeCode.java b/src/main/java/com/eprosima/fastdds/idl/parser/typecode/MapTypeCode.java
@@ -20,17 +20,18 @@ public class MapTypeCode extends com.eprosima.idl.parser.typecode.MapTypeCode
     implements TypeCode
 {
     public MapTypeCode(
-            String maxsize)
+            String maxsize,
+            String evaluated_maxsize)
     {
-        super(maxsize);
+        super(maxsize, evaluated_maxsize);
     }
 
     @Override
     public long maxSerializedSize(
             long current_alignment)
     {
         long initial_alignment = current_alignment;
-        long maxsize = Long.parseLong(getMaxsize(), 10);
+        long maxsize = Long.parseLong(getEvaluatedMaxsize(), 10);
 
 
         if (!getValueTypeCode().isPrimitive() &&

diff --git a/src/main/java/com/eprosima/fastdds/idl/parser/typecode/SequenceTypeCode.java b/src/main/java/com/eprosima/fastdds/idl/parser/typecode/SequenceTypeCode.java
@@ -20,9 +20,10 @@ public class SequenceTypeCode extends com.eprosima.idl.parser.typecode.SequenceT
     implements TypeCode
 {
     public SequenceTypeCode(
-            String maxsize)
+            String maxsize,
+            String evaluated_maxsize)
     {
-        super(maxsize);
+        super(maxsize, evaluated_maxsize);
     }
 
     @Override
@@ -31,7 +32,7 @@ public long maxSerializedSize(
     {
         long initial_alignment = current_alignment;
         long maxsize = !detect_recursive_
-            ? Long.parseLong(getMaxsize(), 10)
+            ? Long.parseLong(getEvaluatedMaxsize(), 10)
             : 0;
 
         boolean should_set_and_unset = !detect_recursive_;

diff --git a/src/main/java/com/eprosima/fastdds/idl/parser/typecode/SetTypeCode.java b/src/main/java/com/eprosima/fastdds/idl/parser/typecode/SetTypeCode.java
@@ -20,17 +20,18 @@ public class SetTypeCode extends com.eprosima.idl.parser.typecode.SetTypeCode
     implements TypeCode
 {
     public SetTypeCode(
-            String maxsize)
+            String maxsize,
+            String evaluated_maxsize)
     {
-        super(maxsize);
+        super(maxsize, evaluated_maxsize);
     }
 
     @Override
     public long maxSerializedSize(
             long current_alignment)
     {
         long initial_alignment = current_alignment;
-        long maxsize = Long.parseLong(getMaxsize(), 10);
+        long maxsize = Long.parseLong(getEvaluatedMaxsize(), 10);
 
         current_alignment += 4 + TypeCode.cdr_alignment(current_alignment, 4);
 

diff --git a/src/main/java/com/eprosima/fastdds/idl/parser/typecode/StringTypeCode.java b/src/main/java/com/eprosima/fastdds/idl/parser/typecode/StringTypeCode.java
@@ -22,17 +22,18 @@ public class StringTypeCode extends com.eprosima.idl.parser.typecode.StringTypeC
 {
     public StringTypeCode(
             int kind,
-            String maxsize)
+            String maxsize,
+            String evaluated_maxsize)
     {
-        super(kind, maxsize);
+        super(kind, maxsize, evaluated_maxsize);
     }
 
     @Override
     public long maxSerializedSize(
             long current_alignment)
     {
         long initial_alignment = current_alignment;
-        long maxsize = Long.parseLong(getMaxsize(), 10);
+        long maxsize = Long.parseLong(getEvaluatedMaxsize(), 10);
 
         switch (getKind())
         {

diff --git a/thirdparty/dds-types-test b/thirdparty/dds-types-test
diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser