Merge pull request #428 from jwillemsen/jwi-nestedannotation

Use @nested annotation as a standards compliant way to annotate whether we have a top level type or not
RemedyIT · Feb 18, 2024 · 7ba05fb · 7ba05fb
2 parents 2e10704 + 54bc8d7
commit 7ba05fb
Show file tree

Hide file tree

Showing 142 changed files with 550 additions and 386 deletions.
diff --git a/connectors/dds4ccm/examples/custom/src/base/custom_example_b_defn.idl b/connectors/dds4ccm/examples/custom/src/base/custom_example_b_defn.idl
@@ -15,14 +15,15 @@ module Example {
 
     /// @struct B11
     ///
+    @nested(TRUE)
     struct B11 {
 
         double B11_1;
 
         double B11_2;
 
         double B11_3;
-    }; //@TopLevel(false)
+    };
 
     /// @typedef B26
     ///
@@ -46,14 +47,16 @@ module Example {
 
     /// @struct B27
     ///
+    @nested(TRUE)
     struct B27 {
         double B27_3;
         Example::B11 B27_2;
         Example::B11 B27_1;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B34
     ///
+    @nested(TRUE)
     struct B34 {
         Example::B11 B34_03;
         Example::B11 B34_04;
@@ -70,10 +73,11 @@ module Example {
         long B34_09;
         long B34_06;
         long B34_14;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B38
     ///
+    @nested(TRUE)
     struct B38 {
         long B38_10;
         long B38_04;
@@ -86,7 +90,7 @@ module Example {
         double B38_03;
         double B38_09;
         long B38_11;
-    }; //@TopLevel(false)
+    };
 
     /// @typedef B37
     ///
@@ -98,16 +102,18 @@ module Example {
 
     /// @struct B35
     ///
+    @nested(TRUE)
     struct B35 {
         long B35_5;
         double B35_3;
         Example::B12 B35_1;
         double B35_2;
         double B35_4;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B15
     ///
+    @nested(TRUE)
     struct B15 {
 
         long B15_07;
@@ -139,27 +145,29 @@ module Example {
         Example::B11 B15_14;
 
         float B15_06;
-    }; //@TopLevel(false)
+    };
 
     /// @typedef B14
     ///
     typedef sequence <B15, 26> B14;
 
     /// @struct B17
     ///
+    @nested(TRUE)
     struct B17 {
 
         double B17_1;
 
         long B17_2;
-    }; //@TopLevel(false)
+    };
 
     /// @typedef B02
     ///
     typedef sequence <octet> B02;
 
     /// @struct B04
     ///
+    @nested(TRUE)
     struct B04 {
 
         double B04_04;
@@ -183,10 +191,11 @@ module Example {
         double B04_10;
 
         double B04_11;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B06
     ///
+    @nested(TRUE)
     struct B06 {
 
         Example::B11 B06_02;
@@ -224,10 +233,11 @@ module Example {
         double B06_11;
 
         double B06_12;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B05
     ///
+    @nested(TRUE)
     struct B05 {
 
         double B05_09;
@@ -249,10 +259,11 @@ module Example {
         double B05_03;
 
         double B05_02;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B53
     ///
+    @nested(TRUE)
     struct B53 {
 
         Example::B14 B53_1;
@@ -262,10 +273,11 @@ module Example {
         double B53_3;
 
         long B53_4;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B54
     ///
+    @nested(TRUE)
     struct B54 {
 
         long B54_6;
@@ -279,18 +291,20 @@ module Example {
         double B54_2;
 
         Example::B12 B54_1;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B31
     ///
+    @nested(TRUE)
     struct B31 {
         double B31_2;
         double B31_1;
         double B31_3;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B30
     ///
+    @nested(TRUE)
     struct B30 {
         double c11;
         double c12;
@@ -301,20 +315,22 @@ module Example {
         double c31;
         double c32;
         double c33;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B32
     ///
+    @nested(TRUE)
     struct B32 {
         double q1;
         double q2;
         double q3;
         double q4;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B01
     ///
     /// unused
+    @nested(TRUE)
     struct B01 {
         unsigned long B01_6;
         unsigned short B01_5;
@@ -323,7 +339,7 @@ module Example {
         unsigned long B01_2;
         double B01_3;
         double B01_7;
-    }; //@TopLevel(false)
+    };
 
     /// @typedef B45
     ///
@@ -400,6 +416,7 @@ module Example {
 
     /// @struct B03
     ///
+     @nested(TRUE)
     struct B03 {
         string B03_10;
         string B03_08;
@@ -415,10 +432,11 @@ module Example {
         Example::B49 B03_07;
         unsigned long B03_12;
         unsigned long B03_14;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B19
     ///
+    @nested(TRUE)
     struct B19 {
         Example::B03 B19_14;
         Example::B47 B19_35;
@@ -461,10 +479,11 @@ module Example {
         double B19_10;
         double B19_11;
         double B19_09;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B16
     ///
+    @nested(TRUE)
     struct B16 {
         Example::B03 B16_02;
         Example::B47 B16_06;
@@ -478,42 +497,46 @@ module Example {
         unsigned long B16_10;
         Example::B22 B16_08;
         Example::B48 B16_09;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B07
     ///
+    @nested(TRUE)
     struct B07 {
         double B07_3;
         Example::B11 B07_1;
         Example::B11 B07_2;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B09
     ///
+    @nested(TRUE)
     struct B09 {
         double B09_1;
         Example::B11 B09_2;
-    }; //@TopLevel(false)
+    };
 
     /// @typedef B08
     ///
     typedef B09 B08[12];
 
     /// @struct B10
     ///
+    @nested(TRUE)
     struct B10 {
         double B10_3;
         long long B10_2;
         Example::B08 B10_1;
-    }; //@TopLevel(false)
+    };
 
     /// @struct B33
     ///
+    @nested(TRUE)
     struct B33 {
         double B33_1;
         double B33_2;
         double B33_3;
-    }; //@TopLevel(false)
+    };
 
     /// @typedef B29
     ///

diff --git a/connectors/dds4ccm/examples/custom/src/base/custom_example_ca1_msg.idl b/connectors/dds4ccm/examples/custom/src/base/custom_example_ca1_msg.idl
@@ -17,12 +17,13 @@ module Example {
 
     /// @struct CA1_msg
     ///
+    @nested(FALSE)
     struct CA1_msg {
 
         Example::NA4 hdr;
 
         Example::CA09 data;
-    }; //@TopLevel()
+    };
 };
 /// @}
 

diff --git a/connectors/dds4ccm/examples/custom/src/base/custom_example_ca_defn.idl b/connectors/dds4ccm/examples/custom/src/base/custom_example_ca_defn.idl
@@ -54,10 +54,11 @@ module Example {
 
     /// @struct CA07
     ///
+    @nested(TRUE)
     struct CA07 {
         double CA07_1;
         double CA07_2;
-    }; //@TopLevel(false)
+    };
 
     /// @typedef CA08
     ///
@@ -74,15 +75,17 @@ module Example {
 
     /// @struct CA09
     ///
+    @nested(TRUE)
     struct CA09 {
 
         double CA09_2;
 
         Example::NA5 CA09_1;
-    }; //@TopLevel(false)
+    };
 
     /// @struct CA10
     ///
+    @nested(TRUE)
     struct CA10 {
 
         Example::B47 C10_15;
@@ -140,7 +143,7 @@ module Example {
         Example::CA08 C10_27;
 
         Example::NA6 C10_07;
-    }; //@TopLevel(false)
+    };
 };
 
 #endif // CX_PORTS__TYPES__EXAMPLE_CA_DEFN_IDL

diff --git a/connectors/dds4ccm/examples/custom/src/base/custom_example_na_defn.idl b/connectors/dds4ccm/examples/custom/src/base/custom_example_na_defn.idl
@@ -40,6 +40,7 @@ module Example {
 
     /// @struct NA4
     ///
+    @nested(TRUE)
     struct NA4 {
         unsigned long NA4_6;
         unsigned short NA4_5;
@@ -48,10 +49,11 @@ module Example {
         unsigned long NA4_2;
         double NA4_3;
         double NA4_7;
-    }; //@TopLevel(false)
+    };
 
     /// @struct NA6
     ///
+    @nested(TRUE)
     struct NA6 {
 
         string NA6_10;
@@ -81,14 +83,15 @@ module Example {
         unsigned long NA6_12;
 
         unsigned long NA6_14;
-    }; //@TopLevel(false)
+    };
 
     /// @struct NA5
     ///
+    @nested(TRUE)
     struct NA5 {
 
         double NA5_1;
-    }; //@TopLevel(false)
+    };
 };
 
 #endif // CX_PORTS__TYPES__EXAMPLE_NA_DEFN_IDL