From d4ea2644c5debfb9dc4819a79e21e8825d4c4d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Bueno=20L=C3=B3pez?= <69244257+JLBuenoLopez-eProsima@users.noreply.github.com> Date: Wed, 20 Dec 2023 15:09:29 +0100 Subject: [PATCH 01/11] Complete test cases (#19) * Refs #19906: add test case: structure inheritance with intermediate empty structure Signed-off-by: JLBuenoLopez-eProsima * Refs #19906: remove unused header Signed-off-by: JLBuenoLopez-eProsima * Refs #19906: extend Annotations.idl test cases Signed-off-by: JLBuenoLopez-eProsima * Refs #19906: fix typo Signed-off-by: JLBuenoLopez-eProsima * Refs #20129: minor fixes to pass TypeObject tests Signed-off-by: JLBuenoLopez-eProsima * Refs #20129: fix inherited bitset Signed-off-by: JLBuenoLopez-eProsima * Refs #20129: apply review suggestions Signed-off-by: JLBuenoLopez-eProsima --------- Signed-off-by: JLBuenoLopez-eProsima --- IDL/annotations.idl | 5 +++++ IDL/constants.idl | 5 +++-- IDL/helpers/basic_inner_types.idl | 4 ++++ IDL/inheritance.idl | 10 ++++++++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/IDL/annotations.idl b/IDL/annotations.idl index 9cc0508..f46e037 100644 --- a/IDL/annotations.idl +++ b/IDL/annotations.idl @@ -24,6 +24,11 @@ }; InnerEnumHelper enum_value; InnerEnumHelper enum_default_value default TWO; + const short inner_const_helper = 10; + typedef string Inner_alias_bounded_string_helper; + Inner_alias_bounded_string_helper var_string_10; + Inner_alias_bounded_string_helper var_default_string_10 default "Hello"; + Inner_alias_bounded_wstring_helper var_wstring_alias; }; @annotation EmptyAnnotationTest diff --git a/IDL/constants.idl b/IDL/constants.idl index 902af3e..9417fc5 100644 --- a/IDL/constants.idl +++ b/IDL/constants.idl @@ -21,8 +21,7 @@ const int32 const_int32 = 74; const uint32 const_uint32 = 64; const int64 const_int64 = 17; const uint64 const_uint64 = 19; -const string const_string = "AAA"; -const wstring const_wstring = L"BBB"; +// String consts are included in basic_inner_types.idl typedef short alias_short; const alias_short alias_const = 55; @@ -38,6 +37,8 @@ module const_module1 { short module1_array_literal_const_moduled[const_moduled]; short module1_array_literal_const_alias_const_moduled[alias_const_moduled]; + alias_short var1; + alias_short_moduled var2; }; }; diff --git a/IDL/helpers/basic_inner_types.idl b/IDL/helpers/basic_inner_types.idl index 6ccdbf0..936c13e 100644 --- a/IDL/helpers/basic_inner_types.idl +++ b/IDL/helpers/basic_inner_types.idl @@ -62,3 +62,7 @@ typedef sequence Inner_alias_sequence_helper; typedef map Inner_alias_map_helper; typedef InnerStructureHelper inner_structure_helper_alias; typedef InnerBitsetHelper inner_bitset_helper_alias; + +// String consts are checked here to avoid generating the related TypeObjectTest. +const string const_string = "AAA"; +const wstring const_wstring = L"BBB"; diff --git a/IDL/inheritance.idl b/IDL/inheritance.idl index 80542f3..e1162ea 100644 --- a/IDL/inheritance.idl +++ b/IDL/inheritance.idl @@ -16,6 +16,11 @@ struct InnerStructureHelperEmptyChild : InnerStructureHelper { }; +struct InnerStructureHelperEmptyChildChild : InnerStructureHelperEmptyChild +{ + char var_char; +}; + struct InnerEmptyStructureHelperChild : InnerEmptyStructureHelper { long long var_child_longlong; @@ -32,8 +37,9 @@ struct StructuresInheritanceStruct InnerStructureHelperChild var_InnerStructureHelperChild; InnerStructureHelperChildChild var_InnerStructureHelperChildChild; InnerStructureHelperEmptyChild var_InnerStructureHelperEmptyChild; + InnerStructureHelperEmptyChildChild var_InnerStructureHelperEmptyChildChild; InnerEmptyStructureHelperChild var_InnerEmptyStructureHelperChild; - + StructAliasInheritanceStruct var_StructAliasInheritanceStruct; }; bitset InnerBitsetHelperChild : InnerBitsetHelper @@ -43,7 +49,7 @@ bitset InnerBitsetHelperChild : InnerBitsetHelper bitset InnerBitsetHelperChildChild : InnerBitsetHelperChild { - bitfield<17> childchild_z; + bitfield<14> childchild_z; }; bitset BitsetAliasInheritanceBitset : inner_bitset_helper_alias From 65f33f9f064dc91dbd8d5cf5e21f0613b12e06b5 Mon Sep 17 00:00:00 2001 From: Adrian del Campo <107918259+adriancampo@users.noreply.github.com> Date: Mon, 8 Jan 2024 15:40:17 +0100 Subject: [PATCH 02/11] Removed float128 type from annotations. (#20) Signed-off-by: adriancampo --- IDL/annotations.idl | 2 -- 1 file changed, 2 deletions(-) diff --git a/IDL/annotations.idl b/IDL/annotations.idl index f46e037..3c0b2df 100644 --- a/IDL/annotations.idl +++ b/IDL/annotations.idl @@ -10,7 +10,6 @@ unsigned long long var_ulonglong; float var_float; double var_double; - long double var_longdouble; boolean var_boolean; octet var_octet; char var_char8; @@ -44,7 +43,6 @@ var_ulonglong = 1, var_float = 1, var_double = 1, - var_longdouble = 1, var_boolean = true, var_octet = 0, var_char8 = 'a', From 6e8e23951b71212b881acb40eef1b085fd670081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Bueno=20L=C3=B3pez?= <69244257+JLBuenoLopez-eProsima@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:44:59 +0100 Subject: [PATCH 03/11] Add test cases about bounded collections with unbounded elements (#23) Signed-off-by: JLBuenoLopez-eProsima --- IDL/maps.idl | 6 ++++-- IDL/sequences.idl | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/IDL/maps.idl b/IDL/maps.idl index 692f4e6..13fd0f6 100644 --- a/IDL/maps.idl +++ b/IDL/maps.idl @@ -1196,8 +1196,6 @@ struct MapInnerAliasBoundedStringHelperInnerBitsetHelper map var_map_inneraliasboundedstringhelper_innerbitsethelper; }; - - struct MapInnerAliasBoundedWStringHelperShort { map var_map_inneraliasboundedwstringhelper_short; @@ -1332,9 +1330,13 @@ struct MapInnerAliasBoundedWStringHelperInnerBitsetHelper struct BoundedSmallMap { map var_small_map; + map var_unbounded_string_long_bounded_small_map; + map var_long_unbounded_string_bounded_small_map; }; struct BoundedLargeMap { map var_large_map; + map var_unbounded_string_long_bounded_large_map; + map var_long_unbounded_string_bounded_large_map; }; diff --git a/IDL/sequences.idl b/IDL/sequences.idl index 1434466..f9df6e3 100644 --- a/IDL/sequences.idl +++ b/IDL/sequences.idl @@ -130,15 +130,15 @@ struct SequenceBitset sequence var_sequence_bitset; }; - - struct BoundedSmallSequences { sequence var_sequence_small; + sequence var_unbounded_string_small_bounded_sequence; }; struct BoundedBigSequences { sequence var_sequence_big; + sequence var_unbounded_string_large_bounded_sequence; }; From 049a2a3bbc7c7e4f29dd56dcf819f734ef173979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Bueno=20L=C3=B3pez?= <69244257+JLBuenoLopez-eProsima@users.noreply.github.com> Date: Tue, 13 Feb 2024 07:26:22 +0100 Subject: [PATCH 04/11] Test case: scoped structures (#25) Signed-off-by: JLBuenoLopez-eProsima --- IDL/structures.idl | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/IDL/structures.idl b/IDL/structures.idl index 5536208..82ddd10 100644 --- a/IDL/structures.idl +++ b/IDL/structures.idl @@ -162,3 +162,37 @@ struct Structures StructBitset var_StructBitset; StructEmpty var_StructEmpty; }; + +module testing_1 +{ + struct foo + { + long a; + long b; + }; +}; + +module testing_2 +{ + struct foo + { + boolean d; + }; +}; + +struct bar +{ + double e; +}; + +struct root1 +{ + testing_1::foo foo_struct; + float c; +}; + +struct root2 +{ + testing_2::foo foo_struct; + bar bar_struct; +}; From 7f3fd13c5478a06e5c3293cb114823e0bfc93cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez?= Date: Fri, 16 Feb 2024 12:12:24 +0100 Subject: [PATCH 05/11] Add future template for pull requests (#27) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Refs #17138. New template for PR Signed-off-by: Ricardo González Moreno * Refs #17138. Apply suggestion Signed-off-by: Ricardo González Moreno --------- Signed-off-by: Ricardo González Moreno --- .github/pull_request_template.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..59a6334 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,24 @@ + + + + + +## Description + + +## Contributor Checklist +- [ ] Commit messages follow the project guidelines. +- [ ] Any new/modified type has been properly reflected on `test/feature/dynamic_types/dds_types_tests` tests in a Pull Request. +- [ ] Any new/modified type has been properly updated on `test/dds/xtypes` tests using `update_header_and_create_cases.py` script in a Pull Request. +- [ ] For any new IDL file, Fast DDS `update_generated_code_from_idl.sh` script adding a new line in `file_needing_output_dir` list in a Pull Request. + +## Reviewer Checklist +- [ ] The PR has a milestone assigned. +- [ ] The title and description correctly express the PR's purpose. +- [ ] Check contributor checklist is correct. From f09e983cc5052c7ece58f94c9bd74d2a11d06e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Bueno=20L=C3=B3pez?= <69244257+JLBuenoLopez-eProsima@users.noreply.github.com> Date: Thu, 14 Mar 2024 07:11:55 +0100 Subject: [PATCH 06/11] Hotfix: IDL typos (#30) * Refs #20424: complete structure members Signed-off-by: JLBuenoLopez-eProsima * Refs #20424: fix union typo Signed-off-by: JLBuenoLopez-eProsima * Refs #20424: use correctly wide strings Signed-off-by: JLBuenoLopez-eProsima * Refs #20424: add structure using substructures with same name Signed-off-by: JLBuenoLopez-eProsima --------- Signed-off-by: JLBuenoLopez-eProsima --- IDL/structures.idl | 8 ++++++++ IDL/unions.idl | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/IDL/structures.idl b/IDL/structures.idl index 82ddd10..e0f85f5 100644 --- a/IDL/structures.idl +++ b/IDL/structures.idl @@ -151,6 +151,8 @@ struct Structures StructChar16 var_StructChar16; StructString var_StructString; StructWString var_StructWString; + StructBoundedString var_StructBoundedString; + StructBoundedWString var_StructBoundedWString; StructEnum var_StructEnum; StructBitMask var_StructBitMask; StructAlias var_StructAlias; @@ -196,3 +198,9 @@ struct root2 testing_2::foo foo_struct; bar bar_struct; }; + +struct root +{ + root1 var_root1; + root2 var_root2; +}; diff --git a/IDL/unions.idl b/IDL/unions.idl index c76281a..ea4bce6 100644 --- a/IDL/unions.idl +++ b/IDL/unions.idl @@ -230,9 +230,9 @@ union Union_Discriminator_char switch (char) union Union_Discriminator_wchar switch (wchar) { - case 'a': + case L'a': long first; - case 'b': + case L'b': long long second; }; @@ -421,7 +421,7 @@ struct UnionDiscriminatorLongLong struct UnionDiscriminatorULongLong { - Union_Discriminator_unsigned_long_long var_union_discriminator_ulong_long_long; + Union_Discriminator_unsigned_long_long var_union_discriminator_ulong_long; }; struct UnionDiscriminatorBoolean From ef234fb8071c0a93fee23a40537592df7e1778bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez?= Date: Thu, 14 Mar 2024 10:48:45 +0100 Subject: [PATCH 07/11] New test case for unions: unions with complex fields [20586] (#29) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Refs #19451. Rebase and remove CRLR Signed-off-by: Ricardo González Moreno * Refs #19451. Add .gitattributes Signed-off-by: Ricardo González Moreno * Refs #19451. Apply suggestion Signed-off-by: Ricardo González Moreno --------- Signed-off-by: Ricardo González Moreno --- .gitattributes | 6 + IDL/aliases.idl | 308 ++-- IDL/annotations.idl | 122 +- IDL/arrays.idl | 1069 ++++++------ IDL/bitsets.idl | 72 +- IDL/constants.idl | 187 +- IDL/enumerations.idl | 54 +- IDL/helpers/basic_inner_types.idl | 136 +- IDL/maps.idl | 2684 ++++++++++++++--------------- IDL/primitives.idl | 206 +-- IDL/relative_path_include.idl | 12 +- IDL/sequences.idl | 287 ++- IDL/strings.idl | 58 +- IDL/structures.idl | 412 ++--- IDL/unions.idl | 959 ++++++----- 15 files changed, 3307 insertions(+), 3265 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..18639b8 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# Set default behaviour, in case users don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files we want to always be normalized and converted +# to native line endings on checkout. +*.idl text eol=lf diff --git a/IDL/aliases.idl b/IDL/aliases.idl index 80fec01..72224a4 100644 --- a/IDL/aliases.idl +++ b/IDL/aliases.idl @@ -1,154 +1,154 @@ -#include "helpers/basic_inner_types.idl" - -typedef short alias_int16; -typedef unsigned short alias_uint16; -typedef long alias_int32; -typedef unsigned long alias_uint32; -typedef long long alias_int64; -typedef unsigned long long alias_uint64; -typedef float alias_float32; -typedef double alias_float64; -typedef long double alias_float128; -typedef boolean alias_bool; -typedef octet alias_octet; -typedef char alias_char8; -typedef wchar alias_char16; -typedef string alias_string8; -typedef wstring alias_string16; -typedef InnerEnumHelper alias_enum; -typedef InnerBitMaskHelper alias_bitmask; -typedef InnerAliasHelper alias_alias; -typedef short alias_array[2]; -typedef short alias_multiarray[2][2]; -typedef sequence alias_sequence; -typedef map alias_map; -typedef InnerUnionHelper alias_union; -typedef InnerStructureHelper alias_structure; -typedef InnerBitsetHelper alias_bitset; - - - -struct AliasInt16 -{ - alias_int16 value; -}; - -struct AliasUint16 -{ - alias_uint16 value; -}; - -struct AliasInt32 -{ - alias_int32 value; -}; - -struct AliasUInt32 -{ - alias_uint32 value; -}; - -struct AliasInt64 -{ - alias_int64 value; -}; - -struct AliasUInt64 -{ - alias_uint64 value; -}; - -struct AliasFloat32 -{ - alias_float32 value; -}; - -struct AliasFloat64 -{ - alias_float64 value; -}; - -struct AliasFloat128 -{ - alias_float128 value; -}; - -struct AliasBool -{ - alias_bool value; -}; - -struct AliasOctet -{ - alias_octet value; -}; - -struct AliasChar8 -{ - alias_char8 value; -}; - -struct AliasChar16 -{ - alias_char16 value; -}; - -struct AliasString8 -{ - alias_string8 value; -}; - -struct AliasString16 -{ - alias_string16 value; -}; - -struct AliasEnum -{ - alias_enum value; -}; - -struct AliasBitmask -{ - alias_bitmask value; -}; - -struct AliasAlias -{ - alias_alias value; -}; - -struct AliasArray -{ - alias_array value; -}; - -struct AliasMultiArray -{ - alias_multiarray value; -}; - -struct AliasSequence -{ - alias_sequence value; -}; - -struct AliasMap -{ - alias_map value; -}; - -struct AliasUnion -{ - alias_union value; -}; - -struct AliasStruct -{ - alias_structure value; -}; - -struct AliasBitset -{ - alias_bitset value; -}; +#include "helpers/basic_inner_types.idl" + +typedef short alias_int16; +typedef unsigned short alias_uint16; +typedef long alias_int32; +typedef unsigned long alias_uint32; +typedef long long alias_int64; +typedef unsigned long long alias_uint64; +typedef float alias_float32; +typedef double alias_float64; +typedef long double alias_float128; +typedef boolean alias_bool; +typedef octet alias_octet; +typedef char alias_char8; +typedef wchar alias_char16; +typedef string alias_string8; +typedef wstring alias_string16; +typedef InnerEnumHelper alias_enum; +typedef InnerBitMaskHelper alias_bitmask; +typedef InnerAliasHelper alias_alias; +typedef short alias_array[2]; +typedef short alias_multiarray[2][2]; +typedef sequence alias_sequence; +typedef map alias_map; +typedef InnerUnionHelper alias_union; +typedef InnerStructureHelper alias_structure; +typedef InnerBitsetHelper alias_bitset; + + + +struct AliasInt16 +{ + alias_int16 value; +}; + +struct AliasUint16 +{ + alias_uint16 value; +}; + +struct AliasInt32 +{ + alias_int32 value; +}; + +struct AliasUInt32 +{ + alias_uint32 value; +}; + +struct AliasInt64 +{ + alias_int64 value; +}; + +struct AliasUInt64 +{ + alias_uint64 value; +}; + +struct AliasFloat32 +{ + alias_float32 value; +}; + +struct AliasFloat64 +{ + alias_float64 value; +}; + +struct AliasFloat128 +{ + alias_float128 value; +}; + +struct AliasBool +{ + alias_bool value; +}; + +struct AliasOctet +{ + alias_octet value; +}; + +struct AliasChar8 +{ + alias_char8 value; +}; + +struct AliasChar16 +{ + alias_char16 value; +}; + +struct AliasString8 +{ + alias_string8 value; +}; + +struct AliasString16 +{ + alias_string16 value; +}; + +struct AliasEnum +{ + alias_enum value; +}; + +struct AliasBitmask +{ + alias_bitmask value; +}; + +struct AliasAlias +{ + alias_alias value; +}; + +struct AliasArray +{ + alias_array value; +}; + +struct AliasMultiArray +{ + alias_multiarray value; +}; + +struct AliasSequence +{ + alias_sequence value; +}; + +struct AliasMap +{ + alias_map value; +}; + +struct AliasUnion +{ + alias_union value; +}; + +struct AliasStruct +{ + alias_structure value; +}; + +struct AliasBitset +{ + alias_bitset value; +}; diff --git a/IDL/annotations.idl b/IDL/annotations.idl index 3c0b2df..a2f2ffd 100644 --- a/IDL/annotations.idl +++ b/IDL/annotations.idl @@ -1,61 +1,61 @@ -#include "helpers/basic_inner_types.idl" - -@annotation AnnotationTest -{ - short var_short; - unsigned short var_ushort; - long var_long; - unsigned long var_ulong; - long long var_longlong; - unsigned long long var_ulonglong; - float var_float; - double var_double; - boolean var_boolean; - octet var_octet; - char var_char8; - wchar var_char16; - string var_string; - wstring var_wstring; - enum InnerEnumHelper - { - ONE, - TWO - }; - InnerEnumHelper enum_value; - InnerEnumHelper enum_default_value default TWO; - const short inner_const_helper = 10; - typedef string Inner_alias_bounded_string_helper; - Inner_alias_bounded_string_helper var_string_10; - Inner_alias_bounded_string_helper var_default_string_10 default "Hello"; - Inner_alias_bounded_wstring_helper var_wstring_alias; -}; - -@annotation EmptyAnnotationTest -{ -}; - -@AnnotationTest( - var_short = 1, - var_ushort = 1, - var_long = 1, - var_ulong = 1, - var_longlong = 1, - var_ulonglong = 1, - var_float = 1, - var_double = 1, - var_boolean = true, - var_octet = 0, - var_char8 = 'a', - var_char16 = L'a', - var_string = "a", - var_wstring = L"a", - enum_value = ONE - ) -struct AnnotatedStruct -{ -}; - -@EmptyAnnotationTest() -struct EmptyAnnotatedStruct -{ -}; +#include "helpers/basic_inner_types.idl" + +@annotation AnnotationTest +{ + short var_short; + unsigned short var_ushort; + long var_long; + unsigned long var_ulong; + long long var_longlong; + unsigned long long var_ulonglong; + float var_float; + double var_double; + boolean var_boolean; + octet var_octet; + char var_char8; + wchar var_char16; + string var_string; + wstring var_wstring; + enum InnerEnumHelper + { + ONE, + TWO + }; + InnerEnumHelper enum_value; + InnerEnumHelper enum_default_value default TWO; + const short inner_const_helper = 10; + typedef string Inner_alias_bounded_string_helper; + Inner_alias_bounded_string_helper var_string_10; + Inner_alias_bounded_string_helper var_default_string_10 default "Hello"; + Inner_alias_bounded_wstring_helper var_wstring_alias; +}; + +@annotation EmptyAnnotationTest +{ +}; + +@AnnotationTest( + var_short = 1, + var_ushort = 1, + var_long = 1, + var_ulong = 1, + var_longlong = 1, + var_ulonglong = 1, + var_float = 1, + var_double = 1, + var_boolean = true, + var_octet = 0, + var_char8 = 'a', + var_char16 = L'a', + var_string = "a", + var_wstring = L"a", + enum_value = ONE + ) +struct AnnotatedStruct +{ +}; + +@EmptyAnnotationTest() +struct EmptyAnnotatedStruct +{ +}; diff --git a/IDL/arrays.idl b/IDL/arrays.idl index fcdd589..53ca625 100644 --- a/IDL/arrays.idl +++ b/IDL/arrays.idl @@ -1,535 +1,534 @@ -#include "helpers/basic_inner_types.idl" - -struct ArrayShort -{ - short var_array_short[10]; -}; - -struct ArrayUShort -{ - unsigned short var_array_ushort[10]; -}; - -struct ArrayLong -{ - long var_array_long[10]; -}; - -struct ArrayULong -{ - unsigned long var_array_ulong[10]; -}; - -struct ArrayLongLong -{ - long long var_array_longlong[10]; -}; - -struct ArrayULongLong -{ - unsigned long long var_array_ulonglong[10]; -}; - -struct ArrayFloat -{ - float var_array_float[10]; -}; - -struct ArrayDouble -{ - double var_array_double[10]; -}; - -struct ArrayLongDouble -{ - long double var_array_longdouble[10]; -}; - -struct ArrayBoolean -{ - boolean var_array_boolean[10]; -}; - -struct ArrayOctet -{ - octet var_array_octet[10]; -}; - -struct ArrayChar -{ - char var_array_char[10]; -}; - -struct ArrayWChar -{ - wchar var_array_wchar[10]; -}; - -struct ArrayString -{ - string var_array_string[10]; -}; - -struct ArrayWString -{ - wstring var_array_wstring[10]; -}; - -struct ArrayBoundedString -{ - Inner_alias_bounded_string_helper var_array_bounded_string[10]; -}; - -struct ArrayBoundedWString -{ - Inner_alias_bounded_wstring_helper var_array_bounded_wstring[10]; -}; - -struct ArrayEnum -{ - InnerEnumHelper var_array_enum[10]; -}; - -struct ArrayBitMask -{ - InnerBitMaskHelper var_array_bitmask[10]; -}; - -struct ArrayAlias -{ - InnerAliasHelper var_array_alias[10]; -}; - -struct ArrayShortArray -{ - short var_array_short_array[10][10]; -}; - -struct ArraySequence -{ - sequence var_array_sequence[10]; -}; - -struct ArrayMap -{ - map var_array_map[10]; -}; - -struct ArrayUnion -{ - InnerUnionHelper var_array_union[10]; -}; - -struct ArrayStructure -{ - InnerStructureHelper var_array_structure[10]; -}; - -struct ArrayBitset -{ - InnerBitsetHelper var_array_bitset[10]; -}; - - - - -struct ArrayMultiDimensionShort -{ - short var_array_short[10][10][10]; -}; - -struct ArrayMultiDimensionUShort -{ - unsigned short var_array_ushort[10][10][10]; -}; - -struct ArrayMultiDimensionLong -{ - long var_array_long[10][10][10]; -}; - -struct ArrayMultiDimensionULong -{ - unsigned long var_array_ulong[10][10][10]; -}; - -struct ArrayMultiDimensionLongLong -{ - long long var_array_longlong[10][10][10]; -}; - -struct ArrayMultiDimensionULongLong -{ - unsigned long long var_array_ulonglong[10][10][10]; -}; - -struct ArrayMultiDimensionFloat -{ - float var_array_float[10][10][10]; -}; - -struct ArrayMultiDimensionDouble -{ - double var_array_double[10][10][10]; -}; - -struct ArrayMultiDimensionLongDouble -{ - long double var_array_longdouble[10][10][10]; -}; - -struct ArrayMultiDimensionBoolean -{ - boolean var_array_boolean[10][10][10]; -}; - -struct ArrayMultiDimensionOctet -{ - octet var_array_octet[10][10][10]; -}; - -struct ArrayMultiDimensionChar -{ - char var_array_char[10][10][10]; -}; - -struct ArrayMultiDimensionWChar -{ - wchar var_array_wchar[10][10][10]; -}; - -struct ArrayMultiDimensionString -{ - string var_array_string[10][10][10]; -}; - -struct ArrayMultiDimensionWString -{ - wstring var_array_wstring[10][10][10]; -}; - -struct ArrayMultiDimensionBoundedString -{ - Inner_alias_bounded_string_helper var_array_bounded_string[10][10][10]; -}; - -struct ArrayMultiDimensionBoundedWString -{ - Inner_alias_bounded_wstring_helper var_array_bounded_wstring[10][10][10]; -}; - -struct ArrayMultiDimensionEnum -{ - InnerEnumHelper var_array_enum[10][10][10]; -}; - -struct ArrayMultiDimensionBitMask -{ - InnerBitMaskHelper var_array_bitmask[10][10][10]; -}; - -struct ArrayMultiDimensionAlias -{ - InnerAliasHelper var_array_alias[10][10][10]; -}; - -struct ArrayMultiDimensionSequence -{ - sequence var_array_sequence[10][10][10]; -}; - -struct ArrayMultiDimensionMap -{ - map var_array_map[10][10][10]; -}; - -struct ArrayMultiDimensionUnion -{ - InnerUnionHelper var_array_union[10][10][10]; -}; - -struct ArrayMultiDimensionStructure -{ - InnerStructureHelper var_array_structure[10][10][10]; -}; - -struct ArrayMultiDimensionBitset -{ - InnerBitsetHelper var_array_bitset[10][10][10]; -}; - - - -const long size_1 = 5; -const long size_2 = 2; - - -struct ArraySingleDimensionLiteralsShort -{ - short var_array_short[size_1]; -}; - -struct ArraySingleDimensionLiteralsUnsignedShort -{ - unsigned short var_array_ushort[5 * 2]; -}; - -struct ArraySingleDimensionLiteralsLong -{ - long var_array_long[5 + 5]; -}; - -struct ArraySingleDimensionLiteralsUnsignedLong -{ - unsigned long var_array_ulong[size_1 * 2]; -}; - -struct ArraySingleDimensionLiteralsLongLong -{ - long long var_array_longlong[size_1 + 5]; -}; - -struct ArraySingleDimensionLiteralsUnsignedLongLong -{ - unsigned long long var_array_ulonglong[size_1 * size_2]; -}; - -struct ArraySingleDimensionLiteralsFloat -{ - float var_array_float[size_1]; -}; - -struct ArraySingleDimensionLiteralsDouble -{ - double var_array_double[5 * 2]; -}; - -struct ArraySingleDimensionLiteralsLongDouble -{ - long double var_array_longdouble[5 + 5]; -}; - -struct ArraySingleDimensionLiteralsBoolean -{ - boolean var_array_boolean[size_1]; -}; - -struct ArraySingleDimensionLiteralsOctet -{ - octet var_array_octet[size_1 * 2]; -}; - -struct ArraySingleDimensionLiteralsChar -{ - char var_array_char[size_1]; -}; - -struct ArraySingleDimensionLiteralsWChar -{ - wchar var_array_wchar[size_1 + 5]; -}; - -struct ArraySingleDimensionLiteralsString -{ - string var_array_string[size_1]; -}; - -struct ArraySingleDimensionLiteralsWString -{ - wstring var_array_wstring[size_1 * size_2]; -}; - -struct ArraySingleDimensionLiteralsBoundedString -{ - Inner_alias_bounded_string_helper var_array_bounded_string[size_1]; -}; - -struct ArraySingleDimensionLiteralsBoundedWString -{ - Inner_alias_bounded_wstring_helper var_array_bounded_wstring[size_1 * size_2]; -}; - -struct ArraySingleDimensionLiteralsEnum -{ - InnerEnumHelper var_array_enum[size_1]; -}; - -struct ArraySingleDimensionLiteralsBitMask -{ - InnerBitMaskHelper var_array_bitmask[size_1 + 5]; -}; - -struct ArraySingleDimensionLiteralsAlias -{ - InnerAliasHelper var_array_alias[size_1 * 2]; -}; - -struct ArraySingleDimensionLiteralsShortArray -{ - short var_array_short_array[size_1 * size_2][size_1 + 5]; -}; - -struct ArraySingleDimensionLiteralsSequence -{ - sequence var_array_sequence[size_1]; -}; - -struct ArraySingleDimensionLiteralsMap -{ - map var_array_map[size_2]; -}; - -struct ArraySingleDimensionLiteralsUnion -{ - InnerUnionHelper var_array_union[5 * 2]; -}; - -struct ArraySingleDimensionLiteralsStructure -{ - InnerStructureHelper var_array_structure[size_1]; -}; - -struct ArraySingleDimensionLiteralsBitset -{ - InnerBitsetHelper var_array_bitset[size_1 + 5]; -}; - - - - -struct ArrayMultiDimensionLiteralsShort -{ - short var_array_short[size_1][5 + 5][size_2]; -}; - -struct ArrayMultiDimensionLiteralsUShort -{ - unsigned short var_array_ushort[size_1][size_1 * 2][5]; -}; - -struct ArrayMultiDimensionLiteralsLong -{ - long var_array_long[5 * 2][size_1][5]; -}; - -struct ArrayMultiDimensionLiteralsULong -{ - unsigned long var_array_ulong[5 + 5][size_1 * size_2][size_1]; -}; - -struct ArrayMultiDimensionLiteralsLongLong -{ - long long var_array_longlong[size_1][5 * 2][5]; -}; - -struct ArrayMultiDimensionLiteralsULongLong -{ - unsigned long long var_array_ulonglong[size_1 + 5][size_1 * size_2][5 + 5]; -}; - -struct ArrayMultiDimensionLiteralsFloat -{ - float var_array_float[5 * 2][size_1][5 + 5]; -}; - -struct ArrayMultiDimensionLiteralsDouble -{ - double var_array_double[size_1][size_1 + 5][size_1]; -}; - -struct ArrayMultiDimensionLiteralsLongDouble -{ - long double var_array_longdouble[size_1][size_1][size_1 + 5]; -}; - -struct ArrayMultiDimensionLiteralsBoolean -{ - boolean var_array_boolean[size_1 * size_2][size_1][5]; -}; - -struct ArrayMultiDimensionLiteralsOctet -{ - octet var_array_octet[size_1][size_1 * 2][size_1]; -}; - -struct ArrayMultiDimensionLiteralsChar -{ - char var_array_char[5 + 5][size_1][5 + 5]; -}; - -struct ArrayMultiDimensionLiteralsWChar -{ - wchar var_array_wchar[size_1 * size_2][size_1 + 5][size_1]; -}; - -struct ArrayMultiDimensionLiteralsString -{ - string var_array_string[size_1][5 * 2][5]; -}; - -struct ArrayMultiDimensionLiteralsWString -{ - wstring var_array_wstring[size_1 + 5][size_1 * size_2][5 * 2]; -}; - -struct ArrayMultiDimensionLiteralsBoundedString -{ - Inner_alias_bounded_string_helper var_array_bounded_string[size_1][5 * 2][5]; -}; - -struct ArrayMultiDimensionLiteralsBoundedWString -{ - Inner_alias_bounded_wstring_helper var_array_bounded_wstring[size_1 + 5][size_1 * size_2][5 * 2]; -}; - -struct ArrayMultiDimensionLiteralsEnum -{ - InnerEnumHelper var_array_enum[5 * 2][size_1][5 + 5]; -}; - -struct ArrayMultiDimensionLiteralsBitMask -{ - InnerBitMaskHelper var_array_bitmask[size_1][size_1 + 5][size_1]; -}; - -struct ArrayMultiDimensionLiteralsAlias -{ - InnerAliasHelper var_array_alias[size_1 * 2][5 * 2][size_1 * size_2]; -}; - -struct ArrayMultiDimensionLiteralsSequence -{ - sequence var_array_sequence[size_1 + 5][size_1][5 * 2]; -}; - -struct ArrayMultiDimensionLiteralsMap -{ - map var_array_map[size_1][size_1 * 2][size_1]; -}; - -struct ArrayMultiDimensionLiteralsUnion -{ - InnerUnionHelper var_array_union[size_1 * size_2][size_1 + 5][size_1 * 2]; -}; - -struct ArrayMultiDimensionLiteralsStructure -{ - InnerStructureHelper var_array_structure[5][size_1][size_1 + 5]; -}; - -struct ArrayMultiDimensionLiteralsBitSet -{ - InnerBitsetHelper var_array_bitset[size_1 + 5][size_1 * 2][size_1 * size_2]; -}; - - -struct BoundedSmallArrays -{ - short var_array_small[1]; -}; - -struct BoundedBigArrays -{ - short var_array_big[41925]; -}; - +#include "helpers/basic_inner_types.idl" + +struct ArrayShort +{ + short var_array_short[10]; +}; + +struct ArrayUShort +{ + unsigned short var_array_ushort[10]; +}; + +struct ArrayLong +{ + long var_array_long[10]; +}; + +struct ArrayULong +{ + unsigned long var_array_ulong[10]; +}; + +struct ArrayLongLong +{ + long long var_array_longlong[10]; +}; + +struct ArrayULongLong +{ + unsigned long long var_array_ulonglong[10]; +}; + +struct ArrayFloat +{ + float var_array_float[10]; +}; + +struct ArrayDouble +{ + double var_array_double[10]; +}; + +struct ArrayLongDouble +{ + long double var_array_longdouble[10]; +}; + +struct ArrayBoolean +{ + boolean var_array_boolean[10]; +}; + +struct ArrayOctet +{ + octet var_array_octet[10]; +}; + +struct ArrayChar +{ + char var_array_char[10]; +}; + +struct ArrayWChar +{ + wchar var_array_wchar[10]; +}; + +struct ArrayString +{ + string var_array_string[10]; +}; + +struct ArrayWString +{ + wstring var_array_wstring[10]; +}; + +struct ArrayBoundedString +{ + Inner_alias_bounded_string_helper var_array_bounded_string[10]; +}; + +struct ArrayBoundedWString +{ + Inner_alias_bounded_wstring_helper var_array_bounded_wstring[10]; +}; + +struct ArrayEnum +{ + InnerEnumHelper var_array_enum[10]; +}; + +struct ArrayBitMask +{ + InnerBitMaskHelper var_array_bitmask[10]; +}; + +struct ArrayAlias +{ + InnerAliasHelper var_array_alias[10]; +}; + +struct ArrayShortArray +{ + short var_array_short_array[10][10]; +}; + +struct ArraySequence +{ + sequence var_array_sequence[10]; +}; + +struct ArrayMap +{ + map var_array_map[10]; +}; + +struct ArrayUnion +{ + InnerUnionHelper var_array_union[10]; +}; + +struct ArrayStructure +{ + InnerStructureHelper var_array_structure[10]; +}; + +struct ArrayBitset +{ + InnerBitsetHelper var_array_bitset[10]; +}; + + + + +struct ArrayMultiDimensionShort +{ + short var_array_short[10][10][10]; +}; + +struct ArrayMultiDimensionUShort +{ + unsigned short var_array_ushort[10][10][10]; +}; + +struct ArrayMultiDimensionLong +{ + long var_array_long[10][10][10]; +}; + +struct ArrayMultiDimensionULong +{ + unsigned long var_array_ulong[10][10][10]; +}; + +struct ArrayMultiDimensionLongLong +{ + long long var_array_longlong[10][10][10]; +}; + +struct ArrayMultiDimensionULongLong +{ + unsigned long long var_array_ulonglong[10][10][10]; +}; + +struct ArrayMultiDimensionFloat +{ + float var_array_float[10][10][10]; +}; + +struct ArrayMultiDimensionDouble +{ + double var_array_double[10][10][10]; +}; + +struct ArrayMultiDimensionLongDouble +{ + long double var_array_longdouble[10][10][10]; +}; + +struct ArrayMultiDimensionBoolean +{ + boolean var_array_boolean[10][10][10]; +}; + +struct ArrayMultiDimensionOctet +{ + octet var_array_octet[10][10][10]; +}; + +struct ArrayMultiDimensionChar +{ + char var_array_char[10][10][10]; +}; + +struct ArrayMultiDimensionWChar +{ + wchar var_array_wchar[10][10][10]; +}; + +struct ArrayMultiDimensionString +{ + string var_array_string[10][10][10]; +}; + +struct ArrayMultiDimensionWString +{ + wstring var_array_wstring[10][10][10]; +}; + +struct ArrayMultiDimensionBoundedString +{ + Inner_alias_bounded_string_helper var_array_bounded_string[10][10][10]; +}; + +struct ArrayMultiDimensionBoundedWString +{ + Inner_alias_bounded_wstring_helper var_array_bounded_wstring[10][10][10]; +}; + +struct ArrayMultiDimensionEnum +{ + InnerEnumHelper var_array_enum[10][10][10]; +}; + +struct ArrayMultiDimensionBitMask +{ + InnerBitMaskHelper var_array_bitmask[10][10][10]; +}; + +struct ArrayMultiDimensionAlias +{ + InnerAliasHelper var_array_alias[10][10][10]; +}; + +struct ArrayMultiDimensionSequence +{ + sequence var_array_sequence[10][10][10]; +}; + +struct ArrayMultiDimensionMap +{ + map var_array_map[10][10][10]; +}; + +struct ArrayMultiDimensionUnion +{ + InnerUnionHelper var_array_union[10][10][10]; +}; + +struct ArrayMultiDimensionStructure +{ + InnerStructureHelper var_array_structure[10][10][10]; +}; + +struct ArrayMultiDimensionBitset +{ + InnerBitsetHelper var_array_bitset[10][10][10]; +}; + + + +const long size_1 = 5; +const long size_2 = 2; + + +struct ArraySingleDimensionLiteralsShort +{ + short var_array_short[size_1]; +}; + +struct ArraySingleDimensionLiteralsUnsignedShort +{ + unsigned short var_array_ushort[5 * 2]; +}; + +struct ArraySingleDimensionLiteralsLong +{ + long var_array_long[5 + 5]; +}; + +struct ArraySingleDimensionLiteralsUnsignedLong +{ + unsigned long var_array_ulong[size_1 * 2]; +}; + +struct ArraySingleDimensionLiteralsLongLong +{ + long long var_array_longlong[size_1 + 5]; +}; + +struct ArraySingleDimensionLiteralsUnsignedLongLong +{ + unsigned long long var_array_ulonglong[size_1 * size_2]; +}; + +struct ArraySingleDimensionLiteralsFloat +{ + float var_array_float[size_1]; +}; + +struct ArraySingleDimensionLiteralsDouble +{ + double var_array_double[5 * 2]; +}; + +struct ArraySingleDimensionLiteralsLongDouble +{ + long double var_array_longdouble[5 + 5]; +}; + +struct ArraySingleDimensionLiteralsBoolean +{ + boolean var_array_boolean[size_1]; +}; + +struct ArraySingleDimensionLiteralsOctet +{ + octet var_array_octet[size_1 * 2]; +}; + +struct ArraySingleDimensionLiteralsChar +{ + char var_array_char[size_1]; +}; + +struct ArraySingleDimensionLiteralsWChar +{ + wchar var_array_wchar[size_1 + 5]; +}; + +struct ArraySingleDimensionLiteralsString +{ + string var_array_string[size_1]; +}; + +struct ArraySingleDimensionLiteralsWString +{ + wstring var_array_wstring[size_1 * size_2]; +}; + +struct ArraySingleDimensionLiteralsBoundedString +{ + Inner_alias_bounded_string_helper var_array_bounded_string[size_1]; +}; + +struct ArraySingleDimensionLiteralsBoundedWString +{ + Inner_alias_bounded_wstring_helper var_array_bounded_wstring[size_1 * size_2]; +}; + +struct ArraySingleDimensionLiteralsEnum +{ + InnerEnumHelper var_array_enum[size_1]; +}; + +struct ArraySingleDimensionLiteralsBitMask +{ + InnerBitMaskHelper var_array_bitmask[size_1 + 5]; +}; + +struct ArraySingleDimensionLiteralsAlias +{ + InnerAliasHelper var_array_alias[size_1 * 2]; +}; + +struct ArraySingleDimensionLiteralsShortArray +{ + short var_array_short_array[size_1 * size_2][size_1 + 5]; +}; + +struct ArraySingleDimensionLiteralsSequence +{ + sequence var_array_sequence[size_1]; +}; + +struct ArraySingleDimensionLiteralsMap +{ + map var_array_map[size_2]; +}; + +struct ArraySingleDimensionLiteralsUnion +{ + InnerUnionHelper var_array_union[5 * 2]; +}; + +struct ArraySingleDimensionLiteralsStructure +{ + InnerStructureHelper var_array_structure[size_1]; +}; + +struct ArraySingleDimensionLiteralsBitset +{ + InnerBitsetHelper var_array_bitset[size_1 + 5]; +}; + + + + +struct ArrayMultiDimensionLiteralsShort +{ + short var_array_short[size_1][5 + 5][size_2]; +}; + +struct ArrayMultiDimensionLiteralsUShort +{ + unsigned short var_array_ushort[size_1][size_1 * 2][5]; +}; + +struct ArrayMultiDimensionLiteralsLong +{ + long var_array_long[5 * 2][size_1][5]; +}; + +struct ArrayMultiDimensionLiteralsULong +{ + unsigned long var_array_ulong[5 + 5][size_1 * size_2][size_1]; +}; + +struct ArrayMultiDimensionLiteralsLongLong +{ + long long var_array_longlong[size_1][5 * 2][5]; +}; + +struct ArrayMultiDimensionLiteralsULongLong +{ + unsigned long long var_array_ulonglong[size_1 + 5][size_1 * size_2][5 + 5]; +}; + +struct ArrayMultiDimensionLiteralsFloat +{ + float var_array_float[5 * 2][size_1][5 + 5]; +}; + +struct ArrayMultiDimensionLiteralsDouble +{ + double var_array_double[size_1][size_1 + 5][size_1]; +}; + +struct ArrayMultiDimensionLiteralsLongDouble +{ + long double var_array_longdouble[size_1][size_1][size_1 + 5]; +}; + +struct ArrayMultiDimensionLiteralsBoolean +{ + boolean var_array_boolean[size_1 * size_2][size_1][5]; +}; + +struct ArrayMultiDimensionLiteralsOctet +{ + octet var_array_octet[size_1][size_1 * 2][size_1]; +}; + +struct ArrayMultiDimensionLiteralsChar +{ + char var_array_char[5 + 5][size_1][5 + 5]; +}; + +struct ArrayMultiDimensionLiteralsWChar +{ + wchar var_array_wchar[size_1 * size_2][size_1 + 5][size_1]; +}; + +struct ArrayMultiDimensionLiteralsString +{ + string var_array_string[size_1][5 * 2][5]; +}; + +struct ArrayMultiDimensionLiteralsWString +{ + wstring var_array_wstring[size_1 + 5][size_1 * size_2][5 * 2]; +}; + +struct ArrayMultiDimensionLiteralsBoundedString +{ + Inner_alias_bounded_string_helper var_array_bounded_string[size_1][5 * 2][5]; +}; + +struct ArrayMultiDimensionLiteralsBoundedWString +{ + Inner_alias_bounded_wstring_helper var_array_bounded_wstring[size_1 + 5][size_1 * size_2][5 * 2]; +}; + +struct ArrayMultiDimensionLiteralsEnum +{ + InnerEnumHelper var_array_enum[5 * 2][size_1][5 + 5]; +}; + +struct ArrayMultiDimensionLiteralsBitMask +{ + InnerBitMaskHelper var_array_bitmask[size_1][size_1 + 5][size_1]; +}; + +struct ArrayMultiDimensionLiteralsAlias +{ + InnerAliasHelper var_array_alias[size_1 * 2][5 * 2][size_1 * size_2]; +}; + +struct ArrayMultiDimensionLiteralsSequence +{ + sequence var_array_sequence[size_1 + 5][size_1][5 * 2]; +}; + +struct ArrayMultiDimensionLiteralsMap +{ + map var_array_map[size_1][size_1 * 2][size_1]; +}; + +struct ArrayMultiDimensionLiteralsUnion +{ + InnerUnionHelper var_array_union[size_1 * size_2][size_1 + 5][size_1 * 2]; +}; + +struct ArrayMultiDimensionLiteralsStructure +{ + InnerStructureHelper var_array_structure[5][size_1][size_1 + 5]; +}; + +struct ArrayMultiDimensionLiteralsBitSet +{ + InnerBitsetHelper var_array_bitset[size_1 + 5][size_1 * 2][size_1 * size_2]; +}; + + +struct BoundedSmallArrays +{ + short var_array_small[1]; +}; + +struct BoundedBigArrays +{ + short var_array_big[41925]; +}; diff --git a/IDL/bitsets.idl b/IDL/bitsets.idl index 0b1f7a3..d7a73da 100644 --- a/IDL/bitsets.idl +++ b/IDL/bitsets.idl @@ -1,36 +1,36 @@ -#include "helpers/basic_inner_types.idl" - -bitset InnerTypedBitsetHelper -{ - bitfield<1, boolean> boolean_bitfield; - bitfield<8, octet> byte_bitfield; - bitfield<8, int8> int8_bitfield; - bitfield<8, uint8> uint8_bitfield; - bitfield<16, short> short_bitfield; - bitfield<16, unsigned short> ushort_bitfield; -}; - -bitset InnerTypedBitsetHelper2 -{ - bitfield<32, long> long_bitfield; - bitfield<32, unsigned long> ulong_bitfield; -}; - -bitset InnerTypedBitsetHelper3 -{ - bitfield<64, long long> long_long_bitfield; -}; - -bitset InnerTypedBitsetHelper4 -{ - bitfield<64, unsigned long long> ulong_long_bitfield; -}; - -struct BitsetStruct -{ - InnerBitsetHelper var_InnerBitsetHelper; - InnerTypedBitsetHelper var_InnerTypedBitsetHelper; - InnerTypedBitsetHelper2 var_InnerTypedBitsetHelper2; - InnerTypedBitsetHelper3 var_InnerTypedBitsetHelper3; - InnerTypedBitsetHelper4 var_InnerTypedBitsetHelper4; -}; +#include "helpers/basic_inner_types.idl" + +bitset InnerTypedBitsetHelper +{ + bitfield<1, boolean> boolean_bitfield; + bitfield<8, octet> byte_bitfield; + bitfield<8, int8> int8_bitfield; + bitfield<8, uint8> uint8_bitfield; + bitfield<16, short> short_bitfield; + bitfield<16, unsigned short> ushort_bitfield; +}; + +bitset InnerTypedBitsetHelper2 +{ + bitfield<32, long> long_bitfield; + bitfield<32, unsigned long> ulong_bitfield; +}; + +bitset InnerTypedBitsetHelper3 +{ + bitfield<64, long long> long_long_bitfield; +}; + +bitset InnerTypedBitsetHelper4 +{ + bitfield<64, unsigned long long> ulong_long_bitfield; +}; + +struct BitsetStruct +{ + InnerBitsetHelper var_InnerBitsetHelper; + InnerTypedBitsetHelper var_InnerTypedBitsetHelper; + InnerTypedBitsetHelper2 var_InnerTypedBitsetHelper2; + InnerTypedBitsetHelper3 var_InnerTypedBitsetHelper3; + InnerTypedBitsetHelper4 var_InnerTypedBitsetHelper4; +}; diff --git a/IDL/constants.idl b/IDL/constants.idl index 9417fc5..f9b096a 100644 --- a/IDL/constants.idl +++ b/IDL/constants.idl @@ -1,94 +1,93 @@ -#include "helpers/basic_inner_types.idl" - -const short const_short = 87; -const unsigned short const_ushort = 43; -const long const_long = 23; -const unsigned long const_ulong = 6; -const long long const_longlong = 8; -const unsigned long long const_ulonglong = 67; -const float const_float = 13.1; -const double const_double = 84.1; -const long double const_longdouble = 46.1; -const boolean const_boolean = true; -const octet const_octet = 7; -const char const_char8 = 'A'; -const wchar const_char16 = L'B'; -const int8 const_int8 = 53; -const uint8 const_uint8 = 11; -const int16 const_int16 = 27; -const uint16 const_uint16 = 31; -const int32 const_int32 = 74; -const uint32 const_uint32 = 64; -const int64 const_int64 = 17; -const uint64 const_uint64 = 19; -// String consts are included in basic_inner_types.idl - -typedef short alias_short; -const alias_short alias_const = 55; - - -module const_module1 -{ - const short const_moduled = 11; - typedef short alias_short_moduled; - const alias_short_moduled alias_const_moduled = 10; - - struct ModuleConstsLiteralsStruct - { - short module1_array_literal_const_moduled[const_moduled]; - short module1_array_literal_const_alias_const_moduled[alias_const_moduled]; - alias_short var1; - alias_short_moduled var2; - }; -}; - -module const_module2 -{ - const short const_moduled = 22; - const const_module1::alias_short_moduled alias_const_moduled = 2; - - struct Module2ConstsLiteralsStruct - { - short module2_array_literal_const_moduled[const_moduled]; - short module2_array_literal_const_alias_const_moduled[alias_const_moduled]; - short module2_array_literal_const_scoped_moduled[const_module2::const_moduled]; - short module2_array_literal_module1_const_moduled[const_module1::const_moduled]; - }; -}; - -struct ConstsLiteralsStruct -{ - short array_literal_const_short[const_short]; - unsigned short array_literal_const_ushort[const_ushort]; - long array_literal_const_long[const_long]; - unsigned long array_literal_const_ulong[const_ulong]; - long long array_literal_const_longlong[const_longlong]; - unsigned long long array_literal_const_ulonglong[const_ulonglong]; - int8 array_literal_const_int8[const_int8]; - uint8 array_literal_const_uint8[const_uint8]; - int16 array_literal_const_int16[const_int16]; - uint16 array_literal_const_uint16[const_uint16]; - int32 array_literal_const_int32[const_int32]; - uint32 array_literal_const_uint32[const_uint32]; - int64 array_literal_const_int64[const_int64]; - uint64 array_literal_const_uint64[const_uint64]; - - short array_literals_operations1_const[const_short + const_long]; - short array_literals_operations2_const[const_short - const_long]; - short array_literals_operations3_const[const_short + const_module2::const_moduled]; - short array_literals_operations4_const[const_module2::const_moduled - const_module1::const_moduled]; - short array_literals_operations5_const[const_short * const_long]; - short array_literals_operations6_const[const_short / const_long]; - short array_literals_operations7_const[const_short * const_module2::const_moduled]; - short array_literals_operations8_const[const_module1::const_moduled % const_module2::const_moduled]; - - short array_literal_const_inner_const_helper[inner_const_helper]; - - short array_moduled1_literal_const[const_module1::const_moduled]; - short array_moduled2_literal_const[const_module2::const_moduled]; - - short array_literal_const_alias_const[alias_const]; - short array_moduled1_literal_alias_const_moduled[const_module1::alias_const_moduled]; - short array_moduled2_literal_alias_const_moduled[const_module2::alias_const_moduled]; -}; - +#include "helpers/basic_inner_types.idl" + +const short const_short = 87; +const unsigned short const_ushort = 43; +const long const_long = 23; +const unsigned long const_ulong = 6; +const long long const_longlong = 8; +const unsigned long long const_ulonglong = 67; +const float const_float = 13.1; +const double const_double = 84.1; +const long double const_longdouble = 46.1; +const boolean const_boolean = true; +const octet const_octet = 7; +const char const_char8 = 'A'; +const wchar const_char16 = L'B'; +const int8 const_int8 = 53; +const uint8 const_uint8 = 11; +const int16 const_int16 = 27; +const uint16 const_uint16 = 31; +const int32 const_int32 = 74; +const uint32 const_uint32 = 64; +const int64 const_int64 = 17; +const uint64 const_uint64 = 19; +// String consts are included in basic_inner_types.idl + +typedef short alias_short; +const alias_short alias_const = 55; + + +module const_module1 +{ + const short const_moduled = 11; + typedef short alias_short_moduled; + const alias_short_moduled alias_const_moduled = 10; + + struct ModuleConstsLiteralsStruct + { + short module1_array_literal_const_moduled[const_moduled]; + short module1_array_literal_const_alias_const_moduled[alias_const_moduled]; + alias_short var1; + alias_short_moduled var2; + }; +}; + +module const_module2 +{ + const short const_moduled = 22; + const const_module1::alias_short_moduled alias_const_moduled = 2; + + struct Module2ConstsLiteralsStruct + { + short module2_array_literal_const_moduled[const_moduled]; + short module2_array_literal_const_alias_const_moduled[alias_const_moduled]; + short module2_array_literal_const_scoped_moduled[const_module2::const_moduled]; + short module2_array_literal_module1_const_moduled[const_module1::const_moduled]; + }; +}; + +struct ConstsLiteralsStruct +{ + short array_literal_const_short[const_short]; + unsigned short array_literal_const_ushort[const_ushort]; + long array_literal_const_long[const_long]; + unsigned long array_literal_const_ulong[const_ulong]; + long long array_literal_const_longlong[const_longlong]; + unsigned long long array_literal_const_ulonglong[const_ulonglong]; + int8 array_literal_const_int8[const_int8]; + uint8 array_literal_const_uint8[const_uint8]; + int16 array_literal_const_int16[const_int16]; + uint16 array_literal_const_uint16[const_uint16]; + int32 array_literal_const_int32[const_int32]; + uint32 array_literal_const_uint32[const_uint32]; + int64 array_literal_const_int64[const_int64]; + uint64 array_literal_const_uint64[const_uint64]; + + short array_literals_operations1_const[const_short + const_long]; + short array_literals_operations2_const[const_short - const_long]; + short array_literals_operations3_const[const_short + const_module2::const_moduled]; + short array_literals_operations4_const[const_module2::const_moduled - const_module1::const_moduled]; + short array_literals_operations5_const[const_short * const_long]; + short array_literals_operations6_const[const_short / const_long]; + short array_literals_operations7_const[const_short * const_module2::const_moduled]; + short array_literals_operations8_const[const_module1::const_moduled % const_module2::const_moduled]; + + short array_literal_const_inner_const_helper[inner_const_helper]; + + short array_moduled1_literal_const[const_module1::const_moduled]; + short array_moduled2_literal_const[const_module2::const_moduled]; + + short array_literal_const_alias_const[alias_const]; + short array_moduled1_literal_alias_const_moduled[const_module1::alias_const_moduled]; + short array_moduled2_literal_alias_const_moduled[const_module2::alias_const_moduled]; +}; diff --git a/IDL/enumerations.idl b/IDL/enumerations.idl index 901b471..ff992ad 100644 --- a/IDL/enumerations.idl +++ b/IDL/enumerations.idl @@ -1,27 +1,27 @@ -#include "helpers/basic_inner_types.idl" - -module Test -{ - enum InnerEnumHelper - { - ENUM_VALUE_1, - ENUM_VALUE_2, - ENUM_VALUE_3 - }; -}; - -struct EnumStructure -{ - InnerEnumHelper var_InnerEnumHelper; - Test::InnerEnumHelper var_scoped_InnerEnumHelper; -}; - -struct BitMaskStructure -{ - InnerBitMaskHelper var_InnerBitMaskHelper; -}; - -struct BoundedBitMaskStructure -{ - InnerBoundedBitMaskHelper var_InnerBoundedBitMaskHelper; -}; +#include "helpers/basic_inner_types.idl" + +module Test +{ + enum InnerEnumHelper + { + ENUM_VALUE_1, + ENUM_VALUE_2, + ENUM_VALUE_3 + }; +}; + +struct EnumStructure +{ + InnerEnumHelper var_InnerEnumHelper; + Test::InnerEnumHelper var_scoped_InnerEnumHelper; +}; + +struct BitMaskStructure +{ + InnerBitMaskHelper var_InnerBitMaskHelper; +}; + +struct BoundedBitMaskStructure +{ + InnerBoundedBitMaskHelper var_InnerBoundedBitMaskHelper; +}; diff --git a/IDL/helpers/basic_inner_types.idl b/IDL/helpers/basic_inner_types.idl index 936c13e..08500a5 100644 --- a/IDL/helpers/basic_inner_types.idl +++ b/IDL/helpers/basic_inner_types.idl @@ -1,68 +1,68 @@ -enum InnerEnumHelper -{ - ENUM_VALUE_1, - ENUM_VALUE_2, - ENUM_VALUE_3 -}; - -bitmask InnerBitMaskHelper -{ - @position(0) flag0, - @position(1) flag1, - @position(4) flag4, - @position(6) flag6 -}; - -@bit_bound(8) -bitmask InnerBoundedBitMaskHelper -{ - @position(0) bflag0, - @position(1) bflag1, - @position(4) bflag4, - @position(6) bflag6 -}; - -typedef long InnerAliasHelper; - -@nested -struct InnerStructureHelper -{ - long field1; - float field2; -}; - -@nested -struct InnerEmptyStructureHelper -{ -}; - -@nested -union InnerUnionHelper switch (long) -{ - case 0: long longValue; - case 1: float floatValue; - default: short shortValue; -}; - -bitset InnerBitsetHelper -{ - bitfield<3> a; - bitfield<1> b; - bitfield<4>; - bitfield<10> c; - bitfield<3>; - bitfield<12, short> d; -}; - -const short inner_const_helper = 1; -typedef string<10> Inner_alias_bounded_string_helper; -typedef wstring<10> Inner_alias_bounded_wstring_helper; -typedef short Inner_alias_array_helper[2]; -typedef sequence Inner_alias_sequence_helper; -typedef map Inner_alias_map_helper; -typedef InnerStructureHelper inner_structure_helper_alias; -typedef InnerBitsetHelper inner_bitset_helper_alias; - -// String consts are checked here to avoid generating the related TypeObjectTest. -const string const_string = "AAA"; -const wstring const_wstring = L"BBB"; +enum InnerEnumHelper +{ + ENUM_VALUE_1, + ENUM_VALUE_2, + ENUM_VALUE_3 +}; + +bitmask InnerBitMaskHelper +{ + @position(0) flag0, + @position(1) flag1, + @position(4) flag4, + @position(6) flag6 +}; + +@bit_bound(8) +bitmask InnerBoundedBitMaskHelper +{ + @position(0) bflag0, + @position(1) bflag1, + @position(4) bflag4, + @position(6) bflag6 +}; + +typedef long InnerAliasHelper; + +@nested +struct InnerStructureHelper +{ + long field1; + float field2; +}; + +@nested +struct InnerEmptyStructureHelper +{ +}; + +@nested +union InnerUnionHelper switch (long) +{ + case 0: long longValue; + case 1: float floatValue; + default: short shortValue; +}; + +bitset InnerBitsetHelper +{ + bitfield<3> a; + bitfield<1> b; + bitfield<4>; + bitfield<10> c; + bitfield<3>; + bitfield<12, short> d; +}; + +const short inner_const_helper = 1; +typedef string<10> Inner_alias_bounded_string_helper; +typedef wstring<10> Inner_alias_bounded_wstring_helper; +typedef short Inner_alias_array_helper[2]; +typedef sequence Inner_alias_sequence_helper; +typedef map Inner_alias_map_helper; +typedef InnerStructureHelper inner_structure_helper_alias; +typedef InnerBitsetHelper inner_bitset_helper_alias; + +// String consts are checked here to avoid generating the related TypeObjectTest. +const string const_string = "AAA"; +const wstring const_wstring = L"BBB"; diff --git a/IDL/maps.idl b/IDL/maps.idl index 13fd0f6..a24b8e8 100644 --- a/IDL/maps.idl +++ b/IDL/maps.idl @@ -1,1342 +1,1342 @@ -#include "helpers/basic_inner_types.idl" - -struct MapShortShort -{ - map var_map_short_short; -}; - -struct MapShortUShort -{ - map var_map_short_ushort; -}; - -struct MapShortLong -{ - map var_map_short_long; -}; - -struct MapShortULong -{ - map var_map_short_ulong; -}; - -struct MapShortLongLong -{ - map var_map_short_longlong; -}; - -struct MapShortULongLong -{ - map var_map_short_ulonglong; -}; - -struct MapShortFloat -{ - map var_map_short_float; -}; - -struct MapShortDouble -{ - map var_map_short_double; -}; - -struct MapShortLongDouble -{ - map var_map_short_longdouble; -}; - -struct MapShortBoolean -{ - map var_map_short_boolean; -}; - -struct MapShortOctet -{ - map var_map_short_octet; -}; - -struct MapShortChar -{ - map var_map_short_char; -}; - -struct MapShortWChar -{ - map var_map_short_wchar; -}; - -struct MapShortString -{ - map var_map_short_string; -}; - -struct MapShortWString -{ - map var_map_short_wstring; -}; - -struct MapShortInnerAliasBoundedStringHelper -{ - map var_map_short_inneraliasboundedstringhelper; -}; - -struct MapShortInnerAliasBoundedWStringHelper -{ - map var_map_short_inneraliasboundedwstringhelper; -}; - -struct MapShortInnerEnumHelper -{ - map var_map_short_innerenumhelper; -}; - -struct MapShortInnerBitMaskHelper -{ - map var_map_short_innerbitmaskhelper; -}; - -struct MapShortInnerAliasHelper -{ - map var_map_short_inneraliashelper; -}; - -struct MapShortInnerAliasArrayHelper -{ - map var_map_short_inneraliasarrayhelper; -}; - -struct MapShortInnerAliasSequenceHelper -{ - map var_map_short_inneraliassequencehelper; -}; - -struct MapShortInnerAliasMapHelper -{ - map var_map_short_inneraliasmaphelper; -}; - -struct MapShortInnerUnionHelper -{ - map var_map_short_innerunionhelper; -}; - -struct MapShortInnerStructureHelper -{ - map var_map_short_innerstructurehelper; -}; - -struct MapShortInnerBitsetHelper -{ - map var_map_short_innerbitsethelper; -}; - - - - - -struct MapUShortShort -{ - map var_map_ushort_short; -}; - -struct MapUShortUShort -{ - map var_map_ushort_ushort; -}; - -struct MapUShortLong -{ - map var_map_ushort_long; -}; - -struct MapUShortULong -{ - map var_map_ushort_ulong; -}; - -struct MapUShortLongLong -{ - map var_map_ushort_longlong; -}; - -struct MapUShortULongLong -{ - map var_map_ushort_ulonglong; -}; - -struct MapUShortFloat -{ - map var_map_ushort_float; -}; - -struct MapUShortDouble -{ - map var_map_ushort_double; -}; - -struct MapUShortLongDouble -{ - map var_map_ushort_longdouble; -}; - -struct MapUShortBoolean -{ - map var_map_ushort_boolean; -}; - -struct MapUShortOctet -{ - map var_map_ushort_octet; -}; - -struct MapUShortChar -{ - map var_map_ushort_char; -}; - -struct MapUShortWChar -{ - map var_map_ushort_wchar; -}; - -struct MapUShortString -{ - map var_map_ushort_string; -}; - -struct MapUShortWString -{ - map var_map_ushort_wstring; -}; - -struct MapUShortInnerAliasBoundedStringHelper -{ - map var_map_ushort_inneraliasboundedstringhelper; -}; - -struct MapUShortInnerAliasBoundedWStringHelper -{ - map var_map_ushort_inneraliasboundedwstringhelper; -}; - -struct MapUShortInnerEnumHelper -{ - map var_map_ushort_innerenumhelper; -}; - -struct MapUShortInnerBitMaskHelper -{ - map var_map_ushort_innerbitmaskhelper; -}; - -struct MapUShortInnerAliasHelper -{ - map var_map_ushort_inneraliashelper; -}; - -struct MapUShortInnerAliasArrayHelper -{ - map var_map_ushort_inneraliasarrayhelper; -}; - -struct MapUShortInnerAliasSequenceHelper -{ - map var_map_ushort_inneraliassequencehelper; -}; - -struct MapUShortInnerAliasMapHelper -{ - map var_map_ushort_inneraliasmaphelper; -}; - -struct MapUShortInnerUnionHelper -{ - map var_map_ushort_innerunionhelper; -}; - -struct MapUShortInnerStructureHelper -{ - map var_map_ushort_innerstructurehelper; -}; - -struct MapUShortInnerBitsetHelper -{ - map var_map_ushort_innerbitsethelper; -}; - - - - - -struct MapLongShort -{ - map var_map_long_short; -}; - -struct MapLongUShort -{ - map var_map_long_ushort; -}; - -struct MapLongLong -{ - map var_map_long_long; -}; - -struct MapLongULong -{ - map var_map_long_ulong; -}; - -struct MapLongKeyLongLongValue -{ - map var_map_long_longlong; -}; - -struct MapLongULongLong -{ - map var_map_long_ulonglong; -}; - -struct MapLongFloat -{ - map var_map_long_float; -}; - -struct MapLongDouble -{ - map var_map_long_double; -}; - -struct MapLongKeyLongDoubleValue -{ - map var_map_long_longdouble; -}; - -struct MapLongBoolean -{ - map var_map_long_boolean; -}; - -struct MapLongOctet -{ - map var_map_long_octet; -}; - -struct MapLongChar -{ - map var_map_long_char; -}; - -struct MapLongWChar -{ - map var_map_long_wchar; -}; - -struct MapLongString -{ - map var_map_long_string; -}; - -struct MapLongWString -{ - map var_map_long_wstring; -}; - -struct MapLongInnerAliasBoundedStringHelper -{ - map var_map_long_inneraliasboundedstringhelper; -}; - -struct MapLongInnerAliasBoundedWStringHelper -{ - map var_map_long_inneraliasboundedwstringhelper; -}; - -struct MapLongInnerEnumHelper -{ - map var_map_long_innerenumhelper; -}; - -struct MapLongInnerBitMaskHelper -{ - map var_map_long_innerbitmaskhelper; -}; - -struct MapLongInnerAliasHelper -{ - map var_map_long_inneraliashelper; -}; - -struct MapLongInnerAliasArrayHelper -{ - map var_map_long_inneraliasarrayhelper; -}; - -struct MapLongInnerAliasSequenceHelper -{ - map var_map_long_inneraliassequencehelper; -}; - -struct MapLongInnerAliasMapHelper -{ - map var_map_long_inneraliasmaphelper; -}; - -struct MapLongInnerUnionHelper -{ - map var_map_long_innerunionhelper; -}; - -struct MapLongInnerStructureHelper -{ - map var_map_long_innerstructurehelper; -}; - -struct MapLongInnerBitsetHelper -{ - map var_map_long_innerbitsethelper; -}; - - - - -struct MapULongShort -{ - map var_map_ulong_short; -}; - -struct MapULongUShort -{ - map var_map_ulong_ushort; -}; - -struct MapULongLong -{ - map var_map_ulong_long; -}; - -struct MapULongULong -{ - map var_map_ulong_ulong; -}; - -struct MapKeyULongValueLongLong -{ - map var_map_ulong_longlong; -}; - -struct MapULongULongLong -{ - map var_map_ulong_ulonglong; -}; - -struct MapULongFloat -{ - map var_map_ulong_float; -}; - -struct MapULongDouble -{ - map var_map_ulong_double; -}; - -struct MapKeyULongValueLongDouble -{ - map var_map_ulong_longdouble; -}; - -struct MapULongBoolean -{ - map var_map_ulong_boolean; -}; - -struct MapULongOctet -{ - map var_map_ulong_octet; -}; - -struct MapULongChar -{ - map var_map_ulong_char; -}; - -struct MapULongWChar -{ - map var_map_ulong_wchar; -}; - -struct MapULongString -{ - map var_map_ulong_string; -}; - -struct MapULongWString -{ - map var_map_ulong_wstring; -}; - -struct MapULongInnerAliasBoundedStringHelper -{ - map var_map_ulong_inneraliasboundedstringhelper; -}; - -struct MapULongInnerAliasBoundedWStringHelper -{ - map var_map_ulong_inneraliasboundedwstringhelper; -}; - -struct MapULongInnerEnumHelper -{ - map var_map_ulong_innerenumhelper; -}; - -struct MapULongInnerBitMaskHelper -{ - map var_map_ulong_innerbitmaskhelper; -}; - -struct MapULongInnerAliasHelper -{ - map var_map_ulong_inneraliashelper; -}; - -struct MapULongInnerAliasArrayHelper -{ - map var_map_ulong_inneraliasarrayhelper; -}; - -struct MapULongInnerAliasSequenceHelper -{ - map var_map_ulong_inneraliassequencehelper; -}; - -struct MapULongInnerAliasMapHelper -{ - map var_map_ulong_inneraliasmaphelper; -}; - -struct MapULongInnerUnionHelper -{ - map var_map_ulong_innerunionhelper; -}; - -struct MapULongInnerStructureHelper -{ - map var_map_ulong_innerstructurehelper; -}; - -struct MapULongInnerBitsetHelper -{ - map var_map_ulong_innerbitsethelper; -}; - - - - -struct MapLongLongShort -{ - map var_map_longlong_short; -}; - -struct MapLongLongUShort -{ - map var_map_longlong_ushort; -}; - -struct MapLongLongKeyLongValue -{ - map var_map_longlong_long; -}; - -struct MapLongLongULong -{ - map var_map_longlong_ulong; -}; - -struct MapLongLongLongLong -{ - map var_map_longlong_longlong; -}; - -struct MapLongLongULongLong -{ - map var_map_longlong_ulonglong; -}; - -struct MapLongLongFloat -{ - map var_map_longlong_float; -}; - -struct MapLongLongKeyDoubleValue -{ - map var_map_longlong_double; -}; - -struct MapLongLongLongDouble -{ - map var_map_longlong_longdouble; -}; - -struct MapLongLongBoolean -{ - map var_map_longlong_boolean; -}; - -struct MapLongLongOctet -{ - map var_map_longlong_octet; -}; - -struct MapLongLongChar -{ - map var_map_longlong_char; -}; - -struct MapLongLongWChar -{ - map var_map_longlong_wchar; -}; - -struct MapLongLongString -{ - map var_map_longlong_string; -}; - -struct MapLongLongWString -{ - map var_map_longlong_wstring; -}; - -struct MapLongLongInnerAliasBoundedStringHelper -{ - map var_map_longlong_inneraliasboundedstringhelper; -}; - -struct MapLongLongInnerAliasBoundedWStringHelper -{ - map var_map_longlong_inneraliasboundedwstringhelper; -}; - -struct MapLongLongInnerEnumHelper -{ - map var_map_longlong_innerenumhelper; -}; - -struct MapLongLongInnerBitMaskHelper -{ - map var_map_longlong_innerbitmaskhelper; -}; - -struct MapLongLongInnerAliasHelper -{ - map var_map_longlong_inneraliashelper; -}; - -struct MapLongLongInnerAliasArrayHelper -{ - map var_map_longlong_inneraliasarrayhelper; -}; - -struct MapLongLongInnerAliasSequenceHelper -{ - map var_map_longlong_inneraliassequencehelper; -}; - -struct MapLongLongInnerAliasMapHelper -{ - map var_map_longlong_inneraliasmaphelper; -}; - -struct MapLongLongInnerUnionHelper -{ - map var_map_longlong_innerunionhelper; -}; - -struct MapLongLongInnerStructureHelper -{ - map var_map_longlong_innerstructurehelper; -}; - -struct MapLongLongInnerBitsetHelper -{ - map var_map_longlong_innerbitsethelper; -}; - - - - - - -struct MapULongLongShort -{ - map var_map_u_long_long_short; -}; - -struct MapULongLongUShort -{ - map var_map_u_long_long_u_short; -}; - -struct MapULongLongLong -{ - map var_map_u_long_long_long; -}; - -struct MapULongLongULong -{ - map var_map_u_long_long_u_long; -}; - -struct MapULongLongLongLong -{ - map var_map_u_long_long_long_long; -}; - -struct MapULongLongULongLong -{ - map var_map_u_long_long_u_long_long; -}; - -struct MapULongLongFloat -{ - map var_map_u_long_long_float; -}; - -struct MapKeyULongLongValueDouble -{ - map var_map_u_long_long_double; -}; - -struct MapULongLongLongDouble -{ - map var_map_u_long_long_long_double; -}; - -struct MapULongLongBoolean -{ - map var_map_u_long_long_boolean; -}; - -struct MapULongLongOctet -{ - map var_map_u_long_long_octet; -}; - -struct MapULongLongChar -{ - map var_map_u_long_long_char; -}; - -struct MapULongLongWChar -{ - map var_map_u_long_long_wchar; -}; - -struct MapULongLongString -{ - map var_map_u_long_long_string; -}; - -struct MapULongLongWString -{ - map var_map_u_long_long_wstring; -}; - -struct MapULongLongInnerAliasBoundedStringHelper -{ - map var_map_u_long_long_inner_alias_bounded_string_helper; -}; - -struct MapULongLongInnerAliasBoundedWStringHelper -{ - map var_map_u_long_long_inner_alias_bounded_wstring_helper; -}; - -struct MapULongLongInnerEnumHelper -{ - map var_map_u_long_long_inner_enum_helper; -}; - -struct MapULongLongInnerBitMaskHelper -{ - map var_map_u_long_long_inner_bit_mask_helper; -}; - -struct MapULongLongInnerAliasHelper -{ - map var_map_u_long_long_inner_alias_helper; -}; - -struct MapULongLongInnerAliasArrayHelper -{ - map var_map_u_long_long_inner_alias_array_helper; -}; - -struct MapULongLongInnerAliasSequenceHelper -{ - map var_map_u_long_long_inner_alias_sequence_helper; -}; - -struct MapULongLongInnerAliasMapHelper -{ - map var_map_u_long_long_inner_alias_map_helper; -}; - -struct MapULongLongInnerUnionHelper -{ - map var_map_u_long_long_inner_union_helper; -}; - -struct MapULongLongInnerStructureHelper -{ - map var_map_u_long_long_inner_structure_helper; -}; - -struct MapULongLongInnerBitsetHelper -{ - map var_map_u_long_long_inner_bitset_helper; -}; - - - - -struct MapStringShort -{ - map var_map_string_short; -}; - -struct MapStringUShort -{ - map var_map_string_ushort; -}; - -struct MapStringLong -{ - map var_map_string_long; -}; - -struct MapStringULong -{ - map var_map_string_ulong; -}; - -struct MapStringLongLong -{ - map var_map_string_longlong; -}; - -struct MapStringULongLong -{ - map var_map_string_ulonglong; -}; - -struct MapStringFloat -{ - map var_map_string_float; -}; - -struct MapStringDouble -{ - map var_map_string_double; -}; - -struct MapStringLongDouble -{ - map var_map_string_longdouble; -}; - -struct MapStringBoolean -{ - map var_map_string_boolean; -}; - -struct MapStringOctet -{ - map var_map_string_octet; -}; - -struct MapStringChar -{ - map var_map_string_char; -}; - -struct MapStringWChar -{ - map var_map_string_wchar; -}; - -struct MapStringString -{ - map var_map_string_string; -}; - -struct MapStringWString -{ - map var_map_string_wstring; -}; - -struct MapStringInnerAliasBoundedStringHelper -{ - map var_map_string_inneraliasboundedstringhelper; -}; - -struct MapStringInnerAliasBoundedWStringHelper -{ - map var_map_string_inneraliasboundedwstringhelper; -}; - -struct MapStringInnerEnumHelper -{ - map var_map_string_innerenumhelper; -}; - -struct MapStringInnerBitMaskHelper -{ - map var_map_string_innerbitmaskhelper; -}; - -struct MapStringInnerAliasHelper -{ - map var_map_string_inneraliashelper; -}; - -struct MapStringInnerAliasArrayHelper -{ - map var_map_string_inneraliasarrayhelper; -}; - -struct MapStringInnerAliasSequenceHelper -{ - map var_map_string_inneraliassequencehelper; -}; - -struct MapStringInnerAliasMapHelper -{ - map var_map_string_inneraliasmaphelper; -}; - -struct MapStringInnerUnionHelper -{ - map var_map_string_innerunionhelper; -}; - -struct MapStringInnerStructureHelper -{ - map var_map_string_innerstructurehelper; -}; - -struct MapStringInnerBitsetHelper -{ - map var_map_string_innerbitsethelper; -}; - - - -struct MapWStringShort -{ - map var_map_wstring_short; -}; - -struct MapWStringUShort -{ - map var_map_wstring_ushort; -}; - -struct MapWStringLong -{ - map var_map_wstring_long; -}; - -struct MapWStringULong -{ - map var_map_wstring_ulong; -}; - -struct MapWStringLongLong -{ - map var_map_wstring_longlong; -}; - -struct MapWStringULongLong -{ - map var_map_wstring_ulonglong; -}; - -struct MapWStringFloat -{ - map var_map_wstring_float; -}; - -struct MapWStringDouble -{ - map var_map_wstring_double; -}; - -struct MapWStringLongDouble -{ - map var_map_wstring_longdouble; -}; - -struct MapWStringBoolean -{ - map var_map_wstring_boolean; -}; - -struct MapWStringOctet -{ - map var_map_wstring_octet; -}; - -struct MapWStringChar -{ - map var_map_wstring_char; -}; - -struct MapWStringWChar -{ - map var_map_wstring_wchar; -}; - -struct MapWStringString -{ - map var_map_wstring_string; -}; - -struct MapWStringWString -{ - map var_map_wstring_wstring; -}; - -struct MapWStringInnerAliasBoundedStringHelper -{ - map var_map_wstring_inneraliasboundedstringhelper; -}; - -struct MapWStringInnerAliasBoundedWStringHelper -{ - map var_map_wstring_inneraliasboundedwstringhelper; -}; - -struct MapWStringInnerEnumHelper -{ - map var_map_wstring_innerenumhelper; -}; - -struct MapWStringInnerBitMaskHelper -{ - map var_map_wstring_innerbitmaskhelper; -}; - -struct MapWStringInnerAliasHelper -{ - map var_map_wstring_inneraliashelper; -}; - -struct MapWStringInnerAliasArrayHelper -{ - map var_map_wstring_inneraliasarrayhelper; -}; - -struct MapWStringInnerAliasSequenceHelper -{ - map var_map_wstring_inneraliassequencehelper; -}; - -struct MapWStringInnerAliasMapHelper -{ - map var_map_wstring_inneraliasmaphelper; -}; - -struct MapWStringInnerUnionHelper -{ - map var_map_wstring_innerunionhelper; -}; - -struct MapWStringInnerStructureHelper -{ - map var_map_wstring_innerstructurehelper; -}; - -struct MapWStringInnerBitsetHelper -{ - map var_map_wstring_innerbitsethelper; -}; - - - -struct MapInnerAliasBoundedStringHelperShort -{ - map var_map_inneraliasboundedstringhelper_short; -}; - -struct MapInnerAliasBoundedStringHelperUShort -{ - map var_map_inneraliasboundedstringhelper_ushort; -}; - -struct MapInnerAliasBoundedStringHelperLong -{ - map var_map_inneraliasboundedstringhelper_long; -}; - -struct MapInnerAliasBoundedStringHelperULong -{ - map var_map_inneraliasboundedstringhelper_ulong; -}; - -struct MapInnerAliasBoundedStringHelperLongLong -{ - map var_map_inneraliasboundedstringhelper_longlong; -}; - -struct MapInnerAliasBoundedStringHelperULongLong -{ - map var_map_inneraliasboundedstringhelper_ulonglong; -}; - -struct MapInnerAliasBoundedStringHelperFloat -{ - map var_map_inneraliasboundedstringhelper_float; -}; - -struct MapInnerAliasBoundedStringHelperDouble -{ - map var_map_inneraliasboundedstringhelper_double; -}; - -struct MapInnerAliasBoundedStringHelperLongDouble -{ - map var_map_inneraliasboundedstringhelper_longdouble; -}; - -struct MapInnerAliasBoundedStringHelperBoolean -{ - map var_map_inneraliasboundedstringhelper_boolean; -}; - -struct MapInnerAliasBoundedStringHelperOctet -{ - map var_map_inneraliasboundedstringhelper_octet; -}; - -struct MapInnerAliasBoundedStringHelperChar -{ - map var_map_inneraliasboundedstringhelper_char; -}; - -struct MapInnerAliasBoundedStringHelperWChar -{ - map var_map_inneraliasboundedstringhelper_wchar; -}; - -struct MapInnerAliasBoundedStringHelperString -{ - map var_map_inneraliasboundedstringhelper_string; -}; - -struct MapInnerAliasBoundedStringHelperWString -{ - map var_map_inneraliasboundedstringhelper_wstring; -}; - -struct MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper -{ - map var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; -}; - -struct MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper -{ - map var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; -}; - -struct MapInnerAliasBoundedStringHelperInnerEnumHelper -{ - map var_map_inneraliasboundedstringhelper_innerenumhelper; -}; - -struct MapInnerAliasBoundedStringHelperInnerBitMaskHelper -{ - map var_map_inneraliasboundedstringhelper_innerbitmaskhelper; -}; - -struct MapInnerAliasBoundedStringHelperInnerAliasHelper -{ - map var_map_inneraliasboundedstringhelper_inneraliashelper; -}; - -struct MapInnerAliasBoundedStringHelperInnerAliasArrayHelper -{ - map var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; -}; - -struct MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper -{ - map var_map_inneraliasboundedstringhelper_inneraliassequencehelper; -}; - -struct MapInnerAliasBoundedStringHelperInnerAliasMapHelper -{ - map var_map_inneraliasboundedstringhelper_inneraliasmaphelper; -}; - -struct MapInnerAliasBoundedStringHelperInnerUnionHelper -{ - map var_map_inneraliasboundedstringhelper_innerunionhelper; -}; - -struct MapInnerAliasBoundedStringHelperInnerStructureHelper -{ - map var_map_inneraliasboundedstringhelper_innerstructurehelper; -}; - -struct MapInnerAliasBoundedStringHelperInnerBitsetHelper -{ - map var_map_inneraliasboundedstringhelper_innerbitsethelper; -}; - -struct MapInnerAliasBoundedWStringHelperShort -{ - map var_map_inneraliasboundedwstringhelper_short; -}; - -struct MapInnerAliasBoundedWStringHelperUShort -{ - map var_map_inneraliasboundedwstringhelper_ushort; -}; - -struct MapInnerAliasBoundedWStringHelperLong -{ - map var_map_inneraliasboundedwstringhelper_long; -}; - -struct MapInnerAliasBoundedWStringHelperULong -{ - map var_map_inneraliasboundedwstringhelper_ulong; -}; - -struct MapInnerAliasBoundedWStringHelperLongLong -{ - map var_map_inneraliasboundedwstringhelper_longlong; -}; - -struct MapInnerAliasBoundedWStringHelperULongLong -{ - map var_map_inneraliasboundedwstringhelper_ulonglong; -}; - -struct MapInnerAliasBoundedWStringHelperFloat -{ - map var_map_inneraliasboundedwstringhelper_float; -}; - -struct MapInnerAliasBoundedWStringHelperDouble -{ - map var_map_inneraliasboundedwstringhelper_double; -}; - -struct MapInnerAliasBoundedWStringHelperLongDouble -{ - map var_map_inneraliasboundedwstringhelper_longdouble; -}; - -struct MapInnerAliasBoundedWStringHelperBoolean -{ - map var_map_inneraliasboundedwstringhelper_boolean; -}; - -struct MapInnerAliasBoundedWStringHelperOctet -{ - map var_map_inneraliasboundedwstringhelper_octet; -}; - -struct MapInnerAliasBoundedWStringHelperChar -{ - map var_map_inneraliasboundedwstringhelper_char; -}; - -struct MapInnerAliasBoundedWStringHelperWChar -{ - map var_map_inneraliasboundedwstringhelper_wchar; -}; - -struct MapInnerAliasBoundedWStringHelperString -{ - map var_map_inneraliasboundedwstringhelper_string; -}; - -struct MapInnerAliasBoundedWStringHelperWString -{ - map var_map_inneraliasboundedwstringhelper_wstring; -}; - -struct MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper -{ - map var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; -}; - -struct MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper -{ - map var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; -}; - -struct MapInnerAliasBoundedWStringHelperInnerEnumHelper -{ - map var_map_inneraliasboundedwstringhelper_innerenumhelper; -}; - -struct MapInnerAliasBoundedWStringHelperInnerBitMaskHelper -{ - map var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; -}; - -struct MapInnerAliasBoundedWStringHelperInnerAliasHelper -{ - map var_map_inneraliasboundedwstringhelper_inneraliashelper; -}; - -struct MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper -{ - map var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; -}; - -struct MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper -{ - map var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; -}; - -struct MapInnerAliasBoundedWStringHelperInnerAliasMapHelper -{ - map var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; -}; - -struct MapInnerAliasBoundedWStringHelperInnerUnionHelper -{ - map var_map_inneraliasboundedwstringhelper_innerunionhelper; -}; - -struct MapInnerAliasBoundedWStringHelperInnerStructureHelper -{ - map var_map_inneraliasboundedwstringhelper_innerstructurehelper; -}; - -struct MapInnerAliasBoundedWStringHelperInnerBitsetHelper -{ - map var_map_inneraliasboundedwstringhelper_innerbitsethelper; -}; - - -struct BoundedSmallMap -{ - map var_small_map; - map var_unbounded_string_long_bounded_small_map; - map var_long_unbounded_string_bounded_small_map; -}; - -struct BoundedLargeMap -{ - map var_large_map; - map var_unbounded_string_long_bounded_large_map; - map var_long_unbounded_string_bounded_large_map; -}; +#include "helpers/basic_inner_types.idl" + +struct MapShortShort +{ + map var_map_short_short; +}; + +struct MapShortUShort +{ + map var_map_short_ushort; +}; + +struct MapShortLong +{ + map var_map_short_long; +}; + +struct MapShortULong +{ + map var_map_short_ulong; +}; + +struct MapShortLongLong +{ + map var_map_short_longlong; +}; + +struct MapShortULongLong +{ + map var_map_short_ulonglong; +}; + +struct MapShortFloat +{ + map var_map_short_float; +}; + +struct MapShortDouble +{ + map var_map_short_double; +}; + +struct MapShortLongDouble +{ + map var_map_short_longdouble; +}; + +struct MapShortBoolean +{ + map var_map_short_boolean; +}; + +struct MapShortOctet +{ + map var_map_short_octet; +}; + +struct MapShortChar +{ + map var_map_short_char; +}; + +struct MapShortWChar +{ + map var_map_short_wchar; +}; + +struct MapShortString +{ + map var_map_short_string; +}; + +struct MapShortWString +{ + map var_map_short_wstring; +}; + +struct MapShortInnerAliasBoundedStringHelper +{ + map var_map_short_inneraliasboundedstringhelper; +}; + +struct MapShortInnerAliasBoundedWStringHelper +{ + map var_map_short_inneraliasboundedwstringhelper; +}; + +struct MapShortInnerEnumHelper +{ + map var_map_short_innerenumhelper; +}; + +struct MapShortInnerBitMaskHelper +{ + map var_map_short_innerbitmaskhelper; +}; + +struct MapShortInnerAliasHelper +{ + map var_map_short_inneraliashelper; +}; + +struct MapShortInnerAliasArrayHelper +{ + map var_map_short_inneraliasarrayhelper; +}; + +struct MapShortInnerAliasSequenceHelper +{ + map var_map_short_inneraliassequencehelper; +}; + +struct MapShortInnerAliasMapHelper +{ + map var_map_short_inneraliasmaphelper; +}; + +struct MapShortInnerUnionHelper +{ + map var_map_short_innerunionhelper; +}; + +struct MapShortInnerStructureHelper +{ + map var_map_short_innerstructurehelper; +}; + +struct MapShortInnerBitsetHelper +{ + map var_map_short_innerbitsethelper; +}; + + + + + +struct MapUShortShort +{ + map var_map_ushort_short; +}; + +struct MapUShortUShort +{ + map var_map_ushort_ushort; +}; + +struct MapUShortLong +{ + map var_map_ushort_long; +}; + +struct MapUShortULong +{ + map var_map_ushort_ulong; +}; + +struct MapUShortLongLong +{ + map var_map_ushort_longlong; +}; + +struct MapUShortULongLong +{ + map var_map_ushort_ulonglong; +}; + +struct MapUShortFloat +{ + map var_map_ushort_float; +}; + +struct MapUShortDouble +{ + map var_map_ushort_double; +}; + +struct MapUShortLongDouble +{ + map var_map_ushort_longdouble; +}; + +struct MapUShortBoolean +{ + map var_map_ushort_boolean; +}; + +struct MapUShortOctet +{ + map var_map_ushort_octet; +}; + +struct MapUShortChar +{ + map var_map_ushort_char; +}; + +struct MapUShortWChar +{ + map var_map_ushort_wchar; +}; + +struct MapUShortString +{ + map var_map_ushort_string; +}; + +struct MapUShortWString +{ + map var_map_ushort_wstring; +}; + +struct MapUShortInnerAliasBoundedStringHelper +{ + map var_map_ushort_inneraliasboundedstringhelper; +}; + +struct MapUShortInnerAliasBoundedWStringHelper +{ + map var_map_ushort_inneraliasboundedwstringhelper; +}; + +struct MapUShortInnerEnumHelper +{ + map var_map_ushort_innerenumhelper; +}; + +struct MapUShortInnerBitMaskHelper +{ + map var_map_ushort_innerbitmaskhelper; +}; + +struct MapUShortInnerAliasHelper +{ + map var_map_ushort_inneraliashelper; +}; + +struct MapUShortInnerAliasArrayHelper +{ + map var_map_ushort_inneraliasarrayhelper; +}; + +struct MapUShortInnerAliasSequenceHelper +{ + map var_map_ushort_inneraliassequencehelper; +}; + +struct MapUShortInnerAliasMapHelper +{ + map var_map_ushort_inneraliasmaphelper; +}; + +struct MapUShortInnerUnionHelper +{ + map var_map_ushort_innerunionhelper; +}; + +struct MapUShortInnerStructureHelper +{ + map var_map_ushort_innerstructurehelper; +}; + +struct MapUShortInnerBitsetHelper +{ + map var_map_ushort_innerbitsethelper; +}; + + + + + +struct MapLongShort +{ + map var_map_long_short; +}; + +struct MapLongUShort +{ + map var_map_long_ushort; +}; + +struct MapLongLong +{ + map var_map_long_long; +}; + +struct MapLongULong +{ + map var_map_long_ulong; +}; + +struct MapLongKeyLongLongValue +{ + map var_map_long_longlong; +}; + +struct MapLongULongLong +{ + map var_map_long_ulonglong; +}; + +struct MapLongFloat +{ + map var_map_long_float; +}; + +struct MapLongDouble +{ + map var_map_long_double; +}; + +struct MapLongKeyLongDoubleValue +{ + map var_map_long_longdouble; +}; + +struct MapLongBoolean +{ + map var_map_long_boolean; +}; + +struct MapLongOctet +{ + map var_map_long_octet; +}; + +struct MapLongChar +{ + map var_map_long_char; +}; + +struct MapLongWChar +{ + map var_map_long_wchar; +}; + +struct MapLongString +{ + map var_map_long_string; +}; + +struct MapLongWString +{ + map var_map_long_wstring; +}; + +struct MapLongInnerAliasBoundedStringHelper +{ + map var_map_long_inneraliasboundedstringhelper; +}; + +struct MapLongInnerAliasBoundedWStringHelper +{ + map var_map_long_inneraliasboundedwstringhelper; +}; + +struct MapLongInnerEnumHelper +{ + map var_map_long_innerenumhelper; +}; + +struct MapLongInnerBitMaskHelper +{ + map var_map_long_innerbitmaskhelper; +}; + +struct MapLongInnerAliasHelper +{ + map var_map_long_inneraliashelper; +}; + +struct MapLongInnerAliasArrayHelper +{ + map var_map_long_inneraliasarrayhelper; +}; + +struct MapLongInnerAliasSequenceHelper +{ + map var_map_long_inneraliassequencehelper; +}; + +struct MapLongInnerAliasMapHelper +{ + map var_map_long_inneraliasmaphelper; +}; + +struct MapLongInnerUnionHelper +{ + map var_map_long_innerunionhelper; +}; + +struct MapLongInnerStructureHelper +{ + map var_map_long_innerstructurehelper; +}; + +struct MapLongInnerBitsetHelper +{ + map var_map_long_innerbitsethelper; +}; + + + + +struct MapULongShort +{ + map var_map_ulong_short; +}; + +struct MapULongUShort +{ + map var_map_ulong_ushort; +}; + +struct MapULongLong +{ + map var_map_ulong_long; +}; + +struct MapULongULong +{ + map var_map_ulong_ulong; +}; + +struct MapKeyULongValueLongLong +{ + map var_map_ulong_longlong; +}; + +struct MapULongULongLong +{ + map var_map_ulong_ulonglong; +}; + +struct MapULongFloat +{ + map var_map_ulong_float; +}; + +struct MapULongDouble +{ + map var_map_ulong_double; +}; + +struct MapKeyULongValueLongDouble +{ + map var_map_ulong_longdouble; +}; + +struct MapULongBoolean +{ + map var_map_ulong_boolean; +}; + +struct MapULongOctet +{ + map var_map_ulong_octet; +}; + +struct MapULongChar +{ + map var_map_ulong_char; +}; + +struct MapULongWChar +{ + map var_map_ulong_wchar; +}; + +struct MapULongString +{ + map var_map_ulong_string; +}; + +struct MapULongWString +{ + map var_map_ulong_wstring; +}; + +struct MapULongInnerAliasBoundedStringHelper +{ + map var_map_ulong_inneraliasboundedstringhelper; +}; + +struct MapULongInnerAliasBoundedWStringHelper +{ + map var_map_ulong_inneraliasboundedwstringhelper; +}; + +struct MapULongInnerEnumHelper +{ + map var_map_ulong_innerenumhelper; +}; + +struct MapULongInnerBitMaskHelper +{ + map var_map_ulong_innerbitmaskhelper; +}; + +struct MapULongInnerAliasHelper +{ + map var_map_ulong_inneraliashelper; +}; + +struct MapULongInnerAliasArrayHelper +{ + map var_map_ulong_inneraliasarrayhelper; +}; + +struct MapULongInnerAliasSequenceHelper +{ + map var_map_ulong_inneraliassequencehelper; +}; + +struct MapULongInnerAliasMapHelper +{ + map var_map_ulong_inneraliasmaphelper; +}; + +struct MapULongInnerUnionHelper +{ + map var_map_ulong_innerunionhelper; +}; + +struct MapULongInnerStructureHelper +{ + map var_map_ulong_innerstructurehelper; +}; + +struct MapULongInnerBitsetHelper +{ + map var_map_ulong_innerbitsethelper; +}; + + + + +struct MapLongLongShort +{ + map var_map_longlong_short; +}; + +struct MapLongLongUShort +{ + map var_map_longlong_ushort; +}; + +struct MapLongLongKeyLongValue +{ + map var_map_longlong_long; +}; + +struct MapLongLongULong +{ + map var_map_longlong_ulong; +}; + +struct MapLongLongLongLong +{ + map var_map_longlong_longlong; +}; + +struct MapLongLongULongLong +{ + map var_map_longlong_ulonglong; +}; + +struct MapLongLongFloat +{ + map var_map_longlong_float; +}; + +struct MapLongLongKeyDoubleValue +{ + map var_map_longlong_double; +}; + +struct MapLongLongLongDouble +{ + map var_map_longlong_longdouble; +}; + +struct MapLongLongBoolean +{ + map var_map_longlong_boolean; +}; + +struct MapLongLongOctet +{ + map var_map_longlong_octet; +}; + +struct MapLongLongChar +{ + map var_map_longlong_char; +}; + +struct MapLongLongWChar +{ + map var_map_longlong_wchar; +}; + +struct MapLongLongString +{ + map var_map_longlong_string; +}; + +struct MapLongLongWString +{ + map var_map_longlong_wstring; +}; + +struct MapLongLongInnerAliasBoundedStringHelper +{ + map var_map_longlong_inneraliasboundedstringhelper; +}; + +struct MapLongLongInnerAliasBoundedWStringHelper +{ + map var_map_longlong_inneraliasboundedwstringhelper; +}; + +struct MapLongLongInnerEnumHelper +{ + map var_map_longlong_innerenumhelper; +}; + +struct MapLongLongInnerBitMaskHelper +{ + map var_map_longlong_innerbitmaskhelper; +}; + +struct MapLongLongInnerAliasHelper +{ + map var_map_longlong_inneraliashelper; +}; + +struct MapLongLongInnerAliasArrayHelper +{ + map var_map_longlong_inneraliasarrayhelper; +}; + +struct MapLongLongInnerAliasSequenceHelper +{ + map var_map_longlong_inneraliassequencehelper; +}; + +struct MapLongLongInnerAliasMapHelper +{ + map var_map_longlong_inneraliasmaphelper; +}; + +struct MapLongLongInnerUnionHelper +{ + map var_map_longlong_innerunionhelper; +}; + +struct MapLongLongInnerStructureHelper +{ + map var_map_longlong_innerstructurehelper; +}; + +struct MapLongLongInnerBitsetHelper +{ + map var_map_longlong_innerbitsethelper; +}; + + + + + + +struct MapULongLongShort +{ + map var_map_u_long_long_short; +}; + +struct MapULongLongUShort +{ + map var_map_u_long_long_u_short; +}; + +struct MapULongLongLong +{ + map var_map_u_long_long_long; +}; + +struct MapULongLongULong +{ + map var_map_u_long_long_u_long; +}; + +struct MapULongLongLongLong +{ + map var_map_u_long_long_long_long; +}; + +struct MapULongLongULongLong +{ + map var_map_u_long_long_u_long_long; +}; + +struct MapULongLongFloat +{ + map var_map_u_long_long_float; +}; + +struct MapKeyULongLongValueDouble +{ + map var_map_u_long_long_double; +}; + +struct MapULongLongLongDouble +{ + map var_map_u_long_long_long_double; +}; + +struct MapULongLongBoolean +{ + map var_map_u_long_long_boolean; +}; + +struct MapULongLongOctet +{ + map var_map_u_long_long_octet; +}; + +struct MapULongLongChar +{ + map var_map_u_long_long_char; +}; + +struct MapULongLongWChar +{ + map var_map_u_long_long_wchar; +}; + +struct MapULongLongString +{ + map var_map_u_long_long_string; +}; + +struct MapULongLongWString +{ + map var_map_u_long_long_wstring; +}; + +struct MapULongLongInnerAliasBoundedStringHelper +{ + map var_map_u_long_long_inner_alias_bounded_string_helper; +}; + +struct MapULongLongInnerAliasBoundedWStringHelper +{ + map var_map_u_long_long_inner_alias_bounded_wstring_helper; +}; + +struct MapULongLongInnerEnumHelper +{ + map var_map_u_long_long_inner_enum_helper; +}; + +struct MapULongLongInnerBitMaskHelper +{ + map var_map_u_long_long_inner_bit_mask_helper; +}; + +struct MapULongLongInnerAliasHelper +{ + map var_map_u_long_long_inner_alias_helper; +}; + +struct MapULongLongInnerAliasArrayHelper +{ + map var_map_u_long_long_inner_alias_array_helper; +}; + +struct MapULongLongInnerAliasSequenceHelper +{ + map var_map_u_long_long_inner_alias_sequence_helper; +}; + +struct MapULongLongInnerAliasMapHelper +{ + map var_map_u_long_long_inner_alias_map_helper; +}; + +struct MapULongLongInnerUnionHelper +{ + map var_map_u_long_long_inner_union_helper; +}; + +struct MapULongLongInnerStructureHelper +{ + map var_map_u_long_long_inner_structure_helper; +}; + +struct MapULongLongInnerBitsetHelper +{ + map var_map_u_long_long_inner_bitset_helper; +}; + + + + +struct MapStringShort +{ + map var_map_string_short; +}; + +struct MapStringUShort +{ + map var_map_string_ushort; +}; + +struct MapStringLong +{ + map var_map_string_long; +}; + +struct MapStringULong +{ + map var_map_string_ulong; +}; + +struct MapStringLongLong +{ + map var_map_string_longlong; +}; + +struct MapStringULongLong +{ + map var_map_string_ulonglong; +}; + +struct MapStringFloat +{ + map var_map_string_float; +}; + +struct MapStringDouble +{ + map var_map_string_double; +}; + +struct MapStringLongDouble +{ + map var_map_string_longdouble; +}; + +struct MapStringBoolean +{ + map var_map_string_boolean; +}; + +struct MapStringOctet +{ + map var_map_string_octet; +}; + +struct MapStringChar +{ + map var_map_string_char; +}; + +struct MapStringWChar +{ + map var_map_string_wchar; +}; + +struct MapStringString +{ + map var_map_string_string; +}; + +struct MapStringWString +{ + map var_map_string_wstring; +}; + +struct MapStringInnerAliasBoundedStringHelper +{ + map var_map_string_inneraliasboundedstringhelper; +}; + +struct MapStringInnerAliasBoundedWStringHelper +{ + map var_map_string_inneraliasboundedwstringhelper; +}; + +struct MapStringInnerEnumHelper +{ + map var_map_string_innerenumhelper; +}; + +struct MapStringInnerBitMaskHelper +{ + map var_map_string_innerbitmaskhelper; +}; + +struct MapStringInnerAliasHelper +{ + map var_map_string_inneraliashelper; +}; + +struct MapStringInnerAliasArrayHelper +{ + map var_map_string_inneraliasarrayhelper; +}; + +struct MapStringInnerAliasSequenceHelper +{ + map var_map_string_inneraliassequencehelper; +}; + +struct MapStringInnerAliasMapHelper +{ + map var_map_string_inneraliasmaphelper; +}; + +struct MapStringInnerUnionHelper +{ + map var_map_string_innerunionhelper; +}; + +struct MapStringInnerStructureHelper +{ + map var_map_string_innerstructurehelper; +}; + +struct MapStringInnerBitsetHelper +{ + map var_map_string_innerbitsethelper; +}; + + + +struct MapWStringShort +{ + map var_map_wstring_short; +}; + +struct MapWStringUShort +{ + map var_map_wstring_ushort; +}; + +struct MapWStringLong +{ + map var_map_wstring_long; +}; + +struct MapWStringULong +{ + map var_map_wstring_ulong; +}; + +struct MapWStringLongLong +{ + map var_map_wstring_longlong; +}; + +struct MapWStringULongLong +{ + map var_map_wstring_ulonglong; +}; + +struct MapWStringFloat +{ + map var_map_wstring_float; +}; + +struct MapWStringDouble +{ + map var_map_wstring_double; +}; + +struct MapWStringLongDouble +{ + map var_map_wstring_longdouble; +}; + +struct MapWStringBoolean +{ + map var_map_wstring_boolean; +}; + +struct MapWStringOctet +{ + map var_map_wstring_octet; +}; + +struct MapWStringChar +{ + map var_map_wstring_char; +}; + +struct MapWStringWChar +{ + map var_map_wstring_wchar; +}; + +struct MapWStringString +{ + map var_map_wstring_string; +}; + +struct MapWStringWString +{ + map var_map_wstring_wstring; +}; + +struct MapWStringInnerAliasBoundedStringHelper +{ + map var_map_wstring_inneraliasboundedstringhelper; +}; + +struct MapWStringInnerAliasBoundedWStringHelper +{ + map var_map_wstring_inneraliasboundedwstringhelper; +}; + +struct MapWStringInnerEnumHelper +{ + map var_map_wstring_innerenumhelper; +}; + +struct MapWStringInnerBitMaskHelper +{ + map var_map_wstring_innerbitmaskhelper; +}; + +struct MapWStringInnerAliasHelper +{ + map var_map_wstring_inneraliashelper; +}; + +struct MapWStringInnerAliasArrayHelper +{ + map var_map_wstring_inneraliasarrayhelper; +}; + +struct MapWStringInnerAliasSequenceHelper +{ + map var_map_wstring_inneraliassequencehelper; +}; + +struct MapWStringInnerAliasMapHelper +{ + map var_map_wstring_inneraliasmaphelper; +}; + +struct MapWStringInnerUnionHelper +{ + map var_map_wstring_innerunionhelper; +}; + +struct MapWStringInnerStructureHelper +{ + map var_map_wstring_innerstructurehelper; +}; + +struct MapWStringInnerBitsetHelper +{ + map var_map_wstring_innerbitsethelper; +}; + + + +struct MapInnerAliasBoundedStringHelperShort +{ + map var_map_inneraliasboundedstringhelper_short; +}; + +struct MapInnerAliasBoundedStringHelperUShort +{ + map var_map_inneraliasboundedstringhelper_ushort; +}; + +struct MapInnerAliasBoundedStringHelperLong +{ + map var_map_inneraliasboundedstringhelper_long; +}; + +struct MapInnerAliasBoundedStringHelperULong +{ + map var_map_inneraliasboundedstringhelper_ulong; +}; + +struct MapInnerAliasBoundedStringHelperLongLong +{ + map var_map_inneraliasboundedstringhelper_longlong; +}; + +struct MapInnerAliasBoundedStringHelperULongLong +{ + map var_map_inneraliasboundedstringhelper_ulonglong; +}; + +struct MapInnerAliasBoundedStringHelperFloat +{ + map var_map_inneraliasboundedstringhelper_float; +}; + +struct MapInnerAliasBoundedStringHelperDouble +{ + map var_map_inneraliasboundedstringhelper_double; +}; + +struct MapInnerAliasBoundedStringHelperLongDouble +{ + map var_map_inneraliasboundedstringhelper_longdouble; +}; + +struct MapInnerAliasBoundedStringHelperBoolean +{ + map var_map_inneraliasboundedstringhelper_boolean; +}; + +struct MapInnerAliasBoundedStringHelperOctet +{ + map var_map_inneraliasboundedstringhelper_octet; +}; + +struct MapInnerAliasBoundedStringHelperChar +{ + map var_map_inneraliasboundedstringhelper_char; +}; + +struct MapInnerAliasBoundedStringHelperWChar +{ + map var_map_inneraliasboundedstringhelper_wchar; +}; + +struct MapInnerAliasBoundedStringHelperString +{ + map var_map_inneraliasboundedstringhelper_string; +}; + +struct MapInnerAliasBoundedStringHelperWString +{ + map var_map_inneraliasboundedstringhelper_wstring; +}; + +struct MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper +{ + map var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; +}; + +struct MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper +{ + map var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; +}; + +struct MapInnerAliasBoundedStringHelperInnerEnumHelper +{ + map var_map_inneraliasboundedstringhelper_innerenumhelper; +}; + +struct MapInnerAliasBoundedStringHelperInnerBitMaskHelper +{ + map var_map_inneraliasboundedstringhelper_innerbitmaskhelper; +}; + +struct MapInnerAliasBoundedStringHelperInnerAliasHelper +{ + map var_map_inneraliasboundedstringhelper_inneraliashelper; +}; + +struct MapInnerAliasBoundedStringHelperInnerAliasArrayHelper +{ + map var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; +}; + +struct MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper +{ + map var_map_inneraliasboundedstringhelper_inneraliassequencehelper; +}; + +struct MapInnerAliasBoundedStringHelperInnerAliasMapHelper +{ + map var_map_inneraliasboundedstringhelper_inneraliasmaphelper; +}; + +struct MapInnerAliasBoundedStringHelperInnerUnionHelper +{ + map var_map_inneraliasboundedstringhelper_innerunionhelper; +}; + +struct MapInnerAliasBoundedStringHelperInnerStructureHelper +{ + map var_map_inneraliasboundedstringhelper_innerstructurehelper; +}; + +struct MapInnerAliasBoundedStringHelperInnerBitsetHelper +{ + map var_map_inneraliasboundedstringhelper_innerbitsethelper; +}; + +struct MapInnerAliasBoundedWStringHelperShort +{ + map var_map_inneraliasboundedwstringhelper_short; +}; + +struct MapInnerAliasBoundedWStringHelperUShort +{ + map var_map_inneraliasboundedwstringhelper_ushort; +}; + +struct MapInnerAliasBoundedWStringHelperLong +{ + map var_map_inneraliasboundedwstringhelper_long; +}; + +struct MapInnerAliasBoundedWStringHelperULong +{ + map var_map_inneraliasboundedwstringhelper_ulong; +}; + +struct MapInnerAliasBoundedWStringHelperLongLong +{ + map var_map_inneraliasboundedwstringhelper_longlong; +}; + +struct MapInnerAliasBoundedWStringHelperULongLong +{ + map var_map_inneraliasboundedwstringhelper_ulonglong; +}; + +struct MapInnerAliasBoundedWStringHelperFloat +{ + map var_map_inneraliasboundedwstringhelper_float; +}; + +struct MapInnerAliasBoundedWStringHelperDouble +{ + map var_map_inneraliasboundedwstringhelper_double; +}; + +struct MapInnerAliasBoundedWStringHelperLongDouble +{ + map var_map_inneraliasboundedwstringhelper_longdouble; +}; + +struct MapInnerAliasBoundedWStringHelperBoolean +{ + map var_map_inneraliasboundedwstringhelper_boolean; +}; + +struct MapInnerAliasBoundedWStringHelperOctet +{ + map var_map_inneraliasboundedwstringhelper_octet; +}; + +struct MapInnerAliasBoundedWStringHelperChar +{ + map var_map_inneraliasboundedwstringhelper_char; +}; + +struct MapInnerAliasBoundedWStringHelperWChar +{ + map var_map_inneraliasboundedwstringhelper_wchar; +}; + +struct MapInnerAliasBoundedWStringHelperString +{ + map var_map_inneraliasboundedwstringhelper_string; +}; + +struct MapInnerAliasBoundedWStringHelperWString +{ + map var_map_inneraliasboundedwstringhelper_wstring; +}; + +struct MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper +{ + map var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; +}; + +struct MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper +{ + map var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; +}; + +struct MapInnerAliasBoundedWStringHelperInnerEnumHelper +{ + map var_map_inneraliasboundedwstringhelper_innerenumhelper; +}; + +struct MapInnerAliasBoundedWStringHelperInnerBitMaskHelper +{ + map var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; +}; + +struct MapInnerAliasBoundedWStringHelperInnerAliasHelper +{ + map var_map_inneraliasboundedwstringhelper_inneraliashelper; +}; + +struct MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper +{ + map var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; +}; + +struct MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper +{ + map var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; +}; + +struct MapInnerAliasBoundedWStringHelperInnerAliasMapHelper +{ + map var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; +}; + +struct MapInnerAliasBoundedWStringHelperInnerUnionHelper +{ + map var_map_inneraliasboundedwstringhelper_innerunionhelper; +}; + +struct MapInnerAliasBoundedWStringHelperInnerStructureHelper +{ + map var_map_inneraliasboundedwstringhelper_innerstructurehelper; +}; + +struct MapInnerAliasBoundedWStringHelperInnerBitsetHelper +{ + map var_map_inneraliasboundedwstringhelper_innerbitsethelper; +}; + + +struct BoundedSmallMap +{ + map var_small_map; + map var_unbounded_string_long_bounded_small_map; + map var_long_unbounded_string_bounded_small_map; +}; + +struct BoundedLargeMap +{ + map var_large_map; + map var_unbounded_string_long_bounded_large_map; + map var_long_unbounded_string_bounded_large_map; +}; diff --git a/IDL/primitives.idl b/IDL/primitives.idl index d1bb472..34f5cdf 100644 --- a/IDL/primitives.idl +++ b/IDL/primitives.idl @@ -1,103 +1,103 @@ -struct ShortStruct -{ - short var_short; -}; - -struct UShortStruct -{ - unsigned short var_ushort; -}; - -struct LongStruct -{ - long var_long; -}; - -struct ULongStruct -{ - unsigned long var_ulong; -}; - -struct LongLongStruct -{ - long long var_longlong; -}; - -struct ULongLongStruct -{ - unsigned long long var_ulonglong; -}; - -struct FloatStruct -{ - float var_float; -}; - -struct DoubleStruct -{ - double var_double; -}; - -struct LongDoubleStruct -{ - long double var_longdouble; -}; - -struct BooleanStruct -{ - boolean var_boolean; -}; - -struct OctetStruct -{ - octet var_octet; -}; - -struct CharStruct -{ - char var_char8; -}; - -struct WCharStruct -{ - wchar var_char16; -}; - -struct Int8Struct -{ - int8 var_int8; -}; -struct Uint8Struct -{ - uint8 var_uint8; -}; - -struct Int16Struct -{ - int16 var_int16; -}; - -struct Uint16Struct -{ - uint16 var_uint16; -}; - -struct Int32Struct -{ - int32 var_int32; -}; - -struct Uint32Struct -{ - uint32 var_uint32; -}; - -struct Int64Struct -{ - int64 var_int64; -}; - -struct Uint64Struct -{ - uint64 var_uint64; -}; +struct ShortStruct +{ + short var_short; +}; + +struct UShortStruct +{ + unsigned short var_ushort; +}; + +struct LongStruct +{ + long var_long; +}; + +struct ULongStruct +{ + unsigned long var_ulong; +}; + +struct LongLongStruct +{ + long long var_longlong; +}; + +struct ULongLongStruct +{ + unsigned long long var_ulonglong; +}; + +struct FloatStruct +{ + float var_float; +}; + +struct DoubleStruct +{ + double var_double; +}; + +struct LongDoubleStruct +{ + long double var_longdouble; +}; + +struct BooleanStruct +{ + boolean var_boolean; +}; + +struct OctetStruct +{ + octet var_octet; +}; + +struct CharStruct +{ + char var_char8; +}; + +struct WCharStruct +{ + wchar var_char16; +}; + +struct Int8Struct +{ + int8 var_int8; +}; +struct Uint8Struct +{ + uint8 var_uint8; +}; + +struct Int16Struct +{ + int16 var_int16; +}; + +struct Uint16Struct +{ + uint16 var_uint16; +}; + +struct Int32Struct +{ + int32 var_int32; +}; + +struct Uint32Struct +{ + uint32 var_uint32; +}; + +struct Int64Struct +{ + int64 var_int64; +}; + +struct Uint64Struct +{ + uint64 var_uint64; +}; diff --git a/IDL/relative_path_include.idl b/IDL/relative_path_include.idl index a995178..cf907e4 100644 --- a/IDL/relative_path_include.idl +++ b/IDL/relative_path_include.idl @@ -1,6 +1,6 @@ -#include "../IDL/helpers/basic_inner_types.idl" - -struct RelativePathIncludeStruct -{ - InnerEnumHelper value; -}; +#include "../IDL/helpers/basic_inner_types.idl" + +struct RelativePathIncludeStruct +{ + InnerEnumHelper value; +}; diff --git a/IDL/sequences.idl b/IDL/sequences.idl index f9df6e3..f86ec13 100644 --- a/IDL/sequences.idl +++ b/IDL/sequences.idl @@ -1,144 +1,143 @@ -#include "helpers/basic_inner_types.idl" - -struct SequenceShort -{ - sequence var_sequence_short; -}; - -struct SequenceUShort -{ - sequence var_sequence_ushort; -}; - -struct SequenceLong -{ - sequence var_sequence_long; -}; - -struct SequenceULong -{ - sequence var_sequence_ulong; -}; - -struct SequenceLongLong -{ - sequence var_sequence_longlong; -}; - -struct SequenceULongLong -{ - sequence var_sequence_ulonglong; -}; - -struct SequenceFloat -{ - sequence var_sequence_float; -}; - -struct SequenceDouble -{ - sequence var_sequence_double; -}; - -struct SequenceLongDouble -{ - sequence var_sequence_longdouble; -}; - -struct SequenceBoolean -{ - sequence var_sequence_boolean; -}; - -struct SequenceOctet -{ - sequence var_sequence_octet; -}; - -struct SequenceChar -{ - sequence var_sequence_char; -}; - -struct SequenceWChar -{ - sequence var_sequence_wchar; -}; - -struct SequenceString -{ - sequence var_sequence_string; -}; - -struct SequenceWString -{ - sequence var_sequence_wstring; -}; - -struct SequenceStringBounded -{ - sequence var_sequence_bounded_string; -}; - -struct SequenceWStringBounded -{ - sequence var_sequence_bounded_wstring; -}; - -struct SequenceEnum -{ - sequence var_sequence_enum; -}; - -struct SequenceBitMask -{ - sequence var_sequence_bitmask; -}; - -struct SequenceAlias -{ - sequence var_sequence_alias; -}; - -struct SequenceShortArray -{ - sequence var_sequence_short_array; -}; - -struct SequenceSequence -{ - sequence var_sequence_sequence; -}; - -struct SequenceMap -{ - sequence var_sequence_map; -}; - -struct SequenceUnion -{ - sequence var_sequence_union; -}; - -struct SequenceStructure -{ - sequence var_sequence_structure; -}; - -struct SequenceBitset -{ - sequence var_sequence_bitset; -}; - -struct BoundedSmallSequences -{ - sequence var_sequence_small; - sequence var_unbounded_string_small_bounded_sequence; -}; - -struct BoundedBigSequences -{ - sequence var_sequence_big; - sequence var_unbounded_string_large_bounded_sequence; -}; - +#include "helpers/basic_inner_types.idl" + +struct SequenceShort +{ + sequence var_sequence_short; +}; + +struct SequenceUShort +{ + sequence var_sequence_ushort; +}; + +struct SequenceLong +{ + sequence var_sequence_long; +}; + +struct SequenceULong +{ + sequence var_sequence_ulong; +}; + +struct SequenceLongLong +{ + sequence var_sequence_longlong; +}; + +struct SequenceULongLong +{ + sequence var_sequence_ulonglong; +}; + +struct SequenceFloat +{ + sequence var_sequence_float; +}; + +struct SequenceDouble +{ + sequence var_sequence_double; +}; + +struct SequenceLongDouble +{ + sequence var_sequence_longdouble; +}; + +struct SequenceBoolean +{ + sequence var_sequence_boolean; +}; + +struct SequenceOctet +{ + sequence var_sequence_octet; +}; + +struct SequenceChar +{ + sequence var_sequence_char; +}; + +struct SequenceWChar +{ + sequence var_sequence_wchar; +}; + +struct SequenceString +{ + sequence var_sequence_string; +}; + +struct SequenceWString +{ + sequence var_sequence_wstring; +}; + +struct SequenceStringBounded +{ + sequence var_sequence_bounded_string; +}; + +struct SequenceWStringBounded +{ + sequence var_sequence_bounded_wstring; +}; + +struct SequenceEnum +{ + sequence var_sequence_enum; +}; + +struct SequenceBitMask +{ + sequence var_sequence_bitmask; +}; + +struct SequenceAlias +{ + sequence var_sequence_alias; +}; + +struct SequenceShortArray +{ + sequence var_sequence_short_array; +}; + +struct SequenceSequence +{ + sequence var_sequence_sequence; +}; + +struct SequenceMap +{ + sequence var_sequence_map; +}; + +struct SequenceUnion +{ + sequence var_sequence_union; +}; + +struct SequenceStructure +{ + sequence var_sequence_structure; +}; + +struct SequenceBitset +{ + sequence var_sequence_bitset; +}; + +struct BoundedSmallSequences +{ + sequence var_sequence_small; + sequence var_unbounded_string_small_bounded_sequence; +}; + +struct BoundedBigSequences +{ + sequence var_sequence_big; + sequence var_unbounded_string_large_bounded_sequence; +}; diff --git a/IDL/strings.idl b/IDL/strings.idl index 11b66c9..0b58b85 100644 --- a/IDL/strings.idl +++ b/IDL/strings.idl @@ -1,29 +1,29 @@ -struct StringStruct -{ - string var_string8; -}; - -struct WStringStruct -{ - wstring var_string16; -}; - -struct SmallStringStruct -{ - string<1> var_small_string; -}; - -struct SmallWStringStruct -{ - wstring<1> var_small_wstring; -}; - -struct LargeStringStruct -{ - string<41925> var_large_string; -}; - -struct LargeWStringStruct -{ - wstring<41925> var_large_wstring; -}; \ No newline at end of file +struct StringStruct +{ + string var_string8; +}; + +struct WStringStruct +{ + wstring var_string16; +}; + +struct SmallStringStruct +{ + string<1> var_small_string; +}; + +struct SmallWStringStruct +{ + wstring<1> var_small_wstring; +}; + +struct LargeStringStruct +{ + string<41925> var_large_string; +}; + +struct LargeWStringStruct +{ + wstring<41925> var_large_wstring; +}; diff --git a/IDL/structures.idl b/IDL/structures.idl index e0f85f5..95c5f6d 100644 --- a/IDL/structures.idl +++ b/IDL/structures.idl @@ -1,206 +1,206 @@ -#include "helpers/basic_inner_types.idl" - -struct StructShort -{ - short var_short; -}; - -struct StructUnsignedShort -{ - unsigned short var_ushort; -}; - -struct StructLong -{ - long var_long; -}; - -struct StructUnsignedLong -{ - unsigned long var_ulong; -}; - -struct StructLongLong -{ - long long var_longlong; -}; - -struct StructUnsignedLongLong -{ - unsigned long long var_ulonglong; -}; - -struct StructFloat -{ - float var_float; -}; - -struct StructDouble -{ - double var_double; -}; - -struct StructLongDouble -{ - long double var_longdouble; -}; - -struct StructBoolean -{ - boolean var_boolean; -}; - -struct StructOctet -{ - octet var_octet; -}; - -struct StructChar8 -{ - char var_char8; -}; - -struct StructChar16 -{ - wchar var_char16; -}; - -struct StructString -{ - string var_string; -}; - -struct StructWString -{ - wstring var_wstring; -}; - -struct StructBoundedString -{ - Inner_alias_bounded_string_helper var_bounded_string; -}; - -struct StructBoundedWString -{ - Inner_alias_bounded_wstring_helper var_bounded_wstring; -}; - -struct StructEnum -{ - InnerEnumHelper var_enum; -}; - -struct StructBitMask -{ - InnerBitMaskHelper var_bitmask; -}; - -struct StructAlias -{ - InnerAliasHelper var_alias; -}; - -struct StructShortArray -{ - short var_array_short[10]; -}; - -struct StructSequence -{ - sequence var_sequence; -}; - -struct StructMap -{ - map var_map; -}; - -struct StructUnion -{ - InnerUnionHelper var_union; -}; - -struct StructStructure -{ - InnerStructureHelper var_structure; -}; - -struct StructBitset -{ - InnerBitsetHelper var_bitset; -}; - -struct StructEmpty -{ -}; - -struct Structures -{ - StructShort var_StructShort; - StructUnsignedShort var_StructUnsignedShort; - StructLong var_StructLong; - StructUnsignedLong var_StructUnsignedLong; - StructLongLong var_StructLongLong; - StructUnsignedLongLong var_StructUnsignedLongLong; - StructFloat var_StructFloat; - StructDouble var_StructDouble; - StructLongDouble var_StructLongDouble; - StructBoolean var_StructBoolean; - StructOctet var_StructOctet; - StructChar8 var_StructChar8; - StructChar16 var_StructChar16; - StructString var_StructString; - StructWString var_StructWString; - StructBoundedString var_StructBoundedString; - StructBoundedWString var_StructBoundedWString; - StructEnum var_StructEnum; - StructBitMask var_StructBitMask; - StructAlias var_StructAlias; - StructShortArray var_StructShortArray; - StructSequence var_StructSequence; - StructMap var_StructMap; - StructUnion var_StructUnion; - StructStructure var_StructStructure; - StructBitset var_StructBitset; - StructEmpty var_StructEmpty; -}; - -module testing_1 -{ - struct foo - { - long a; - long b; - }; -}; - -module testing_2 -{ - struct foo - { - boolean d; - }; -}; - -struct bar -{ - double e; -}; - -struct root1 -{ - testing_1::foo foo_struct; - float c; -}; - -struct root2 -{ - testing_2::foo foo_struct; - bar bar_struct; -}; - -struct root -{ - root1 var_root1; - root2 var_root2; -}; +#include "helpers/basic_inner_types.idl" + +struct StructShort +{ + short var_short; +}; + +struct StructUnsignedShort +{ + unsigned short var_ushort; +}; + +struct StructLong +{ + long var_long; +}; + +struct StructUnsignedLong +{ + unsigned long var_ulong; +}; + +struct StructLongLong +{ + long long var_longlong; +}; + +struct StructUnsignedLongLong +{ + unsigned long long var_ulonglong; +}; + +struct StructFloat +{ + float var_float; +}; + +struct StructDouble +{ + double var_double; +}; + +struct StructLongDouble +{ + long double var_longdouble; +}; + +struct StructBoolean +{ + boolean var_boolean; +}; + +struct StructOctet +{ + octet var_octet; +}; + +struct StructChar8 +{ + char var_char8; +}; + +struct StructChar16 +{ + wchar var_char16; +}; + +struct StructString +{ + string var_string; +}; + +struct StructWString +{ + wstring var_wstring; +}; + +struct StructBoundedString +{ + Inner_alias_bounded_string_helper var_bounded_string; +}; + +struct StructBoundedWString +{ + Inner_alias_bounded_wstring_helper var_bounded_wstring; +}; + +struct StructEnum +{ + InnerEnumHelper var_enum; +}; + +struct StructBitMask +{ + InnerBitMaskHelper var_bitmask; +}; + +struct StructAlias +{ + InnerAliasHelper var_alias; +}; + +struct StructShortArray +{ + short var_array_short[10]; +}; + +struct StructSequence +{ + sequence var_sequence; +}; + +struct StructMap +{ + map var_map; +}; + +struct StructUnion +{ + InnerUnionHelper var_union; +}; + +struct StructStructure +{ + InnerStructureHelper var_structure; +}; + +struct StructBitset +{ + InnerBitsetHelper var_bitset; +}; + +struct StructEmpty +{ +}; + +struct Structures +{ + StructShort var_StructShort; + StructUnsignedShort var_StructUnsignedShort; + StructLong var_StructLong; + StructUnsignedLong var_StructUnsignedLong; + StructLongLong var_StructLongLong; + StructUnsignedLongLong var_StructUnsignedLongLong; + StructFloat var_StructFloat; + StructDouble var_StructDouble; + StructLongDouble var_StructLongDouble; + StructBoolean var_StructBoolean; + StructOctet var_StructOctet; + StructChar8 var_StructChar8; + StructChar16 var_StructChar16; + StructString var_StructString; + StructWString var_StructWString; + StructBoundedString var_StructBoundedString; + StructBoundedWString var_StructBoundedWString; + StructEnum var_StructEnum; + StructBitMask var_StructBitMask; + StructAlias var_StructAlias; + StructShortArray var_StructShortArray; + StructSequence var_StructSequence; + StructMap var_StructMap; + StructUnion var_StructUnion; + StructStructure var_StructStructure; + StructBitset var_StructBitset; + StructEmpty var_StructEmpty; +}; + +module testing_1 +{ + struct foo + { + long a; + long b; + }; +}; + +module testing_2 +{ + struct foo + { + boolean d; + }; +}; + +struct bar +{ + double e; +}; + +struct root1 +{ + testing_1::foo foo_struct; + float c; +}; + +struct root2 +{ + testing_2::foo foo_struct; + bar bar_struct; +}; + +struct root +{ + root1 var_root1; + root2 var_root2; +}; diff --git a/IDL/unions.idl b/IDL/unions.idl index ea4bce6..ad9ac3f 100644 --- a/IDL/unions.idl +++ b/IDL/unions.idl @@ -1,460 +1,499 @@ -#include "helpers/basic_inner_types.idl" - -union Union_Short switch (long) -{ - case 0: - short a; -}; - -union Union_UShort switch (long) -{ - case 1: - unsigned short b; -}; - -union Union_Long switch (long) -{ - case 2: - long c; -}; - -union Union_ULong switch (long) -{ - case 3: - unsigned long d; -}; - -union Union_LongLong switch (long) -{ - case 4: - long long e; -}; - -union Union_ULongLOng switch (long) -{ - case 5: - unsigned long long f; -}; - -union Union_Float switch (long) -{ - case 6: - float g; -}; - -union Union_Double switch (long) -{ - case 7: - double h; -}; - -union Union_LongDouble switch (long) -{ - case 8: - long double i; -}; - -union Union_Boolean switch (long) -{ - case 9: - boolean j; -}; - -union Union_Octet switch (long) -{ - case 10: - octet k; -}; - -union Union_Char switch (long) -{ - case 11: - char l; -}; - -union Union_WChar switch (long) -{ - case 12: - wchar m; -}; - -union Union_String switch (long) -{ - case 13: - string n; -}; - -union Union_WString switch (long) -{ - case 14: - wstring o; -}; - -union Union_BoundedString switch (long) -{ - case 13: - Inner_alias_bounded_string_helper bn; -}; - -union Union_BoundedWString switch (long) -{ - case 14: - Inner_alias_bounded_wstring_helper bo; -}; - -union Union_InnerEnumHelper switch (long) -{ - case 15: - InnerEnumHelper p; -}; - -union Union_InnerBitMaskHelper switch (long) -{ - case 16: - InnerBitMaskHelper q; -}; - -union Union_InnerAliasHelper switch (long) -{ - case 17: - InnerAliasHelper r; -}; - -union Union_Array switch (long) -{ - case 18: - Inner_alias_array_helper s; -}; - -union Union_Sequence switch (long) -{ - case 19: - sequence t; -}; - -union Union_Map switch (long) -{ - case 20: - map u; -}; - -union Union_InnerUnionHelper switch (long) -{ - case 21: - InnerUnionHelper v; -}; - -union Union_InnerStructureHelper switch (long) -{ - case 22: - InnerStructureHelper w; -}; - -union Union_InnerBitsetHelper switch (long) -{ - case 23: - InnerBitsetHelper x; -}; - -union Union_Discriminator_short switch (short) -{ - case 1: - long first; - case -2: - long long second; -}; - -union Union_Discriminator_unsigned_short switch (unsigned short) -{ - case 1: - long first; - case 2: - long long second; -}; - -union Union_Discriminator_long switch (long) -{ - case 1: - long first; - case -2: - long long second; -}; - -union Union_Discriminator_unsigned_long switch (unsigned long) -{ - case 1: - long first; - case 2: - long long second; -}; - -union Union_Discriminator_long_long switch (long long) -{ - case 1: - long first; - case -2: - long long second; -}; - -union Union_Discriminator_unsigned_long_long switch (unsigned long long) -{ - case 2: - long first; - case 1: - long long second; -}; - -union Union_Discriminator_boolean switch (boolean) -{ - case TRUE: - long first; - case FALSE: - long long second; -}; - -union Union_Discriminator_octet switch (octet) -{ - case 0: - long first; - case 1: - long long second; -}; - -union Union_Discriminator_char switch (char) -{ - case 'a': - long first; - case 'b': - long long second; -}; - -union Union_Discriminator_wchar switch (wchar) -{ - case L'a': - long first; - case L'b': - long long second; -}; - -union Union_Discriminator_enum switch (InnerEnumHelper) -{ - case ENUM_VALUE_1: - long first; - case ENUM_VALUE_2: - long long second; - default: - octet third; -}; - -union Union_Discriminator_enum_labels switch (InnerEnumHelper) -{ - case ENUM_VALUE_3: - case ENUM_VALUE_1: - short first; - case ENUM_VALUE_2: - short second; -}; - -union Union_Discriminator_alias switch (InnerAliasHelper) -{ - case 1: - long first; - case 2: - long long second; -}; - - -struct UnionShort -{ - Union_Short var_union_short; -}; - -struct UnionUShort -{ - Union_UShort var_union_ushort; -}; - -struct UnionLong -{ - Union_Long var_union_long; -}; - -struct UnionULong -{ - Union_ULong var_union_ulong; -}; - -struct UnionLongLong -{ - Union_LongLong var_union_long_long; -}; - -struct UnionULongLong -{ - Union_ULongLOng var_union_ulong_long; -}; - -struct UnionFloat -{ - Union_Float var_union_float; -}; - -struct UnionDouble -{ - Union_Double var_union_double; -}; - -struct UnionLongDouble -{ - Union_LongDouble var_union_long_double; -}; - -struct UnionBoolean -{ - Union_Boolean var_union_boolean; -}; - -struct UnionOctet -{ - Union_Octet var_union_octet; -}; - -struct UnionChar -{ - Union_Char var_union_char; -}; - -struct UnionWChar -{ - Union_WChar var_union_wchar; -}; - -struct UnionString -{ - Union_String var_union_string; -}; - -struct UnionWString -{ - Union_WString var_union_wstring; -}; - -struct UnionBoundedString -{ - Union_BoundedString var_union_bounded_string; -}; - -struct UnionBoundedWString -{ - Union_BoundedWString var_union_bounded_wstring; -}; - -struct UnionInnerEnumHelper -{ - Union_InnerEnumHelper var_union_my_enum; -}; - -struct UnionInnerBitMaskHelper -{ - Union_InnerBitMaskHelper var_union_my_bit_mask; -}; - -struct UnionInnerAliasHelper -{ - Union_InnerAliasHelper var_union_my_alias; -}; - -struct UnionArray -{ - Union_Array var_union_array; -}; - -struct UnionSequence -{ - Union_Sequence var_union_sequence; -}; - -struct UnionMap -{ - Union_Map var_union_map; -}; - -struct UnionInnerUnionHelper -{ - Union_InnerUnionHelper var_union_my_union; -}; - -struct UnionInnerStructureHelper -{ - Union_InnerStructureHelper var_union_my_structure; -}; - -struct UnionInnerBitsetHelper -{ - Union_InnerBitsetHelper var_union_my_bitset; -}; - -struct UnionDiscriminatorShort -{ - Union_Discriminator_short var_union_discriminator_short; -}; - -struct UnionDiscriminatorUShort -{ - Union_Discriminator_unsigned_short var_union_discriminator_ushort; -}; - -struct UnionDiscriminatorLong -{ - Union_Discriminator_long var_union_discriminator_long; -}; - -struct UnionDiscriminatorULong -{ - Union_Discriminator_unsigned_long var_union_discriminator_ulong; -}; - -struct UnionDiscriminatorLongLong -{ - Union_Discriminator_long_long var_union_discriminator_long_long; -}; - -struct UnionDiscriminatorULongLong -{ - Union_Discriminator_unsigned_long_long var_union_discriminator_ulong_long; -}; - -struct UnionDiscriminatorBoolean -{ - Union_Discriminator_boolean var_union_discriminator_boolean; -}; - -struct UnionDiscriminatorOctet -{ - Union_Discriminator_octet var_union_discriminator_octet; -}; - -struct UnionDiscriminatorChar -{ - Union_Discriminator_char var_union_discriminator_char; -}; - -struct UnionDiscriminatorWChar -{ - Union_Discriminator_wchar var_union_discriminator_wchar; -}; - -struct UnionDiscriminatorEnum -{ - Union_Discriminator_enum var_union_discriminator_enum; -}; - -struct UnionDiscriminatorEnumLabel -{ - Union_Discriminator_enum_labels var_union_discriminator_enum; -}; - -struct UnionDiscriminatorAlias -{ - Union_Discriminator_alias var_union_discriminator_alias; -}; +#include "helpers/basic_inner_types.idl" + +union Union_Short switch (long) +{ + case 0: + short a; +}; + +union Union_UShort switch (long) +{ + case 1: + unsigned short b; +}; + +union Union_Long switch (long) +{ + case 2: + long c; +}; + +union Union_ULong switch (long) +{ + case 3: + unsigned long d; +}; + +union Union_LongLong switch (long) +{ + case 4: + long long e; +}; + +union Union_ULongLOng switch (long) +{ + case 5: + unsigned long long f; +}; + +union Union_Float switch (long) +{ + case 6: + float g; +}; + +union Union_Double switch (long) +{ + case 7: + double h; +}; + +union Union_LongDouble switch (long) +{ + case 8: + long double i; +}; + +union Union_Boolean switch (long) +{ + case 9: + boolean j; +}; + +union Union_Octet switch (long) +{ + case 10: + octet k; +}; + +union Union_Char switch (long) +{ + case 11: + char l; +}; + +union Union_WChar switch (long) +{ + case 12: + wchar m; +}; + +union Union_String switch (long) +{ + case 13: + string n; +}; + +union Union_WString switch (long) +{ + case 14: + wstring o; +}; + +union Union_BoundedString switch (long) +{ + case 13: + Inner_alias_bounded_string_helper bn; +}; + +union Union_BoundedWString switch (long) +{ + case 14: + Inner_alias_bounded_wstring_helper bo; +}; + +union Union_InnerEnumHelper switch (long) +{ + case 15: + InnerEnumHelper p; +}; + +union Union_InnerBitMaskHelper switch (long) +{ + case 16: + InnerBitMaskHelper q; +}; + +union Union_InnerAliasHelper switch (long) +{ + case 17: + InnerAliasHelper r; +}; + +union Union_Array switch (long) +{ + case 18: + Inner_alias_array_helper s; +}; + +union Union_Sequence switch (long) +{ + case 19: + sequence t; +}; + +union Union_Map switch (long) +{ + case 20: + map u; +}; + +union Union_InnerUnionHelper switch (long) +{ + case 21: + InnerUnionHelper v; +}; + +union Union_InnerStructureHelper switch (long) +{ + case 22: + InnerStructureHelper w; +}; + +union Union_InnerBitsetHelper switch (long) +{ + case 23: + InnerBitsetHelper x; +}; + +union Union_Discriminator_short switch (short) +{ + case 1: + long first; + case -2: + long long second; +}; + +union Union_Discriminator_unsigned_short switch (unsigned short) +{ + case 1: + long first; + case 2: + long long second; +}; + +union Union_Discriminator_long switch (long) +{ + case 1: + long first; + case -2: + long long second; +}; + +union Union_Discriminator_unsigned_long switch (unsigned long) +{ + case 1: + long first; + case 2: + long long second; +}; + +union Union_Discriminator_long_long switch (long long) +{ + case 1: + long first; + case -2: + long long second; +}; + +union Union_Discriminator_unsigned_long_long switch (unsigned long long) +{ + case 2: + long first; + case 1: + long long second; +}; + +union Union_Discriminator_boolean switch (boolean) +{ + case TRUE: + long first; + case FALSE: + long long second; +}; + +union Union_Discriminator_octet switch (octet) +{ + case 0: + long first; + case 1: + long long second; +}; + +union Union_Discriminator_char switch (char) +{ + case 'a': + long first; + case 'b': + long long second; +}; + +union Union_Discriminator_wchar switch (wchar) +{ + case L'a': + long first; + case L'b': + long long second; +}; + +union Union_Discriminator_enum switch (InnerEnumHelper) +{ + case ENUM_VALUE_1: + long first; + case ENUM_VALUE_2: + long long second; + default: + octet third; +}; + +union Union_Discriminator_enum_labels switch (InnerEnumHelper) +{ + case ENUM_VALUE_3: + case ENUM_VALUE_1: + short first; + case ENUM_VALUE_2: + short second; +}; + +union Union_Discriminator_alias switch (InnerAliasHelper) +{ + case 1: + long first; + case 2: + long long second; +}; + +union Union_Several_Fields switch (long) +{ + case 0: + InnerStructureHelper a; + case 1: + InnerEmptyStructureHelper b; + case 2: + Inner_alias_bounded_string_helper c; + case 3: + Inner_alias_array_helper d; + case 4: + Inner_alias_sequence_helper e; +}; + +union Union_Several_Fields_With_Default switch (long) +{ + case 0: + InnerStructureHelper a; + case 1: + InnerEmptyStructureHelper b; + case 2: + Inner_alias_bounded_string_helper c; + case 3: + Inner_alias_array_helper d; + case 4: + Inner_alias_sequence_helper e; + default: + sequence f; +}; + +struct UnionShort +{ + Union_Short var_union_short; +}; + +struct UnionUShort +{ + Union_UShort var_union_ushort; +}; + +struct UnionLong +{ + Union_Long var_union_long; +}; + +struct UnionULong +{ + Union_ULong var_union_ulong; +}; + +struct UnionLongLong +{ + Union_LongLong var_union_long_long; +}; + +struct UnionULongLong +{ + Union_ULongLOng var_union_ulong_long; +}; + +struct UnionFloat +{ + Union_Float var_union_float; +}; + +struct UnionDouble +{ + Union_Double var_union_double; +}; + +struct UnionLongDouble +{ + Union_LongDouble var_union_long_double; +}; + +struct UnionBoolean +{ + Union_Boolean var_union_boolean; +}; + +struct UnionOctet +{ + Union_Octet var_union_octet; +}; + +struct UnionChar +{ + Union_Char var_union_char; +}; + +struct UnionWChar +{ + Union_WChar var_union_wchar; +}; + +struct UnionString +{ + Union_String var_union_string; +}; + +struct UnionWString +{ + Union_WString var_union_wstring; +}; + +struct UnionBoundedString +{ + Union_BoundedString var_union_bounded_string; +}; + +struct UnionBoundedWString +{ + Union_BoundedWString var_union_bounded_wstring; +}; + +struct UnionInnerEnumHelper +{ + Union_InnerEnumHelper var_union_my_enum; +}; + +struct UnionInnerBitMaskHelper +{ + Union_InnerBitMaskHelper var_union_my_bit_mask; +}; + +struct UnionInnerAliasHelper +{ + Union_InnerAliasHelper var_union_my_alias; +}; + +struct UnionArray +{ + Union_Array var_union_array; +}; + +struct UnionSequence +{ + Union_Sequence var_union_sequence; +}; + +struct UnionMap +{ + Union_Map var_union_map; +}; + +struct UnionInnerUnionHelper +{ + Union_InnerUnionHelper var_union_my_union; +}; + +struct UnionInnerStructureHelper +{ + Union_InnerStructureHelper var_union_my_structure; +}; + +struct UnionInnerBitsetHelper +{ + Union_InnerBitsetHelper var_union_my_bitset; +}; + +struct UnionDiscriminatorShort +{ + Union_Discriminator_short var_union_discriminator_short; +}; + +struct UnionDiscriminatorUShort +{ + Union_Discriminator_unsigned_short var_union_discriminator_ushort; +}; + +struct UnionDiscriminatorLong +{ + Union_Discriminator_long var_union_discriminator_long; +}; + +struct UnionDiscriminatorULong +{ + Union_Discriminator_unsigned_long var_union_discriminator_ulong; +}; + +struct UnionDiscriminatorLongLong +{ + Union_Discriminator_long_long var_union_discriminator_long_long; +}; + +struct UnionDiscriminatorULongLong +{ + Union_Discriminator_unsigned_long_long var_union_discriminator_ulong_long; +}; + +struct UnionDiscriminatorBoolean +{ + Union_Discriminator_boolean var_union_discriminator_boolean; +}; + +struct UnionDiscriminatorOctet +{ + Union_Discriminator_octet var_union_discriminator_octet; +}; + +struct UnionDiscriminatorChar +{ + Union_Discriminator_char var_union_discriminator_char; +}; + +struct UnionDiscriminatorWChar +{ + Union_Discriminator_wchar var_union_discriminator_wchar; +}; + +struct UnionDiscriminatorEnum +{ + Union_Discriminator_enum var_union_discriminator_enum; +}; + +struct UnionDiscriminatorEnumLabel +{ + Union_Discriminator_enum_labels var_union_discriminator_enum; +}; + +struct UnionDiscriminatorAlias +{ + Union_Discriminator_alias var_union_discriminator_alias; +}; + +struct UnionSeveralFields +{ + Union_Several_Fields var_union_several_fields; +}; + +struct UnionSeveralFieldsWithDefault +{ + Union_Several_Fields_With_Default var_union_several_fields_with_default; +}; From f8a4ccaa9201b81c9819fd587beb691e374388ae Mon Sep 17 00:00:00 2001 From: Adrian del Campo <107918259+adriancampo@users.noreply.github.com> Date: Mon, 25 Mar 2024 09:48:44 +0100 Subject: [PATCH 08/11] Refs #20563: Added basic annotated structure (#28) Signed-off-by: adriancampo --- IDL/annotations.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/IDL/annotations.idl b/IDL/annotations.idl index a2f2ffd..26c10fd 100644 --- a/IDL/annotations.idl +++ b/IDL/annotations.idl @@ -59,3 +59,19 @@ struct AnnotatedStruct struct EmptyAnnotatedStruct { }; + +@annotation BasicAnnotationsTest +{ + short var_basic_short; +}; + +@BasicAnnotationsTest( + var_basic_short = 1 + ) +struct BasicAnnotationsStruct +{ + @BasicAnnotationsTest( + var_basic_short = 1 + ) + short basic_annotations_member; +}; From 38ca91a2d718d900b46dc451cdd7f2be627313d9 Mon Sep 17 00:00:00 2001 From: adriancampo Date: Mon, 12 Feb 2024 14:57:54 +0100 Subject: [PATCH 09/11] Refs #20421: Added regresion tests for TypeIdentifier comparation. Signed-off-by: adriancampo --- IDL/structures.idl | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/IDL/structures.idl b/IDL/structures.idl index 95c5f6d..9f27074 100644 --- a/IDL/structures.idl +++ b/IDL/structures.idl @@ -165,6 +165,59 @@ struct Structures StructEmpty var_StructEmpty; }; +struct StructShortBIS +{ + short var_short; +}; + +struct ContentSeqStruct { + sequence var_seq; +}; + +struct ContentBISSeqStruct { + sequence var_seq; +}; + +struct ContentBigSeqStruct { + sequence var_seq; +}; + +struct ContentBISBigSeqStruct { + sequence var_seq; +}; + +struct ContentMapStruct { + map var_map; +}; + +struct ContentBISMapStruct { + map var_map; +}; + +struct ContentBigMapStruct { + map var_map; +}; + +struct ContentBISBigMapStruct { + map var_map; +}; + +struct ContentArrayStruct { + StructShort var_array[10]; +}; + +struct ContentBISArrayStruct { + StructShortBIS var_array[10]; +}; + +struct ContentBigArrayStruct { + StructShort var_array[1000]; +}; + +struct ContentBISBigArrayStruct { + StructShortBIS var_array[1000]; +}; + module testing_1 { struct foo From eb5b5134854c6b830ae132138f4954b471b0ea14 Mon Sep 17 00:00:00 2001 From: adriancampo Date: Mon, 12 Feb 2024 15:23:24 +0100 Subject: [PATCH 10/11] Refs #20421: Applied suggestions. Signed-off-by: adriancampo --- IDL/structures.idl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/IDL/structures.idl b/IDL/structures.idl index 9f27074..d46b4f7 100644 --- a/IDL/structures.idl +++ b/IDL/structures.idl @@ -165,7 +165,7 @@ struct Structures StructEmpty var_StructEmpty; }; -struct StructShortBIS +struct StructShortBis { short var_short; }; @@ -174,48 +174,48 @@ struct ContentSeqStruct { sequence var_seq; }; -struct ContentBISSeqStruct { - sequence var_seq; +struct ContentSeqStructBis { + sequence var_seq; }; struct ContentBigSeqStruct { sequence var_seq; }; -struct ContentBISBigSeqStruct { - sequence var_seq; +struct ContentBigSeqStructBis { + sequence var_seq; }; struct ContentMapStruct { map var_map; }; -struct ContentBISMapStruct { - map var_map; +struct ContentMapStructBis { + map var_map; }; struct ContentBigMapStruct { map var_map; }; -struct ContentBISBigMapStruct { - map var_map; +struct ContentBigMapStructBis { + map var_map; }; struct ContentArrayStruct { StructShort var_array[10]; }; -struct ContentBISArrayStruct { - StructShortBIS var_array[10]; +struct ContentArrayStructBis { + StructShortBis var_array[10]; }; struct ContentBigArrayStruct { StructShort var_array[1000]; }; -struct ContentBISBigArrayStruct { - StructShortBIS var_array[1000]; +struct ContentBigArrayStructBis { + StructShortBis var_array[1000]; }; module testing_1 From 2defa4b988559e38b21c0f5a46624ba58f64c9b4 Mon Sep 17 00:00:00 2001 From: adriancampo Date: Mon, 25 Mar 2024 10:45:20 +0100 Subject: [PATCH 11/11] Refs #20421: Added cases for unions Signed-off-by: adriancampo --- IDL/structures.idl | 24 +++++++------- IDL/unions.idl | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 12 deletions(-) diff --git a/IDL/structures.idl b/IDL/structures.idl index d46b4f7..13fca40 100644 --- a/IDL/structures.idl +++ b/IDL/structures.idl @@ -170,51 +170,51 @@ struct StructShortBis short var_short; }; -struct ContentSeqStruct { +struct ContentStructSeqStruct { sequence var_seq; }; -struct ContentSeqStructBis { +struct ContentStructSeqStructBis { sequence var_seq; }; -struct ContentBigSeqStruct { +struct ContentStructBigSeqStruct { sequence var_seq; }; -struct ContentBigSeqStructBis { +struct ContentStructBigSeqStructBis { sequence var_seq; }; -struct ContentMapStruct { +struct ContentStructMapStruct { map var_map; }; -struct ContentMapStructBis { +struct ContentStructMapStructBis { map var_map; }; -struct ContentBigMapStruct { +struct ContentStructBigMapStruct { map var_map; }; -struct ContentBigMapStructBis { +struct ContentStructBigMapStructBis { map var_map; }; -struct ContentArrayStruct { +struct ContentStructArrayStruct { StructShort var_array[10]; }; -struct ContentArrayStructBis { +struct ContentStructArrayStructBis { StructShortBis var_array[10]; }; -struct ContentBigArrayStruct { +struct ContentStructBigArrayStruct { StructShort var_array[1000]; }; -struct ContentBigArrayStructBis { +struct ContentStructBigArrayStructBis { StructShortBis var_array[1000]; }; diff --git a/IDL/unions.idl b/IDL/unions.idl index ad9ac3f..fb07d9a 100644 --- a/IDL/unions.idl +++ b/IDL/unions.idl @@ -293,6 +293,88 @@ union Union_Several_Fields_With_Default switch (long) sequence f; }; +struct StructForUnionTest +{ + short var_short; +}; + +struct StructForUnionTestBis +{ + short var_short; +}; + +union ContentUnionSeq switch (long) +{ + case 0: + sequence a; +}; + +union ContentUnionSeqBis switch (long) +{ + case 0: + sequence a; +}; + +union ContentUnionBigSeq switch (long) +{ + case 0: + sequence a; +}; + +union ContentUnionBigSeqBis switch (long) +{ + case 0: + sequence a; +}; + +union ContentUnionMap switch (long) +{ + case 0: + map a; +}; + +union ContentUnionMapBis switch (long) +{ + case 0: + map a; +}; + +union ContentUnionBigMap switch (long) +{ + case 0: + map a; +}; + +union ContentUnionBigMapBis switch (long) +{ + case 0: + map a; +}; + +union ContentUnionArray switch (long) +{ + case 0: + StructForUnionTest a[10]; +}; + +union ContentUnionArrayBis switch (long) +{ + case 0: + StructForUnionTestBis a[10]; +}; + +union ContentUnionBigArray switch (long) +{ + case 0: + StructForUnionTest a[1000]; +}; + +union ContentUnionBigArrayBis switch (long) +{ + case 0: + StructForUnionTestBis a[1000]; +}; + struct UnionShort { Union_Short var_union_short;