From 5437e933657756848cfa76d9538f47c32ef04e14 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 14 Feb 2024 17:36:28 +0100 Subject: [PATCH 01/14] Migrating from TopLevel to nested --- .../custom/src/base/custom_example_b_defn.idl | 46 +++---- .../src/base/custom_example_ca1_msg.idl | 2 +- .../src/base/custom_example_ca_defn.idl | 6 +- .../src/base/custom_example_na_defn.idl | 6 +- .../examples/idl/data/idl_example_b_defn.idl | 46 +++---- .../examples/idl/data/idl_example_ca1_msg.idl | 2 +- .../examples/idl/data/idl_example_ca_defn.idl | 6 +- .../examples/idl/data/idl_example_na_defn.idl | 6 +- .../shapes_asm/ports/shapes_shapetype_msg.idl | 2 +- .../apc_event_defaults/data/event_record.idl | 2 +- .../apc_event_extended/data/event_record.idl | 2 +- .../tests/apc/gen_comp/data/shapes.idl | 2 +- .../tests/apc/gen_comp_only/data/shapes.idl | 2 +- .../tests/coherent_write/data/common.idl | 2 +- .../connector_status_listener/data/common.idl | 2 +- .../connector_status_listener/data/csl.idl | 2 +- .../event_listener/data/common.idl | 2 +- .../base/data/shapes_shapetype_msg.idl | 2 +- .../extended/data/shapes_shapetype_msg.idl | 2 +- .../listeners/event/data/common.idl | 2 +- .../listeners/state/data/common.idl | 2 +- .../filter_attrib/read_get/data/common.idl | 2 +- .../listeners/event/data/common.idl | 2 +- .../listeners/state/data/common.idl | 2 +- .../query_attrib/read_get/data/common.idl | 2 +- .../tests/get_component/data/common.idl | 2 +- .../dds4ccm/tests/getter/data/common.idl | 2 +- .../idl_conversion/data/idl_conversion.idl | 28 ++-- .../dds4ccm/tests/invalid_qos/data/common.idl | 2 +- .../ports/messages/example_aa1_msg.idl | 2 +- .../ports/messages/example_aa2_msg.idl | 2 +- .../ports/messages/example_aa_defn.idl | 4 +- .../ports/messages/example_b_defn.idl | 46 +++---- .../ports/messages/example_ba1_msg.idl | 2 +- .../ports/messages/example_ba2_msg.idl | 2 +- .../ports/messages/example_ba_defn.idl | 4 +- .../ports/messages/example_ca1_msg.idl | 2 +- .../ports/messages/example_ca2_msg.idl | 2 +- .../ports/messages/example_ca_defn.idl | 6 +- .../ports/messages/example_da1_msg.idl | 2 +- .../ports/messages/example_da2_msg.idl | 2 +- .../ports/messages/example_da3_msg.idl | 2 +- .../ports/messages/example_da4_msg.idl | 2 +- .../ports/messages/example_da5_msg.idl | 2 +- .../ports/messages/example_da_defn.idl | 16 +-- .../ports/messages/example_ea1_msg.idl | 2 +- .../ports/messages/example_ea2_msg.idl | 2 +- .../ports/messages/example_ea_defn.idl | 4 +- .../ports/messages/example_fa1_msg.idl | 2 +- .../ports/messages/example_fa2_msg.idl | 2 +- .../ports/messages/example_fa_defn.idl | 6 +- .../ports/messages/example_ga1_msg.idl | 2 +- .../ports/messages/example_ga2_msg.idl | 2 +- .../ports/messages/example_ga_defn.idl | 4 +- .../ports/messages/example_ha1_msg.idl | 2 +- .../ports/messages/example_ha2_msg.idl | 2 +- .../ports/messages/example_ha_defn.idl | 4 +- .../ports/messages/example_ia1_msg.idl | 2 +- .../ports/messages/example_ia2_msg.idl | 2 +- .../ports/messages/example_ia_defn.idl | 4 +- .../ports/messages/example_ja1_msg.idl | 2 +- .../ports/messages/example_ja2_msg.idl | 2 +- .../ports/messages/example_ja_defn.idl | 4 +- .../ports/messages/example_ka1_msg.idl | 2 +- .../ports/messages/example_ka2_msg.idl | 2 +- .../ports/messages/example_ka_defn.idl | 4 +- .../ports/messages/example_ma1_msg.idl | 2 +- .../ports/messages/example_ma2_msg.idl | 2 +- .../ports/messages/example_ma_defn.idl | 4 +- .../ports/messages/example_na_defn.idl | 6 +- .../late_binded/read_get/data/common.idl | 2 +- .../tests/latency/data/latency_data.idl | 2 +- .../max_delivered_data/getter/data/common.idl | 2 +- .../listeners/data/data/common.idl | 2 +- .../listeners/state/data/common.idl | 2 +- .../minimal_latency/data/latency_data.idl | 2 +- .../tests/non_changeable/data/common.idl | 2 +- .../deadline_missed/data/common.idl | 2 +- .../sample_lost/data/common.idl | 2 +- .../tests/type_name/data/typename_base.idl | 2 +- .../data/typenamemodule_typenamemessage.idl | 2 +- .../typenamemodulemodule2_typenamemessage.idl | 2 +- .../typenamemodulemodule_typenamemessage.idl | 2 +- .../dds4ccm/tests/union/struct/data/union.idl | 10 +- .../tests/union/toplevel/data/top_union.idl | 6 +- .../unkeyed_writer/data/unkeyed_writer.idl | 3 +- .../dds4ccm/tests/updater/data/common.idl | 2 +- connectors/psdd4ccm/docs/src/psdd4ccm.adoc | 2 +- .../psdd4ccm/docs/src/psdd4ccm_details.adoc | 16 +-- .../psdd4ccm/examples/hello/base/message.idl | 2 +- .../examples/hello_ports/base/message.idl | 2 +- .../facets/psdd4ccm/writers/psdd_idl.rb | 10 +- .../tests/custom-serializer/base/topic.idl | 2 +- .../psdd4ccm/tests/data-types/base/topic.idl | 8 +- .../psdd4ccm/tests/get_many/base/topic.idl | 2 +- .../tests/get_many_with_max/base/topic.idl | 2 +- .../tests/keys/multiple/base/topic.idl | 2 +- .../tests/keys/nokey-key/base/topic.idl | 2 +- .../keys/pod/basic-typedef/base/topic.idl | 2 +- .../tests/keys/pod/enum/base/topic.idl | 2 +- .../tests/latency/data/latency_data.idl | 2 +- .../psdd4ccm/tests/many-to-one/base/topic.idl | 2 +- .../tests/single-frame/base/topic.idl | 2 +- .../topic-types/array/multidim/base/topic.idl | 2 +- .../topic-types/array/simple/base/topic.idl | 2 +- .../sequence/bounded/base/topic.idl | 2 +- .../sequence/complex/base/topic.idl | 2 +- .../sequence/simple/base/topic.idl | 2 +- .../string/toplevel/bounded/base/topic.idl | 2 +- .../string/toplevel/default/base/topic.idl | 2 +- .../struct/keyonly-key/base/topic.idl | 2 +- .../topic-types/struct/nested/base/topic.idl | 2 +- .../struct/toplevel/base/topic.idl | 2 +- .../topic-types/union/nested/base/topic.idl | 2 +- .../topic-types/union/toplevel/base/topic.idl | 2 +- .../psdd4ccm/tests/write_many/base/topic.idl | 2 +- ddsx11/docs/src/ddsx11_files.adoc | 2 +- ddsx11/examples/shapes/base/shapetype.idl | 2 +- ddsx11/tests/builtin/base/shapetype.idl | 2 +- ddsx11/tests/latency/data/latency_data.idl | 2 +- ddsx11/tests/logger_backend/log_record.idl | 2 +- .../minimal_latency/data/latency_data.idl | 2 +- .../unkeyed_writer/data/unkeyed_writer.idl | 2 +- .../psdd4ccm/examples/hello/base/message.idl | 2 +- .../async-event-combi/data/event_record.idl | 2 +- ridlbe/ccmx11/facets/dds/config.rb | 9 -- ridlbe/ccmx11/facets/dds/config/directives.rb | 130 +++++++++--------- ridlbe/ccmx11/facets/dds/visitorbase.rb | 15 +- ridlbe/ccmx11/facets/dds/visitors/struct.rb | 23 ++-- ridlbe/ccmx11/facets/dds/visitors/union.rb | 14 +- .../facets/dds/writers/ddstypedentitiesidl.rb | 8 +- .../facets/dds/writers/ddstypesupport.rb | 8 +- .../facets/dds4ccm/writers/dds4ccm_sev_idl.rb | 8 +- .../async-event-combi/data/event_record.idl | 2 +- tests/attributes/component/foo_exec.h | 42 +++--- tests/bst_test/base/bst_bst_defn.idl | 2 +- 136 files changed, 391 insertions(+), 379 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 index 18074e87b..627911fb1 100644 --- a/connectors/dds4ccm/examples/custom/src/base/custom_example_b_defn.idl +++ b/connectors/dds4ccm/examples/custom/src/base/custom_example_b_defn.idl @@ -22,7 +22,7 @@ module Example { double B11_2; double B11_3; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B26 /// @@ -50,7 +50,7 @@ module Example { double B27_3; Example::B11 B27_2; Example::B11 B27_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B34 /// @@ -70,7 +70,7 @@ module Example { long B34_09; long B34_06; long B34_14; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B38 /// @@ -86,7 +86,7 @@ module Example { double B38_03; double B38_09; long B38_11; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B37 /// @@ -104,7 +104,7 @@ module Example { Example::B12 B35_1; double B35_2; double B35_4; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B15 /// @@ -139,7 +139,7 @@ module Example { Example::B11 B15_14; float B15_06; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B14 /// @@ -152,7 +152,7 @@ module Example { double B17_1; long B17_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B02 /// @@ -183,7 +183,7 @@ module Example { double B04_10; double B04_11; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B06 /// @@ -224,7 +224,7 @@ module Example { double B06_11; double B06_12; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B05 /// @@ -249,7 +249,7 @@ module Example { double B05_03; double B05_02; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B53 /// @@ -262,7 +262,7 @@ module Example { double B53_3; long B53_4; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B54 /// @@ -279,7 +279,7 @@ module Example { double B54_2; Example::B12 B54_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B31 /// @@ -287,7 +287,7 @@ module Example { double B31_2; double B31_1; double B31_3; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B30 /// @@ -301,7 +301,7 @@ module Example { double c31; double c32; double c33; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B32 /// @@ -310,7 +310,7 @@ module Example { double q2; double q3; double q4; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B01 /// @@ -323,7 +323,7 @@ module Example { unsigned long B01_2; double B01_3; double B01_7; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B45 /// @@ -415,7 +415,7 @@ module Example { Example::B49 B03_07; unsigned long B03_12; unsigned long B03_14; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B19 /// @@ -461,7 +461,7 @@ module Example { double B19_10; double B19_11; double B19_09; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B16 /// @@ -478,7 +478,7 @@ module Example { unsigned long B16_10; Example::B22 B16_08; Example::B48 B16_09; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B07 /// @@ -486,14 +486,14 @@ module Example { double B07_3; Example::B11 B07_1; Example::B11 B07_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B09 /// struct B09 { double B09_1; Example::B11 B09_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B08 /// @@ -505,7 +505,7 @@ module Example { double B10_3; long long B10_2; Example::B08 B10_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B33 /// @@ -513,7 +513,7 @@ module Example { double B33_1; double B33_2; double B33_3; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @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 index 68b6c4e5c..51dc4241d 100644 --- a/connectors/dds4ccm/examples/custom/src/base/custom_example_ca1_msg.idl +++ b/connectors/dds4ccm/examples/custom/src/base/custom_example_ca1_msg.idl @@ -22,7 +22,7 @@ module Example { Example::NA4 hdr; Example::CA09 data; - }; //@TopLevel() + }; //@nested(FALSE) }; /// @} 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 index 0bc8b777c..7850cd777 100644 --- a/connectors/dds4ccm/examples/custom/src/base/custom_example_ca_defn.idl +++ b/connectors/dds4ccm/examples/custom/src/base/custom_example_ca_defn.idl @@ -57,7 +57,7 @@ module Example { struct CA07 { double CA07_1; double CA07_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef CA08 /// @@ -79,7 +79,7 @@ module Example { double CA09_2; Example::NA5 CA09_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct CA10 /// @@ -140,7 +140,7 @@ module Example { Example::CA08 C10_27; Example::NA6 C10_07; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #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 index ff85e3f85..1ceed0050 100644 --- a/connectors/dds4ccm/examples/custom/src/base/custom_example_na_defn.idl +++ b/connectors/dds4ccm/examples/custom/src/base/custom_example_na_defn.idl @@ -48,7 +48,7 @@ module Example { unsigned long NA4_2; double NA4_3; double NA4_7; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct NA6 /// @@ -81,14 +81,14 @@ module Example { unsigned long NA6_12; unsigned long NA6_14; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct NA5 /// struct NA5 { double NA5_1; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_NA_DEFN_IDL diff --git a/connectors/dds4ccm/examples/idl/data/idl_example_b_defn.idl b/connectors/dds4ccm/examples/idl/data/idl_example_b_defn.idl index 96958c9c0..4b0394a4b 100644 --- a/connectors/dds4ccm/examples/idl/data/idl_example_b_defn.idl +++ b/connectors/dds4ccm/examples/idl/data/idl_example_b_defn.idl @@ -24,7 +24,7 @@ module Example { double B11_2; double B11_3; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B26 /// @@ -52,7 +52,7 @@ module Example { double B27_3; Example::B11 B27_2; Example::B11 B27_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B34 /// @@ -72,7 +72,7 @@ module Example { long B34_09; long B34_06; long B34_14; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B38 /// @@ -88,7 +88,7 @@ module Example { double B38_03; double B38_09; long B38_11; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B37 /// @@ -106,7 +106,7 @@ module Example { Example::B12 B35_1; double B35_2; double B35_4; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B15 /// @@ -141,7 +141,7 @@ module Example { Example::B11 B15_14; float B15_06; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B14 /// @@ -154,7 +154,7 @@ module Example { double B17_1; long B17_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B02 /// @@ -185,7 +185,7 @@ module Example { double B04_10; double B04_11; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B06 /// @@ -226,7 +226,7 @@ module Example { double B06_11; double B06_12; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B05 /// @@ -251,7 +251,7 @@ module Example { double B05_03; double B05_02; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B53 /// @@ -264,7 +264,7 @@ module Example { double B53_3; long B53_4; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B54 /// @@ -281,7 +281,7 @@ module Example { double B54_2; Example::B12 B54_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B31 /// @@ -289,7 +289,7 @@ module Example { double B31_2; double B31_1; double B31_3; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B30 /// @@ -303,7 +303,7 @@ module Example { double c31; double c32; double c33; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B32 /// @@ -312,7 +312,7 @@ module Example { double q2; double q3; double q4; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B01 /// @@ -325,7 +325,7 @@ module Example { unsigned long B01_2; double B01_3; double B01_7; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B45 /// @@ -417,7 +417,7 @@ module Example { Example::B49 B03_07; unsigned long B03_12; unsigned long B03_14; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B19 /// @@ -463,7 +463,7 @@ module Example { double B19_10; double B19_11; double B19_09; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B16 /// @@ -480,7 +480,7 @@ module Example { unsigned long B16_10; Example::B22 B16_08; Example::B48 B16_09; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B07 /// @@ -488,14 +488,14 @@ module Example { double B07_3; Example::B11 B07_1; Example::B11 B07_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B09 /// struct B09 { double B09_1; Example::B11 B09_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B08 /// @@ -507,7 +507,7 @@ module Example { double B10_3; long long B10_2; Example::B08 B10_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B33 /// @@ -515,7 +515,7 @@ module Example { double B33_1; double B33_2; double B33_3; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B29 /// diff --git a/connectors/dds4ccm/examples/idl/data/idl_example_ca1_msg.idl b/connectors/dds4ccm/examples/idl/data/idl_example_ca1_msg.idl index 22950394d..3fb1835de 100644 --- a/connectors/dds4ccm/examples/idl/data/idl_example_ca1_msg.idl +++ b/connectors/dds4ccm/examples/idl/data/idl_example_ca1_msg.idl @@ -19,7 +19,7 @@ module Example { struct CA1_msg { Example::NA4 hdr; Example::CA09 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_CA1_MSG_IDL diff --git a/connectors/dds4ccm/examples/idl/data/idl_example_ca_defn.idl b/connectors/dds4ccm/examples/idl/data/idl_example_ca_defn.idl index 3c8ff81f7..c420dabea 100644 --- a/connectors/dds4ccm/examples/idl/data/idl_example_ca_defn.idl +++ b/connectors/dds4ccm/examples/idl/data/idl_example_ca_defn.idl @@ -57,7 +57,7 @@ module Example { struct CA07 { double CA07_1; double CA07_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef CA08 /// @@ -79,7 +79,7 @@ module Example { double CA09_2; Example::NA5 CA09_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct CA10 /// @@ -140,7 +140,7 @@ module Example { Example::CA08 C10_27; Example::NA6 C10_07; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_CA_DEFN_IDL diff --git a/connectors/dds4ccm/examples/idl/data/idl_example_na_defn.idl b/connectors/dds4ccm/examples/idl/data/idl_example_na_defn.idl index fc336805e..0d3604fe3 100644 --- a/connectors/dds4ccm/examples/idl/data/idl_example_na_defn.idl +++ b/connectors/dds4ccm/examples/idl/data/idl_example_na_defn.idl @@ -48,7 +48,7 @@ module Example { unsigned long NA4_2; double NA4_3; double NA4_7; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct NA6 /// @@ -81,14 +81,14 @@ module Example { unsigned long NA6_12; unsigned long NA6_14; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct NA5 /// struct NA5 { double NA5_1; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_NA_DEFN_IDL diff --git a/connectors/dds4ccm/examples/shapes_asm/ports/shapes_shapetype_msg.idl b/connectors/dds4ccm/examples/shapes_asm/ports/shapes_shapetype_msg.idl index d93641e3b..3a1b58268 100644 --- a/connectors/dds4ccm/examples/shapes_asm/ports/shapes_shapetype_msg.idl +++ b/connectors/dds4ccm/examples/shapes_asm/ports/shapes_shapetype_msg.idl @@ -21,6 +21,6 @@ struct ShapeType { long y; /// This field contains the size of the shape. long shapesize; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/connectors/dds4ccm/tests/apc/apc_event_defaults/data/event_record.idl b/connectors/dds4ccm/tests/apc/apc_event_defaults/data/event_record.idl index ad42e0858..d1c984db2 100644 --- a/connectors/dds4ccm/tests/apc/apc_event_defaults/data/event_record.idl +++ b/connectors/dds4ccm/tests/apc/apc_event_defaults/data/event_record.idl @@ -17,7 +17,7 @@ module Data string key; long iteration; ::OctetSeq data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif /* EVENT_RECORD_IDL_ */ diff --git a/connectors/dds4ccm/tests/apc/apc_event_extended/data/event_record.idl b/connectors/dds4ccm/tests/apc/apc_event_extended/data/event_record.idl index 7190d58aa..2346706bd 100644 --- a/connectors/dds4ccm/tests/apc/apc_event_extended/data/event_record.idl +++ b/connectors/dds4ccm/tests/apc/apc_event_extended/data/event_record.idl @@ -17,7 +17,7 @@ module Data string key; long iteration; ::OctetSeq data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif /* EVENT_RECORD_IDL_ */ diff --git a/connectors/dds4ccm/tests/apc/gen_comp/data/shapes.idl b/connectors/dds4ccm/tests/apc/gen_comp/data/shapes.idl index 9a3c3d898..75f026378 100644 --- a/connectors/dds4ccm/tests/apc/gen_comp/data/shapes.idl +++ b/connectors/dds4ccm/tests/apc/gen_comp/data/shapes.idl @@ -16,7 +16,7 @@ struct ShapeType { long x; long y; long shapesize; -}; //@TopLevel() +}; //@nested(FALSE) struct Bar diff --git a/connectors/dds4ccm/tests/apc/gen_comp_only/data/shapes.idl b/connectors/dds4ccm/tests/apc/gen_comp_only/data/shapes.idl index 991097f59..94ddfe557 100644 --- a/connectors/dds4ccm/tests/apc/gen_comp_only/data/shapes.idl +++ b/connectors/dds4ccm/tests/apc/gen_comp_only/data/shapes.idl @@ -16,7 +16,7 @@ struct ShapeType { long x; long y; long shapesize; -}; //@TopLevel() +}; //@nested(FALSE) struct Bar diff --git a/connectors/dds4ccm/tests/coherent_write/data/common.idl b/connectors/dds4ccm/tests/coherent_write/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/coherent_write/data/common.idl +++ b/connectors/dds4ccm/tests/coherent_write/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/connector_status_listener/data/common.idl b/connectors/dds4ccm/tests/connector_status_listener/data/common.idl index 68028f42d..dde919390 100644 --- a/connectors/dds4ccm/tests/connector_status_listener/data/common.idl +++ b/connectors/dds4ccm/tests/connector_status_listener/data/common.idl @@ -14,6 +14,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/connector_status_listener/data/csl.idl b/connectors/dds4ccm/tests/connector_status_listener/data/csl.idl index 3c7d9dea1..1e4ac92a0 100644 --- a/connectors/dds4ccm/tests/connector_status_listener/data/csl.idl +++ b/connectors/dds4ccm/tests/connector_status_listener/data/csl.idl @@ -15,6 +15,6 @@ struct OnInconsistentTopicMessage { string key; //@key short iteration; short extra; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_IDL_ */ diff --git a/connectors/dds4ccm/tests/content_filtered_topics/event_listener/data/common.idl b/connectors/dds4ccm/tests/content_filtered_topics/event_listener/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/content_filtered_topics/event_listener/data/common.idl +++ b/connectors/dds4ccm/tests/content_filtered_topics/event_listener/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/extensibility/base/data/shapes_shapetype_msg.idl b/connectors/dds4ccm/tests/extensibility/base/data/shapes_shapetype_msg.idl index 7f44ef7cf..f2c279047 100644 --- a/connectors/dds4ccm/tests/extensibility/base/data/shapes_shapetype_msg.idl +++ b/connectors/dds4ccm/tests/extensibility/base/data/shapes_shapetype_msg.idl @@ -22,6 +22,6 @@ struct ShapeType { long y; /// This field contains the size of the shape. long shapesize; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/connectors/dds4ccm/tests/extensibility/extended/data/shapes_shapetype_msg.idl b/connectors/dds4ccm/tests/extensibility/extended/data/shapes_shapetype_msg.idl index 8de1bf4ca..31894ec32 100644 --- a/connectors/dds4ccm/tests/extensibility/extended/data/shapes_shapetype_msg.idl +++ b/connectors/dds4ccm/tests/extensibility/extended/data/shapes_shapetype_msg.idl @@ -24,6 +24,6 @@ struct ShapeType { long shapesize; /// This field contains the angle of the shape. long angle; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/filter_attrib/listeners/event/data/common.idl b/connectors/dds4ccm/tests/filters/filter_attrib/listeners/event/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/filters/filter_attrib/listeners/event/data/common.idl +++ b/connectors/dds4ccm/tests/filters/filter_attrib/listeners/event/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/filter_attrib/listeners/state/data/common.idl b/connectors/dds4ccm/tests/filters/filter_attrib/listeners/state/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/filters/filter_attrib/listeners/state/data/common.idl +++ b/connectors/dds4ccm/tests/filters/filter_attrib/listeners/state/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/filter_attrib/read_get/data/common.idl b/connectors/dds4ccm/tests/filters/filter_attrib/read_get/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/filters/filter_attrib/read_get/data/common.idl +++ b/connectors/dds4ccm/tests/filters/filter_attrib/read_get/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/query_attrib/listeners/event/data/common.idl b/connectors/dds4ccm/tests/filters/query_attrib/listeners/event/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/filters/query_attrib/listeners/event/data/common.idl +++ b/connectors/dds4ccm/tests/filters/query_attrib/listeners/event/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/query_attrib/listeners/state/data/common.idl b/connectors/dds4ccm/tests/filters/query_attrib/listeners/state/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/filters/query_attrib/listeners/state/data/common.idl +++ b/connectors/dds4ccm/tests/filters/query_attrib/listeners/state/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/query_attrib/read_get/data/common.idl b/connectors/dds4ccm/tests/filters/query_attrib/read_get/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/filters/query_attrib/read_get/data/common.idl +++ b/connectors/dds4ccm/tests/filters/query_attrib/read_get/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/get_component/data/common.idl b/connectors/dds4ccm/tests/get_component/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/get_component/data/common.idl +++ b/connectors/dds4ccm/tests/get_component/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/getter/data/common.idl b/connectors/dds4ccm/tests/getter/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/getter/data/common.idl +++ b/connectors/dds4ccm/tests/getter/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/idl_conversion/data/idl_conversion.idl b/connectors/dds4ccm/tests/idl_conversion/data/idl_conversion.idl index a69b1ad42..889a4a9b0 100644 --- a/connectors/dds4ccm/tests/idl_conversion/data/idl_conversion.idl +++ b/connectors/dds4ccm/tests/idl_conversion/data/idl_conversion.idl @@ -13,7 +13,7 @@ module Example { struct B02 { long B02_1; - }; //@TopLevel(false) + }; //@nested(TRUE) typedef sequence B10; typedef sequence B11; @@ -47,7 +47,7 @@ module Example { struct B31 { long B31_1; - }; //@TopLevel(false) + }; //@nested(TRUE) typedef B31 B32[2]; typedef B31 B33[4][5]; @@ -93,7 +93,7 @@ module Example { long a; string b; B58 c; - }; //@TopLevel(false) + }; //@nested(TRUE) typedef sequence B82; struct B83 { string a; @@ -183,7 +183,7 @@ module Example { string key; short iteration; - }; //@TopLevel() + }; //@nested(FALSE) struct ColorStruct; typedef sequence ColorList; @@ -205,7 +205,7 @@ module Example { struct Color3Struct { string colorString; long colorNum; - }; //@TopLevel() + }; //@nested(FALSE) typedef sequence Color3Seq; struct Color4Struct; @@ -215,7 +215,7 @@ module Example { string colorString; long colorNum; Color3Seq color2seq; - }; //@TopLevel() + }; //@nested(FALSE) union B03; typedef sequence B03List; @@ -257,12 +257,12 @@ module Escaping union _private switch (long) { case 2: short b_03_3; - }; //@TopLevel() + }; //@nested(FALSE) struct _public; struct _public { string bar; - }; //@TopLevel() + }; //@nested(FALSE) }; module Foo @@ -272,7 +272,7 @@ module Foo struct TopicA { string a; - }; //@TopLevel() + }; //@nested(FALSE) }; }; @@ -304,30 +304,30 @@ module SequenceTest { myLong myl; myLongSeq mylseq; - }; //@TopLevel() + }; //@nested(FALSE) struct My_msg2 { long myl; - }; //@TopLevel() + }; //@nested(FALSE) typedef sequence My_msg2Seq; union My_msg3 switch (long) { case 2: long myl; - }; //@TopLevel() + }; //@nested(FALSE) typedef sequence My_msg3Seq; struct My_msg4 { long myl; - }; //@TopLevel() + }; //@nested(FALSE) typedef sequence My_msg4Bounded; union My_msg5 switch (long) { case 2: My_msg4Bounded myl; - }; //@TopLevel() + }; //@nested(FALSE) typedef sequence My_msg5Seq; typedef sequence My_msg5_b12; typedef sequence My_msg5_b11; diff --git a/connectors/dds4ccm/tests/invalid_qos/data/common.idl b/connectors/dds4ccm/tests/invalid_qos/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/invalid_qos/data/common.idl +++ b/connectors/dds4ccm/tests/invalid_qos/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa1_msg.idl index 44ca54a46..14a864a81 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa1_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::AA4 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_AA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa2_msg.idl index 92c39d080..b6674bb11 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa2_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::AA5 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_AA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa_defn.idl index 734cb6199..2acfb92b5 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa_defn.idl @@ -49,7 +49,7 @@ module Example { double AA4_3; double AA4_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct AA5 /// @@ -78,7 +78,7 @@ module Example { double AA5_12; double AA5_09; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_AA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_b_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_b_defn.idl index 0764f2ebe..10b941ba9 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_b_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_b_defn.idl @@ -19,7 +19,7 @@ module Example { double B11_2; double B11_3; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B26 /// @@ -47,7 +47,7 @@ module Example { double B27_3; Example::B11 B27_2; Example::B11 B27_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B34 /// @@ -67,7 +67,7 @@ module Example { long B34_09; long B34_06; long B34_14; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B38 /// @@ -83,7 +83,7 @@ module Example { double B38_03; double B38_09; long B38_11; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B37 /// @@ -101,7 +101,7 @@ module Example { Example::B12 B35_1; double B35_2; double B35_4; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B15 /// @@ -136,7 +136,7 @@ module Example { Example::B11 B15_14; float B15_06; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B14 /// @@ -149,7 +149,7 @@ module Example { double B17_1; long B17_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B02 /// @@ -180,7 +180,7 @@ module Example { double B04_10; double B04_11; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B06 /// @@ -221,7 +221,7 @@ module Example { double B06_11; double B06_12; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B05 /// @@ -246,7 +246,7 @@ module Example { double B05_03; double B05_02; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B53 /// @@ -259,7 +259,7 @@ module Example { double B53_3; long B53_4; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B54 /// @@ -276,7 +276,7 @@ module Example { double B54_2; Example::B12 B54_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B31 /// @@ -284,7 +284,7 @@ module Example { double B31_2; double B31_1; double B31_3; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B30 /// @@ -298,7 +298,7 @@ module Example { double c31; double c32; double c33; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B32 /// @@ -307,7 +307,7 @@ module Example { double q2; double q3; double q4; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B01 /// @@ -320,7 +320,7 @@ module Example { unsigned long B01_2; double B01_3; double B01_7; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B45 /// @@ -412,7 +412,7 @@ module Example { Example::B49 B03_07; unsigned long B03_12; unsigned long B03_14; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B19 /// @@ -458,7 +458,7 @@ module Example { double B19_10; double B19_11; double B19_09; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B16 /// @@ -475,7 +475,7 @@ module Example { unsigned long B16_10; Example::B22 B16_08; Example::B48 B16_09; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B07 /// @@ -483,14 +483,14 @@ module Example { double B07_3; Example::B11 B07_1; Example::B11 B07_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B09 /// struct B09 { double B09_1; Example::B11 B09_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B08 /// @@ -502,7 +502,7 @@ module Example { double B10_3; long long B10_2; Example::B08 B10_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct B33 /// @@ -510,7 +510,7 @@ module Example { double B33_1; double B33_2; double B33_3; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef B29 /// diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba1_msg.idl index 5d644f2dc..e0b72ab16 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba1_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::BA3 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_BA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba2_msg.idl index 1ed3c3b08..52cbd8746 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba2_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::BA4 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_BA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba_defn.idl index 00a910e49..ab2a88d26 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba_defn.idl @@ -54,7 +54,7 @@ module Example { double BA4_02; double BA4_07; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct BA3 /// @@ -65,7 +65,7 @@ module Example { double BA3_3; double BA3_2; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_BA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca1_msg.idl index c7caef977..e19065738 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca1_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::CA09 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_CA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca2_msg.idl index 965250b5f..36c8105cb 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca2_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::CA10 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_CA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca_defn.idl index 0d3beda86..cfb4c76f7 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca_defn.idl @@ -55,7 +55,7 @@ module Example { struct CA07 { double CA07_1; double CA07_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef CA08 /// @@ -77,7 +77,7 @@ module Example { double CA09_2; Example::NA5 CA09_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct CA10 /// @@ -138,7 +138,7 @@ module Example { Example::CA08 C10_27; Example::NA6 C10_07; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_CA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da1_msg.idl index 59f4c5b01..f78429558 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da1_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::DA24 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_DA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da2_msg.idl index 2ce721ca1..fd952ed77 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da2_msg.idl @@ -20,7 +20,7 @@ module Example { Example::DA25 data; Example::NA4 hdr; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_DA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da3_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da3_msg.idl index dfcec1d99..4a2a07c24 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da3_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da3_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::DA28 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_DA3_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da4_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da4_msg.idl index ccb4955b2..254e51e63 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da4_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da4_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::DA31 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_DA4_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da5_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da5_msg.idl index 08683c6ab..93c9c9d4c 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da5_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da5_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::DA32 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_DA5_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da_defn.idl index fc31c7d6d..2822164e8 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da_defn.idl @@ -201,7 +201,7 @@ module Example { double DA22_03; double DA22_07; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef DA23 /// @@ -240,7 +240,7 @@ module Example { double DA29_11; double DA29_03; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef DA30 /// @@ -260,7 +260,7 @@ module Example { struct DA26 { Example::DA11 DA26_2; double DA26_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef DA27 /// @@ -291,7 +291,7 @@ module Example { unsigned long DA32_09; Example::DA27 DA32_08; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct DA28 /// @@ -334,7 +334,7 @@ module Example { unsigned long DA28_18; unsigned long DA28_19; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct DA31 /// @@ -351,7 +351,7 @@ module Example { double DA31_5; unsigned long DA31_6; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct DA24 /// @@ -368,7 +368,7 @@ module Example { Example::DA23 DA24_3; Example::NA5 DA24_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct DA25 /// @@ -429,7 +429,7 @@ module Example { double DA25_10; Example::NA5 DA25_04; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_DA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea1_msg.idl index d7a8ee54b..8e2121b2f 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea1_msg.idl @@ -20,7 +20,7 @@ module Example { Example::EA6 data; Example::NA4 hdr; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_EA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea2_msg.idl index b4a6ebccf..93d6698c8 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea2_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::EA7 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_EA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea_defn.idl index 30afc4b74..bb0c07008 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea_defn.idl @@ -137,7 +137,7 @@ module Example { double EA7_33; double EA7_36; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct EA6 /// @@ -162,7 +162,7 @@ module Example { double EA6_09; double EA6_10; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_EA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa1_msg.idl index 8d2f8906d..d344ac067 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa1_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::FA7 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_FA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa2_msg.idl index 9c74ac8bb..e151aca90 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa2_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::FA8 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_FA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa_defn.idl index 24e0f5f0a..494970b3f 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa_defn.idl @@ -46,7 +46,7 @@ module Example { struct FA5 { Example::FA2 FA5_2; double FA5_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @typedef FA6 /// @@ -63,7 +63,7 @@ module Example { double FA7_3; double FA7_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct FA8 /// @@ -110,7 +110,7 @@ module Example { Example::B45 FA8_20; Example::B45 FA8_15; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_FA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga1_msg.idl index 71129627c..abab0a2f9 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga1_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::GA7 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_GA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga2_msg.idl index 022352b39..4d9f5c0a7 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga2_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::GA8 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_GA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga_defn.idl index 4fed0e8f7..c43d64327 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga_defn.idl @@ -57,7 +57,7 @@ module Example { Example::GA5 GA7_1; Example::NA5 GA7_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct GA8 /// @@ -118,7 +118,7 @@ module Example { Example::NA6 GA8_08; unsigned long GA8_19; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_GA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha1_msg.idl index 04b969433..3c92e0150 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha1_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::HA4 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_HA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha2_msg.idl index f81a8c599..27ab0a637 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha2_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::HA5 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_HA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha_defn.idl index 5ee9e66e6..387f882eb 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha_defn.idl @@ -45,7 +45,7 @@ module Example { double HA4_3; Example::NA5 HA4_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct HA5 /// @@ -84,7 +84,7 @@ module Example { double HA5_17; Example::NA6 HA5_05; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_HA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia1_msg.idl index fd53b6d6d..e1150bf44 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia1_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::IA4 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_IA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia2_msg.idl index 1e70d07bb..cfa552a93 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia2_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::IA5 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_IA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia_defn.idl index 06428b3c6..4d18e001d 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia_defn.idl @@ -43,7 +43,7 @@ module Example { unsigned long IA4_2; Example::NA5 IA4_1; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct IA5 /// @@ -72,7 +72,7 @@ module Example { Example::B42 IA5_05; Example::NA6 IA5_01; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_IA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja1_msg.idl index c358f2ba3..f459f2fc6 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja1_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::JA5 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_JA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja2_msg.idl index f0c6aeccc..aaae70b4c 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja2_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::JA6 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_JA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja_defn.idl index a73a2d518..a5b3ca89b 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja_defn.idl @@ -56,7 +56,7 @@ module Example { unsigned long JA5_4; unsigned long JA5_3; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct JA6 /// @@ -81,7 +81,7 @@ module Example { double JA6_07; Example::JA2 JA6_06; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_JA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka1_msg.idl index ec0748088..3b37ef846 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka1_msg.idl @@ -17,7 +17,7 @@ module Example { struct KA1_msg { Example::NA4 hdr; Example::KA4 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_KA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka2_msg.idl index 6d9617185..0a2e7db20 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka2_msg.idl @@ -17,7 +17,7 @@ module Example { struct KA2_msg { Example::NA4 hdr; Example::KA5 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_KA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka_defn.idl index bdbdf6b61..0628ed064 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka_defn.idl @@ -42,7 +42,7 @@ module Example { double KA4_3; double KA4_2; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct KA5 struct KA5 { @@ -74,7 +74,7 @@ module Example { Example::B39 KA5_14; double KA5_10; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_KA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma1_msg.idl index 7b06cb07b..8dd16c39a 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma1_msg.idl @@ -20,7 +20,7 @@ module Example { Example::NA4 hdr; Example::MA3 data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_MA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma2_msg.idl index c03e3faa2..1353a4b24 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma2_msg.idl @@ -42,7 +42,7 @@ module Example { Example::NA4 hdr; Example::MA4 data; boolean trigger; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // CX_PORTS__MESSAGES__EXAMPLE_MA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma_defn.idl index 4b70a8100..1f745666e 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma_defn.idl @@ -40,7 +40,7 @@ module Example { Example::B47 MA3_2; double MA3_4; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct MA4 /// @@ -65,7 +65,7 @@ module Example { double MA4_08; double MA4_07; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_MA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_na_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_na_defn.idl index 226909cd7..34a7dc089 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_na_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_na_defn.idl @@ -46,7 +46,7 @@ module Example { unsigned long NA4_2; double NA4_3; double NA4_7; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct NA6 /// @@ -79,14 +79,14 @@ module Example { unsigned long NA6_12; unsigned long NA6_14; - }; //@TopLevel(false) + }; //@nested(TRUE) /// @struct NA5 /// struct NA5 { double NA5_1; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__TYPES__EXAMPLE_NA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/late_binded/read_get/data/common.idl b/connectors/dds4ccm/tests/late_binded/read_get/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/late_binded/read_get/data/common.idl +++ b/connectors/dds4ccm/tests/late_binded/read_get/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/latency/data/latency_data.idl b/connectors/dds4ccm/tests/latency/data/latency_data.idl index 083e78f0a..05435b234 100644 --- a/connectors/dds4ccm/tests/latency/data/latency_data.idl +++ b/connectors/dds4ccm/tests/latency/data/latency_data.idl @@ -21,7 +21,7 @@ module Test { long seq_num; BD_oct_seq data; - }; //@TopLevel() @final + }; //@nested(FALSE) @final }; #endif // LATENCY_DATA_IDL diff --git a/connectors/dds4ccm/tests/max_delivered_data/getter/data/common.idl b/connectors/dds4ccm/tests/max_delivered_data/getter/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/max_delivered_data/getter/data/common.idl +++ b/connectors/dds4ccm/tests/max_delivered_data/getter/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/max_delivered_data/listeners/data/data/common.idl b/connectors/dds4ccm/tests/max_delivered_data/listeners/data/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/max_delivered_data/listeners/data/data/common.idl +++ b/connectors/dds4ccm/tests/max_delivered_data/listeners/data/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/max_delivered_data/listeners/state/data/common.idl b/connectors/dds4ccm/tests/max_delivered_data/listeners/state/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/max_delivered_data/listeners/state/data/common.idl +++ b/connectors/dds4ccm/tests/max_delivered_data/listeners/state/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl b/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl index 4874b00bb..e7c09ca97 100644 --- a/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl +++ b/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl @@ -16,7 +16,7 @@ module Test struct LatencyData { long seq_num; - }; //@TopLevel() @final + }; //@nested(FALSE) @final }; #endif // LATENCY_DATA_IDL diff --git a/connectors/dds4ccm/tests/non_changeable/data/common.idl b/connectors/dds4ccm/tests/non_changeable/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/non_changeable/data/common.idl +++ b/connectors/dds4ccm/tests/non_changeable/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/port_status_listener/deadline_missed/data/common.idl b/connectors/dds4ccm/tests/port_status_listener/deadline_missed/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/port_status_listener/deadline_missed/data/common.idl +++ b/connectors/dds4ccm/tests/port_status_listener/deadline_missed/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/port_status_listener/sample_lost/data/common.idl b/connectors/dds4ccm/tests/port_status_listener/sample_lost/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/port_status_listener/sample_lost/data/common.idl +++ b/connectors/dds4ccm/tests/port_status_listener/sample_lost/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/type_name/data/typename_base.idl b/connectors/dds4ccm/tests/type_name/data/typename_base.idl index 2746a1a8b..5dab8a00f 100644 --- a/connectors/dds4ccm/tests/type_name/data/typename_base.idl +++ b/connectors/dds4ccm/tests/type_name/data/typename_base.idl @@ -14,6 +14,6 @@ struct TypeNameMessage { string key; long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* TYPENAME_BASE_IDL_ */ diff --git a/connectors/dds4ccm/tests/type_name/data/typenamemodule_typenamemessage.idl b/connectors/dds4ccm/tests/type_name/data/typenamemodule_typenamemessage.idl index 8fa108f68..08639dc61 100644 --- a/connectors/dds4ccm/tests/type_name/data/typenamemodule_typenamemessage.idl +++ b/connectors/dds4ccm/tests/type_name/data/typenamemodule_typenamemessage.idl @@ -17,7 +17,7 @@ module TypeNameModule struct TypeNameMessage { string key; long iteration; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif /* TYPENAMEMODULE_TYPENAMEMESSAGE_IDL_ */ diff --git a/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule2_typenamemessage.idl b/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule2_typenamemessage.idl index 616ac1c21..2f5a85e94 100644 --- a/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule2_typenamemessage.idl +++ b/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule2_typenamemessage.idl @@ -18,7 +18,7 @@ module TypeNameModule struct TypeNameMsg { string key; long iteration; - }; //@TopLevel() + }; //@nested(FALSE) }; }; diff --git a/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule_typenamemessage.idl b/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule_typenamemessage.idl index faf1b9423..b961fba6e 100644 --- a/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule_typenamemessage.idl +++ b/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule_typenamemessage.idl @@ -18,7 +18,7 @@ module TypeNameModule struct TypeNameMessage { string key; long iteration; - }; //@TopLevel() + }; //@nested(FALSE) }; }; diff --git a/connectors/dds4ccm/tests/union/struct/data/union.idl b/connectors/dds4ccm/tests/union/struct/data/union.idl index 43b349678..6b7b2ec53 100644 --- a/connectors/dds4ccm/tests/union/struct/data/union.idl +++ b/connectors/dds4ccm/tests/union/struct/data/union.idl @@ -28,13 +28,13 @@ module Uni { { long x; long y; - }; //@TopLevel(false) + }; //@nested(TRUE) struct Track { long id; Point p; - }; //@TopLevel(false) + }; //@nested(TRUE) union Data switch (DataType) { @@ -48,11 +48,11 @@ module Uni { struct B01 { long b01_1; - }; //@TopLevel(false) + }; //@nested(TRUE) struct B02 { string b02_1; - }; //@TopLevel(false) + }; //@nested(TRUE) union B03 switch (long) { @@ -77,7 +77,7 @@ module Uni { Assignment a; //@key B03 b_03; Data d; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif /* UNION_BASE_IDL_ */ diff --git a/connectors/dds4ccm/tests/union/toplevel/data/top_union.idl b/connectors/dds4ccm/tests/union/toplevel/data/top_union.idl index 9752ffe85..1c8701daf 100644 --- a/connectors/dds4ccm/tests/union/toplevel/data/top_union.idl +++ b/connectors/dds4ccm/tests/union/toplevel/data/top_union.idl @@ -12,7 +12,7 @@ module Uni { case 4: short x; case 5: case 6: long y; - }; //@TopLevel() + }; //@nested(FALSE) enum _module { @@ -22,7 +22,7 @@ module Uni { union foo switch (_module) { case dtLong: long longData; - }; //@TopLevel() + }; //@nested(FALSE) typedef long _union; @@ -30,7 +30,7 @@ module Uni { { case 0: Uni::_union longData; }; - //@TopLevel() + //@nested(FALSE) }; #endif /* TOP_UNION_BASE_IDL_ */ diff --git a/connectors/dds4ccm/tests/unkeyed_writer/data/unkeyed_writer.idl b/connectors/dds4ccm/tests/unkeyed_writer/data/unkeyed_writer.idl index 5feb5cc2d..8fe1f211f 100644 --- a/connectors/dds4ccm/tests/unkeyed_writer/data/unkeyed_writer.idl +++ b/connectors/dds4ccm/tests/unkeyed_writer/data/unkeyed_writer.idl @@ -13,6 +13,7 @@ typedef sequence OctetSeq; module UnkeyedWriterTest { + @nested(FALSE) struct UnkeyedWriterMessage { string key; unsigned long iteration; @@ -21,7 +22,7 @@ module UnkeyedWriterTest /// the receiver can check that we don't get duplicate /// samples unsigned long sample_index; - }; //@TopLevel() + }; }; #endif /* UNKEYED_WRITER_IDL_ */ diff --git a/connectors/dds4ccm/tests/updater/data/common.idl b/connectors/dds4ccm/tests/updater/data/common.idl index 4724aec0c..ea9d92951 100644 --- a/connectors/dds4ccm/tests/updater/data/common.idl +++ b/connectors/dds4ccm/tests/updater/data/common.idl @@ -12,6 +12,6 @@ struct CommonTestMessage { string key; //@key long iteration; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/psdd4ccm/docs/src/psdd4ccm.adoc b/connectors/psdd4ccm/docs/src/psdd4ccm.adoc index 0b3c93c0a..db8c25753 100644 --- a/connectors/psdd4ccm/docs/src/psdd4ccm.adoc +++ b/connectors/psdd4ccm/docs/src/psdd4ccm.adoc @@ -43,7 +43,7 @@ module Test string category; //@key string description; unsigned long value; - }; //@TopLevel() + }; //@nested(FALSE) }; ------------------- diff --git a/connectors/psdd4ccm/docs/src/psdd4ccm_details.adoc b/connectors/psdd4ccm/docs/src/psdd4ccm_details.adoc index 515a8a74b..72570b3cd 100644 --- a/connectors/psdd4ccm/docs/src/psdd4ccm_details.adoc +++ b/connectors/psdd4ccm/docs/src/psdd4ccm_details.adoc @@ -107,10 +107,10 @@ PSDD4CCM supports standard IDL defined data types for use as event types. For support of event filtering and management of event type code generation PSDD4CCM supports 2 IDL4-type annotations: -* `@Toplevel` + +* `@nested` + This annotation is used to specify the toplevel IDL type to be used as event type for the implementation of PSDD4CCM connectors. This annotation is mandatory. Only IDL types -decorated with this annotation are supported as toplevel event types for PSDD4CCM. +decorated with this annotation with value FALSE are supported as toplevel event types for PSDD4CCM. * `@key` + This annotation can be used to identify key member fields in `struct` definitions. @@ -126,8 +126,8 @@ commented form. The standard IDL base types like the (unbounded) string types (`string` and `wstring`), the character types (wide or not), the integer types (unsigned or signed), `boolean` and the floating point types are all usable as toplevel event types. For these types -the `@Toplevel` annotation is implicit. -Typedef definitions of these (or other) types however have to be explicitly specified as toplevel +the `@nested(FALSE)` annotation is implicit. +Typedef definitions of these (or other) types however have to be explicitly specified as nested(FALSE) in IDL. .Standard typedefs @@ -135,12 +135,12 @@ in IDL. As standard typedefs like `CORBA::OctetSeq' are defined in standard IDL which cannot (and should not) be upated with annotations these types cannot be directly used as toplevel types. The way to use these as toplevel types would be to define another alias typedef for these -types in user defined IDL and decorate this typedef with the `@Toplevel` annotation like +types in user defined IDL and decorate this typedef with the `@nested` annotation like this: [source,idl] ------------ -typedef ::CORBA::OctetSeq MyOctetSeq; //@Toplevel +typedef ::CORBA::OctetSeq MyOctetSeq; //@nested(FALSE) ------------ **** @@ -190,7 +190,7 @@ module Test string category; //@key string description; unsigned long value; - }; //@TopLevel() + }; //@nested(FALSE) }; ------------------- @@ -201,7 +201,7 @@ This IDL file will be compiled by the <<{xref_docs_root}/taox11/ridlc.adoc#,RIDL compiler>>. + The key value for this struct is defined with `//@key` as shown above providing the possibility for components to filter event subscriptions on `category` values. -The struct is decorated with `//@Toplevel` to specify that it is to be used as event type. +The struct is decorated with `//@nested(FALSE)` to specify that it is to be used as event type. The example also uses a `string` as another event type. + As this is a standard IDL base type no user data IDL definitions are required. diff --git a/connectors/psdd4ccm/examples/hello/base/message.idl b/connectors/psdd4ccm/examples/hello/base/message.idl index 13cceac0b..9759afa5f 100644 --- a/connectors/psdd4ccm/examples/hello/base/message.idl +++ b/connectors/psdd4ccm/examples/hello/base/message.idl @@ -17,7 +17,7 @@ module Test string category; //@key string description; unsigned long value; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/examples/hello_ports/base/message.idl b/connectors/psdd4ccm/examples/hello_ports/base/message.idl index 13cceac0b..9759afa5f 100644 --- a/connectors/psdd4ccm/examples/hello_ports/base/message.idl +++ b/connectors/psdd4ccm/examples/hello_ports/base/message.idl @@ -17,7 +17,7 @@ module Test string category; //@key string description; unsigned long value; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/writers/psdd_idl.rb b/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/writers/psdd_idl.rb index bcf0d50d3..1b7a92266 100644 --- a/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/writers/psdd_idl.rb +++ b/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/writers/psdd_idl.rb @@ -107,11 +107,11 @@ def init_visitor(v, node) def is_psdd_topic?(node) if params[:psdd_topic].blank? || params[:psdd_topic] == node.scoped_name - annot = node.annotations[:TopLevel] - return false if annot[0] == nil - return true if annot[0].fields[:value] == nil - - annot[0].fields[:value] + annot = node.annotations[:nested] + return true if annot[0] == nil + return false if annot[0].fields[:value] == nil + return false if annot[0].fields[:value] == true + true end false end diff --git a/connectors/psdd4ccm/tests/custom-serializer/base/topic.idl b/connectors/psdd4ccm/tests/custom-serializer/base/topic.idl index 130373a2b..41238ea08 100644 --- a/connectors/psdd4ccm/tests/custom-serializer/base/topic.idl +++ b/connectors/psdd4ccm/tests/custom-serializer/base/topic.idl @@ -19,7 +19,7 @@ module Test unsigned long msgid; boolean status; double value; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/data-types/base/topic.idl b/connectors/psdd4ccm/tests/data-types/base/topic.idl index ce684f94f..39da118b3 100644 --- a/connectors/psdd4ccm/tests/data-types/base/topic.idl +++ b/connectors/psdd4ccm/tests/data-types/base/topic.idl @@ -14,7 +14,7 @@ module Test { struct B02 { long B02_1; - }; //@TopLevel(false) + }; //@nested(TRUE) typedef sequence B10; typedef sequence B11; @@ -28,7 +28,7 @@ module Test struct B31 { long B31_1; - }; //@TopLevel(false) + }; //@nested(TRUE) typedef B31 B32[2]; typedef B31 B33[4][5]; @@ -89,7 +89,7 @@ module Test long a; string b; B58 c; - }; //@TopLevel(false) + }; //@nested(TRUE) typedef sequence B82; struct B83 { @@ -162,7 +162,7 @@ module Test string key; unsigned long count; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/get_many/base/topic.idl b/connectors/psdd4ccm/tests/get_many/base/topic.idl index 83a1bf659..8904852ae 100644 --- a/connectors/psdd4ccm/tests/get_many/base/topic.idl +++ b/connectors/psdd4ccm/tests/get_many/base/topic.idl @@ -25,7 +25,7 @@ module Test string description; char opt; boolean flag; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/get_many_with_max/base/topic.idl b/connectors/psdd4ccm/tests/get_many_with_max/base/topic.idl index 83a1bf659..8904852ae 100644 --- a/connectors/psdd4ccm/tests/get_many_with_max/base/topic.idl +++ b/connectors/psdd4ccm/tests/get_many_with_max/base/topic.idl @@ -25,7 +25,7 @@ module Test string description; char opt; boolean flag; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/keys/multiple/base/topic.idl b/connectors/psdd4ccm/tests/keys/multiple/base/topic.idl index 83a1bf659..8904852ae 100644 --- a/connectors/psdd4ccm/tests/keys/multiple/base/topic.idl +++ b/connectors/psdd4ccm/tests/keys/multiple/base/topic.idl @@ -25,7 +25,7 @@ module Test string description; char opt; boolean flag; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl b/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl index 3f28349ee..763d197bf 100644 --- a/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl +++ b/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl @@ -35,7 +35,7 @@ module Test string description; char opt; boolean flag; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/keys/pod/basic-typedef/base/topic.idl b/connectors/psdd4ccm/tests/keys/pod/basic-typedef/base/topic.idl index f93f7b1fb..3203fe254 100644 --- a/connectors/psdd4ccm/tests/keys/pod/basic-typedef/base/topic.idl +++ b/connectors/psdd4ccm/tests/keys/pod/basic-typedef/base/topic.idl @@ -12,7 +12,7 @@ module Test { - typedef unsigned short Topic; //@TopLevel + typedef unsigned short Topic; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/keys/pod/enum/base/topic.idl b/connectors/psdd4ccm/tests/keys/pod/enum/base/topic.idl index fa2bbf252..c780917c3 100644 --- a/connectors/psdd4ccm/tests/keys/pod/enum/base/topic.idl +++ b/connectors/psdd4ccm/tests/keys/pod/enum/base/topic.idl @@ -18,7 +18,7 @@ module Test EVEN }; - typedef ECategory Topic; //@TopLevel + typedef ECategory Topic; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/latency/data/latency_data.idl b/connectors/psdd4ccm/tests/latency/data/latency_data.idl index d0dca6e68..9d9df41ba 100644 --- a/connectors/psdd4ccm/tests/latency/data/latency_data.idl +++ b/connectors/psdd4ccm/tests/latency/data/latency_data.idl @@ -21,7 +21,7 @@ module Test { long seq_num; BD_oct_seq data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif // LATENCY_DATA_IDL diff --git a/connectors/psdd4ccm/tests/many-to-one/base/topic.idl b/connectors/psdd4ccm/tests/many-to-one/base/topic.idl index 06fa99854..d72f9620c 100644 --- a/connectors/psdd4ccm/tests/many-to-one/base/topic.idl +++ b/connectors/psdd4ccm/tests/many-to-one/base/topic.idl @@ -20,7 +20,7 @@ module Test unsigned long value; char opt; boolean flag; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/single-frame/base/topic.idl b/connectors/psdd4ccm/tests/single-frame/base/topic.idl index 7a56b5521..ea4635bf1 100644 --- a/connectors/psdd4ccm/tests/single-frame/base/topic.idl +++ b/connectors/psdd4ccm/tests/single-frame/base/topic.idl @@ -22,7 +22,7 @@ module Test { ECategory category; //@key string content; - }; //@TopLevel + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/array/multidim/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/array/multidim/base/topic.idl index 8c3446b9e..212006d8a 100644 --- a/connectors/psdd4ccm/tests/topic-types/array/multidim/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/array/multidim/base/topic.idl @@ -20,7 +20,7 @@ module Test string description; ULongArray values; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/array/simple/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/array/simple/base/topic.idl index b6ee2b607..16cf32f9d 100644 --- a/connectors/psdd4ccm/tests/topic-types/array/simple/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/array/simple/base/topic.idl @@ -20,7 +20,7 @@ module Test string description; ULongArray values; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/sequence/bounded/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/sequence/bounded/base/topic.idl index 4fd43485a..b5e5516bb 100644 --- a/connectors/psdd4ccm/tests/topic-types/sequence/bounded/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/sequence/bounded/base/topic.idl @@ -20,7 +20,7 @@ module Test string description; ULongSeq values; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/sequence/complex/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/sequence/complex/base/topic.idl index 78d066089..1edb4d565 100644 --- a/connectors/psdd4ccm/tests/topic-types/sequence/complex/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/sequence/complex/base/topic.idl @@ -27,7 +27,7 @@ module Test string description; DataSeq data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/sequence/simple/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/sequence/simple/base/topic.idl index e14f1221d..178979fa0 100644 --- a/connectors/psdd4ccm/tests/topic-types/sequence/simple/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/sequence/simple/base/topic.idl @@ -20,7 +20,7 @@ module Test string description; ULongSeq values; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/string/toplevel/bounded/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/string/toplevel/bounded/base/topic.idl index 066de9b75..c1e08b9c8 100644 --- a/connectors/psdd4ccm/tests/topic-types/string/toplevel/bounded/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/string/toplevel/bounded/base/topic.idl @@ -12,7 +12,7 @@ module Test { - typedef string<10> Topic; //@TopLevel() + typedef string<10> Topic; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/string/toplevel/default/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/string/toplevel/default/base/topic.idl index cad195799..15102c7a4 100644 --- a/connectors/psdd4ccm/tests/topic-types/string/toplevel/default/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/string/toplevel/default/base/topic.idl @@ -12,7 +12,7 @@ module Test { - typedef string Topic; //@TopLevel() + typedef string Topic; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/struct/keyonly-key/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/struct/keyonly-key/base/topic.idl index 2b40cfb5f..24dce2a58 100644 --- a/connectors/psdd4ccm/tests/topic-types/struct/keyonly-key/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/struct/keyonly-key/base/topic.idl @@ -30,7 +30,7 @@ module Test string description; unsigned long number; double value; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/struct/nested/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/struct/nested/base/topic.idl index ec5d2e6f7..c21ed42ff 100644 --- a/connectors/psdd4ccm/tests/topic-types/struct/nested/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/struct/nested/base/topic.idl @@ -25,7 +25,7 @@ module Test string description; unsigned long value; Nested data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/struct/toplevel/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/struct/toplevel/base/topic.idl index d7f594d40..82166e904 100644 --- a/connectors/psdd4ccm/tests/topic-types/struct/toplevel/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/struct/toplevel/base/topic.idl @@ -19,7 +19,7 @@ module Test unsigned long value; char opt; boolean flag; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/union/nested/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/union/nested/base/topic.idl index 22dfed922..54f223cf2 100644 --- a/connectors/psdd4ccm/tests/topic-types/union/nested/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/union/nested/base/topic.idl @@ -30,7 +30,7 @@ module Test { octet type; Variant value; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/union/toplevel/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/union/toplevel/base/topic.idl index 678c90328..662e983c5 100644 --- a/connectors/psdd4ccm/tests/topic-types/union/toplevel/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/union/toplevel/base/topic.idl @@ -24,7 +24,7 @@ module Test case ONE: string text; case TWO: unsigned long number; case THREE: boolean flag; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/connectors/psdd4ccm/tests/write_many/base/topic.idl b/connectors/psdd4ccm/tests/write_many/base/topic.idl index 83a1bf659..8904852ae 100644 --- a/connectors/psdd4ccm/tests/write_many/base/topic.idl +++ b/connectors/psdd4ccm/tests/write_many/base/topic.idl @@ -25,7 +25,7 @@ module Test string description; char opt; boolean flag; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/ddsx11/docs/src/ddsx11_files.adoc b/ddsx11/docs/src/ddsx11_files.adoc index eb2ae0720..8f6595670 100644 --- a/ddsx11/docs/src/ddsx11_files.adoc +++ b/ddsx11/docs/src/ddsx11_files.adoc @@ -31,7 +31,7 @@ the generation of this file can be suppressed using `-Scp`. The following files are generated by RIDL to provide the IDL to {cxx11} type specific DDS data reader and data writer interfaces. The type specific DDS data reader and data writer are not generated when a type -is marked with top-level false. +is marked with nested TRUE. .{cxx11} type specific DDS data reader and writer [cols="<1,<3",options="header",] diff --git a/ddsx11/examples/shapes/base/shapetype.idl b/ddsx11/examples/shapes/base/shapetype.idl index 82a653e5e..0d8d0b26d 100644 --- a/ddsx11/examples/shapes/base/shapetype.idl +++ b/ddsx11/examples/shapes/base/shapetype.idl @@ -15,6 +15,6 @@ struct ShapeType { long x; long y; long shapesize; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/ddsx11/tests/builtin/base/shapetype.idl b/ddsx11/tests/builtin/base/shapetype.idl index 82a653e5e..0d8d0b26d 100644 --- a/ddsx11/tests/builtin/base/shapetype.idl +++ b/ddsx11/tests/builtin/base/shapetype.idl @@ -15,6 +15,6 @@ struct ShapeType { long x; long y; long shapesize; -}; //@TopLevel() +}; //@nested(FALSE) #endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/ddsx11/tests/latency/data/latency_data.idl b/ddsx11/tests/latency/data/latency_data.idl index 24e7cb697..317af9bb9 100644 --- a/ddsx11/tests/latency/data/latency_data.idl +++ b/ddsx11/tests/latency/data/latency_data.idl @@ -20,7 +20,7 @@ module Test { long seq_num; BD_oct_seq data; - }; //@TopLevel() @final + }; //@nested(FALSE) @final }; #endif // LATENCY_DATA_IDL diff --git a/ddsx11/tests/logger_backend/log_record.idl b/ddsx11/tests/logger_backend/log_record.idl index 625db736d..db320383f 100644 --- a/ddsx11/tests/logger_backend/log_record.idl +++ b/ddsx11/tests/logger_backend/log_record.idl @@ -22,5 +22,5 @@ module DnCX11 /// The error diagnostic string message; - }; //@TopLevel() + }; //@nested(FALSE) }; diff --git a/ddsx11/tests/minimal_latency/data/latency_data.idl b/ddsx11/tests/minimal_latency/data/latency_data.idl index 2ffbd02ba..52df797a8 100644 --- a/ddsx11/tests/minimal_latency/data/latency_data.idl +++ b/ddsx11/tests/minimal_latency/data/latency_data.idl @@ -15,7 +15,7 @@ module Test struct LatencyData { long seq_num; - }; //@TopLevel() @final + }; //@nested(FALSE) @final }; #endif // LATENCY_DATA_IDL diff --git a/exf/connectors/dds4ccm/tests/exf/unkeyed_writer/data/unkeyed_writer.idl b/exf/connectors/dds4ccm/tests/exf/unkeyed_writer/data/unkeyed_writer.idl index d2f71986d..d5df5ea21 100644 --- a/exf/connectors/dds4ccm/tests/exf/unkeyed_writer/data/unkeyed_writer.idl +++ b/exf/connectors/dds4ccm/tests/exf/unkeyed_writer/data/unkeyed_writer.idl @@ -17,7 +17,7 @@ module UnkeyedWriterTest string key; long iteration; ::OctetSeq data; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif /* UNKEYED_WRITER_IDL_ */ diff --git a/exf/connectors/psdd4ccm/examples/hello/base/message.idl b/exf/connectors/psdd4ccm/examples/hello/base/message.idl index 13cceac0b..9759afa5f 100644 --- a/exf/connectors/psdd4ccm/examples/hello/base/message.idl +++ b/exf/connectors/psdd4ccm/examples/hello/base/message.idl @@ -17,7 +17,7 @@ module Test string category; //@key string description; unsigned long value; - }; //@TopLevel() + }; //@nested(FALSE) }; #endif diff --git a/exf/tests/apc/async-event-combi/data/event_record.idl b/exf/tests/apc/async-event-combi/data/event_record.idl index 897fd20ce..a1c5b65d6 100644 --- a/exf/tests/apc/async-event-combi/data/event_record.idl +++ b/exf/tests/apc/async-event-combi/data/event_record.idl @@ -18,7 +18,7 @@ module Hello long x; long y; long shapesize; - }; //@TopLevel() + }; //@nested(FALSE) // struct Event { // string key; // long iteration; diff --git a/ridlbe/ccmx11/facets/dds/config.rb b/ridlbe/ccmx11/facets/dds/config.rb index 00ce3cbc6..e2cd386cb 100644 --- a/ridlbe/ccmx11/facets/dds/config.rb +++ b/ridlbe/ccmx11/facets/dds/config.rb @@ -61,10 +61,6 @@ def self.add_extended_options(ol) ridl_params[:dds_idl_pfx] = '_dds' ridl_params[:dds_traits_pfx] = '_dds_traits' - # 20190730, add AXCIOMA 2 annotations back, issue #4729 - # initialize IDL scanner patches - IDL::CCMX11::DDSX11.load_idl_scanner_patch - IDL::CCMX11::DDSX11.add_extended_options(optlist) end @@ -233,11 +229,6 @@ def self.gen_user_defined_type_traits_for_dds(options, idl_ext) IDL.push_production(:dds_type_traits, ::IDL::CCMX11::DDSX11::UserDefinedTypeTraitsWriter.new(dds_traits_file, options)) end - - # configuration methods - def self.load_idl_scanner_patch - IDL::Scanner.send(:include, IDL::CCMX11::DDSX11::ScannerPatch) unless IDL::Scanner < IDL::CCMX11::DDSX11::ScannerPatch - end end # DDSX11 end # CCMX11 end # IDL diff --git a/ridlbe/ccmx11/facets/dds/config/directives.rb b/ridlbe/ccmx11/facets/dds/config/directives.rb index 4e6bf7006..2d5d971ed 100644 --- a/ridlbe/ccmx11/facets/dds/config/directives.rb +++ b/ridlbe/ccmx11/facets/dds/config/directives.rb @@ -1,67 +1,67 @@ -#-------------------------------------------------------------------- -# @file directives.rb -# @author Martin Corino +# #-------------------------------------------------------------------- +# # @file directives.rb +# # @author Martin Corino +# # +# # @brief DDSX11 facet configuration, adds AXCIOMA 2 +# # annotation support, see #4729 +# # +# # @copyright Copyright (c) Remedy IT Expertise BV # -# @brief DDSX11 facet configuration, adds AXCIOMA 2 -# annotation support, see #4729 +# #-------------------------------------------------------------------- # -# @copyright Copyright (c) Remedy IT Expertise BV - -#-------------------------------------------------------------------- - -module IDL - module CCMX11 - module DDSX11 - module ScannerPatch - def self.included(base) - base.class_eval do - alias_method_chain :next_identifier, :ndds - alias_method_chain :extract_annotation, :ndds - end - end - - def next_identifier_with_ndds(first = nil) - # first perform regular scanner pass - token = next_identifier_without_ndds(first) - # are we parsing an annotation? - if @in_annotation - # did we find an identifier? - if token.first == :identifier - # now check if we stopped scanning the identifier at a '-' - if @in.lookc == ?- - # extract '-' and append to identifier - token[1] += '-' - @in.skipc - # scan next part of identifier (recursively in case the '-'s are repeated) - token2 = next_identifier_with_ndds - parse_error "invalid annotation identifier encountered: #{token.last}" unless token2.first == :identifier - token[1] += token2.last - end - end - end - token - end - - def extract_annotation_with_ndds - @ndds_annotation_level ||= 0 # set to 0 if not set before - - # increase the level to signal we're parsing an annotation body (optionally recursive) - @ndds_annotation_level += 1 # inc level - # now first perform regular extraction - token, annbody = extract_annotation_without_ndds - # next check if we have an undefined annotation body followed by a boolean - if annbody.nil? && !token.nil? && token.first == :boolean_literal - # define an annotation body with a boolean 'value' member - annbody = { value: token.last } - # let them know we used up the token - token = nil - end - - # leaving annotation body - @ndds_annotation_level -= 1 # dec level - [token, annbody] - end - end - end - end -end +# module IDL +# module CCMX11 +# module DDSX11 +# module ScannerPatch +# def self.included(base) +# base.class_eval do +# alias_method_chain :next_identifier, :ndds +# alias_method_chain :extract_annotation, :ndds +# end +# end +# +# def next_identifier_with_ndds(first = nil) +# # first perform regular scanner pass +# token = next_identifier_without_ndds(first) +# # are we parsing an annotation? +# if @in_annotation +# # did we find an identifier? +# if token.first == :identifier +# # now check if we stopped scanning the identifier at a '-' +# if @in.lookc == ?- +# # extract '-' and append to identifier +# token[1] += '-' +# @in.skipc +# # scan next part of identifier (recursively in case the '-'s are repeated) +# token2 = next_identifier_with_ndds +# parse_error "invalid annotation identifier encountered: #{token.last}" unless token2.first == :identifier +# token[1] += token2.last +# end +# end +# end +# token +# end +# +# def extract_annotation_with_ndds +# @ndds_annotation_level ||= 0 # set to 0 if not set before +# +# # increase the level to signal we're parsing an annotation body (optionally recursive) +# @ndds_annotation_level += 1 # inc level +# # now first perform regular extraction +# token, annbody = extract_annotation_without_ndds +# # next check if we have an undefined annotation body followed by a boolean +# if annbody.nil? && !token.nil? && token.first == :boolean_literal +# # define an annotation body with a boolean 'value' member +# annbody = { value: token.last } +# # let them know we used up the token +# token = nil +# end +# +# # leaving annotation body +# @ndds_annotation_level -= 1 # dec level +# [token, annbody] +# end +# end +# end +# end +# end diff --git a/ridlbe/ccmx11/facets/dds/visitorbase.rb b/ridlbe/ccmx11/facets/dds/visitorbase.rb index 947386182..14060daea 100644 --- a/ridlbe/ccmx11/facets/dds/visitorbase.rb +++ b/ridlbe/ccmx11/facets/dds/visitorbase.rb @@ -56,11 +56,18 @@ def strip_global_scope(typename) end def has_toplevel_annotation? - # 20190730 Add support for AXCIOMA 2 top-level annotation, issue #4729 - annot = node.annotations[:'top-level'].first || node.annotations[:TopLevel].first - return false if annot.nil? + unless node.annotations[:'TopLevel'].first.nil? + raise "@TopLevel annotation has been deprecated in AXIOMA, use @nested!" + end + unless node.annotations[:'top-level'].first.nil? + raise "@top-level annotation has been deprecated in AXIOMA, use @nested!" + end - annot.fields[:value].nil? || annot.fields[:value] + annot = node.annotations[:nested].first + return false if annot.nil? + return false if annot.fields[:value].nil? + return false if annot.fields[:value] == true + true end def typesupport_export_include? diff --git a/ridlbe/ccmx11/facets/dds/visitors/struct.rb b/ridlbe/ccmx11/facets/dds/visitors/struct.rb index 5e6fddb0b..58e2d3a8b 100644 --- a/ridlbe/ccmx11/facets/dds/visitors/struct.rb +++ b/ridlbe/ccmx11/facets/dds/visitors/struct.rb @@ -19,15 +19,22 @@ class StructVisitor < Cxx11::NodeVisitorBase optional_template :life_cycle_traits def annotations + ann = node.annotations.dup # Add appendable when it is not final available - ann = node.annotations.dup - unless ann[:'final'].first - ann << IDL::AST::Annotation.new('appendable', {}) - end - # Determine correct value for DDS nested annotation - nested = 'TRUE' - nested = 'FALSE' if has_toplevel_annotation? - ann << IDL::AST::Annotation.new('nested', {value: nested}) + unless ann[:'final'].first + ann << IDL::AST::Annotation.new('appendable', {}) + end + # When generating the nested annotation we need to use TRUE/FALSE + if has_toplevel_annotation? + nes_annot = ann[:nested].first + case nes_annot.fields[:value] + when TrueClass + nes_annot.fields[:value] = 'TRUE' + when FalseClass + nes_annot.fields[:value] = 'FALSE' + end + end + return ann end end # StructVisitor end # CCMX11 diff --git a/ridlbe/ccmx11/facets/dds/visitors/union.rb b/ridlbe/ccmx11/facets/dds/visitors/union.rb index e67412861..49132dde3 100644 --- a/ridlbe/ccmx11/facets/dds/visitors/union.rb +++ b/ridlbe/ccmx11/facets/dds/visitors/union.rb @@ -39,10 +39,16 @@ def annotations unless ann[:'final'].first ann << IDL::AST::Annotation.new('appendable', {}) end - # Determine correct value for DDS nested annotation - nested = 'TRUE' - nested = 'FALSE' if has_toplevel_annotation? - ann << IDL::AST::Annotation.new('nested', {value: nested}) + # When generating the nested annotation we need to use TRUE/FALSE + if has_toplevel_annotation? + nes_annot = ann[:nested].first + case nes_annot.fields[:value] + when TrueClass + nes_annot.fields[:value] = 'TRUE' + when FalseClass + nes_annot.fields[:value] = 'FALSE' + end + end end end end # CCMX11 diff --git a/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb b/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb index 0fce37d20..f68125a8c 100644 --- a/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb +++ b/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb @@ -62,11 +62,11 @@ def is_dds_topic?(node) end def has_toplevel_annotation?(node) - # 20190730 Add support for AXCIOMA 2 top-level annotation, issue #4729 - annot = node.annotations[:'top-level'].first || node.annotations[:TopLevel].first + annot = node.annotations[:nested].first return false if annot.nil? - - annot.fields[:value].nil? || annot.fields[:value] + return false if annot.fields[:value].nil? + return false if annot.fields[:value] == true + true end end # DDSTypeEntitiesIDLWriter end # DDSX11 diff --git a/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb b/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb index b3893803f..6113dde0b 100644 --- a/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb +++ b/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb @@ -34,11 +34,11 @@ def is_dds_topic?(node) end def has_toplevel_annotation?(node) - # 20190730 Add support for AXCIOMA 2 top-level annotation, issue #4729 - annot = node.annotations[:'top-level'].first || node.annotations[:TopLevel].first + annot = node.annotations[:nested].first return false if annot.nil? - - annot.fields[:value].nil? || annot.fields[:value] + return false if annot.fields[:value].nil? + return false if annot.fields[:value] == true + true end end # DDSTypeSupportBaseWriter diff --git a/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb b/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb index 219406aeb..9acdbef25 100644 --- a/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb +++ b/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb @@ -74,11 +74,11 @@ def is_dds_topic?(node) end def has_toplevel_annotation?(node) - # 20190730 Add support for AXCIOMA 2 top-level annotation, issue #4729 - annot = node.annotations[:'top-level'].first || node.annotations[:TopLevel].first + annot = node.annotations[:nested].first return false if annot.nil? - - annot.fields[:value].nil? || annot.fields[:value] + return false if annot.fields[:value].nil? + return false if annot.fields[:value] == true + true end end # SEVIDLWriter end # DDS4CCM diff --git a/tests/apc/async-event-combi/data/event_record.idl b/tests/apc/async-event-combi/data/event_record.idl index 897fd20ce..a1c5b65d6 100644 --- a/tests/apc/async-event-combi/data/event_record.idl +++ b/tests/apc/async-event-combi/data/event_record.idl @@ -18,7 +18,7 @@ module Hello long x; long y; long shapesize; - }; //@TopLevel() + }; //@nested(FALSE) // struct Event { // string key; // long iteration; diff --git a/tests/attributes/component/foo_exec.h b/tests/attributes/component/foo_exec.h index 9fc349834..aa8bf8408 100644 --- a/tests/attributes/component/foo_exec.h +++ b/tests/attributes/component/foo_exec.h @@ -588,37 +588,37 @@ namespace Foo_Impl /// Class member storing value of my_variable_wstring attribute std::wstring my_variable_wstring_{}; /// Class member storing value of my_long_array attribute - ::long_array my_long_array_{{}}; + ::long_array my_long_array_{}; /// Class member storing value of my_ulong_array attribute - ::ulong_array my_ulong_array_{{}}; + ::ulong_array my_ulong_array_{}; /// Class member storing value of my_longlong_array attribute - ::longlong_array my_longlong_array_{{}}; + ::longlong_array my_longlong_array_{}; /// Class member storing value of my_ulonglong_array attribute - ::ulonglong_array my_ulonglong_array_{{}}; + ::ulonglong_array my_ulonglong_array_{}; /// Class member storing value of my_short_array attribute - ::short_array my_short_array_{{}}; + ::short_array my_short_array_{}; /// Class member storing value of my_ushort_array attribute - ::ushort_array my_ushort_array_{{}}; + ::ushort_array my_ushort_array_{}; /// Class member storing value of my_string_array attribute - ::string_array my_string_array_{{}}; + ::string_array my_string_array_{}; /// Class member storing value of my_wstring_array attribute - ::wstring_array my_wstring_array_{{}}; + ::wstring_array my_wstring_array_{}; /// Class member storing value of my_char_array attribute - ::char_array my_char_array_{{}}; + ::char_array my_char_array_{}; /// Class member storing value of my_wchar_array attribute - ::wchar_array my_wchar_array_{{}}; + ::wchar_array my_wchar_array_{}; /// Class member storing value of my_double_array attribute - ::double_array my_double_array_{{}}; + ::double_array my_double_array_{}; /// Class member storing value of my_longdouble_array attribute - ::longdouble_array my_longdouble_array_{{}}; + ::longdouble_array my_longdouble_array_{}; /// Class member storing value of my_float_array attribute - ::float_array my_float_array_{{}}; + ::float_array my_float_array_{}; /// Class member storing value of my_boolean_array attribute - ::boolean_array my_boolean_array_{{}}; + ::boolean_array my_boolean_array_{}; /// Class member storing value of my_octet_array attribute - ::octet_array my_octet_array_{{}}; + ::octet_array my_octet_array_{}; /// Class member storing value of my_multi_dimensional_short_array attribute - ::multi_dimensional_short_array my_multi_dimensional_short_array_{{}}; + ::multi_dimensional_short_array my_multi_dimensional_short_array_{}; /// Class member storing value of my_short_sequence attribute ::short_sequence my_short_sequence_{}; /// Class member storing value of my_empty_sequence attribute @@ -640,11 +640,11 @@ namespace Foo_Impl /// Class member storing value of my_default_bar_struct attribute ::Bar my_default_bar_struct_{}; /// Class member storing value of my_bar_array attribute - ::BarArray my_bar_array_{{}}; + ::BarArray my_bar_array_{}; /// Class member storing value of my_bar_array_2 attribute - ::BarArray2 my_bar_array_2_{{}}; + ::BarArray2 my_bar_array_2_{}; /// Class member storing value of my_sequence_array attribute - ::SequenceArray my_sequence_array_{{}}; + ::SequenceArray my_sequence_array_{}; /// Class member storing value of my_bar_struct_array attribute ::BarStruct my_bar_struct_array_{}; /// Class member storing value of my_baz_struct attribute @@ -664,9 +664,9 @@ namespace Foo_Impl /// Class member storing value of my_bounded_sequence_bounded_wstring attribute ::bounded_sequence_bounded_wstring my_bounded_sequence_bounded_wstring_{}; /// Class member storing value of my_bounded_string_array attribute - ::bounded_string_array my_bounded_string_array_{{}}; + ::bounded_string_array my_bounded_string_array_{}; /// Class member storing value of my_bounded_wstring_array attribute - ::bounded_wstring_array my_bounded_wstring_array_{{}}; + ::bounded_wstring_array my_bounded_wstring_array_{}; /// Class member storing value of my_data_type attribute ::DataType my_data_type_{}; /// Class member storing value of my_data_type_type attribute diff --git a/tests/bst_test/base/bst_bst_defn.idl b/tests/bst_test/base/bst_bst_defn.idl index 8ba17264f..239ff53d8 100644 --- a/tests/bst_test/base/bst_bst_defn.idl +++ b/tests/bst_test/base/bst_bst_defn.idl @@ -22,7 +22,7 @@ module BST { struct MyStructType { BST::MyBoundedStringType boundedString; BST::MyStringTypedef unboundedString; - }; //@TopLevel(false) + }; //@nested(TRUE) }; #endif // CX_PORTS__BST_BST_DEFN_IDL From 129ceb77e6421032baaa649077e4e976b39d347e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Feb 2024 10:14:02 +0100 Subject: [PATCH 02/14] Use @nested annotation --- .../custom/src/base/custom_example_b_defn.idl | 69 ++++++++++++------- .../src/base/custom_example_ca1_msg.idl | 3 +- .../src/base/custom_example_ca_defn.idl | 9 ++- .../src/base/custom_example_na_defn.idl | 9 ++- .../examples/idl/data/idl_example_b_defn.idl | 69 ++++++++++++------- .../examples/idl/data/idl_example_ca1_msg.idl | 3 +- .../examples/idl/data/idl_example_ca_defn.idl | 9 ++- .../examples/idl/data/idl_example_na_defn.idl | 9 ++- .../shapes_asm/ports/shapes_shapetype_msg.idl | 3 +- .../apc_event_defaults/data/event_record.idl | 3 +- .../apc_event_extended/data/event_record.idl | 3 +- .../tests/apc/gen_comp/data/shapes.idl | 3 +- .../tests/apc/gen_comp_only/data/shapes.idl | 3 +- .../tests/coherent_write/data/common.idl | 3 +- .../connector_status_listener/data/common.idl | 3 +- .../connector_status_listener/data/csl.idl | 3 +- .../event_listener/data/common.idl | 3 +- .../base/data/shapes_shapetype_msg.idl | 3 +- .../extended/data/shapes_shapetype_msg.idl | 3 +- .../listeners/event/data/common.idl | 3 +- .../listeners/state/data/common.idl | 3 +- .../filter_attrib/read_get/data/common.idl | 3 +- .../listeners/event/data/common.idl | 3 +- .../listeners/state/data/common.idl | 3 +- .../query_attrib/read_get/data/common.idl | 3 +- .../tests/get_component/data/common.idl | 3 +- .../dds4ccm/tests/getter/data/common.idl | 3 +- .../idl_conversion/data/idl_conversion.idl | 42 +++++++---- .../dds4ccm/tests/invalid_qos/data/common.idl | 3 +- .../ports/messages/example_aa1_msg.idl | 3 +- .../ports/messages/example_aa2_msg.idl | 3 +- .../ports/messages/example_aa_defn.idl | 6 +- .../ports/messages/example_b_defn.idl | 69 ++++++++++++------- .../ports/messages/example_ba1_msg.idl | 3 +- .../ports/messages/example_ba2_msg.idl | 3 +- .../ports/messages/example_ba_defn.idl | 6 +- .../ports/messages/example_ca1_msg.idl | 3 +- .../ports/messages/example_ca2_msg.idl | 3 +- .../ports/messages/example_ca_defn.idl | 9 ++- .../ports/messages/example_da1_msg.idl | 3 +- .../ports/messages/example_da2_msg.idl | 3 +- .../ports/messages/example_da3_msg.idl | 3 +- .../ports/messages/example_da4_msg.idl | 3 +- .../ports/messages/example_da5_msg.idl | 3 +- .../ports/messages/example_da_defn.idl | 24 ++++--- .../ports/messages/example_ea1_msg.idl | 3 +- .../ports/messages/example_ea2_msg.idl | 3 +- .../ports/messages/example_ea_defn.idl | 6 +- .../ports/messages/example_fa1_msg.idl | 3 +- .../ports/messages/example_fa2_msg.idl | 3 +- .../ports/messages/example_fa_defn.idl | 9 ++- .../ports/messages/example_ga1_msg.idl | 3 +- .../ports/messages/example_ga2_msg.idl | 3 +- .../ports/messages/example_ga_defn.idl | 6 +- .../ports/messages/example_ha1_msg.idl | 3 +- .../ports/messages/example_ha2_msg.idl | 3 +- .../ports/messages/example_ha_defn.idl | 6 +- .../ports/messages/example_ia1_msg.idl | 3 +- .../ports/messages/example_ia2_msg.idl | 3 +- .../ports/messages/example_ia_defn.idl | 6 +- .../ports/messages/example_ja1_msg.idl | 3 +- .../ports/messages/example_ja2_msg.idl | 3 +- .../ports/messages/example_ja_defn.idl | 6 +- .../ports/messages/example_ka1_msg.idl | 3 +- .../ports/messages/example_ka2_msg.idl | 3 +- .../ports/messages/example_ka_defn.idl | 6 +- .../ports/messages/example_ma1_msg.idl | 3 +- .../ports/messages/example_ma2_msg.idl | 4 +- .../ports/messages/example_ma_defn.idl | 6 +- .../ports/messages/example_na_defn.idl | 9 ++- .../late_binded/read_get/data/common.idl | 3 +- .../tests/latency/data/latency_data.idl | 4 +- .../max_delivered_data/getter/data/common.idl | 3 +- .../listeners/data/data/common.idl | 3 +- .../listeners/state/data/common.idl | 3 +- .../minimal_latency/data/latency_data.idl | 4 +- .../tests/non_changeable/data/common.idl | 3 +- .../deadline_missed/data/common.idl | 3 +- .../sample_lost/data/common.idl | 3 +- .../tests/type_name/data/typename_base.idl | 3 +- .../data/typenamemodule_typenamemessage.idl | 3 +- .../typenamemodulemodule2_typenamemessage.idl | 3 +- .../typenamemodulemodule_typenamemessage.idl | 3 +- .../dds4ccm/tests/union/struct/data/union.idl | 15 ++-- .../tests/union/toplevel/data/top_union.idl | 8 ++- .../dds4ccm/tests/updater/data/common.idl | 3 +- connectors/psdd4ccm/docs/src/psdd4ccm.adoc | 3 +- .../psdd4ccm/docs/src/psdd4ccm_details.adoc | 8 ++- .../psdd4ccm/examples/hello/base/message.idl | 3 +- .../examples/hello_ports/base/message.idl | 3 +- .../tests/custom-serializer/base/topic.idl | 3 +- .../psdd4ccm/tests/data-types/base/topic.idl | 12 ++-- .../psdd4ccm/tests/get_many/base/topic.idl | 3 +- .../tests/get_many_with_max/base/topic.idl | 3 +- .../tests/keys/multiple/base/topic.idl | 3 +- .../tests/keys/nokey-key/base/topic.idl | 3 +- .../keys/pod/basic-typedef/base/topic.idl | 3 +- .../tests/keys/pod/enum/base/topic.idl | 3 +- .../tests/latency/data/latency_data.idl | 3 +- .../psdd4ccm/tests/many-to-one/base/topic.idl | 3 +- .../tests/single-frame/base/topic.idl | 3 +- .../topic-types/array/multidim/base/topic.idl | 3 +- .../topic-types/array/simple/base/topic.idl | 3 +- .../sequence/bounded/base/topic.idl | 3 +- .../sequence/complex/base/topic.idl | 3 +- .../sequence/simple/base/topic.idl | 3 +- .../string/toplevel/bounded/base/topic.idl | 3 +- .../string/toplevel/default/base/topic.idl | 3 +- .../struct/keyonly-key/base/topic.idl | 3 +- .../topic-types/struct/nested/base/topic.idl | 3 +- .../struct/toplevel/base/topic.idl | 3 +- .../topic-types/union/nested/base/topic.idl | 3 +- .../topic-types/union/toplevel/base/topic.idl | 3 +- .../psdd4ccm/tests/write_many/base/topic.idl | 3 +- ddsx11/examples/shapes/base/shapetype.idl | 3 +- ddsx11/tests/builtin/base/shapetype.idl | 3 +- ddsx11/tests/latency/data/latency_data.idl | 3 +- ddsx11/tests/logger_backend/log_record.idl | 3 +- .../minimal_latency/data/latency_data.idl | 4 +- .../unkeyed_writer/data/unkeyed_writer.idl | 3 +- .../psdd4ccm/examples/hello/base/message.idl | 3 +- .../async-event-combi/data/event_record.idl | 3 +- .../async-event-combi/data/event_record.idl | 3 +- tests/bst_test/base/bst_bst_defn.idl | 3 +- 124 files changed, 489 insertions(+), 245 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 index 627911fb1..f8ae9fd75 100644 --- 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,6 +15,7 @@ module Example { /// @struct B11 /// + @nested(TRUE) struct B11 { double B11_1; @@ -22,7 +23,7 @@ module Example { double B11_2; double B11_3; - }; //@nested(TRUE) + }; /// @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; - }; //@nested(TRUE) + }; /// @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; - }; //@nested(TRUE) + }; /// @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; - }; //@nested(TRUE) + }; /// @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; - }; //@nested(TRUE) + }; /// @struct B15 /// + @nested(TRUE) struct B15 { long B15_07; @@ -139,7 +145,7 @@ module Example { Example::B11 B15_14; float B15_06; - }; //@nested(TRUE) + }; /// @typedef B14 /// @@ -147,12 +153,13 @@ module Example { /// @struct B17 /// + @nested(TRUE) struct B17 { double B17_1; long B17_2; - }; //@nested(TRUE) + }; /// @typedef B02 /// @@ -160,6 +167,7 @@ module Example { /// @struct B04 /// + @nested(TRUE) struct B04 { double B04_04; @@ -183,10 +191,11 @@ module Example { double B04_10; double B04_11; - }; //@nested(TRUE) + }; /// @struct B06 /// + @nested(TRUE) struct B06 { Example::B11 B06_02; @@ -224,10 +233,11 @@ module Example { double B06_11; double B06_12; - }; //@nested(TRUE) + }; /// @struct B05 /// + @nested(TRUE) struct B05 { double B05_09; @@ -249,10 +259,11 @@ module Example { double B05_03; double B05_02; - }; //@nested(TRUE) + }; /// @struct B53 /// + @nested(TRUE) struct B53 { Example::B14 B53_1; @@ -262,10 +273,11 @@ module Example { double B53_3; long B53_4; - }; //@nested(TRUE) + }; /// @struct B54 /// + @nested(TRUE) struct B54 { long B54_6; @@ -279,18 +291,20 @@ module Example { double B54_2; Example::B12 B54_1; - }; //@nested(TRUE) + }; /// @struct B31 /// + @nested(TRUE) struct B31 { double B31_2; double B31_1; double B31_3; - }; //@nested(TRUE) + }; /// @struct B30 /// + @nested(TRUE) struct B30 { double c11; double c12; @@ -301,20 +315,22 @@ module Example { double c31; double c32; double c33; - }; //@nested(TRUE) + }; /// @struct B32 /// + @nested(TRUE) struct B32 { double q1; double q2; double q3; double q4; - }; //@nested(TRUE) + }; /// @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; - }; //@nested(TRUE) + }; /// @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; - }; //@nested(TRUE) + }; /// @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; - }; //@nested(TRUE) + }; /// @struct B16 /// + @nested(TRUE) struct B16 { Example::B03 B16_02; Example::B47 B16_06; @@ -478,22 +497,24 @@ module Example { unsigned long B16_10; Example::B22 B16_08; Example::B48 B16_09; - }; //@nested(TRUE) + }; /// @struct B07 /// + @nested(TRUE) struct B07 { double B07_3; Example::B11 B07_1; Example::B11 B07_2; - }; //@nested(TRUE) + }; /// @struct B09 /// + @nested(TRUE) struct B09 { double B09_1; Example::B11 B09_2; - }; //@nested(TRUE) + }; /// @typedef B08 /// @@ -501,19 +522,21 @@ module Example { /// @struct B10 /// + @nested(TRUE) struct B10 { double B10_3; long long B10_2; Example::B08 B10_1; - }; //@nested(TRUE) + }; /// @struct B33 /// + @nested(TRUE) struct B33 { double B33_1; double B33_2; double B33_3; - }; //@nested(TRUE) + }; /// @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 index 51dc4241d..4bf202926 100644 --- 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; - }; //@nested(FALSE) + }; }; /// @} 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 index 7850cd777..27338cfef 100644 --- 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; - }; //@nested(TRUE) + }; /// @typedef CA08 /// @@ -74,15 +75,17 @@ module Example { /// @struct CA09 /// + @nested(TRUE) struct CA09 { double CA09_2; Example::NA5 CA09_1; - }; //@nested(TRUE) + }; /// @struct CA10 /// + @nested(TRUE) struct CA10 { Example::B47 C10_15; @@ -140,7 +143,7 @@ module Example { Example::CA08 C10_27; Example::NA6 C10_07; - }; //@nested(TRUE) + }; }; #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 index 1ceed0050..fdda46fff 100644 --- 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; - }; //@nested(TRUE) + }; /// @struct NA6 /// + @nested(TRUE) struct NA6 { string NA6_10; @@ -81,14 +83,15 @@ module Example { unsigned long NA6_12; unsigned long NA6_14; - }; //@nested(TRUE) + }; /// @struct NA5 /// + @nested(TRUE) struct NA5 { double NA5_1; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_NA_DEFN_IDL diff --git a/connectors/dds4ccm/examples/idl/data/idl_example_b_defn.idl b/connectors/dds4ccm/examples/idl/data/idl_example_b_defn.idl index 4b0394a4b..d13f54346 100644 --- a/connectors/dds4ccm/examples/idl/data/idl_example_b_defn.idl +++ b/connectors/dds4ccm/examples/idl/data/idl_example_b_defn.idl @@ -17,6 +17,7 @@ module Example { /// @struct B11 /// + @nested(TRUE) struct B11 { double B11_1; @@ -24,7 +25,7 @@ module Example { double B11_2; double B11_3; - }; //@nested(TRUE) + }; /// @typedef B26 /// @@ -48,14 +49,16 @@ module Example { /// @struct B27 /// + @nested(TRUE) struct B27 { double B27_3; Example::B11 B27_2; Example::B11 B27_1; - }; //@nested(TRUE) + }; /// @struct B34 /// + @nested(TRUE) struct B34 { Example::B11 B34_03; Example::B11 B34_04; @@ -72,10 +75,11 @@ module Example { long B34_09; long B34_06; long B34_14; - }; //@nested(TRUE) + }; /// @struct B38 /// + @nested(TRUE) struct B38 { long B38_10; long B38_04; @@ -88,7 +92,7 @@ module Example { double B38_03; double B38_09; long B38_11; - }; //@nested(TRUE) + }; /// @typedef B37 /// @@ -100,16 +104,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; - }; //@nested(TRUE) + }; /// @struct B15 /// + @nested(TRUE) struct B15 { long B15_07; @@ -141,7 +147,7 @@ module Example { Example::B11 B15_14; float B15_06; - }; //@nested(TRUE) + }; /// @typedef B14 /// @@ -149,12 +155,13 @@ module Example { /// @struct B17 /// + @nested(TRUE) struct B17 { double B17_1; long B17_2; - }; //@nested(TRUE) + }; /// @typedef B02 /// @@ -162,6 +169,7 @@ module Example { /// @struct B04 /// + @nested(TRUE) struct B04 { double B04_04; @@ -185,10 +193,11 @@ module Example { double B04_10; double B04_11; - }; //@nested(TRUE) + }; /// @struct B06 /// + @nested(TRUE) struct B06 { Example::B11 B06_02; @@ -226,10 +235,11 @@ module Example { double B06_11; double B06_12; - }; //@nested(TRUE) + }; /// @struct B05 /// + @nested(TRUE) struct B05 { double B05_09; @@ -251,10 +261,11 @@ module Example { double B05_03; double B05_02; - }; //@nested(TRUE) + }; /// @struct B53 /// + @nested(TRUE) struct B53 { Example::B14 B53_1; @@ -264,10 +275,11 @@ module Example { double B53_3; long B53_4; - }; //@nested(TRUE) + }; /// @struct B54 /// + @nested(TRUE) struct B54 { long B54_6; @@ -281,18 +293,20 @@ module Example { double B54_2; Example::B12 B54_1; - }; //@nested(TRUE) + }; /// @struct B31 /// + @nested(TRUE) struct B31 { double B31_2; double B31_1; double B31_3; - }; //@nested(TRUE) + }; /// @struct B30 /// + @nested(TRUE) struct B30 { double c11; double c12; @@ -303,20 +317,22 @@ module Example { double c31; double c32; double c33; - }; //@nested(TRUE) + }; /// @struct B32 /// + @nested(TRUE) struct B32 { double q1; double q2; double q3; double q4; - }; //@nested(TRUE) + }; /// @struct B01 /// /// unused + @nested(TRUE) struct B01 { unsigned long B01_6; unsigned short B01_5; @@ -325,7 +341,7 @@ module Example { unsigned long B01_2; double B01_3; double B01_7; - }; //@nested(TRUE) + }; /// @typedef B45 /// @@ -402,6 +418,7 @@ module Example { /// @struct B03 /// + @nested(TRUE) struct B03 { string B03_10; string B03_08; @@ -417,10 +434,11 @@ module Example { Example::B49 B03_07; unsigned long B03_12; unsigned long B03_14; - }; //@nested(TRUE) + }; /// @struct B19 /// + @nested(TRUE) struct B19 { Example::B03 B19_14; Example::B47 B19_35; @@ -463,10 +481,11 @@ module Example { double B19_10; double B19_11; double B19_09; - }; //@nested(TRUE) + }; /// @struct B16 /// + @nested(TRUE) struct B16 { Example::B03 B16_02; Example::B47 B16_06; @@ -480,22 +499,24 @@ module Example { unsigned long B16_10; Example::B22 B16_08; Example::B48 B16_09; - }; //@nested(TRUE) + }; /// @struct B07 /// + @nested(TRUE) struct B07 { double B07_3; Example::B11 B07_1; Example::B11 B07_2; - }; //@nested(TRUE) + }; /// @struct B09 /// + @nested(TRUE) struct B09 { double B09_1; Example::B11 B09_2; - }; //@nested(TRUE) + }; /// @typedef B08 /// @@ -503,19 +524,21 @@ module Example { /// @struct B10 /// + @nested(TRUE) struct B10 { double B10_3; long long B10_2; Example::B08 B10_1; - }; //@nested(TRUE) + }; /// @struct B33 /// + @nested(TRUE) struct B33 { double B33_1; double B33_2; double B33_3; - }; //@nested(TRUE) + }; /// @typedef B29 /// diff --git a/connectors/dds4ccm/examples/idl/data/idl_example_ca1_msg.idl b/connectors/dds4ccm/examples/idl/data/idl_example_ca1_msg.idl index 3fb1835de..cc91dcb85 100644 --- a/connectors/dds4ccm/examples/idl/data/idl_example_ca1_msg.idl +++ b/connectors/dds4ccm/examples/idl/data/idl_example_ca1_msg.idl @@ -16,10 +16,11 @@ module Example { /// @struct CA1_msg + @nested(FALSE) struct CA1_msg { Example::NA4 hdr; Example::CA09 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_CA1_MSG_IDL diff --git a/connectors/dds4ccm/examples/idl/data/idl_example_ca_defn.idl b/connectors/dds4ccm/examples/idl/data/idl_example_ca_defn.idl index c420dabea..fafa301f5 100644 --- a/connectors/dds4ccm/examples/idl/data/idl_example_ca_defn.idl +++ b/connectors/dds4ccm/examples/idl/data/idl_example_ca_defn.idl @@ -54,10 +54,11 @@ module Example { /// @struct CA07 /// + @nested(TRUE) struct CA07 { double CA07_1; double CA07_2; - }; //@nested(TRUE) + }; /// @typedef CA08 /// @@ -74,15 +75,17 @@ module Example { /// @struct CA09 /// + @nested(TRUE) struct CA09 { double CA09_2; Example::NA5 CA09_1; - }; //@nested(TRUE) + }; /// @struct CA10 /// + @nested(TRUE) struct CA10 { Example::B47 C10_15; @@ -140,7 +143,7 @@ module Example { Example::CA08 C10_27; Example::NA6 C10_07; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_CA_DEFN_IDL diff --git a/connectors/dds4ccm/examples/idl/data/idl_example_na_defn.idl b/connectors/dds4ccm/examples/idl/data/idl_example_na_defn.idl index 0d3604fe3..73e6bfa56 100644 --- a/connectors/dds4ccm/examples/idl/data/idl_example_na_defn.idl +++ b/connectors/dds4ccm/examples/idl/data/idl_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; - }; //@nested(TRUE) + }; /// @struct NA6 /// + @nested(TRUE) struct NA6 { string NA6_10; @@ -81,14 +83,15 @@ module Example { unsigned long NA6_12; unsigned long NA6_14; - }; //@nested(TRUE) + }; /// @struct NA5 /// + @nested(TRUE) struct NA5 { double NA5_1; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_NA_DEFN_IDL diff --git a/connectors/dds4ccm/examples/shapes_asm/ports/shapes_shapetype_msg.idl b/connectors/dds4ccm/examples/shapes_asm/ports/shapes_shapetype_msg.idl index 3a1b58268..d3f8cb457 100644 --- a/connectors/dds4ccm/examples/shapes_asm/ports/shapes_shapetype_msg.idl +++ b/connectors/dds4ccm/examples/shapes_asm/ports/shapes_shapetype_msg.idl @@ -11,6 +11,7 @@ typedef string<128> color_type; /// \struct ShapeType +@nested(FALSE) struct ShapeType { /// This field contains the color of the shape. color_type color; //@key @@ -21,6 +22,6 @@ struct ShapeType { long y; /// This field contains the size of the shape. long shapesize; -}; //@nested(FALSE) +}; #endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/connectors/dds4ccm/tests/apc/apc_event_defaults/data/event_record.idl b/connectors/dds4ccm/tests/apc/apc_event_defaults/data/event_record.idl index d1c984db2..589f6b45f 100644 --- a/connectors/dds4ccm/tests/apc/apc_event_defaults/data/event_record.idl +++ b/connectors/dds4ccm/tests/apc/apc_event_defaults/data/event_record.idl @@ -13,11 +13,12 @@ typedef sequence OctetSeq; module Data { + @nested(FALSE) struct Event { string key; long iteration; ::OctetSeq data; - }; //@nested(FALSE) + }; }; #endif /* EVENT_RECORD_IDL_ */ diff --git a/connectors/dds4ccm/tests/apc/apc_event_extended/data/event_record.idl b/connectors/dds4ccm/tests/apc/apc_event_extended/data/event_record.idl index 2346706bd..c6cb07885 100644 --- a/connectors/dds4ccm/tests/apc/apc_event_extended/data/event_record.idl +++ b/connectors/dds4ccm/tests/apc/apc_event_extended/data/event_record.idl @@ -13,11 +13,12 @@ typedef sequence OctetSeq; module Data { + @nested(FALSE) struct Event { string key; long iteration; ::OctetSeq data; - }; //@nested(FALSE) + }; }; #endif /* EVENT_RECORD_IDL_ */ diff --git a/connectors/dds4ccm/tests/apc/gen_comp/data/shapes.idl b/connectors/dds4ccm/tests/apc/gen_comp/data/shapes.idl index 75f026378..7e8988fe1 100644 --- a/connectors/dds4ccm/tests/apc/gen_comp/data/shapes.idl +++ b/connectors/dds4ccm/tests/apc/gen_comp/data/shapes.idl @@ -11,12 +11,13 @@ typedef string<128> color_type; +@nested(FALSE) struct ShapeType { color_type color; //@key long x; long y; long shapesize; -}; //@nested(FALSE) +}; struct Bar diff --git a/connectors/dds4ccm/tests/apc/gen_comp_only/data/shapes.idl b/connectors/dds4ccm/tests/apc/gen_comp_only/data/shapes.idl index 94ddfe557..011dcb4df 100644 --- a/connectors/dds4ccm/tests/apc/gen_comp_only/data/shapes.idl +++ b/connectors/dds4ccm/tests/apc/gen_comp_only/data/shapes.idl @@ -11,12 +11,13 @@ typedef string<128> color_type; +@nested(FALSE) struct ShapeType { color_type color; //@key long x; long y; long shapesize; -}; //@nested(FALSE) +}; struct Bar diff --git a/connectors/dds4ccm/tests/coherent_write/data/common.idl b/connectors/dds4ccm/tests/coherent_write/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/coherent_write/data/common.idl +++ b/connectors/dds4ccm/tests/coherent_write/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/connector_status_listener/data/common.idl b/connectors/dds4ccm/tests/connector_status_listener/data/common.idl index dde919390..aca56438e 100644 --- a/connectors/dds4ccm/tests/connector_status_listener/data/common.idl +++ b/connectors/dds4ccm/tests/connector_status_listener/data/common.idl @@ -11,9 +11,10 @@ // A topic to test the on_inconsistent_topic callback +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/connector_status_listener/data/csl.idl b/connectors/dds4ccm/tests/connector_status_listener/data/csl.idl index 1e4ac92a0..484f526f2 100644 --- a/connectors/dds4ccm/tests/connector_status_listener/data/csl.idl +++ b/connectors/dds4ccm/tests/connector_status_listener/data/csl.idl @@ -11,10 +11,11 @@ // A topic to test the on_inconsistent_topic callback +@nested(FALSE) struct OnInconsistentTopicMessage { string key; //@key short iteration; short extra; -}; //@nested(FALSE) +}; #endif /* CSL_IDL_ */ diff --git a/connectors/dds4ccm/tests/content_filtered_topics/event_listener/data/common.idl b/connectors/dds4ccm/tests/content_filtered_topics/event_listener/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/content_filtered_topics/event_listener/data/common.idl +++ b/connectors/dds4ccm/tests/content_filtered_topics/event_listener/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/extensibility/base/data/shapes_shapetype_msg.idl b/connectors/dds4ccm/tests/extensibility/base/data/shapes_shapetype_msg.idl index f2c279047..c99374087 100644 --- a/connectors/dds4ccm/tests/extensibility/base/data/shapes_shapetype_msg.idl +++ b/connectors/dds4ccm/tests/extensibility/base/data/shapes_shapetype_msg.idl @@ -12,6 +12,7 @@ typedef string<128> color_type; /// \struct ShapeType @appendable +@nested(FALSE) struct ShapeType { /// This field contains the color of the shape. @key color_type color; @@ -22,6 +23,6 @@ struct ShapeType { long y; /// This field contains the size of the shape. long shapesize; -}; //@nested(FALSE) +}; #endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/connectors/dds4ccm/tests/extensibility/extended/data/shapes_shapetype_msg.idl b/connectors/dds4ccm/tests/extensibility/extended/data/shapes_shapetype_msg.idl index 31894ec32..53ab8b36a 100644 --- a/connectors/dds4ccm/tests/extensibility/extended/data/shapes_shapetype_msg.idl +++ b/connectors/dds4ccm/tests/extensibility/extended/data/shapes_shapetype_msg.idl @@ -12,6 +12,7 @@ typedef string<128> color_type; /// \struct ShapeType @appendable +@nested(FALSE) struct ShapeType { /// This field contains the color of the shape. @key color_type color; @@ -24,6 +25,6 @@ struct ShapeType { long shapesize; /// This field contains the angle of the shape. long angle; -}; //@nested(FALSE) +}; #endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/filter_attrib/listeners/event/data/common.idl b/connectors/dds4ccm/tests/filters/filter_attrib/listeners/event/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/filters/filter_attrib/listeners/event/data/common.idl +++ b/connectors/dds4ccm/tests/filters/filter_attrib/listeners/event/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/filter_attrib/listeners/state/data/common.idl b/connectors/dds4ccm/tests/filters/filter_attrib/listeners/state/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/filters/filter_attrib/listeners/state/data/common.idl +++ b/connectors/dds4ccm/tests/filters/filter_attrib/listeners/state/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/filter_attrib/read_get/data/common.idl b/connectors/dds4ccm/tests/filters/filter_attrib/read_get/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/filters/filter_attrib/read_get/data/common.idl +++ b/connectors/dds4ccm/tests/filters/filter_attrib/read_get/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/query_attrib/listeners/event/data/common.idl b/connectors/dds4ccm/tests/filters/query_attrib/listeners/event/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/filters/query_attrib/listeners/event/data/common.idl +++ b/connectors/dds4ccm/tests/filters/query_attrib/listeners/event/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/query_attrib/listeners/state/data/common.idl b/connectors/dds4ccm/tests/filters/query_attrib/listeners/state/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/filters/query_attrib/listeners/state/data/common.idl +++ b/connectors/dds4ccm/tests/filters/query_attrib/listeners/state/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/filters/query_attrib/read_get/data/common.idl b/connectors/dds4ccm/tests/filters/query_attrib/read_get/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/filters/query_attrib/read_get/data/common.idl +++ b/connectors/dds4ccm/tests/filters/query_attrib/read_get/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/get_component/data/common.idl b/connectors/dds4ccm/tests/get_component/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/get_component/data/common.idl +++ b/connectors/dds4ccm/tests/get_component/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/getter/data/common.idl b/connectors/dds4ccm/tests/getter/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/getter/data/common.idl +++ b/connectors/dds4ccm/tests/getter/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/idl_conversion/data/idl_conversion.idl b/connectors/dds4ccm/tests/idl_conversion/data/idl_conversion.idl index 889a4a9b0..2fa981196 100644 --- a/connectors/dds4ccm/tests/idl_conversion/data/idl_conversion.idl +++ b/connectors/dds4ccm/tests/idl_conversion/data/idl_conversion.idl @@ -11,9 +11,10 @@ module Example { + @nested(TRUE) struct B02 { long B02_1; - }; //@nested(TRUE) + }; typedef sequence B10; typedef sequence B11; @@ -45,9 +46,10 @@ module Example { typedef sequence B21_5; typedef B21_5 B21_6; + @nested(TRUE) struct B31 { long B31_1; - }; //@nested(TRUE) + }; typedef B31 B32[2]; typedef B31 B33[4][5]; @@ -89,11 +91,12 @@ module Example { case B70_3: B70 b_80_3; }; + @nested(TRUE) struct B81 { long a; string b; B58 c; - }; //@nested(TRUE) + }; typedef sequence B82; struct B83 { string a; @@ -112,6 +115,7 @@ module Example { case 3: B41 b_85_3; }; + @nested(FALSE) struct IDLConversionMessage { char a_01; wchar a_02; @@ -183,7 +187,7 @@ module Example { string key; short iteration; - }; //@nested(FALSE) + }; struct ColorStruct; typedef sequence ColorList; @@ -202,20 +206,22 @@ module Example { struct Color3Struct; typedef sequence Color3List; + @nested(FALSE) struct Color3Struct { string colorString; long colorNum; - }; //@nested(FALSE) + }; typedef sequence Color3Seq; struct Color4Struct; typedef sequence Color4List; typedef sequence Color4Seq; + @nested(FALSE) struct Color4Struct { string colorString; long colorNum; Color3Seq color2seq; - }; //@nested(FALSE) + }; union B03; typedef sequence B03List; @@ -254,25 +260,28 @@ module UnionTest module Escaping { union _private; + @nested(FALSE) union _private switch (long) { case 2: short b_03_3; - }; //@nested(FALSE) + }; struct _public; + @nested(FALSE) struct _public { string bar; - }; //@nested(FALSE) + }; }; module Foo { module _ATTRIBUTE { + @nested(FALSE) struct TopicA { string a; - }; //@nested(FALSE) + }; }; }; @@ -300,34 +309,39 @@ module SequenceTest typedef long myLong; typedef sequence myLongSeq; typedef sequence myLongSeq_b16; + @nested(FALSE) struct My_msg { myLong myl; myLongSeq mylseq; - }; //@nested(FALSE) + }; + @nested(FALSE) struct My_msg2 { long myl; - }; //@nested(FALSE) + }; typedef sequence My_msg2Seq; + @nested(FALSE) union My_msg3 switch (long) { case 2: long myl; - }; //@nested(FALSE) + }; typedef sequence My_msg3Seq; + @nested(FALSE) struct My_msg4 { long myl; - }; //@nested(FALSE) + }; typedef sequence My_msg4Bounded; + @nested(FALSE) union My_msg5 switch (long) { case 2: My_msg4Bounded myl; - }; //@nested(FALSE) + }; typedef sequence My_msg5Seq; typedef sequence My_msg5_b12; typedef sequence My_msg5_b11; diff --git a/connectors/dds4ccm/tests/invalid_qos/data/common.idl b/connectors/dds4ccm/tests/invalid_qos/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/invalid_qos/data/common.idl +++ b/connectors/dds4ccm/tests/invalid_qos/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa1_msg.idl index 14a864a81..cc4202b88 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa1_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct AA1_msg /// + @nested(FALSE) struct AA1_msg { Example::NA4 hdr; Example::AA4 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_AA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa2_msg.idl index b6674bb11..0a32e9011 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa2_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct AA2_msg /// + @nested(FALSE) struct AA2_msg { Example::NA4 hdr; Example::AA5 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_AA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa_defn.idl index 2acfb92b5..316871d9d 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_aa_defn.idl @@ -42,6 +42,7 @@ module Example { /// @struct AA4 /// + @nested(TRUE) struct AA4 { Example::NA5 AA4_2; @@ -49,10 +50,11 @@ module Example { double AA4_3; double AA4_1; - }; //@nested(TRUE) + }; /// @struct AA5 /// + @nested(TRUE) struct AA5 { Example::NA6 AA5_04; @@ -78,7 +80,7 @@ module Example { double AA5_12; double AA5_09; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_AA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_b_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_b_defn.idl index 10b941ba9..e440b9d6f 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_b_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_b_defn.idl @@ -12,6 +12,7 @@ module Example { /// @struct B11 /// + @nested(TRUE) struct B11 { double B11_1; @@ -19,7 +20,7 @@ module Example { double B11_2; double B11_3; - }; //@nested(TRUE) + }; /// @typedef B26 /// @@ -43,14 +44,16 @@ module Example { /// @struct B27 /// + @nested(TRUE) struct B27 { double B27_3; Example::B11 B27_2; Example::B11 B27_1; - }; //@nested(TRUE) + }; /// @struct B34 /// + @nested(TRUE) struct B34 { Example::B11 B34_03; Example::B11 B34_04; @@ -67,10 +70,11 @@ module Example { long B34_09; long B34_06; long B34_14; - }; //@nested(TRUE) + }; /// @struct B38 /// + @nested(TRUE) struct B38 { long B38_10; long B38_04; @@ -83,7 +87,7 @@ module Example { double B38_03; double B38_09; long B38_11; - }; //@nested(TRUE) + }; /// @typedef B37 /// @@ -95,16 +99,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; - }; //@nested(TRUE) + }; /// @struct B15 /// + @nested(TRUE) struct B15 { long B15_07; @@ -136,7 +142,7 @@ module Example { Example::B11 B15_14; float B15_06; - }; //@nested(TRUE) + }; /// @typedef B14 /// @@ -144,12 +150,13 @@ module Example { /// @struct B17 /// + @nested(TRUE) struct B17 { double B17_1; long B17_2; - }; //@nested(TRUE) + }; /// @typedef B02 /// @@ -157,6 +164,7 @@ module Example { /// @struct B04 /// + @nested(TRUE) struct B04 { double B04_04; @@ -180,10 +188,11 @@ module Example { double B04_10; double B04_11; - }; //@nested(TRUE) + }; /// @struct B06 /// + @nested(TRUE) struct B06 { Example::B11 B06_02; @@ -221,10 +230,11 @@ module Example { double B06_11; double B06_12; - }; //@nested(TRUE) + }; /// @struct B05 /// + @nested(TRUE) struct B05 { double B05_09; @@ -246,10 +256,11 @@ module Example { double B05_03; double B05_02; - }; //@nested(TRUE) + }; /// @struct B53 /// + @nested(TRUE) struct B53 { Example::B14 B53_1; @@ -259,10 +270,11 @@ module Example { double B53_3; long B53_4; - }; //@nested(TRUE) + }; /// @struct B54 /// + @nested(TRUE) struct B54 { long B54_6; @@ -276,18 +288,20 @@ module Example { double B54_2; Example::B12 B54_1; - }; //@nested(TRUE) + }; /// @struct B31 /// + @nested(TRUE) struct B31 { double B31_2; double B31_1; double B31_3; - }; //@nested(TRUE) + }; /// @struct B30 /// + @nested(TRUE) struct B30 { double c11; double c12; @@ -298,20 +312,22 @@ module Example { double c31; double c32; double c33; - }; //@nested(TRUE) + }; /// @struct B32 /// + @nested(TRUE) struct B32 { double q1; double q2; double q3; double q4; - }; //@nested(TRUE) + }; /// @struct B01 /// /// unused + @nested(TRUE) struct B01 { unsigned long B01_6; unsigned short B01_5; @@ -320,7 +336,7 @@ module Example { unsigned long B01_2; double B01_3; double B01_7; - }; //@nested(TRUE) + }; /// @typedef B45 /// @@ -397,6 +413,7 @@ module Example { /// @struct B03 /// + @nested(TRUE) struct B03 { string B03_10; string B03_08; @@ -412,10 +429,11 @@ module Example { Example::B49 B03_07; unsigned long B03_12; unsigned long B03_14; - }; //@nested(TRUE) + }; /// @struct B19 /// + @nested(TRUE) struct B19 { Example::B03 B19_14; Example::B47 B19_35; @@ -458,10 +476,11 @@ module Example { double B19_10; double B19_11; double B19_09; - }; //@nested(TRUE) + }; /// @struct B16 /// + @nested(TRUE) struct B16 { Example::B03 B16_02; Example::B47 B16_06; @@ -475,22 +494,24 @@ module Example { unsigned long B16_10; Example::B22 B16_08; Example::B48 B16_09; - }; //@nested(TRUE) + }; /// @struct B07 /// + @nested(TRUE) struct B07 { double B07_3; Example::B11 B07_1; Example::B11 B07_2; - }; //@nested(TRUE) + }; /// @struct B09 /// + @nested(TRUE) struct B09 { double B09_1; Example::B11 B09_2; - }; //@nested(TRUE) + }; /// @typedef B08 /// @@ -498,19 +519,21 @@ module Example { /// @struct B10 /// + @nested(TRUE) struct B10 { double B10_3; long long B10_2; Example::B08 B10_1; - }; //@nested(TRUE) + }; /// @struct B33 /// + @nested(TRUE) struct B33 { double B33_1; double B33_2; double B33_3; - }; //@nested(TRUE) + }; /// @typedef B29 /// diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba1_msg.idl index e0b72ab16..404017d60 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba1_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct BA1_msg /// + @nested(FALSE) struct BA1_msg { Example::NA4 hdr; Example::BA3 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_BA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba2_msg.idl index 52cbd8746..ea25087b4 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba2_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct BA2_msg /// + @nested(FALSE) struct BA2_msg { Example::NA4 hdr; Example::BA4 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_BA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba_defn.idl index ab2a88d26..8e578173d 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ba_defn.idl @@ -33,6 +33,7 @@ module Example { /// @struct BA4 /// + @nested(TRUE) struct BA4 { Example::NA6 BA4_03; @@ -54,10 +55,11 @@ module Example { double BA4_02; double BA4_07; - }; //@nested(TRUE) + }; /// @struct BA3 /// + @nested(TRUE) struct BA3 { Example::NA5 BA3_1; @@ -65,7 +67,7 @@ module Example { double BA3_3; double BA3_2; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_BA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca1_msg.idl index e19065738..88b5e5332 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca1_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct CA1_msg /// + @nested(FALSE) struct CA1_msg { Example::NA4 hdr; Example::CA09 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_CA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca2_msg.idl index 36c8105cb..5993a0b78 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca2_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct CA2_msg /// + @nested(FALSE) struct CA2_msg { Example::NA4 hdr; Example::CA10 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_CA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca_defn.idl index cfb4c76f7..12623c131 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ca_defn.idl @@ -52,10 +52,11 @@ module Example { /// @struct CA07 /// + @nested(TRUE) struct CA07 { double CA07_1; double CA07_2; - }; //@nested(TRUE) + }; /// @typedef CA08 /// @@ -72,15 +73,17 @@ module Example { /// @struct CA09 /// + @nested(TRUE) struct CA09 { double CA09_2; Example::NA5 CA09_1; - }; //@nested(TRUE) + }; /// @struct CA10 /// + @nested(TRUE) struct CA10 { Example::B47 C10_15; @@ -138,7 +141,7 @@ module Example { Example::CA08 C10_27; Example::NA6 C10_07; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_CA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da1_msg.idl index f78429558..5f26c0688 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da1_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct DA1_msg /// + @nested(FALSE) struct DA1_msg { Example::NA4 hdr; Example::DA24 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_DA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da2_msg.idl index fd952ed77..cccdd508e 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da2_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct DA2_msg /// + @nested(FALSE) struct DA2_msg { Example::DA25 data; Example::NA4 hdr; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_DA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da3_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da3_msg.idl index 4a2a07c24..96538ad6c 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da3_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da3_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct DA3_msg /// + @nested(FALSE) struct DA3_msg { Example::NA4 hdr; Example::DA28 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_DA3_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da4_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da4_msg.idl index 254e51e63..9ee9b6b94 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da4_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da4_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct DA4_msg /// + @nested(FALSE) struct DA4_msg { Example::NA4 hdr; Example::DA31 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_DA4_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da5_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da5_msg.idl index 93c9c9d4c..544b357b1 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da5_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da5_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct DA5_msg /// + @nested(FALSE) struct DA5_msg { Example::NA4 hdr; Example::DA32 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_DA5_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da_defn.idl index 2822164e8..daa4dad0f 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_da_defn.idl @@ -170,6 +170,7 @@ module Example { /// @struct DA22 /// + @nested(TRUE) struct DA22 { unsigned long DA22_09; @@ -201,7 +202,7 @@ module Example { double DA22_03; double DA22_07; - }; //@nested(TRUE) + }; /// @typedef DA23 /// @@ -209,6 +210,7 @@ module Example { /// @struct DA29 /// + @nested(TRUE) struct DA29 { double DA29_01; @@ -240,7 +242,7 @@ module Example { double DA29_11; double DA29_03; - }; //@nested(TRUE) + }; /// @typedef DA30 /// @@ -257,10 +259,11 @@ module Example { /// @struct DA26 /// + @nested(TRUE) struct DA26 { Example::DA11 DA26_2; double DA26_1; - }; //@nested(TRUE) + }; /// @typedef DA27 /// @@ -268,6 +271,7 @@ module Example { /// @struct DA32 /// + @nested(TRUE) struct DA32 { Example::NA6 DA32_02; @@ -291,10 +295,11 @@ module Example { unsigned long DA32_09; Example::DA27 DA32_08; - }; //@nested(TRUE) + }; /// @struct DA28 /// + @nested(TRUE) struct DA28 { unsigned long DA28_04; @@ -334,10 +339,11 @@ module Example { unsigned long DA28_18; unsigned long DA28_19; - }; //@nested(TRUE) + }; /// @struct DA31 /// + @nested(TRUE) struct DA31 { Example::DA15 DA31_1; @@ -351,10 +357,11 @@ module Example { double DA31_5; unsigned long DA31_6; - }; //@nested(TRUE) + }; /// @struct DA24 /// + @nested(TRUE) struct DA24 { unsigned long DA24_4; @@ -368,10 +375,11 @@ module Example { Example::DA23 DA24_3; Example::NA5 DA24_2; - }; //@nested(TRUE) + }; /// @struct DA25 /// + @nested(TRUE) struct DA25 { unsigned long DA25_28; @@ -429,7 +437,7 @@ module Example { double DA25_10; Example::NA5 DA25_04; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_DA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea1_msg.idl index 8e2121b2f..fc5f63b30 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea1_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct EA1_msg /// + @nested(FALSE) struct EA1_msg { Example::EA6 data; Example::NA4 hdr; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_EA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea2_msg.idl index 93d6698c8..5df3308ce 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea2_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct EA2_msg /// + @nested(FALSE) struct EA2_msg { Example::NA4 hdr; Example::EA7 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_EA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea_defn.idl index bb0c07008..9b3f37d9f 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ea_defn.idl @@ -50,6 +50,7 @@ module Example { /// @struct EA7 /// + @nested(TRUE) struct EA7 { Example::NA6 EA7_15; @@ -137,10 +138,11 @@ module Example { double EA7_33; double EA7_36; - }; //@nested(TRUE) + }; /// @struct EA6 /// + @nested(TRUE) struct EA6 { Example::NA5 EA6_04; @@ -162,7 +164,7 @@ module Example { double EA6_09; double EA6_10; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_EA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa1_msg.idl index d344ac067..f4d7040d6 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa1_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct FA1_msg /// + @nested(FALSE) struct FA1_msg { Example::NA4 hdr; Example::FA7 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_FA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa2_msg.idl index e151aca90..c44eef84d 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa2_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct FA2_msg /// + @nested(FALSE) struct FA2_msg { Example::NA4 hdr; Example::FA8 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_FA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa_defn.idl index 494970b3f..50622259a 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_fa_defn.idl @@ -43,10 +43,11 @@ module Example { /// @struct FA5 /// + @nested(TRUE) struct FA5 { Example::FA2 FA5_2; double FA5_1; - }; //@nested(TRUE) + }; /// @typedef FA6 /// @@ -54,6 +55,7 @@ module Example { /// @struct FA7 /// + @nested(TRUE) struct FA7 { Example::NA5 FA7_1; @@ -63,10 +65,11 @@ module Example { double FA7_3; double FA7_2; - }; //@nested(TRUE) + }; /// @struct FA8 /// + @nested(TRUE) struct FA8 { Example::B47 FA8_12; @@ -110,7 +113,7 @@ module Example { Example::B45 FA8_20; Example::B45 FA8_15; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_FA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga1_msg.idl index abab0a2f9..9d8233c87 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga1_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct GA1_msg /// + @nested(FALSE) struct GA1_msg { Example::NA4 hdr; Example::GA7 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_GA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga2_msg.idl index 4d9f5c0a7..4f72fa4cb 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga2_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct GA2_msg /// + @nested(FALSE) struct GA2_msg { Example::NA4 hdr; Example::GA8 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_GA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga_defn.idl index c43d64327..dde2b5066 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ga_defn.idl @@ -48,6 +48,7 @@ module Example { /// @struct GA7 /// + @nested(TRUE) struct GA7 { double GA7_4; @@ -57,10 +58,11 @@ module Example { Example::GA5 GA7_1; Example::NA5 GA7_2; - }; //@nested(TRUE) + }; /// @struct GA8 /// + @nested(TRUE) struct GA8 { Example::B47 GA8_17; @@ -118,7 +120,7 @@ module Example { Example::NA6 GA8_08; unsigned long GA8_19; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_GA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha1_msg.idl index 3c92e0150..89ad9613a 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha1_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct HA1_msg /// + @nested(FALSE) struct HA1_msg { Example::NA4 hdr; Example::HA4 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_HA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha2_msg.idl index 27ab0a637..bfabed559 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha2_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct HA2_msg /// + @nested(FALSE) struct HA2_msg { Example::NA4 hdr; Example::HA5 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_HA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha_defn.idl index 387f882eb..648e48c0c 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ha_defn.idl @@ -36,6 +36,7 @@ module Example { /// @struct HA4 /// + @nested(TRUE) struct HA4 { double HA4_4; @@ -45,10 +46,11 @@ module Example { double HA4_3; Example::NA5 HA4_1; - }; //@nested(TRUE) + }; /// @struct HA5 /// + @nested(TRUE) struct HA5 { Example::B47 HA5_10; @@ -84,7 +86,7 @@ module Example { double HA5_17; Example::NA6 HA5_05; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_HA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia1_msg.idl index e1150bf44..520fa9208 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia1_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct IA1_msg /// + @nested(FALSE) struct IA1_msg { Example::NA4 hdr; Example::IA4 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_IA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia2_msg.idl index cfa552a93..22bc9a7c0 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia2_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct IA2_msg /// + @nested(FALSE) struct IA2_msg { Example::NA4 hdr; Example::IA5 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_IA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia_defn.idl index 4d18e001d..2ef4c2b42 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ia_defn.idl @@ -36,6 +36,7 @@ module Example { /// @struct IA4 /// + @nested(TRUE) struct IA4 { double IA4_3; @@ -43,10 +44,11 @@ module Example { unsigned long IA4_2; Example::NA5 IA4_1; - }; //@nested(TRUE) + }; /// @struct IA5 /// + @nested(TRUE) struct IA5 { double IA5_12; @@ -72,7 +74,7 @@ module Example { Example::B42 IA5_05; Example::NA6 IA5_01; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_IA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja1_msg.idl index f459f2fc6..7d6ee4dd2 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja1_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct JA1_msg /// + @nested(FALSE) struct JA1_msg { Example::NA4 hdr; Example::JA5 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_JA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja2_msg.idl index aaae70b4c..6466452fe 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja2_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct JA2_msg /// + @nested(FALSE) struct JA2_msg { Example::NA4 hdr; Example::JA6 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_JA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja_defn.idl index a5b3ca89b..d714e8933 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ja_defn.idl @@ -45,6 +45,7 @@ module Example { /// @struct JA5 /// + @nested(TRUE) struct JA5 { Example::NA5 JA5_1; @@ -56,10 +57,11 @@ module Example { unsigned long JA5_4; unsigned long JA5_3; - }; //@nested(TRUE) + }; /// @struct JA6 /// + @nested(TRUE) struct JA6 { Example::NA6 JA6_01; @@ -81,7 +83,7 @@ module Example { double JA6_07; Example::JA2 JA6_06; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_JA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka1_msg.idl index 3b37ef846..e449db18c 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka1_msg.idl @@ -14,10 +14,11 @@ module Example { /// @struct KA1_msg + @nested(FALSE) struct KA1_msg { Example::NA4 hdr; Example::KA4 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_KA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka2_msg.idl index 0a2e7db20..9a8fe78ca 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka2_msg.idl @@ -14,10 +14,11 @@ module Example { /// @struct KA2_msg + @nested(FALSE) struct KA2_msg { Example::NA4 hdr; Example::KA5 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_KA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka_defn.idl index 0628ed064..b382368ec 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ka_defn.idl @@ -35,6 +35,7 @@ module Example { }; /// @struct KA4 + @nested(TRUE) struct KA4 { Example::NA5 KA4_1; @@ -42,9 +43,10 @@ module Example { double KA4_3; double KA4_2; - }; //@nested(TRUE) + }; /// @struct KA5 + @nested(TRUE) struct KA5 { Example::NA6 KA5_04; @@ -74,7 +76,7 @@ module Example { Example::B39 KA5_14; double KA5_10; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_KA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma1_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma1_msg.idl index 8dd16c39a..379f06986 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma1_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma1_msg.idl @@ -15,12 +15,13 @@ module Example { /// @struct MA1_msg /// + @nested(FALSE) struct MA1_msg { Example::NA4 hdr; Example::MA3 data; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_MA1_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma2_msg.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma2_msg.idl index 1353a4b24..695442bed 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma2_msg.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma2_msg.idl @@ -37,12 +37,12 @@ module A { module Example { /// @struct MA2_msg - /// + @nested(FALSE) struct MA2_msg { Example::NA4 hdr; Example::MA4 data; boolean trigger; - }; //@nested(FALSE) + }; }; #endif // CX_PORTS__MESSAGES__EXAMPLE_MA2_MSG_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma_defn.idl index 1f745666e..314a44a76 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_ma_defn.idl @@ -29,6 +29,7 @@ module Example { /// @struct MA3 /// + @nested(TRUE) struct MA3 { double MA3_5; @@ -40,10 +41,11 @@ module Example { Example::B47 MA3_2; double MA3_4; - }; //@nested(TRUE) + }; /// @struct MA4 /// + @nested(TRUE) struct MA4 { Example::NA6 MA4_01; @@ -65,7 +67,7 @@ module Example { double MA4_08; double MA4_07; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_MA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_na_defn.idl b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_na_defn.idl index 34a7dc089..c8e15d3e9 100644 --- a/connectors/dds4ccm/tests/kitchensink/ports/messages/example_na_defn.idl +++ b/connectors/dds4ccm/tests/kitchensink/ports/messages/example_na_defn.idl @@ -38,6 +38,7 @@ module Example { /// @struct NA4 /// + @nested(TRUE) struct NA4 { unsigned long NA4_6; unsigned short NA4_5; @@ -46,10 +47,11 @@ module Example { unsigned long NA4_2; double NA4_3; double NA4_7; - }; //@nested(TRUE) + }; /// @struct NA6 /// + @nested(TRUE) struct NA6 { string NA6_10; @@ -79,14 +81,15 @@ module Example { unsigned long NA6_12; unsigned long NA6_14; - }; //@nested(TRUE) + }; /// @struct NA5 /// + @nested(TRUE) struct NA5 { double NA5_1; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__TYPES__EXAMPLE_NA_DEFN_IDL diff --git a/connectors/dds4ccm/tests/late_binded/read_get/data/common.idl b/connectors/dds4ccm/tests/late_binded/read_get/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/late_binded/read_get/data/common.idl +++ b/connectors/dds4ccm/tests/late_binded/read_get/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/latency/data/latency_data.idl b/connectors/dds4ccm/tests/latency/data/latency_data.idl index 05435b234..6b753233e 100644 --- a/connectors/dds4ccm/tests/latency/data/latency_data.idl +++ b/connectors/dds4ccm/tests/latency/data/latency_data.idl @@ -17,11 +17,13 @@ typedef sequence BD_oct_seq; module Test { + @nested(FALSE) + @final struct LatencyData { long seq_num; BD_oct_seq data; - }; //@nested(FALSE) @final + }; }; #endif // LATENCY_DATA_IDL diff --git a/connectors/dds4ccm/tests/max_delivered_data/getter/data/common.idl b/connectors/dds4ccm/tests/max_delivered_data/getter/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/max_delivered_data/getter/data/common.idl +++ b/connectors/dds4ccm/tests/max_delivered_data/getter/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/max_delivered_data/listeners/data/data/common.idl b/connectors/dds4ccm/tests/max_delivered_data/listeners/data/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/max_delivered_data/listeners/data/data/common.idl +++ b/connectors/dds4ccm/tests/max_delivered_data/listeners/data/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/max_delivered_data/listeners/state/data/common.idl b/connectors/dds4ccm/tests/max_delivered_data/listeners/state/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/max_delivered_data/listeners/state/data/common.idl +++ b/connectors/dds4ccm/tests/max_delivered_data/listeners/state/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl b/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl index e7c09ca97..6a7a68b13 100644 --- a/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl +++ b/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl @@ -11,12 +11,14 @@ #ifndef LATENCY_DATA_IDL #define LATENCY_DATA_IDL +@nested(FALSE) +@final module Test { struct LatencyData { long seq_num; - }; //@nested(FALSE) @final + }; }; #endif // LATENCY_DATA_IDL diff --git a/connectors/dds4ccm/tests/non_changeable/data/common.idl b/connectors/dds4ccm/tests/non_changeable/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/non_changeable/data/common.idl +++ b/connectors/dds4ccm/tests/non_changeable/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/port_status_listener/deadline_missed/data/common.idl b/connectors/dds4ccm/tests/port_status_listener/deadline_missed/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/port_status_listener/deadline_missed/data/common.idl +++ b/connectors/dds4ccm/tests/port_status_listener/deadline_missed/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/port_status_listener/sample_lost/data/common.idl b/connectors/dds4ccm/tests/port_status_listener/sample_lost/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/port_status_listener/sample_lost/data/common.idl +++ b/connectors/dds4ccm/tests/port_status_listener/sample_lost/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/dds4ccm/tests/type_name/data/typename_base.idl b/connectors/dds4ccm/tests/type_name/data/typename_base.idl index 5dab8a00f..d15c55584 100644 --- a/connectors/dds4ccm/tests/type_name/data/typename_base.idl +++ b/connectors/dds4ccm/tests/type_name/data/typename_base.idl @@ -11,9 +11,10 @@ // Typename, given to DDS, should be 'TypeNameMessage' +@nested(FALSE) struct TypeNameMessage { string key; long iteration; -}; //@nested(FALSE) +}; #endif /* TYPENAME_BASE_IDL_ */ diff --git a/connectors/dds4ccm/tests/type_name/data/typenamemodule_typenamemessage.idl b/connectors/dds4ccm/tests/type_name/data/typenamemodule_typenamemessage.idl index 08639dc61..1dbc85c90 100644 --- a/connectors/dds4ccm/tests/type_name/data/typenamemodule_typenamemessage.idl +++ b/connectors/dds4ccm/tests/type_name/data/typenamemodule_typenamemessage.idl @@ -14,10 +14,11 @@ // Typename, given to DDS, should be 'TypeNameModule::TypeNameMessage' module TypeNameModule { + @nested(FALSE) struct TypeNameMessage { string key; long iteration; - }; //@nested(FALSE) + }; }; #endif /* TYPENAMEMODULE_TYPENAMEMESSAGE_IDL_ */ diff --git a/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule2_typenamemessage.idl b/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule2_typenamemessage.idl index 2f5a85e94..fa5d3b48f 100644 --- a/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule2_typenamemessage.idl +++ b/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule2_typenamemessage.idl @@ -15,10 +15,11 @@ module TypeNameModule { module TypeNameModuleModule2 { + @nested(FALSE) struct TypeNameMsg { string key; long iteration; - }; //@nested(FALSE) + }; }; }; diff --git a/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule_typenamemessage.idl b/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule_typenamemessage.idl index b961fba6e..07b5bbdd4 100644 --- a/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule_typenamemessage.idl +++ b/connectors/dds4ccm/tests/type_name/data/typenamemodulemodule_typenamemessage.idl @@ -15,10 +15,11 @@ module TypeNameModule { module TypeNameModuleModule { + @nested(FALSE) struct TypeNameMessage { string key; long iteration; - }; //@nested(FALSE) + }; }; }; diff --git a/connectors/dds4ccm/tests/union/struct/data/union.idl b/connectors/dds4ccm/tests/union/struct/data/union.idl index 6b7b2ec53..e18e051d2 100644 --- a/connectors/dds4ccm/tests/union/struct/data/union.idl +++ b/connectors/dds4ccm/tests/union/struct/data/union.idl @@ -24,17 +24,19 @@ module Uni { dtGlobal }; + @nested(TRUE) struct Point { long x; long y; - }; //@nested(TRUE) + }; + @nested(TRUE) struct Track { long id; Point p; - }; //@nested(TRUE) + }; union Data switch (DataType) { @@ -46,13 +48,15 @@ module Uni { case dtGlobal: Global globalData; }; + @nested(TRUE) struct B01 { long b01_1; - }; //@nested(TRUE) + }; + @nested(TRUE) struct B02 { string b02_1; - }; //@nested(TRUE) + }; union B03 switch (long) { @@ -73,11 +77,12 @@ module Uni { D }; + @nested(FALSE) struct UnionMessage { Assignment a; //@key B03 b_03; Data d; - }; //@nested(FALSE) + }; }; #endif /* UNION_BASE_IDL_ */ diff --git a/connectors/dds4ccm/tests/union/toplevel/data/top_union.idl b/connectors/dds4ccm/tests/union/toplevel/data/top_union.idl index 1c8701daf..c50a07c6b 100644 --- a/connectors/dds4ccm/tests/union/toplevel/data/top_union.idl +++ b/connectors/dds4ccm/tests/union/toplevel/data/top_union.idl @@ -8,29 +8,31 @@ #define TOP_UNION_BASE_IDL_ module Uni { + @nested(FALSE) union TopUnionMessage switch (long) { case 4: short x; case 5: case 6: long y; - }; //@nested(FALSE) + }; enum _module { dtLong }; + @nested(FALSE) union foo switch (_module) { case dtLong: long longData; - }; //@nested(FALSE) + }; typedef long _union; + @nested(FALSE) union foo2 switch (long) { case 0: Uni::_union longData; }; - //@nested(FALSE) }; #endif /* TOP_UNION_BASE_IDL_ */ diff --git a/connectors/dds4ccm/tests/updater/data/common.idl b/connectors/dds4ccm/tests/updater/data/common.idl index ea9d92951..bba20d1a5 100644 --- a/connectors/dds4ccm/tests/updater/data/common.idl +++ b/connectors/dds4ccm/tests/updater/data/common.idl @@ -9,9 +9,10 @@ #ifndef CSL_COMMON_IDL_ #define CSL_COMMON_IDL_ +@nested(FALSE) struct CommonTestMessage { string key; //@key long iteration; -}; //@nested(FALSE) +}; #endif /* CSL_COMMON_IDL_ */ diff --git a/connectors/psdd4ccm/docs/src/psdd4ccm.adoc b/connectors/psdd4ccm/docs/src/psdd4ccm.adoc index db8c25753..af3294af6 100644 --- a/connectors/psdd4ccm/docs/src/psdd4ccm.adoc +++ b/connectors/psdd4ccm/docs/src/psdd4ccm.adoc @@ -38,12 +38,13 @@ be defined in IDL like this: ------------------- module Test { + @nested(FALSE) struct Message { string category; //@key string description; unsigned long value; - }; //@nested(FALSE) + }; }; ------------------- diff --git a/connectors/psdd4ccm/docs/src/psdd4ccm_details.adoc b/connectors/psdd4ccm/docs/src/psdd4ccm_details.adoc index 72570b3cd..d2a0b526c 100644 --- a/connectors/psdd4ccm/docs/src/psdd4ccm_details.adoc +++ b/connectors/psdd4ccm/docs/src/psdd4ccm_details.adoc @@ -140,7 +140,8 @@ this: [source,idl] ------------ -typedef ::CORBA::OctetSeq MyOctetSeq; //@nested(FALSE) +@nested(FALSE) +typedef ::CORBA::OctetSeq MyOctetSeq; ------------ **** @@ -185,12 +186,13 @@ The following IDL can be found in `hello/base`: ------------------- module Test { + @nested(FALSE) struct Message { string category; //@key string description; unsigned long value; - }; //@nested(FALSE) + }; }; ------------------- @@ -201,7 +203,7 @@ This IDL file will be compiled by the <<{xref_docs_root}/taox11/ridlc.adoc#,RIDL compiler>>. + The key value for this struct is defined with `//@key` as shown above providing the possibility for components to filter event subscriptions on `category` values. -The struct is decorated with `//@nested(FALSE)` to specify that it is to be used as event type. +The struct is decorated with `@nested(FALSE)` to specify that it is to be used as event type. The example also uses a `string` as another event type. + As this is a standard IDL base type no user data IDL definitions are required. diff --git a/connectors/psdd4ccm/examples/hello/base/message.idl b/connectors/psdd4ccm/examples/hello/base/message.idl index 9759afa5f..69da338a6 100644 --- a/connectors/psdd4ccm/examples/hello/base/message.idl +++ b/connectors/psdd4ccm/examples/hello/base/message.idl @@ -12,12 +12,13 @@ module Test { + @nested(FALSE) struct Message { string category; //@key string description; unsigned long value; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/examples/hello_ports/base/message.idl b/connectors/psdd4ccm/examples/hello_ports/base/message.idl index 9759afa5f..69da338a6 100644 --- a/connectors/psdd4ccm/examples/hello_ports/base/message.idl +++ b/connectors/psdd4ccm/examples/hello_ports/base/message.idl @@ -12,12 +12,13 @@ module Test { + @nested(FALSE) struct Message { string category; //@key string description; unsigned long value; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/custom-serializer/base/topic.idl b/connectors/psdd4ccm/tests/custom-serializer/base/topic.idl index 41238ea08..9e1a49c57 100644 --- a/connectors/psdd4ccm/tests/custom-serializer/base/topic.idl +++ b/connectors/psdd4ccm/tests/custom-serializer/base/topic.idl @@ -12,6 +12,7 @@ module Test { + @nested(FALSE) struct Topic { string key; @@ -19,7 +20,7 @@ module Test unsigned long msgid; boolean status; double value; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/data-types/base/topic.idl b/connectors/psdd4ccm/tests/data-types/base/topic.idl index 39da118b3..efa40dfd2 100644 --- a/connectors/psdd4ccm/tests/data-types/base/topic.idl +++ b/connectors/psdd4ccm/tests/data-types/base/topic.idl @@ -12,9 +12,10 @@ module Test { + @nested(TRUE) struct B02 { long B02_1; - }; //@nested(TRUE) + }; typedef sequence B10; typedef sequence B11; @@ -26,9 +27,10 @@ module Test typedef sequence B15; typedef double B16[4][5]; + @nested(TRUE) struct B31 { long B31_1; - }; //@nested(TRUE) + }; typedef B31 B32[2]; typedef B31 B33[4][5]; @@ -85,11 +87,12 @@ module Test case B70_3: B70 b_80_3; }; + @nested(TRUE) struct B81 { long a; string b; B58 c; - }; //@nested(TRUE) + }; typedef sequence B82; struct B83 { @@ -101,6 +104,7 @@ module Test B82 f; }; + @nested(FALSE) struct Topic { char a_01; @@ -162,7 +166,7 @@ module Test string key; unsigned long count; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/get_many/base/topic.idl b/connectors/psdd4ccm/tests/get_many/base/topic.idl index 8904852ae..d3e623b2c 100644 --- a/connectors/psdd4ccm/tests/get_many/base/topic.idl +++ b/connectors/psdd4ccm/tests/get_many/base/topic.idl @@ -18,6 +18,7 @@ module Test EVEN }; + @nested(FALSE) struct Topic { ECategory category; //@key @@ -25,7 +26,7 @@ module Test string description; char opt; boolean flag; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/get_many_with_max/base/topic.idl b/connectors/psdd4ccm/tests/get_many_with_max/base/topic.idl index 8904852ae..d3e623b2c 100644 --- a/connectors/psdd4ccm/tests/get_many_with_max/base/topic.idl +++ b/connectors/psdd4ccm/tests/get_many_with_max/base/topic.idl @@ -18,6 +18,7 @@ module Test EVEN }; + @nested(FALSE) struct Topic { ECategory category; //@key @@ -25,7 +26,7 @@ module Test string description; char opt; boolean flag; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/keys/multiple/base/topic.idl b/connectors/psdd4ccm/tests/keys/multiple/base/topic.idl index 8904852ae..d3e623b2c 100644 --- a/connectors/psdd4ccm/tests/keys/multiple/base/topic.idl +++ b/connectors/psdd4ccm/tests/keys/multiple/base/topic.idl @@ -18,6 +18,7 @@ module Test EVEN }; + @nested(FALSE) struct Topic { ECategory category; //@key @@ -25,7 +26,7 @@ module Test string description; char opt; boolean flag; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl b/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl index 763d197bf..f947791ff 100644 --- a/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl +++ b/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl @@ -29,13 +29,14 @@ module Test // Toplevel struct defines nokey struct as key member type // in which case the member type is considered key-only // (entire value is key value). + @nested(FALSE) struct Topic { Key the_key; //@key string description; char opt; boolean flag; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/keys/pod/basic-typedef/base/topic.idl b/connectors/psdd4ccm/tests/keys/pod/basic-typedef/base/topic.idl index 3203fe254..e596c1a82 100644 --- a/connectors/psdd4ccm/tests/keys/pod/basic-typedef/base/topic.idl +++ b/connectors/psdd4ccm/tests/keys/pod/basic-typedef/base/topic.idl @@ -12,7 +12,8 @@ module Test { - typedef unsigned short Topic; //@nested(FALSE) + @nested(FALSE) + typedef unsigned short Topic; }; #endif diff --git a/connectors/psdd4ccm/tests/keys/pod/enum/base/topic.idl b/connectors/psdd4ccm/tests/keys/pod/enum/base/topic.idl index c780917c3..8b3b19b65 100644 --- a/connectors/psdd4ccm/tests/keys/pod/enum/base/topic.idl +++ b/connectors/psdd4ccm/tests/keys/pod/enum/base/topic.idl @@ -18,7 +18,8 @@ module Test EVEN }; - typedef ECategory Topic; //@nested(FALSE) + @nested(FALSE) + typedef ECategory Topic; }; #endif diff --git a/connectors/psdd4ccm/tests/latency/data/latency_data.idl b/connectors/psdd4ccm/tests/latency/data/latency_data.idl index 9d9df41ba..3784e3418 100644 --- a/connectors/psdd4ccm/tests/latency/data/latency_data.idl +++ b/connectors/psdd4ccm/tests/latency/data/latency_data.idl @@ -17,11 +17,12 @@ typedef sequence BD_oct_seq; module Test { + @nested(FALSE) struct LatencyData { long seq_num; BD_oct_seq data; - }; //@nested(FALSE) + }; }; #endif // LATENCY_DATA_IDL diff --git a/connectors/psdd4ccm/tests/many-to-one/base/topic.idl b/connectors/psdd4ccm/tests/many-to-one/base/topic.idl index d72f9620c..ae57225b0 100644 --- a/connectors/psdd4ccm/tests/many-to-one/base/topic.idl +++ b/connectors/psdd4ccm/tests/many-to-one/base/topic.idl @@ -12,6 +12,7 @@ module Test { + @nested(FALSE) struct Topic { unsigned long publisher_id; //@key @@ -20,7 +21,7 @@ module Test unsigned long value; char opt; boolean flag; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/single-frame/base/topic.idl b/connectors/psdd4ccm/tests/single-frame/base/topic.idl index ea4635bf1..ceade502d 100644 --- a/connectors/psdd4ccm/tests/single-frame/base/topic.idl +++ b/connectors/psdd4ccm/tests/single-frame/base/topic.idl @@ -18,11 +18,12 @@ module Test EVEN }; + @nested(FALSE) struct Topic { ECategory category; //@key string content; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/array/multidim/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/array/multidim/base/topic.idl index 212006d8a..bae8fb777 100644 --- a/connectors/psdd4ccm/tests/topic-types/array/multidim/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/array/multidim/base/topic.idl @@ -14,13 +14,14 @@ module Test { typedef unsigned long ULongArray[2][25]; + @nested(FALSE) struct Topic { string category; string description; ULongArray values; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/array/simple/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/array/simple/base/topic.idl index 16cf32f9d..e10d26ba3 100644 --- a/connectors/psdd4ccm/tests/topic-types/array/simple/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/array/simple/base/topic.idl @@ -14,13 +14,14 @@ module Test { typedef unsigned long ULongArray[50]; + @nested(FALSE) struct Topic { string category; string description; ULongArray values; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/sequence/bounded/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/sequence/bounded/base/topic.idl index b5e5516bb..8bdb1b9bf 100644 --- a/connectors/psdd4ccm/tests/topic-types/sequence/bounded/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/sequence/bounded/base/topic.idl @@ -14,13 +14,14 @@ module Test { typedef sequence ULongSeq; + @nested(FALSE) struct Topic { string category; string description; ULongSeq values; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/sequence/complex/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/sequence/complex/base/topic.idl index 1edb4d565..e68c8012b 100644 --- a/connectors/psdd4ccm/tests/topic-types/sequence/complex/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/sequence/complex/base/topic.idl @@ -21,13 +21,14 @@ module Test typedef sequence DataSeq; + @nested(FALSE) struct Topic { string category; string description; DataSeq data; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/sequence/simple/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/sequence/simple/base/topic.idl index 178979fa0..81a220a0c 100644 --- a/connectors/psdd4ccm/tests/topic-types/sequence/simple/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/sequence/simple/base/topic.idl @@ -14,13 +14,14 @@ module Test { typedef sequence ULongSeq; + @nested(FALSE) struct Topic { string category; string description; ULongSeq values; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/string/toplevel/bounded/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/string/toplevel/bounded/base/topic.idl index c1e08b9c8..b3de8cbae 100644 --- a/connectors/psdd4ccm/tests/topic-types/string/toplevel/bounded/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/string/toplevel/bounded/base/topic.idl @@ -12,7 +12,8 @@ module Test { - typedef string<10> Topic; //@nested(FALSE) + @nested(FALSE) + typedef string<10> Topic; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/string/toplevel/default/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/string/toplevel/default/base/topic.idl index 15102c7a4..c203d27d9 100644 --- a/connectors/psdd4ccm/tests/topic-types/string/toplevel/default/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/string/toplevel/default/base/topic.idl @@ -12,7 +12,8 @@ module Test { - typedef string Topic; //@nested(FALSE) + @nested(FALSE) + typedef string Topic; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/struct/keyonly-key/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/struct/keyonly-key/base/topic.idl index 24dce2a58..4da7444b0 100644 --- a/connectors/psdd4ccm/tests/topic-types/struct/keyonly-key/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/struct/keyonly-key/base/topic.idl @@ -24,13 +24,14 @@ module Test string subtype; }; + @nested(FALSE) struct Topic { Key k; //@key string description; unsigned long number; double value; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/struct/nested/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/struct/nested/base/topic.idl index c21ed42ff..2e9c2f4ef 100644 --- a/connectors/psdd4ccm/tests/topic-types/struct/nested/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/struct/nested/base/topic.idl @@ -19,13 +19,14 @@ module Test char opt; }; + @nested(FALSE) struct Topic { string category; string description; unsigned long value; Nested data; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/struct/toplevel/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/struct/toplevel/base/topic.idl index 82166e904..1922d34a0 100644 --- a/connectors/psdd4ccm/tests/topic-types/struct/toplevel/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/struct/toplevel/base/topic.idl @@ -12,6 +12,7 @@ module Test { + @nested(FALSE) struct Topic { string category; @@ -19,7 +20,7 @@ module Test unsigned long value; char opt; boolean flag; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/union/nested/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/union/nested/base/topic.idl index 54f223cf2..dd0b3e21b 100644 --- a/connectors/psdd4ccm/tests/topic-types/union/nested/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/union/nested/base/topic.idl @@ -26,11 +26,12 @@ module Test case THREE: boolean flag; }; + @nested(FALSE) struct Topic { octet type; Variant value; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/topic-types/union/toplevel/base/topic.idl b/connectors/psdd4ccm/tests/topic-types/union/toplevel/base/topic.idl index 662e983c5..d0ea68cd5 100644 --- a/connectors/psdd4ccm/tests/topic-types/union/toplevel/base/topic.idl +++ b/connectors/psdd4ccm/tests/topic-types/union/toplevel/base/topic.idl @@ -19,12 +19,13 @@ module Test THREE }; + @nested(FALSE) union Topic switch(Option) { case ONE: string text; case TWO: unsigned long number; case THREE: boolean flag; - }; //@nested(FALSE) + }; }; #endif diff --git a/connectors/psdd4ccm/tests/write_many/base/topic.idl b/connectors/psdd4ccm/tests/write_many/base/topic.idl index 8904852ae..d3e623b2c 100644 --- a/connectors/psdd4ccm/tests/write_many/base/topic.idl +++ b/connectors/psdd4ccm/tests/write_many/base/topic.idl @@ -18,6 +18,7 @@ module Test EVEN }; + @nested(FALSE) struct Topic { ECategory category; //@key @@ -25,7 +26,7 @@ module Test string description; char opt; boolean flag; - }; //@nested(FALSE) + }; }; #endif diff --git a/ddsx11/examples/shapes/base/shapetype.idl b/ddsx11/examples/shapes/base/shapetype.idl index 0d8d0b26d..29585eb46 100644 --- a/ddsx11/examples/shapes/base/shapetype.idl +++ b/ddsx11/examples/shapes/base/shapetype.idl @@ -10,11 +10,12 @@ typedef string<128> color_type; +@nested(FALSE) struct ShapeType { color_type color; //@key long x; long y; long shapesize; -}; //@nested(FALSE) +}; #endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/ddsx11/tests/builtin/base/shapetype.idl b/ddsx11/tests/builtin/base/shapetype.idl index 0d8d0b26d..29585eb46 100644 --- a/ddsx11/tests/builtin/base/shapetype.idl +++ b/ddsx11/tests/builtin/base/shapetype.idl @@ -10,11 +10,12 @@ typedef string<128> color_type; +@nested(FALSE) struct ShapeType { color_type color; //@key long x; long y; long shapesize; -}; //@nested(FALSE) +}; #endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/ddsx11/tests/latency/data/latency_data.idl b/ddsx11/tests/latency/data/latency_data.idl index 317af9bb9..6f074b49a 100644 --- a/ddsx11/tests/latency/data/latency_data.idl +++ b/ddsx11/tests/latency/data/latency_data.idl @@ -16,11 +16,12 @@ typedef sequence BD_oct_seq; module Test { + @nested(FALSE) @final struct LatencyData { long seq_num; BD_oct_seq data; - }; //@nested(FALSE) @final + }; }; #endif // LATENCY_DATA_IDL diff --git a/ddsx11/tests/logger_backend/log_record.idl b/ddsx11/tests/logger_backend/log_record.idl index db320383f..e664a5d07 100644 --- a/ddsx11/tests/logger_backend/log_record.idl +++ b/ddsx11/tests/logger_backend/log_record.idl @@ -9,6 +9,7 @@ module DnCX11 { + @nested(FALSE) struct Log_Record { /// The name of the node this originates from, if available @@ -22,5 +23,5 @@ module DnCX11 /// The error diagnostic string message; - }; //@nested(FALSE) + }; }; diff --git a/ddsx11/tests/minimal_latency/data/latency_data.idl b/ddsx11/tests/minimal_latency/data/latency_data.idl index 52df797a8..936b515d5 100644 --- a/ddsx11/tests/minimal_latency/data/latency_data.idl +++ b/ddsx11/tests/minimal_latency/data/latency_data.idl @@ -12,10 +12,12 @@ module Test { + @nested(FALSE) + @final struct LatencyData { long seq_num; - }; //@nested(FALSE) @final + }; }; #endif // LATENCY_DATA_IDL diff --git a/exf/connectors/dds4ccm/tests/exf/unkeyed_writer/data/unkeyed_writer.idl b/exf/connectors/dds4ccm/tests/exf/unkeyed_writer/data/unkeyed_writer.idl index d5df5ea21..441d1f752 100644 --- a/exf/connectors/dds4ccm/tests/exf/unkeyed_writer/data/unkeyed_writer.idl +++ b/exf/connectors/dds4ccm/tests/exf/unkeyed_writer/data/unkeyed_writer.idl @@ -13,11 +13,12 @@ typedef sequence OctetSeq; module UnkeyedWriterTest { + @nested(FALSE) struct UnkeyedWriterMessage { string key; long iteration; ::OctetSeq data; - }; //@nested(FALSE) + }; }; #endif /* UNKEYED_WRITER_IDL_ */ diff --git a/exf/connectors/psdd4ccm/examples/hello/base/message.idl b/exf/connectors/psdd4ccm/examples/hello/base/message.idl index 9759afa5f..69da338a6 100644 --- a/exf/connectors/psdd4ccm/examples/hello/base/message.idl +++ b/exf/connectors/psdd4ccm/examples/hello/base/message.idl @@ -12,12 +12,13 @@ module Test { + @nested(FALSE) struct Message { string category; //@key string description; unsigned long value; - }; //@nested(FALSE) + }; }; #endif diff --git a/exf/tests/apc/async-event-combi/data/event_record.idl b/exf/tests/apc/async-event-combi/data/event_record.idl index a1c5b65d6..602380c80 100644 --- a/exf/tests/apc/async-event-combi/data/event_record.idl +++ b/exf/tests/apc/async-event-combi/data/event_record.idl @@ -13,12 +13,13 @@ typedef sequence OctetSeq; typedef string<128> color_type; module Hello { + @nested(FALSE) struct ShapeType { color_type color; //@key long x; long y; long shapesize; - }; //@nested(FALSE) + }; // struct Event { // string key; // long iteration; diff --git a/tests/apc/async-event-combi/data/event_record.idl b/tests/apc/async-event-combi/data/event_record.idl index a1c5b65d6..602380c80 100644 --- a/tests/apc/async-event-combi/data/event_record.idl +++ b/tests/apc/async-event-combi/data/event_record.idl @@ -13,12 +13,13 @@ typedef sequence OctetSeq; typedef string<128> color_type; module Hello { + @nested(FALSE) struct ShapeType { color_type color; //@key long x; long y; long shapesize; - }; //@nested(FALSE) + }; // struct Event { // string key; // long iteration; diff --git a/tests/bst_test/base/bst_bst_defn.idl b/tests/bst_test/base/bst_bst_defn.idl index 239ff53d8..21dcbd9fe 100644 --- a/tests/bst_test/base/bst_bst_defn.idl +++ b/tests/bst_test/base/bst_bst_defn.idl @@ -19,10 +19,11 @@ module BST { typedef string MyStringTypedef; /// @struct MyStructType + @nested(TRUE) struct MyStructType { BST::MyBoundedStringType boundedString; BST::MyStringTypedef unboundedString; - }; //@nested(TRUE) + }; }; #endif // CX_PORTS__BST_BST_DEFN_IDL From ed820fa121a7984c02818b35e8c9153a9b9b6ea1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Feb 2024 10:25:51 +0100 Subject: [PATCH 03/14] Fixed typo * connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl: --- connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl b/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl index f947791ff..54e2605b4 100644 --- a/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl +++ b/connectors/psdd4ccm/tests/keys/nokey-key/base/topic.idl @@ -19,7 +19,7 @@ module Test }; // Struct is not toplevel (not used as event by itself) - // and has no designated, separate, key memebers. + // and has no designated, separate, key members. struct Key { ECategory category; From 42a174a55e83b6c35947d57f5319e40f6dedd584 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Feb 2024 10:41:37 +0100 Subject: [PATCH 04/14] Use nil? * scripts/converting/convert_plan.rb: --- scripts/converting/convert_plan.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/converting/convert_plan.rb b/scripts/converting/convert_plan.rb index aec300eee..bf8c42fc6 100644 --- a/scripts/converting/convert_plan.rb +++ b/scripts/converting/convert_plan.rb @@ -196,7 +196,7 @@ def self.run(options) parser.parse! -if options[:cdp_plan_in] == nil +if options[:cdp_plan_in].nil? begin print 'Enter filename of input cdp plan: ' input_file = gets.chomp @@ -206,7 +206,7 @@ def self.run(options) end until options[:cdp_plan_in] != nil end -if options[:cdp_plan_out] == nil +if options[:cdp_plan_out].nil? begin print 'Enter filename of output cdp plan: ' output_file = gets.chomp From a348767967bfe6e1f69ef4ebe7093d61699dade0 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Feb 2024 10:47:04 +0100 Subject: [PATCH 05/14] Corrected nested annotation check * connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/writers/psdd_idl.rb: --- .../ridlbe/ccmx11/facets/psdd4ccm/writers/psdd_idl.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/writers/psdd_idl.rb b/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/writers/psdd_idl.rb index 1b7a92266..456995772 100644 --- a/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/writers/psdd_idl.rb +++ b/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/writers/psdd_idl.rb @@ -107,11 +107,11 @@ def init_visitor(v, node) def is_psdd_topic?(node) if params[:psdd_topic].blank? || params[:psdd_topic] == node.scoped_name - annot = node.annotations[:nested] - return true if annot[0] == nil - return false if annot[0].fields[:value] == nil - return false if annot[0].fields[:value] == true - true + annot = node.annotations[:nested].first + return true if annot.nil? + return false if annot.fields[:value].nil? + return true if annot.fields[:value] == false + false end false end From 65dd6e2b67e220b2801df15d2e60987c7c07a876 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Feb 2024 10:54:07 +0100 Subject: [PATCH 06/14] Removed old workaround for top-level --- ridlbe/ccmx11/facets/dds/config/directives.rb | 67 ------------------- 1 file changed, 67 deletions(-) delete mode 100644 ridlbe/ccmx11/facets/dds/config/directives.rb diff --git a/ridlbe/ccmx11/facets/dds/config/directives.rb b/ridlbe/ccmx11/facets/dds/config/directives.rb deleted file mode 100644 index 2d5d971ed..000000000 --- a/ridlbe/ccmx11/facets/dds/config/directives.rb +++ /dev/null @@ -1,67 +0,0 @@ -# #-------------------------------------------------------------------- -# # @file directives.rb -# # @author Martin Corino -# # -# # @brief DDSX11 facet configuration, adds AXCIOMA 2 -# # annotation support, see #4729 -# # -# # @copyright Copyright (c) Remedy IT Expertise BV -# -# #-------------------------------------------------------------------- -# -# module IDL -# module CCMX11 -# module DDSX11 -# module ScannerPatch -# def self.included(base) -# base.class_eval do -# alias_method_chain :next_identifier, :ndds -# alias_method_chain :extract_annotation, :ndds -# end -# end -# -# def next_identifier_with_ndds(first = nil) -# # first perform regular scanner pass -# token = next_identifier_without_ndds(first) -# # are we parsing an annotation? -# if @in_annotation -# # did we find an identifier? -# if token.first == :identifier -# # now check if we stopped scanning the identifier at a '-' -# if @in.lookc == ?- -# # extract '-' and append to identifier -# token[1] += '-' -# @in.skipc -# # scan next part of identifier (recursively in case the '-'s are repeated) -# token2 = next_identifier_with_ndds -# parse_error "invalid annotation identifier encountered: #{token.last}" unless token2.first == :identifier -# token[1] += token2.last -# end -# end -# end -# token -# end -# -# def extract_annotation_with_ndds -# @ndds_annotation_level ||= 0 # set to 0 if not set before -# -# # increase the level to signal we're parsing an annotation body (optionally recursive) -# @ndds_annotation_level += 1 # inc level -# # now first perform regular extraction -# token, annbody = extract_annotation_without_ndds -# # next check if we have an undefined annotation body followed by a boolean -# if annbody.nil? && !token.nil? && token.first == :boolean_literal -# # define an annotation body with a boolean 'value' member -# annbody = { value: token.last } -# # let them know we used up the token -# token = nil -# end -# -# # leaving annotation body -# @ndds_annotation_level -= 1 # dec level -# [token, annbody] -# end -# end -# end -# end -# end From 13322a458854f9210753278b893e0ccf9e80320c Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Feb 2024 10:55:30 +0100 Subject: [PATCH 07/14] No need for the config directory * ridlbe/ccmx11/facets/dds/require.rb: --- ridlbe/ccmx11/facets/dds/require.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ridlbe/ccmx11/facets/dds/require.rb b/ridlbe/ccmx11/facets/dds/require.rb index 08ba20765..c143c1a3a 100644 --- a/ridlbe/ccmx11/facets/dds/require.rb +++ b/ridlbe/ccmx11/facets/dds/require.rb @@ -35,7 +35,3 @@ module DDSX11 require File.join(IDL::CCMX11::DDSX11::ROOT, 'writers', File.basename(f, '.*')) end -# config/parser -Dir.glob(File.join(File.dirname(__FILE__), 'config', '*.rb')).each do |f| - require File.join(IDL::CCMX11::DDSX11::ROOT, 'config', File.basename(f, '.*')) -end From 0b3b1893723ea109392a54dac72b804d34fc784e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Feb 2024 10:58:17 +0100 Subject: [PATCH 08/14] Code can't be reached anymore now workaround for - has been removed * ridlbe/ccmx11/facets/dds/visitorbase.rb: --- ridlbe/ccmx11/facets/dds/visitorbase.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ridlbe/ccmx11/facets/dds/visitorbase.rb b/ridlbe/ccmx11/facets/dds/visitorbase.rb index 14060daea..1200cf649 100644 --- a/ridlbe/ccmx11/facets/dds/visitorbase.rb +++ b/ridlbe/ccmx11/facets/dds/visitorbase.rb @@ -57,12 +57,8 @@ def strip_global_scope(typename) def has_toplevel_annotation? unless node.annotations[:'TopLevel'].first.nil? - raise "@TopLevel annotation has been deprecated in AXIOMA, use @nested!" + raise "@TopLevel annotation has been deprecated in AXIOMA, use @nested(FALSE)!" end - unless node.annotations[:'top-level'].first.nil? - raise "@top-level annotation has been deprecated in AXIOMA, use @nested!" - end - annot = node.annotations[:nested].first return false if annot.nil? return false if annot.fields[:value].nil? From 0d2132f366c67597f6b4483489bb08de2742d7dd Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Feb 2024 12:29:59 +0100 Subject: [PATCH 09/14] Correct location of annotations * connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl: --- .../dds4ccm/tests/minimal_latency/data/latency_data.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl b/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl index 6a7a68b13..242ee1d3c 100644 --- a/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl +++ b/connectors/dds4ccm/tests/minimal_latency/data/latency_data.idl @@ -11,10 +11,10 @@ #ifndef LATENCY_DATA_IDL #define LATENCY_DATA_IDL -@nested(FALSE) -@final module Test { + @nested(FALSE) + @final struct LatencyData { long seq_num; From fd5f6a96d64e78a841ff46bc2f758deeda2c3a14 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Feb 2024 13:57:43 +0100 Subject: [PATCH 10/14] Fixed error, didn't return the set of annotations * ridlbe/ccmx11/facets/dds/visitors/struct.rb: * ridlbe/ccmx11/facets/dds/visitors/union.rb: --- ridlbe/ccmx11/facets/dds/visitors/struct.rb | 2 +- ridlbe/ccmx11/facets/dds/visitors/union.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ridlbe/ccmx11/facets/dds/visitors/struct.rb b/ridlbe/ccmx11/facets/dds/visitors/struct.rb index 58e2d3a8b..2d954f20f 100644 --- a/ridlbe/ccmx11/facets/dds/visitors/struct.rb +++ b/ridlbe/ccmx11/facets/dds/visitors/struct.rb @@ -34,7 +34,7 @@ def annotations nes_annot.fields[:value] = 'FALSE' end end - return ann + ann end end # StructVisitor end # CCMX11 diff --git a/ridlbe/ccmx11/facets/dds/visitors/union.rb b/ridlbe/ccmx11/facets/dds/visitors/union.rb index 49132dde3..871c211ea 100644 --- a/ridlbe/ccmx11/facets/dds/visitors/union.rb +++ b/ridlbe/ccmx11/facets/dds/visitors/union.rb @@ -49,6 +49,7 @@ def annotations nes_annot.fields[:value] = 'FALSE' end end + ann end end end # CCMX11 From bce698fe01384ec7b34f588d96d478d7d56df92a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Feb 2024 15:41:04 +0100 Subject: [PATCH 11/14] Fixed regeneration tag error * tests/dance/service_objects/advanced_resources/component/foo_exec.cpp: * tests/dance/service_objects/advanced_resources/component/foo_exec.h: --- .../service_objects/advanced_resources/component/foo_exec.cpp | 1 + .../service_objects/advanced_resources/component/foo_exec.h | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/dance/service_objects/advanced_resources/component/foo_exec.cpp b/tests/dance/service_objects/advanced_resources/component/foo_exec.cpp index e0b3680ec..624940de9 100644 --- a/tests/dance/service_objects/advanced_resources/component/foo_exec.cpp +++ b/tests/dance/service_objects/advanced_resources/component/foo_exec.cpp @@ -11,6 +11,7 @@ #include "foo_exec.h" +//@@{__RIDL_REGEN_MARKER__} - BEGIN : Foo_Impl[user_includes] #include "ciaox11/testlib/ciaox11_testlog.h" #include "dancex11/core/dancex11_deployment_state.h" //@@{__RIDL_REGEN_MARKER__} - END : Foo_Impl[user_includes] diff --git a/tests/dance/service_objects/advanced_resources/component/foo_exec.h b/tests/dance/service_objects/advanced_resources/component/foo_exec.h index b89575950..ac8426a1b 100644 --- a/tests/dance/service_objects/advanced_resources/component/foo_exec.h +++ b/tests/dance/service_objects/advanced_resources/component/foo_exec.h @@ -11,6 +11,7 @@ #ifndef __RIDL_FOO_EXEC_H_BCHJJJGJ_INCLUDED__ #define __RIDL_FOO_EXEC_H_BCHJJJGJ_INCLUDED__ +//@@{__RIDL_REGEN_MARKER__} - HEADER_BEGIN : foo_impl.h[Header] //@@{__RIDL_REGEN_MARKER__} - HEADER_END : foo_impl.h[Header] #pragma once From bb980706d0ea8b74034cde1d695a47edeb56b962 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 15 Feb 2024 17:58:18 +0100 Subject: [PATCH 12/14] Dup doesn't make a deep copy, so :nested can be false or FALSE * ridlbe/ccmx11/facets/dds/visitorbase.rb: * ridlbe/ccmx11/facets/dds/visitors/struct.rb: * ridlbe/ccmx11/facets/dds/visitors/union.rb: * ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb: * ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb: * ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb: --- ridlbe/ccmx11/facets/dds/visitorbase.rb | 5 +++-- ridlbe/ccmx11/facets/dds/visitors/struct.rb | 4 ++-- ridlbe/ccmx11/facets/dds/visitors/union.rb | 4 ++-- ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb | 5 +++-- ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb | 5 +++-- ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb | 5 +++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ridlbe/ccmx11/facets/dds/visitorbase.rb b/ridlbe/ccmx11/facets/dds/visitorbase.rb index 1200cf649..94429099a 100644 --- a/ridlbe/ccmx11/facets/dds/visitorbase.rb +++ b/ridlbe/ccmx11/facets/dds/visitorbase.rb @@ -62,8 +62,9 @@ def has_toplevel_annotation? annot = node.annotations[:nested].first return false if annot.nil? return false if annot.fields[:value].nil? - return false if annot.fields[:value] == true - true + return true if annot.fields[:value] == 'FALSE' + return true if annot.fields[:value] == false + false end def typesupport_export_include? diff --git a/ridlbe/ccmx11/facets/dds/visitors/struct.rb b/ridlbe/ccmx11/facets/dds/visitors/struct.rb index 2d954f20f..47d31ace3 100644 --- a/ridlbe/ccmx11/facets/dds/visitors/struct.rb +++ b/ridlbe/ccmx11/facets/dds/visitors/struct.rb @@ -25,8 +25,8 @@ def annotations ann << IDL::AST::Annotation.new('appendable', {}) end # When generating the nested annotation we need to use TRUE/FALSE - if has_toplevel_annotation? - nes_annot = ann[:nested].first + nes_annot = ann[:nested].first + unless nes_annot.nil? case nes_annot.fields[:value] when TrueClass nes_annot.fields[:value] = 'TRUE' diff --git a/ridlbe/ccmx11/facets/dds/visitors/union.rb b/ridlbe/ccmx11/facets/dds/visitors/union.rb index 871c211ea..353baad55 100644 --- a/ridlbe/ccmx11/facets/dds/visitors/union.rb +++ b/ridlbe/ccmx11/facets/dds/visitors/union.rb @@ -40,8 +40,8 @@ def annotations ann << IDL::AST::Annotation.new('appendable', {}) end # When generating the nested annotation we need to use TRUE/FALSE - if has_toplevel_annotation? - nes_annot = ann[:nested].first + nes_annot = ann[:nested].first + unless nes_annot.nil? case nes_annot.fields[:value] when TrueClass nes_annot.fields[:value] = 'TRUE' diff --git a/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb b/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb index f68125a8c..897a2cc85 100644 --- a/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb +++ b/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb @@ -65,8 +65,9 @@ def has_toplevel_annotation?(node) annot = node.annotations[:nested].first return false if annot.nil? return false if annot.fields[:value].nil? - return false if annot.fields[:value] == true - true + return true if annot.fields[:value] == 'FALSE' + return true if annot.fields[:value] == false + false end end # DDSTypeEntitiesIDLWriter end # DDSX11 diff --git a/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb b/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb index 6113dde0b..84891b915 100644 --- a/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb +++ b/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb @@ -37,8 +37,9 @@ def has_toplevel_annotation?(node) annot = node.annotations[:nested].first return false if annot.nil? return false if annot.fields[:value].nil? - return false if annot.fields[:value] == true - true + return true if annot.fields[:value] == false + return true if annot.fields[:value] == 'FALSE' + false end end # DDSTypeSupportBaseWriter diff --git a/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb b/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb index 9acdbef25..40f642d2a 100644 --- a/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb +++ b/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb @@ -77,8 +77,9 @@ def has_toplevel_annotation?(node) annot = node.annotations[:nested].first return false if annot.nil? return false if annot.fields[:value].nil? - return false if annot.fields[:value] == true - true + return true if annot.fields[:value] == false + return true if annot.fields[:value] == 'FALSE' + false end end # SEVIDLWriter end # DDS4CCM From 8d8d079c01779cba3c7827a56f72e8e490c0487a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 16 Feb 2024 14:18:06 +0100 Subject: [PATCH 13/14] Make use of new IDL Annotation idl_stringified, cleanup some workarounds not necessary anymore * ridlbe/ccmx11/facets/dds/templates/idl/dds/enum.erb: * ridlbe/ccmx11/facets/dds/templates/idl/dds/struct.erb: * ridlbe/ccmx11/facets/dds/templates/idl/dds/union.erb: * ridlbe/ccmx11/facets/dds/visitorbase.rb: * ridlbe/ccmx11/facets/dds/visitors/struct.rb: * ridlbe/ccmx11/facets/dds/visitors/union.rb: * ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb: * ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb: * ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb: --- ridlbe/ccmx11/facets/dds/templates/idl/dds/enum.erb | 12 ++++++------ .../ccmx11/facets/dds/templates/idl/dds/struct.erb | 12 ++++++------ ridlbe/ccmx11/facets/dds/templates/idl/dds/union.erb | 12 ++++++------ ridlbe/ccmx11/facets/dds/visitorbase.rb | 1 - ridlbe/ccmx11/facets/dds/visitors/struct.rb | 10 ---------- ridlbe/ccmx11/facets/dds/visitors/union.rb | 10 ---------- .../ccmx11/facets/dds/writers/ddstypedentitiesidl.rb | 1 - ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb | 1 - .../ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb | 1 - 9 files changed, 18 insertions(+), 42 deletions(-) diff --git a/ridlbe/ccmx11/facets/dds/templates/idl/dds/enum.erb b/ridlbe/ccmx11/facets/dds/templates/idl/dds/enum.erb index f63d0de7b..a93c9e9e2 100644 --- a/ridlbe/ccmx11/facets/dds/templates/idl/dds/enum.erb +++ b/ridlbe/ccmx11/facets/dds/templates/idl/dds/enum.erb @@ -1,16 +1,16 @@ // generated from <%= ridl_template_path %> /// @copydoc <%= doc_scoped_name %> -% annotations.each do |_a| -@<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.each_with_index do |f, index| %><%= _a.fields.keys[index] %>=<%= _a.fields.values[index] %><% if index < _a.fields.size - 1%>,<% end %><% end %>)<% end %> -% end +%annotations.each do |_a| +<%= _a.idl_stringified %> +%end enum <%= unescaped_name %> { -% enumerators.each do |e| +%enumerators.each do |e| /// @copydoc <%= e.doc_scoped_name %> % e.annotations.each do |_a| - @<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.each_with_index do |f, index| %><%= _a.fields.keys[index] %>=<%= _a.fields.values[index] %><% if index < _a.fields.size - 1%>,<% end %><% end %>)<% end %> + <%= _a.idl_stringified %> % end <%= e.name %><% unless e.equal?(enumerators.last)%>,<% end %> -% end +%end }; diff --git a/ridlbe/ccmx11/facets/dds/templates/idl/dds/struct.erb b/ridlbe/ccmx11/facets/dds/templates/idl/dds/struct.erb index 6e0849f53..d6fd06c4c 100644 --- a/ridlbe/ccmx11/facets/dds/templates/idl/dds/struct.erb +++ b/ridlbe/ccmx11/facets/dds/templates/idl/dds/struct.erb @@ -1,14 +1,14 @@ // generated from <%= ridl_template_path %> /// @copydoc <%= doc_scoped_name %> -% annotations.each do |_a| -@<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.each_with_index do |f, index| %><%= _a.fields.keys[index] %>=<%= _a.fields.values[index] %><% if index < _a.fields.size - 1%>,<% end %><% end %>)<% end %> -% end +%annotations.each do |_a| +<%= _a.idl_stringified %> +%end struct <%= unescaped_name %><% unless base.nil? %> : <%= base.unescaped_name %><% end %> { % members.each do |_m| /// @copydoc <%= _m.doc_scoped_name %> -% _m.annotations.each do |_a| - @<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.each_with_index do |f, index| %><%= _a.fields.keys[index] %>=<%= _a.fields.values[index] %><% if index < _a.fields.size - 1%>,<% end %><% end %>)<% end %> -% end +%_m.annotations.each do |_a| + <%= _a.idl_stringified %> +%end <%= strip_global_scope(_m.idltype_unescaped_name) %> <%= _m.unescaped_name %>; % end }; diff --git a/ridlbe/ccmx11/facets/dds/templates/idl/dds/union.erb b/ridlbe/ccmx11/facets/dds/templates/idl/dds/union.erb index da3e6ca5d..3467c7ffe 100644 --- a/ridlbe/ccmx11/facets/dds/templates/idl/dds/union.erb +++ b/ridlbe/ccmx11/facets/dds/templates/idl/dds/union.erb @@ -1,9 +1,9 @@ // generated from <%= ridl_template_path %> /// @copydoc <%= doc_scoped_name %> -% annotations.each do |_a| -@<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.each_with_index do |f, index| %><%= _a.fields.keys[index] %>=<%= _a.fields.values[index] %><% if index < _a.fields.size - 1%>,<% end %><% end %>)<% end %> -% end +%annotations.each do |_a| +<%= _a.idl_stringified %> +%end union <%= unescaped_name %> switch (<%= strip_global_scope(switchtype.idltype_unescaped_name) %>) { % members.each do |_m| % if _m.is_default? @@ -14,9 +14,9 @@ union <%= unescaped_name %> switch (<%= strip_global_scope(switchtype.idltype_un % end % end /// @copydoc <%= _m.doc_scoped_name %> -% _m.annotations.each do |_a| - @<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.each_with_index do |f, index| %><%= _a.fields.keys[index] %>=<%= _a.fields.values[index] %><% if index < _a.fields.size - 1%>,<% end %><% end %>)<% end %> -% end +%_m.annotations.each do |_a| + <%= _a.idl_stringified %> +%end <%= strip_global_scope(_m.idltype_unescaped_name) %> <%= _m.unescaped_name %>; % end }; diff --git a/ridlbe/ccmx11/facets/dds/visitorbase.rb b/ridlbe/ccmx11/facets/dds/visitorbase.rb index 94429099a..a3902021b 100644 --- a/ridlbe/ccmx11/facets/dds/visitorbase.rb +++ b/ridlbe/ccmx11/facets/dds/visitorbase.rb @@ -62,7 +62,6 @@ def has_toplevel_annotation? annot = node.annotations[:nested].first return false if annot.nil? return false if annot.fields[:value].nil? - return true if annot.fields[:value] == 'FALSE' return true if annot.fields[:value] == false false end diff --git a/ridlbe/ccmx11/facets/dds/visitors/struct.rb b/ridlbe/ccmx11/facets/dds/visitors/struct.rb index 47d31ace3..fe7de0a63 100644 --- a/ridlbe/ccmx11/facets/dds/visitors/struct.rb +++ b/ridlbe/ccmx11/facets/dds/visitors/struct.rb @@ -24,16 +24,6 @@ def annotations unless ann[:'final'].first ann << IDL::AST::Annotation.new('appendable', {}) end - # When generating the nested annotation we need to use TRUE/FALSE - nes_annot = ann[:nested].first - unless nes_annot.nil? - case nes_annot.fields[:value] - when TrueClass - nes_annot.fields[:value] = 'TRUE' - when FalseClass - nes_annot.fields[:value] = 'FALSE' - end - end ann end end # StructVisitor diff --git a/ridlbe/ccmx11/facets/dds/visitors/union.rb b/ridlbe/ccmx11/facets/dds/visitors/union.rb index 353baad55..96154aa53 100644 --- a/ridlbe/ccmx11/facets/dds/visitors/union.rb +++ b/ridlbe/ccmx11/facets/dds/visitors/union.rb @@ -39,16 +39,6 @@ def annotations unless ann[:'final'].first ann << IDL::AST::Annotation.new('appendable', {}) end - # When generating the nested annotation we need to use TRUE/FALSE - nes_annot = ann[:nested].first - unless nes_annot.nil? - case nes_annot.fields[:value] - when TrueClass - nes_annot.fields[:value] = 'TRUE' - when FalseClass - nes_annot.fields[:value] = 'FALSE' - end - end ann end end diff --git a/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb b/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb index 897a2cc85..720a6129b 100644 --- a/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb +++ b/ridlbe/ccmx11/facets/dds/writers/ddstypedentitiesidl.rb @@ -65,7 +65,6 @@ def has_toplevel_annotation?(node) annot = node.annotations[:nested].first return false if annot.nil? return false if annot.fields[:value].nil? - return true if annot.fields[:value] == 'FALSE' return true if annot.fields[:value] == false false end diff --git a/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb b/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb index 84891b915..ea7e15ef4 100644 --- a/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb +++ b/ridlbe/ccmx11/facets/dds/writers/ddstypesupport.rb @@ -38,7 +38,6 @@ def has_toplevel_annotation?(node) return false if annot.nil? return false if annot.fields[:value].nil? return true if annot.fields[:value] == false - return true if annot.fields[:value] == 'FALSE' false end end # DDSTypeSupportBaseWriter diff --git a/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb b/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb index 40f642d2a..28184c6fa 100644 --- a/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb +++ b/ridlbe/ccmx11/facets/dds4ccm/writers/dds4ccm_sev_idl.rb @@ -78,7 +78,6 @@ def has_toplevel_annotation?(node) return false if annot.nil? return false if annot.fields[:value].nil? return true if annot.fields[:value] == false - return true if annot.fields[:value] == 'FALSE' false end end # SEVIDLWriter From 54bc8d738b94995e6deeda77ebb0410d574c5951 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 16 Feb 2024 14:34:19 +0100 Subject: [PATCH 14/14] Fixed indent * ridlbe/ccmx11/facets/dds/visitors/union.rb: --- ridlbe/ccmx11/facets/dds/visitors/union.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ridlbe/ccmx11/facets/dds/visitors/union.rb b/ridlbe/ccmx11/facets/dds/visitors/union.rb index 96154aa53..90969b3fa 100644 --- a/ridlbe/ccmx11/facets/dds/visitors/union.rb +++ b/ridlbe/ccmx11/facets/dds/visitors/union.rb @@ -39,7 +39,7 @@ def annotations unless ann[:'final'].first ann << IDL::AST::Annotation.new('appendable', {}) end - ann + ann end end end # CCMX11