From 0f55b5ce1515aa0126c01a159be841092e53d972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Thu, 7 Dec 2023 11:16:04 +0100 Subject: [PATCH 1/3] Refs #20084. New idl to tests MemberId settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- IDL/appendable.idl | 5 ++ IDL/final.idl | 5 ++ IDL/member_id.idl | 128 +++++++++++++++++++++++++++++++++++++++++++++ IDL/mutable.idl | 5 ++ 4 files changed, 143 insertions(+) create mode 100644 IDL/member_id.idl diff --git a/IDL/appendable.idl b/IDL/appendable.idl index 74509d0..a4f5f90 100644 --- a/IDL/appendable.idl +++ b/IDL/appendable.idl @@ -97,3 +97,8 @@ struct AppendableInheritanceStruct : AppendableShortStruct struct AppendableInheritanceEmptyStruct : AppendableShortStruct { }; + +struct AppendableExtensibilityInheritance : AppendableShortStruct +{ + long var_long; +}; diff --git a/IDL/final.idl b/IDL/final.idl index c17c591..dcd47f7 100644 --- a/IDL/final.idl +++ b/IDL/final.idl @@ -97,3 +97,8 @@ struct FinalInheritanceStruct : FinalShortStruct struct InheritanceEmptyStruct : FinalShortStruct { }; + +struct FinalExtensibilityInheritance : FinalShortStruct +{ + long var_long; +}; diff --git a/IDL/member_id.idl b/IDL/member_id.idl new file mode 100644 index 0000000..8d56233 --- /dev/null +++ b/IDL/member_id.idl @@ -0,0 +1,128 @@ +@mutable +struct FixId +{ + @id(100) + octet o; + @id(300) + short s; + @id(500) + long l; + long long ll; +}; + +@mutable +struct FixHashidDefault +{ + @hashid + octet o; + @hashid + short s; + @hashid + long l; + long long ll; +}; + +@mutable +struct FixHashid +{ + @hashid("octet") + octet o; + @hashid("short") + short s; + @hashid("long") + long l; + long long ll; +}; + +@mutable +struct FixMix +{ + @id(100) + octet o; + @hashid + short s; + @hashid("long") + long l; + long long ll; +}; + +@mutable +@autoid +struct AutoidDefault +{ + char c; + @id(100) + octet o; + @hashid + short s; + @hashid("long") + long l; + long long ll; +}; + +@mutable +@autoid(SEQUENTIAL) +struct AutoidSequential +{ + char c; + @id(100) + octet o; + @hashid + short s; + @hashid("long") + long l; + long long ll; +}; + +@mutable +@autoid(HASH) +struct AutoidHash +{ + char c; + @id(100) + octet o; + @hashid + short s; + @hashid("long") + long l; + long long ll; +}; + +@autoid +struct DerivedAutoidDefault : AutoidDefault +{ + char cd; + @id(101) + octet od; + @hashid + short sd; + @hashid("long2") + long ld; + long long lld; +}; + +@autoid(SEQUENTIAL) +struct DerivedAutoidSequential : AutoidSequential +{ + char cd; + @id(101) + octet od; + @hashid + short sd; + @hashid("long2") + long ld; + long long lld; +}; + +@autoid(HASH) +struct DerivedAutoidHash : AutoidHash +{ + char cd; + @id(101) + octet od; + @hashid + short sd; + @hashid("long2") + long ld; + long long lld; +}; diff --git a/IDL/mutable.idl b/IDL/mutable.idl index 07c3668..c140a53 100644 --- a/IDL/mutable.idl +++ b/IDL/mutable.idl @@ -97,3 +97,8 @@ struct MutableInheritanceStruct : MutableShortStruct struct MutableInheritanceEmptyStruct : MutableShortStruct { }; + +struct MutableExtensibilityInheritance : MutableShortStruct +{ + long var_long; +}; From 01b76188e9cbee68cdea134a22494945f3bcba66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Thu, 7 Dec 2023 11:18:36 +0100 Subject: [PATCH 2/3] Refs #20084. A derived class cannot has key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- IDL/key.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IDL/key.idl b/IDL/key.idl index 24836b9..a28f7bc 100644 --- a/IDL/key.idl +++ b/IDL/key.idl @@ -83,13 +83,13 @@ struct KeyedEmptyStruct struct KeyedEmptyInheritanceStruct : KeyedEmptyStruct { - @key string key_str; + string key_str; string var_str; }; struct KeyedInheritanceStruct : KeyedShortStruct { - @key string key_str; + string key_str; string var_str; }; From 65376cdee0811f27768b7aa2d1c6096af3b5b497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez=20Moreno?= Date: Mon, 11 Dec 2023 09:16:38 +0100 Subject: [PATCH 3/3] Refs #20084. Apply suggestions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ricardo González Moreno --- IDL/member_id.idl | 97 ++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 61 deletions(-) diff --git a/IDL/member_id.idl b/IDL/member_id.idl index 8d56233..f0b982a 100644 --- a/IDL/member_id.idl +++ b/IDL/member_id.idl @@ -1,48 +1,36 @@ @mutable struct FixId { - @id(100) - octet o; - @id(300) - short s; - @id(500) - long l; + @id(100) octet o; + @id(300) short s; + @id(500) long l; long long ll; }; @mutable struct FixHashidDefault { - @hashid - octet o; - @hashid - short s; - @hashid - long l; + @hashid octet o; + @hashid short s; + @hashid long l; long long ll; }; @mutable struct FixHashid { - @hashid("octet") - octet o; - @hashid("short") - short s; - @hashid("long") - long l; + @hashid("octet") octet o; + @hashid("short") short s; + @hashid("long") long l; long long ll; }; @mutable struct FixMix { - @id(100) - octet o; - @hashid - short s; - @hashid("long") - long l; + @id(100) octet o; + @hashid short s; + @hashid("long") long l; long long ll; }; @@ -51,12 +39,9 @@ struct FixMix struct AutoidDefault { char c; - @id(100) - octet o; - @hashid - short s; - @hashid("long") - long l; + @id(100) octet o; + @hashid short s; + @hashid("long") long l; long long ll; }; @@ -65,12 +50,9 @@ struct AutoidDefault struct AutoidSequential { char c; - @id(100) - octet o; - @hashid - short s; - @hashid("long") - long l; + @id(100) octet o; + @hashid short s; + @hashid("long") long l; long long ll; }; @@ -79,12 +61,9 @@ struct AutoidSequential struct AutoidHash { char c; - @id(100) - octet o; - @hashid - short s; - @hashid("long") - long l; + @id(100) octet o; + @hashid short s; + @hashid("long") long l; long long ll; }; @@ -92,25 +71,24 @@ struct AutoidHash struct DerivedAutoidDefault : AutoidDefault { char cd; - @id(101) - octet od; - @hashid - short sd; - @hashid("long2") - long ld; + @id(101) octet od; + @hashid short sd; + @hashid("long2") long ld; long long lld; }; @autoid(SEQUENTIAL) -struct DerivedAutoidSequential : AutoidSequential +struct DerivedEmptyAutoidSequential : AutoidSequential +{ +}; + +@autoid(SEQUENTIAL) +struct DerivedAutoidSequential : DerivedEmptyAutoidSequential { char cd; - @id(101) - octet od; - @hashid - short sd; - @hashid("long2") - long ld; + @id(101) octet od; + @hashid short sd; + @hashid("long2") long ld; long long lld; }; @@ -118,11 +96,8 @@ struct DerivedAutoidSequential : AutoidSequential struct DerivedAutoidHash : AutoidHash { char cd; - @id(101) - octet od; - @hashid - short sd; - @hashid("long2") - long ld; + @id(101) octet od; + @hashid short sd; + @hashid("long2") long ld; long long lld; };