From e391708ff1026a9040d965e778ea13b66742b98a Mon Sep 17 00:00:00 2001 From: Lev Walkin Date: Wed, 23 Aug 2017 10:29:38 -0700 Subject: [PATCH] regenerated test cases --- .../104-param-1-OK.asn1.-Pfwide-types | 4 +- .../105-param-2-OK.asn1.-Pfwide-types | 12 ++-- .../106-param-constr-OK.asn1.-P | 4 +- .../110-param-3-OK.asn1.-Pfwide-types | 8 +-- .../119-per-strings-OK.asn1.-Pgen-PER | 4 +- .../126-per-extensions-OK.asn1.-Pgen-PER | 12 ++-- .../127-per-long-OK.asn1.-Pgen-PER | 4 +- .../134-per-long-OK.asn1.-Pgen-PER | 4 +- .../136-oer-long-OK.asn1.-Pgen-OER | 4 +- .../137-oer-string-OK.asn1.-Pgen-OER | 12 ++-- ...ent-relation-OK.asn1.-EFprint-class-matrix | 1 + .../139-component-relation-OK.asn1.-P | 8 +-- ...ent-relation-OK.asn1.-EFprint-class-matrix | 1 + .../140-component-relation-OK.asn1.-P | 8 +-- ...ent-relation-OK.asn1.-EFprint-class-matrix | 1 + .../141-component-relation-OK.asn1.-P | 8 +-- .../142-anonymous-types-deco-OK.asn1.-P | 20 +++---- .../143-inner-parameterization-OK.asn1.-P | 12 ++-- .../144-ios-parameterization-OK.asn1.-P | 12 ++-- .../19-param-OK.asn1.-Pfwide-types | 8 +-- .../22-tags-OK.asn1.-Pfwide-types | 8 +-- .../30-set-OK.asn1.-Pfwide-types | 4 +- .../31-set-of-OK.asn1.-Pfwide-types | 16 +++--- .../32-sequence-of-OK.asn1.-P | 8 +-- .../37-indirect-choice-OK.asn1.-Pfwide-types | 12 ++-- .../39-sequence-of-OK.asn1.-Pfwide-types | 8 +-- .../42-real-life-OK.asn1.-PR | 24 ++++---- .../43-recursion-OK.asn1.-Pfwide-types | 16 +++--- .../44-choice-in-sequence-OK.asn1.-P | 16 +++--- .../46-redefine-OK.asn1.-PR | 4 +- .../47-set-ext-OK.asn1.-Pfwide-types | 16 +++--- .../50-constraint-OK.asn1.-Pfwide-types | 4 +- .../50-constraint-OK.asn1.-Pgen-PER | 4 +- .../59-choice-extended-OK.asn1.-Pfwide-types | 4 +- .../60-any-OK.asn1.-Pfwide-types | 8 +-- .../65-multi-tag-OK.asn1.-Pfnative-types | 4 +- .../65-multi-tag-OK.asn1.-Pfwide-types | 4 +- .../69-reserved-words-OK.asn1.-Pfwide-types | 8 +-- .../70-xer-test-OK.asn1.-Pfwide-types | 28 +++++----- .../72-same-names-OK.asn1.-Pfwide-types | 36 ++++++------ .../73-circular-OK.asn1.-Pfwide-types | 12 ++-- .../84-param-tags-OK.asn1.-Pfwide-types | 24 ++++---- ...-bit-string-enum-OK.asn1.-Pfcompound-names | 4 +- .../89-bit-string-enum-OK.asn1.-Pfwide-types | 4 +- ...-circular-loops-OK.asn1.-Pfindirect-choice | 56 +++++++++---------- .../92-circular-loops-OK.asn1.-Pfwide-types | 56 +++++++++---------- .../93-asn1c-controls-OK.asn1.-Pfwide-types | 12 ++-- .../94-set-optionals-OK.asn1.-P | 4 +- .../95-choice-per-order-OK.asn1.-Pfwide-types | 12 ++-- .../95-choice-per-order-OK.asn1.-Pgen-PER | 12 ++-- .../98-attribute-class-OK.asn1.-P | 4 +- 51 files changed, 291 insertions(+), 288 deletions(-) diff --git a/tests/tests-asn1c-compiler/104-param-1-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/104-param-1-OK.asn1.-Pfwide-types index df698186..740db922 100644 --- a/tests/tests-asn1c-compiler/104-param-1-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/104-param-1-OK.asn1.-Pfwide-types @@ -184,8 +184,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Bunch_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_Bunch_specs_1 = { sizeof(struct Bunch), offsetof(struct Bunch, _asn_ctx), - asn_MAP_Bunch_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Bunch_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/105-param-2-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/105-param-2-OK.asn1.-Pfwide-types index 8b11c2c7..3439300b 100644 --- a/tests/tests-asn1c-compiler/105-param-2-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/105-param-2-OK.asn1.-Pfwide-types @@ -73,8 +73,8 @@ static const asn_TYPE_tag2member_t asn_MAP_SIGNED_16P0_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_SIGNED_16P0_specs_1 = { sizeof(struct SIGNED_16P0), offsetof(struct SIGNED_16P0, _asn_ctx), - asn_MAP_SIGNED_16P0_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_SIGNED_16P0_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -133,8 +133,8 @@ asn_SET_specifics_t asn_SPC_signed_specs_4 = { sizeof(struct Signed), offsetof(struct Signed, _asn_ctx), offsetof(struct Signed, _presence_map), - asn_MAP_signed_tag2el_4, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_signed_tag2el_4, + .tag2el_count = 1, /* Count of tags in the map */ asn_MAP_signed_tag2el_4, /* Same as above */ 1, /* Count of tags in the CXER map */ 0, /* Whether extensible */ @@ -190,8 +190,8 @@ static const asn_TYPE_tag2member_t asn_MAP_SIGNED_16P1_tag2el_3[] = { asn_SEQUENCE_specifics_t asn_SPC_SIGNED_16P1_specs_3 = { sizeof(struct SIGNED_16P1), offsetof(struct SIGNED_16P1, _asn_ctx), - asn_MAP_SIGNED_16P1_tag2el_3, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_SIGNED_16P1_tag2el_3, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.-P b/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.-P index 8acf3976..635a573c 100644 --- a/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.-P @@ -165,8 +165,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Narrow_15P0_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Narrow_15P0_specs_1 = { sizeof(struct Narrow_15P0), offsetof(struct Narrow_15P0, _asn_ctx), - asn_MAP_Narrow_15P0_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_Narrow_15P0_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/110-param-3-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/110-param-3-OK.asn1.-Pfwide-types index 671781a0..4d851054 100644 --- a/tests/tests-asn1c-compiler/110-param-3-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/110-param-3-OK.asn1.-Pfwide-types @@ -94,8 +94,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Flag_16P0_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Flag_16P0_specs_1 = { sizeof(struct Flag_16P0), offsetof(struct Flag_16P0, _asn_ctx), - asn_MAP_Flag_16P0_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Flag_16P0_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -218,8 +218,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Flag_16P1_tag2el_6[] = { asn_SEQUENCE_specifics_t asn_SPC_Flag_16P1_specs_6 = { sizeof(struct Flag_16P1), offsetof(struct Flag_16P1, _asn_ctx), - asn_MAP_Flag_16P1_tag2el_6, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Flag_16P1_tag2el_6, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/119-per-strings-OK.asn1.-Pgen-PER b/tests/tests-asn1c-compiler/119-per-strings-OK.asn1.-Pgen-PER index 637a260b..c09c605e 100644 --- a/tests/tests-asn1c-compiler/119-per-strings-OK.asn1.-Pgen-PER +++ b/tests/tests-asn1c-compiler/119-per-strings-OK.asn1.-Pgen-PER @@ -1617,8 +1617,8 @@ static const asn_TYPE_tag2member_t asn_MAP_PDU_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_PDU_specs_1 = { sizeof(struct PDU), offsetof(struct PDU, _asn_ctx), - asn_MAP_PDU_tag2el_1, - 31, /* Count of tags in the map */ + .tag2el = asn_MAP_PDU_tag2el_1, + .tag2el_count = 31, /* Count of tags in the map */ asn_MAP_PDU_oms_1, /* Optional members */ 31, 0, /* Root/Additions */ -1, /* Start extensions */ diff --git a/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.-Pgen-PER b/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.-Pgen-PER index 28401b62..8a4311d7 100644 --- a/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.-Pgen-PER +++ b/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.-Pgen-PER @@ -95,8 +95,8 @@ static const asn_TYPE_tag2member_t asn_MAP_PDU_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_PDU_specs_1 = { sizeof(struct PDU), offsetof(struct PDU, _asn_ctx), - asn_MAP_PDU_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_PDU_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ asn_MAP_PDU_oms_1, /* Optional members */ 0, 4, /* Root/Additions */ -1, /* Start extensions */ @@ -202,8 +202,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Singleton_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Singleton_specs_1 = { sizeof(struct Singleton), offsetof(struct Singleton, _asn_ctx), - asn_MAP_Singleton_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Singleton_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ asn_MAP_Singleton_oms_1, /* Optional members */ 1, 0, /* Root/Additions */ -1, /* Start extensions */ @@ -334,8 +334,8 @@ asn_CHOICE_specifics_t asn_SPC_PDU_2_specs_1 = { offsetof(struct PDU_2, _asn_ctx), offsetof(struct PDU_2, present), sizeof(((struct PDU_2 *)0)->present), - asn_MAP_PDU_2_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_PDU_2_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ .canonical_order = asn_MAP_PDU_2_cmap_1, /* Canonically sorted */ .ext_start = 1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/127-per-long-OK.asn1.-Pgen-PER b/tests/tests-asn1c-compiler/127-per-long-OK.asn1.-Pgen-PER index 80e595b7..17e0fbf9 100644 --- a/tests/tests-asn1c-compiler/127-per-long-OK.asn1.-Pgen-PER +++ b/tests/tests-asn1c-compiler/127-per-long-OK.asn1.-Pgen-PER @@ -332,8 +332,8 @@ static const asn_TYPE_tag2member_t asn_MAP_T_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_T_specs_1 = { sizeof(struct T), offsetof(struct T, _asn_ctx), - asn_MAP_T_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_T_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/134-per-long-OK.asn1.-Pgen-PER b/tests/tests-asn1c-compiler/134-per-long-OK.asn1.-Pgen-PER index 9fd69453..09608825 100644 --- a/tests/tests-asn1c-compiler/134-per-long-OK.asn1.-Pgen-PER +++ b/tests/tests-asn1c-compiler/134-per-long-OK.asn1.-Pgen-PER @@ -230,8 +230,8 @@ static const asn_TYPE_tag2member_t asn_MAP_T_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_T_specs_1 = { sizeof(struct T), offsetof(struct T, _asn_ctx), - asn_MAP_T_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_T_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.-Pgen-OER b/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.-Pgen-OER index 229bc4d6..fa5dae54 100644 --- a/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.-Pgen-OER +++ b/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.-Pgen-OER @@ -556,8 +556,8 @@ static const asn_TYPE_tag2member_t asn_MAP_T_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_T_specs_1 = { sizeof(struct T), offsetof(struct T, _asn_ctx), - asn_MAP_T_tag2el_1, - 12, /* Count of tags in the map */ + .tag2el = asn_MAP_T_tag2el_1, + .tag2el_count = 12, /* Count of tags in the map */ asn_MAP_T_oms_1, /* Optional members */ 1, 6, /* Root/Additions */ 5, /* Start extensions */ diff --git a/tests/tests-asn1c-compiler/137-oer-string-OK.asn1.-Pgen-OER b/tests/tests-asn1c-compiler/137-oer-string-OK.asn1.-Pgen-OER index e65926ab..5ee4e0f1 100644 --- a/tests/tests-asn1c-compiler/137-oer-string-OK.asn1.-Pgen-OER +++ b/tests/tests-asn1c-compiler/137-oer-string-OK.asn1.-Pgen-OER @@ -216,8 +216,8 @@ static const asn_TYPE_tag2member_t asn_MAP_unconstrained_tag2el_2[] = { static asn_SEQUENCE_specifics_t asn_SPC_unconstrained_specs_2 = { sizeof(struct unconstrained), offsetof(struct unconstrained, _asn_ctx), - asn_MAP_unconstrained_tag2el_2, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_unconstrained_tag2el_2, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -297,8 +297,8 @@ static const asn_TYPE_tag2member_t asn_MAP_constrained_tag2el_6[] = { static asn_SEQUENCE_specifics_t asn_SPC_constrained_specs_6 = { sizeof(struct constrained), offsetof(struct constrained, _asn_ctx), - asn_MAP_constrained_tag2el_6, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_constrained_tag2el_6, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -366,8 +366,8 @@ static const asn_TYPE_tag2member_t asn_MAP_T_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_T_specs_1 = { sizeof(struct T), offsetof(struct T, _asn_ctx), - asn_MAP_T_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_T_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-EFprint-class-matrix b/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-EFprint-class-matrix index fad77f9e..31bf4581 100644 --- a/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-EFprint-class-matrix +++ b/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-EFprint-class-matrix @@ -25,6 +25,7 @@ FrameTypes FRAME-STRUCTURE ::= {{ PrimitiveMessage IDENTIFIED BY basicMessage } -- [ &id][ &Type] -- [1] basicMessage PrimitiveMessage -- [2] 2 ComplexMessage +-- [ ] ... PrimitiveMessage ::= SEQUENCE { } diff --git a/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-P b/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-P index 3c03e653..641bca89 100644 --- a/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.-P @@ -158,8 +158,8 @@ static asn_CHOICE_specifics_t asn_SPC_value_specs_3 = { offsetof(struct value, _asn_ctx), offsetof(struct value, present), sizeof(((struct value *)0)->present), - asn_MAP_value_tag2el_3, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_value_tag2el_3, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -222,8 +222,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Frame_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_Frame_specs_1 = { sizeof(struct Frame), offsetof(struct Frame, _asn_ctx), - asn_MAP_Frame_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Frame_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 1, /* Start extensions */ 3 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.-EFprint-class-matrix b/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.-EFprint-class-matrix index 85d71010..778d76b7 100644 --- a/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.-EFprint-class-matrix +++ b/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.-EFprint-class-matrix @@ -25,6 +25,7 @@ FrameTypes FRAME-STRUCTURE ::= {{ PrimitiveMessage IDENTIFIED BY basicMessage } -- [ &id][ &Type] -- [1] basicMessage PrimitiveMessage -- [2] 2 ComplexMessage +-- [ ] ... primType FRAME-STRUCTURE ::= { PrimitiveMessage IDENTIFIED BY basicMessage } diff --git a/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.-P b/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.-P index 3c03e653..641bca89 100644 --- a/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.-P @@ -158,8 +158,8 @@ static asn_CHOICE_specifics_t asn_SPC_value_specs_3 = { offsetof(struct value, _asn_ctx), offsetof(struct value, present), sizeof(((struct value *)0)->present), - asn_MAP_value_tag2el_3, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_value_tag2el_3, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -222,8 +222,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Frame_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_Frame_specs_1 = { sizeof(struct Frame), offsetof(struct Frame, _asn_ctx), - asn_MAP_Frame_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Frame_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 1, /* Start extensions */ 3 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.-EFprint-class-matrix b/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.-EFprint-class-matrix index 9fbe655e..9820b301 100644 --- a/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.-EFprint-class-matrix +++ b/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.-EFprint-class-matrix @@ -27,6 +27,7 @@ FrameTypes FRAME-STRUCTURE ::= {{ PrimitiveMessage IDENTIFIED BY primMessage } | -- [ &id][ &Type] -- [1] primMessage PrimitiveMessage -- [2] cplxMessage ComplexMessage +-- [ ] ... PrimitiveMessage ::= SEQUENCE { } diff --git a/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.-P b/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.-P index 9043f224..2718acc5 100644 --- a/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.-P @@ -164,8 +164,8 @@ static asn_CHOICE_specifics_t asn_SPC_value_specs_3 = { offsetof(struct value, _asn_ctx), offsetof(struct value, present), sizeof(((struct value *)0)->present), - asn_MAP_value_tag2el_3, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_value_tag2el_3, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -229,8 +229,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Frame_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_Frame_specs_1 = { sizeof(struct Frame), offsetof(struct Frame, _asn_ctx), - asn_MAP_Frame_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Frame_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 1, /* Start extensions */ 3 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/142-anonymous-types-deco-OK.asn1.-P b/tests/tests-asn1c-compiler/142-anonymous-types-deco-OK.asn1.-P index 6be0ee1a..fd73afa8 100644 --- a/tests/tests-asn1c-compiler/142-anonymous-types-deco-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/142-anonymous-types-deco-OK.asn1.-P @@ -65,8 +65,8 @@ static asn_CHOICE_specifics_t asn_SPC_CommonType_specs_1 = { offsetof(struct CommonType, _asn_ctx), offsetof(struct CommonType, present), sizeof(((struct CommonType *)0)->present), - asn_MAP_CommonType_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_CommonType_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -225,8 +225,8 @@ static const asn_TYPE_tag2member_t asn_MAP_anonType_tag2el_2[] = { static asn_SEQUENCE_specifics_t asn_SPC_anonType_specs_2 = { sizeof(struct anonType), offsetof(struct anonType, _asn_ctx), - asn_MAP_anonType_tag2el_2, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_anonType_tag2el_2, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -280,8 +280,8 @@ asn_CHOICE_specifics_t asn_SPC_Type1_specs_1 = { offsetof(struct Type1, _asn_ctx), offsetof(struct Type1, present), sizeof(((struct Type1 *)0)->present), - asn_MAP_Type1_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Type1_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -440,8 +440,8 @@ static const asn_TYPE_tag2member_t asn_MAP_anonType_tag2el_2[] = { static asn_SEQUENCE_specifics_t asn_SPC_anonType_specs_2 = { sizeof(struct anonType), offsetof(struct anonType, _asn_ctx), - asn_MAP_anonType_tag2el_2, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_anonType_tag2el_2, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -495,8 +495,8 @@ asn_CHOICE_specifics_t asn_SPC_Type2_specs_1 = { offsetof(struct Type2, _asn_ctx), offsetof(struct Type2, present), sizeof(((struct Type2 *)0)->present), - asn_MAP_Type2_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Type2_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/143-inner-parameterization-OK.asn1.-P b/tests/tests-asn1c-compiler/143-inner-parameterization-OK.asn1.-P index e871047c..988cfe59 100644 --- a/tests/tests-asn1c-compiler/143-inner-parameterization-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/143-inner-parameterization-OK.asn1.-P @@ -54,8 +54,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Message_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_Message_specs_1 = { sizeof(struct Message), offsetof(struct Message, _asn_ctx), - asn_MAP_Message_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Message_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -194,8 +194,8 @@ static const asn_TYPE_tag2member_t asn_MAP_SpecializedContent_21P0_tag2el_1[] = asn_SEQUENCE_specifics_t asn_SPC_SpecializedContent_21P0_specs_1 = { sizeof(struct SpecializedContent_21P0), offsetof(struct SpecializedContent_21P0, _asn_ctx), - asn_MAP_SpecializedContent_21P0_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_SpecializedContent_21P0_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -249,8 +249,8 @@ static const asn_TYPE_tag2member_t asn_MAP_SpecializedContent_21P1_tag2el_3[] = asn_SEQUENCE_specifics_t asn_SPC_SpecializedContent_21P1_specs_3 = { sizeof(struct SpecializedContent_21P1), offsetof(struct SpecializedContent_21P1, _asn_ctx), - asn_MAP_SpecializedContent_21P1_tag2el_3, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_SpecializedContent_21P1_tag2el_3, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/144-ios-parameterization-OK.asn1.-P b/tests/tests-asn1c-compiler/144-ios-parameterization-OK.asn1.-P index 2fdfcc0b..340d2ecb 100644 --- a/tests/tests-asn1c-compiler/144-ios-parameterization-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/144-ios-parameterization-OK.asn1.-P @@ -41,8 +41,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Message_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_Message_specs_1 = { sizeof(struct Message), offsetof(struct Message, _asn_ctx), - asn_MAP_Message_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Message_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -231,8 +231,8 @@ static asn_CHOICE_specifics_t asn_SPC_value_specs_3 = { offsetof(struct value, _asn_ctx), offsetof(struct value, present), sizeof(((struct value *)0)->present), - asn_MAP_value_tag2el_3, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_value_tag2el_3, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -295,8 +295,8 @@ static const asn_TYPE_tag2member_t asn_MAP_SpecializedContent_30P0_tag2el_1[] = asn_SEQUENCE_specifics_t asn_SPC_SpecializedContent_30P0_specs_1 = { sizeof(struct SpecializedContent_30P0), offsetof(struct SpecializedContent_30P0, _asn_ctx), - asn_MAP_SpecializedContent_30P0_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_SpecializedContent_30P0_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/19-param-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/19-param-OK.asn1.-Pfwide-types index df32328d..af673683 100644 --- a/tests/tests-asn1c-compiler/19-param-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/19-param-OK.asn1.-Pfwide-types @@ -113,8 +113,8 @@ static const asn_TYPE_tag2member_t asn_MAP_toBeSigned_tag2el_2[] = { static asn_SEQUENCE_specifics_t asn_SPC_toBeSigned_specs_2 = { sizeof(struct toBeSigned), offsetof(struct toBeSigned, _asn_ctx), - asn_MAP_toBeSigned_tag2el_2, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_toBeSigned_tag2el_2, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -193,8 +193,8 @@ static const asn_TYPE_tag2member_t asn_MAP_SIGNED_15P0_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_SIGNED_15P0_specs_1 = { sizeof(struct SIGNED_15P0), offsetof(struct SIGNED_15P0, _asn_ctx), - asn_MAP_SIGNED_15P0_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_SIGNED_15P0_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/22-tags-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/22-tags-OK.asn1.-Pfwide-types index cefd9766..ccc8c75e 100644 --- a/tests/tests-asn1c-compiler/22-tags-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/22-tags-OK.asn1.-Pfwide-types @@ -74,8 +74,8 @@ static asn_CHOICE_specifics_t asn_SPC_b_specs_3 = { offsetof(struct b, _asn_ctx), offsetof(struct b, present), sizeof(((struct b *)0)->present), - asn_MAP_b_tag2el_3, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_b_tag2el_3, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -151,8 +151,8 @@ static const asn_TYPE_tag2member_t asn_MAP_T1_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_T1_specs_1 = { sizeof(struct T1), offsetof(struct T1, _asn_ctx), - asn_MAP_T1_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_T1_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/30-set-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/30-set-OK.asn1.-Pfwide-types index a0deb700..5e3a3a83 100644 --- a/tests/tests-asn1c-compiler/30-set-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/30-set-OK.asn1.-Pfwide-types @@ -94,8 +94,8 @@ asn_SET_specifics_t asn_SPC_T_specs_1 = { sizeof(struct T), offsetof(struct T, _asn_ctx), offsetof(struct T, _presence_map), - asn_MAP_T_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_T_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ asn_MAP_T_tag2el_1, /* Same as above */ 3, /* Count of tags in the CXER map */ 1, /* Whether extensible */ diff --git a/tests/tests-asn1c-compiler/31-set-of-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/31-set-of-OK.asn1.-Pfwide-types index b562307a..a4401c22 100644 --- a/tests/tests-asn1c-compiler/31-set-of-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/31-set-of-OK.asn1.-Pfwide-types @@ -135,8 +135,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Tree_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Tree_specs_1 = { sizeof(struct Tree), offsetof(struct Tree, _asn_ctx), - asn_MAP_Tree_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Tree_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -333,8 +333,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_5[] = { static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_5 = { sizeof(struct Member), offsetof(struct Member, _asn_ctx), - asn_MAP_Member_tag2el_5, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Member_tag2el_5, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 0, /* Start extensions */ 2 /* Stop extensions */ @@ -450,8 +450,8 @@ static asn_CHOICE_specifics_t asn_SPC_other_specs_9 = { offsetof(struct other, _asn_ctx), offsetof(struct other, present), sizeof(((struct other *)0)->present), - asn_MAP_other_tag2el_9, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_other_tag2el_9, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -538,8 +538,8 @@ asn_SET_specifics_t asn_SPC_Stuff_specs_1 = { sizeof(struct Stuff), offsetof(struct Stuff, _asn_ctx), offsetof(struct Stuff, _presence_map), - asn_MAP_Stuff_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_Stuff_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ asn_MAP_Stuff_tag2el_cxer_1, 3, /* Count of tags in the CXER map */ 1, /* Whether extensible */ diff --git a/tests/tests-asn1c-compiler/32-sequence-of-OK.asn1.-P b/tests/tests-asn1c-compiler/32-sequence-of-OK.asn1.-P index c52168eb..c4d2466b 100644 --- a/tests/tests-asn1c-compiler/32-sequence-of-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/32-sequence-of-OK.asn1.-P @@ -337,8 +337,8 @@ static const asn_TYPE_tag2member_t asn_MAP_SeqWithMandatory_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_SeqWithMandatory_specs_1 = { sizeof(struct SeqWithMandatory), offsetof(struct SeqWithMandatory, _asn_ctx), - asn_MAP_SeqWithMandatory_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_SeqWithMandatory_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -491,8 +491,8 @@ static const asn_TYPE_tag2member_t asn_MAP_SeqWithOptional_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_SeqWithOptional_specs_1 = { sizeof(struct SeqWithOptional), offsetof(struct SeqWithOptional, _asn_ctx), - asn_MAP_SeqWithOptional_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_SeqWithOptional_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/37-indirect-choice-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/37-indirect-choice-OK.asn1.-Pfwide-types index 22d35d68..dbc92209 100644 --- a/tests/tests-asn1c-compiler/37-indirect-choice-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/37-indirect-choice-OK.asn1.-Pfwide-types @@ -95,8 +95,8 @@ static asn_CHOICE_specifics_t asn_SPC_T_specs_1 = { offsetof(struct T, _asn_ctx), offsetof(struct T, present), sizeof(((struct T *)0)->present), - asn_MAP_T_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_T_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -194,8 +194,8 @@ asn_CHOICE_specifics_t asn_SPC_Choice1_specs_1 = { offsetof(struct Choice1, _asn_ctx), offsetof(struct Choice1, present), sizeof(((struct Choice1 *)0)->present), - asn_MAP_Choice1_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice1_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -325,8 +325,8 @@ asn_CHOICE_specifics_t asn_SPC_Choice2_specs_1 = { offsetof(struct Choice2, _asn_ctx), offsetof(struct Choice2, present), sizeof(((struct Choice2 *)0)->present), - asn_MAP_Choice2_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice2_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/39-sequence-of-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/39-sequence-of-OK.asn1.-Pfwide-types index 9b39bc4b..ab34a4b4 100644 --- a/tests/tests-asn1c-compiler/39-sequence-of-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/39-sequence-of-OK.asn1.-Pfwide-types @@ -118,8 +118,8 @@ static const asn_TYPE_tag2member_t asn_MAP_T_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_T_specs_1 = { sizeof(struct T), offsetof(struct T, _asn_ctx), - asn_MAP_T_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_T_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -210,8 +210,8 @@ static const asn_TYPE_tag2member_t asn_MAP_T2_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_T2_specs_1 = { sizeof(struct T2), offsetof(struct T2, _asn_ctx), - asn_MAP_T2_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_T2_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR b/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR index c3569213..06dd0e4b 100644 --- a/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR +++ b/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR @@ -151,8 +151,8 @@ static const asn_TYPE_tag2member_t asn_MAP_LogLine_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_LogLine_specs_1 = { sizeof(struct LogLine), offsetof(struct LogLine, _asn_ctx), - asn_MAP_LogLine_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_LogLine_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 1, /* Start extensions */ 3 /* Stop extensions */ @@ -332,8 +332,8 @@ static const asn_TYPE_tag2member_t asn_MAP_VariablePartSet_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_VariablePartSet_specs_1 = { sizeof(struct VariablePartSet), offsetof(struct VariablePartSet, _asn_ctx), - asn_MAP_VariablePartSet_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_VariablePartSet_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 1, /* Start extensions */ 3 /* Stop extensions */ @@ -536,8 +536,8 @@ static const asn_TYPE_tag2member_t asn_MAP_vrange_tag2el_4[] = { static asn_SEQUENCE_specifics_t asn_SPC_vrange_specs_4 = { sizeof(struct vrange), offsetof(struct vrange, _asn_ctx), - asn_MAP_vrange_tag2el_4, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_vrange_tag2el_4, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 1, /* Start extensions */ 3 /* Stop extensions */ @@ -603,8 +603,8 @@ asn_CHOICE_specifics_t asn_SPC_VariablePart_specs_1 = { offsetof(struct VariablePart, _asn_ctx), offsetof(struct VariablePart, present), sizeof(((struct VariablePart *)0)->present), - asn_MAP_VariablePart_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_VariablePart_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = 2 /* Extensions start */ }; @@ -833,8 +833,8 @@ static const asn_TYPE_tag2member_t asn_MAP_notify_tag2el_7[] = { static asn_SEQUENCE_specifics_t asn_SPC_notify_specs_7 = { sizeof(struct notify), offsetof(struct notify, _asn_ctx), - asn_MAP_notify_tag2el_7, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_notify_tag2el_7, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 1, /* Start extensions */ 3 /* Stop extensions */ @@ -901,8 +901,8 @@ static const asn_TYPE_tag2member_t asn_MAP_ActionItem_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_ActionItem_specs_1 = { sizeof(struct ActionItem), offsetof(struct ActionItem, _asn_ctx), - asn_MAP_ActionItem_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_ActionItem_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 1, /* Start extensions */ 3 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/43-recursion-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/43-recursion-OK.asn1.-Pfwide-types index 2097caa2..19ecb132 100644 --- a/tests/tests-asn1c-compiler/43-recursion-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/43-recursion-OK.asn1.-Pfwide-types @@ -202,8 +202,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Test_structure_1_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Test_structure_1_specs_1 = { sizeof(struct Test_structure_1), offsetof(struct Test_structure_1, _asn_ctx), - asn_MAP_Test_structure_1_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_Test_structure_1_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -396,8 +396,8 @@ asn_CHOICE_specifics_t asn_SPC_Choice_1_specs_1 = { offsetof(struct Choice_1, _asn_ctx), offsetof(struct Choice_1, present), sizeof(((struct Choice_1 *)0)->present), - asn_MAP_Choice_1_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice_1_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -496,8 +496,8 @@ asn_SET_specifics_t asn_SPC_Test_structure_2_specs_1 = { sizeof(struct Test_structure_2), offsetof(struct Test_structure_2, _asn_ctx), offsetof(struct Test_structure_2, _presence_map), - asn_MAP_Test_structure_2_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Test_structure_2_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ asn_MAP_Test_structure_2_tag2el_1, /* Same as above */ 1, /* Count of tags in the CXER map */ 0, /* Whether extensible */ @@ -600,8 +600,8 @@ asn_SET_specifics_t asn_SPC_Test_structure_3_specs_1 = { sizeof(struct Test_structure_3), offsetof(struct Test_structure_3, _asn_ctx), offsetof(struct Test_structure_3, _presence_map), - asn_MAP_Test_structure_3_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Test_structure_3_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ asn_MAP_Test_structure_3_tag2el_1, /* Same as above */ 1, /* Count of tags in the CXER map */ 0, /* Whether extensible */ diff --git a/tests/tests-asn1c-compiler/44-choice-in-sequence-OK.asn1.-P b/tests/tests-asn1c-compiler/44-choice-in-sequence-OK.asn1.-P index ac0d5e1f..ab8d27a4 100644 --- a/tests/tests-asn1c-compiler/44-choice-in-sequence-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/44-choice-in-sequence-OK.asn1.-P @@ -103,8 +103,8 @@ static asn_CHOICE_specifics_t asn_SPC_e_specs_6 = { offsetof(struct e, _asn_ctx), offsetof(struct e, present), sizeof(((struct e *)0)->present), - asn_MAP_e_tag2el_6, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_e_tag2el_6, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -167,8 +167,8 @@ static asn_CHOICE_specifics_t asn_SPC_h_specs_9 = { offsetof(struct h, _asn_ctx), offsetof(struct h, present), sizeof(((struct h *)0)->present), - asn_MAP_h_tag2el_9, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_h_tag2el_9, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -256,8 +256,8 @@ static asn_CHOICE_specifics_t asn_SPC_b_specs_3 = { offsetof(struct b, _asn_ctx), offsetof(struct b, present), sizeof(((struct b *)0)->present), - asn_MAP_b_tag2el_3, - 5, /* Count of tags in the map */ + .tag2el = asn_MAP_b_tag2el_3, + .tag2el_count = 5, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -326,8 +326,8 @@ static const asn_TYPE_tag2member_t asn_MAP_T_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_T_specs_1 = { sizeof(struct T), offsetof(struct T, _asn_ctx), - asn_MAP_T_tag2el_1, - 6, /* Count of tags in the map */ + .tag2el = asn_MAP_T_tag2el_1, + .tag2el_count = 6, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/46-redefine-OK.asn1.-PR b/tests/tests-asn1c-compiler/46-redefine-OK.asn1.-PR index 4b2a364d..f0fc1ead 100644 --- a/tests/tests-asn1c-compiler/46-redefine-OK.asn1.-PR +++ b/tests/tests-asn1c-compiler/46-redefine-OK.asn1.-PR @@ -101,8 +101,8 @@ static const asn_TYPE_tag2member_t asn_MAP_ConstructedType_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_ConstructedType_specs_1 = { sizeof(struct ConstructedType), offsetof(struct ConstructedType, _asn_ctx), - asn_MAP_ConstructedType_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_ConstructedType_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/47-set-ext-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/47-set-ext-OK.asn1.-Pfwide-types index e1266cfd..1a8e9979 100644 --- a/tests/tests-asn1c-compiler/47-set-ext-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/47-set-ext-OK.asn1.-Pfwide-types @@ -64,8 +64,8 @@ asn_SET_specifics_t asn_SPC_T1_specs_1 = { sizeof(struct T1), offsetof(struct T1, _asn_ctx), offsetof(struct T1, _presence_map), - asn_MAP_T1_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_T1_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ asn_MAP_T1_tag2el_1, /* Same as above */ 1, /* Count of tags in the CXER map */ 1, /* Whether extensible */ @@ -164,8 +164,8 @@ asn_SET_specifics_t asn_SPC_T2_specs_1 = { sizeof(struct T2), offsetof(struct T2, _asn_ctx), offsetof(struct T2, _presence_map), - asn_MAP_T2_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_T2_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ asn_MAP_T2_tag2el_1, /* Same as above */ 1, /* Count of tags in the CXER map */ 1, /* Whether extensible */ @@ -256,8 +256,8 @@ static asn_CHOICE_specifics_t asn_SPC_T3_specs_1 = { offsetof(struct T3, _asn_ctx), offsetof(struct T3, present), sizeof(((struct T3 *)0)->present), - asn_MAP_T3_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_T3_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ .canonical_order = 0, .ext_start = 1 /* Extensions start */ }; @@ -344,8 +344,8 @@ static asn_CHOICE_specifics_t asn_SPC_T4_specs_1 = { offsetof(struct T4, _asn_ctx), offsetof(struct T4, present), sizeof(((struct T4 *)0)->present), - asn_MAP_T4_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_T4_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ .canonical_order = 0, .ext_start = 1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pfwide-types index 45d46bf9..7ff414d9 100644 --- a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pfwide-types @@ -2462,8 +2462,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Sequence_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Sequence_specs_1 = { sizeof(struct Sequence), offsetof(struct Sequence, _asn_ctx), - asn_MAP_Sequence_tag2el_1, - 7, /* Count of tags in the map */ + .tag2el = asn_MAP_Sequence_tag2el_1, + .tag2el_count = 7, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 5, /* Start extensions */ 8 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pgen-PER b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pgen-PER index 2058de9b..a732d0e7 100644 --- a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pgen-PER +++ b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.-Pgen-PER @@ -2690,8 +2690,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Sequence_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Sequence_specs_1 = { sizeof(struct Sequence), offsetof(struct Sequence, _asn_ctx), - asn_MAP_Sequence_tag2el_1, - 7, /* Count of tags in the map */ + .tag2el = asn_MAP_Sequence_tag2el_1, + .tag2el_count = 7, /* Count of tags in the map */ asn_MAP_Sequence_oms_1, /* Optional members */ 3, 1, /* Root/Additions */ 5, /* Start extensions */ diff --git a/tests/tests-asn1c-compiler/59-choice-extended-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/59-choice-extended-OK.asn1.-Pfwide-types index 5052aef2..d1667aa8 100644 --- a/tests/tests-asn1c-compiler/59-choice-extended-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/59-choice-extended-OK.asn1.-Pfwide-types @@ -96,8 +96,8 @@ asn_CHOICE_specifics_t asn_SPC_Choice_specs_1 = { offsetof(struct Choice, _asn_ctx), offsetof(struct Choice, present), sizeof(((struct Choice *)0)->present), - asn_MAP_Choice_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ .canonical_order = 0, .ext_start = 1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/60-any-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/60-any-OK.asn1.-Pfwide-types index 9890600a..1f882e2b 100644 --- a/tests/tests-asn1c-compiler/60-any-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/60-any-OK.asn1.-Pfwide-types @@ -54,8 +54,8 @@ static const asn_TYPE_tag2member_t asn_MAP_T1_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_T1_specs_1 = { sizeof(struct T1), offsetof(struct T1, _asn_ctx), - asn_MAP_T1_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_T1_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -144,8 +144,8 @@ static const asn_TYPE_tag2member_t asn_MAP_T2_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_T2_specs_1 = { sizeof(struct T2), offsetof(struct T2, _asn_ctx), - asn_MAP_T2_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_T2_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.-Pfnative-types b/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.-Pfnative-types index 5e12b499..a4158fc1 100644 --- a/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.-Pfnative-types +++ b/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.-Pfnative-types @@ -510,8 +510,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Ts_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Ts_specs_1 = { sizeof(struct Ts), offsetof(struct Ts, _asn_ctx), - asn_MAP_Ts_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_Ts_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.-Pfwide-types index dd6a889e..bcc9f3ad 100644 --- a/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.-Pfwide-types @@ -510,8 +510,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Ts_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Ts_specs_1 = { sizeof(struct Ts), offsetof(struct Ts, _asn_ctx), - asn_MAP_Ts_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_Ts_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/69-reserved-words-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/69-reserved-words-OK.asn1.-Pfwide-types index 32e4cabb..2fd988c3 100644 --- a/tests/tests-asn1c-compiler/69-reserved-words-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/69-reserved-words-OK.asn1.-Pfwide-types @@ -86,8 +86,8 @@ asn_SET_specifics_t asn_SPC_class_specs_4 = { sizeof(struct Class), offsetof(struct Class, _asn_ctx), offsetof(struct Class, _presence_map), - asn_MAP_class_tag2el_4, - 0, /* Count of tags in the map */ + 0, /* No top level tags */ + 0, /* No tags in the map */ asn_MAP_class_tag2el_4, /* Same as above */ 0, /* Count of tags in the CXER map */ 1, /* Whether extensible */ @@ -178,8 +178,8 @@ static const asn_TYPE_tag2member_t asn_MAP_T_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_T_specs_1 = { sizeof(struct T), offsetof(struct T, _asn_ctx), - asn_MAP_T_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_T_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ diff --git a/tests/tests-asn1c-compiler/70-xer-test-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/70-xer-test-OK.asn1.-Pfwide-types index b50ab260..db026ffd 100644 --- a/tests/tests-asn1c-compiler/70-xer-test-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/70-xer-test-OK.asn1.-Pfwide-types @@ -266,8 +266,8 @@ static asn_CHOICE_specifics_t asn_SPC_PDU_specs_1 = { offsetof(struct PDU, _asn_ctx), offsetof(struct PDU, present), sizeof(((struct PDU *)0)->present), - asn_MAP_PDU_tag2el_1, - 15, /* Count of tags in the map */ + .tag2el = asn_MAP_PDU_tag2el_1, + .tag2el_count = 15, /* Count of tags in the map */ .canonical_order = 0, .ext_start = 15 /* Extensions start */ }; @@ -390,8 +390,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Sequence_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Sequence_specs_1 = { sizeof(struct Sequence), offsetof(struct Sequence, _asn_ctx), - asn_MAP_Sequence_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_Sequence_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -501,8 +501,8 @@ asn_SET_specifics_t asn_SPC_Set_specs_1 = { sizeof(struct Set), offsetof(struct Set, _asn_ctx), offsetof(struct Set, _presence_map), - asn_MAP_Set_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Set_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ asn_MAP_Set_tag2el_1, /* Same as above */ 2, /* Count of tags in the CXER map */ 0, /* Whether extensible */ @@ -677,8 +677,8 @@ asn_SET_specifics_t asn_SPC_ExtensibleSet_specs_1 = { sizeof(struct ExtensibleSet), offsetof(struct ExtensibleSet, _asn_ctx), offsetof(struct ExtensibleSet, _presence_map), - asn_MAP_ExtensibleSet_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_ExtensibleSet_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ asn_MAP_ExtensibleSet_tag2el_1, /* Same as above */ 2, /* Count of tags in the CXER map */ 1, /* Whether extensible */ @@ -788,8 +788,8 @@ static const asn_TYPE_tag2member_t asn_MAP_ExtensibleSequence_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_ExtensibleSequence_specs_1 = { sizeof(struct ExtensibleSequence), offsetof(struct ExtensibleSequence, _asn_ctx), - asn_MAP_ExtensibleSequence_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_ExtensibleSequence_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 0, /* Start extensions */ 4 /* Stop extensions */ @@ -884,8 +884,8 @@ static const asn_TYPE_tag2member_t asn_MAP_ExtensibleSequence2_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_ExtensibleSequence2_specs_1 = { sizeof(struct ExtensibleSequence2), offsetof(struct ExtensibleSequence2, _asn_ctx), - asn_MAP_ExtensibleSequence2_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_ExtensibleSequence2_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 0, /* Start extensions */ 3 /* Stop extensions */ @@ -1844,8 +1844,8 @@ asn_CHOICE_specifics_t asn_SPC_SimpleChoice_specs_1 = { offsetof(struct SimpleChoice, _asn_ctx), offsetof(struct SimpleChoice, present), sizeof(((struct SimpleChoice *)0)->present), - asn_MAP_SimpleChoice_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_SimpleChoice_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/72-same-names-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/72-same-names-OK.asn1.-Pfwide-types index 03948a18..468ecfcb 100644 --- a/tests/tests-asn1c-compiler/72-same-names-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/72-same-names-OK.asn1.-Pfwide-types @@ -67,8 +67,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = { static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { sizeof(struct Member), offsetof(struct Member, _asn_ctx), - asn_MAP_Member_tag2el_2, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_Member_tag2el_2, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -228,8 +228,8 @@ static const asn_TYPE_tag2member_t asn_MAP_another_name_tag2el_3[] = { static asn_SEQUENCE_specifics_t asn_SPC_another_name_specs_3 = { sizeof(struct another_name), offsetof(struct another_name, _asn_ctx), - asn_MAP_another_name_tag2el_3, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_another_name_tag2el_3, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -283,8 +283,8 @@ static asn_CHOICE_specifics_t asn_SPC_one_name_specs_2 = { offsetof(struct one_name, _asn_ctx), offsetof(struct one_name, present), sizeof(((struct one_name *)0)->present), - asn_MAP_one_name_tag2el_2, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_one_name_tag2el_2, + .tag2el_count = 1, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -336,8 +336,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Type1_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Type1_specs_1 = { sizeof(struct Type1), offsetof(struct Type1, _asn_ctx), - asn_MAP_Type1_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Type1_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -545,8 +545,8 @@ static const asn_TYPE_tag2member_t asn_MAP_another_name_tag2el_3[] = { static asn_SEQUENCE_specifics_t asn_SPC_another_name_specs_3 = { sizeof(struct another_name), offsetof(struct another_name, _asn_ctx), - asn_MAP_another_name_tag2el_3, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_another_name_tag2el_3, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -601,8 +601,8 @@ static const asn_TYPE_tag2member_t asn_MAP_one_name_tag2el_2[] = { static asn_SEQUENCE_specifics_t asn_SPC_one_name_specs_2 = { sizeof(struct one_name), offsetof(struct one_name, _asn_ctx), - asn_MAP_one_name_tag2el_2, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_one_name_tag2el_2, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -669,8 +669,8 @@ static const asn_TYPE_tag2member_t asn_MAP_another_name_tag2el_8[] = { static asn_SEQUENCE_specifics_t asn_SPC_another_name_specs_8 = { sizeof(struct another_name), offsetof(struct another_name, _asn_ctx), - asn_MAP_another_name_tag2el_8, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_another_name_tag2el_8, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -730,8 +730,8 @@ asn_SET_specifics_t asn_SPC_two_name_specs_7 = { sizeof(struct two_name), offsetof(struct two_name, _asn_ctx), offsetof(struct two_name, _presence_map), - asn_MAP_two_name_tag2el_7, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_two_name_tag2el_7, + .tag2el_count = 1, /* Count of tags in the map */ asn_MAP_two_name_tag2el_7, /* Same as above */ 1, /* Count of tags in the CXER map */ 0, /* Whether extensible */ @@ -798,8 +798,8 @@ asn_CHOICE_specifics_t asn_SPC_Type2_specs_1 = { offsetof(struct Type2, _asn_ctx), offsetof(struct Type2, present), sizeof(((struct Type2 *)0)->present), - asn_MAP_Type2_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Type2_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/73-circular-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/73-circular-OK.asn1.-Pfwide-types index 70af2653..04afb3c8 100644 --- a/tests/tests-asn1c-compiler/73-circular-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/73-circular-OK.asn1.-Pfwide-types @@ -106,8 +106,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Type_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Type_specs_1 = { sizeof(struct Type), offsetof(struct Type, _asn_ctx), - asn_MAP_Type_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_Type_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -334,8 +334,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Epyt_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Epyt_specs_1 = { sizeof(struct Epyt), offsetof(struct Epyt, _asn_ctx), - asn_MAP_Epyt_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_Epyt_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -652,8 +652,8 @@ asn_SET_specifics_t asn_SPC_Ypet_specs_1 = { sizeof(struct Ypet), offsetof(struct Ypet, _asn_ctx), offsetof(struct Ypet, _presence_map), - asn_MAP_Ypet_tag2el_1, - 5, /* Count of tags in the map */ + .tag2el = asn_MAP_Ypet_tag2el_1, + .tag2el_count = 5, /* Count of tags in the map */ asn_MAP_Ypet_tag2el_1, /* Same as above */ 5, /* Count of tags in the CXER map */ 0, /* Whether extensible */ diff --git a/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.-Pfwide-types index b36cb131..a3e01842 100644 --- a/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.-Pfwide-types @@ -99,8 +99,8 @@ static const asn_TYPE_tag2member_t asn_MAP_TestType_16P0_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_TestType_16P0_specs_1 = { sizeof(struct TestType_16P0), offsetof(struct TestType_16P0, _asn_ctx), - asn_MAP_TestType_16P0_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_TestType_16P0_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -172,8 +172,8 @@ static const asn_TYPE_tag2member_t asn_MAP_TestType_16P1_tag2el_3[] = { asn_SEQUENCE_specifics_t asn_SPC_TestType_16P1_specs_3 = { sizeof(struct TestType_16P1), offsetof(struct TestType_16P1, _asn_ctx), - asn_MAP_TestType_16P1_tag2el_3, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_TestType_16P1_tag2el_3, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -271,8 +271,8 @@ static asn_CHOICE_specifics_t asn_SPC_TestChoice_specs_1 = { offsetof(struct TestChoice, _asn_ctx), offsetof(struct TestChoice, present), sizeof(((struct TestChoice *)0)->present), - asn_MAP_TestChoice_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_TestChoice_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -409,8 +409,8 @@ static const asn_TYPE_tag2member_t asn_MAP_AutoType_34P0_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_AutoType_34P0_specs_1 = { sizeof(struct AutoType_34P0), offsetof(struct AutoType_34P0, _asn_ctx), - asn_MAP_AutoType_34P0_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_AutoType_34P0_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -464,8 +464,8 @@ static const asn_TYPE_tag2member_t asn_MAP_AutoType_34P1_tag2el_3[] = { asn_SEQUENCE_specifics_t asn_SPC_AutoType_34P1_specs_3 = { sizeof(struct AutoType_34P1), offsetof(struct AutoType_34P1, _asn_ctx), - asn_MAP_AutoType_34P1_tag2el_3, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_AutoType_34P1_tag2el_3, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -563,8 +563,8 @@ static asn_CHOICE_specifics_t asn_SPC_AutoChoice_specs_1 = { offsetof(struct AutoChoice, _asn_ctx), offsetof(struct AutoChoice, present), sizeof(((struct AutoChoice *)0)->present), - asn_MAP_AutoChoice_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_AutoChoice_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.-Pfcompound-names b/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.-Pfcompound-names index 5956b580..1b6d8b0c 100644 --- a/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.-Pfcompound-names +++ b/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.-Pfcompound-names @@ -54,8 +54,8 @@ static asn_CHOICE_specifics_t asn_SPC_T_specs_1 = { offsetof(struct T, _asn_ctx), offsetof(struct T, present), sizeof(((struct T *)0)->present), - asn_MAP_T_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_T_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.-Pfwide-types index d69c79a6..ea81fe00 100644 --- a/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.-Pfwide-types @@ -54,8 +54,8 @@ static asn_CHOICE_specifics_t asn_SPC_T_specs_1 = { offsetof(struct T, _asn_ctx), offsetof(struct T, present), sizeof(((struct T *)0)->present), - asn_MAP_T_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_T_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfindirect-choice b/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfindirect-choice index 47430a9a..5679887d 100644 --- a/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfindirect-choice +++ b/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfindirect-choice @@ -178,8 +178,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Everything_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Everything_specs_1 = { sizeof(struct Everything), offsetof(struct Everything, _asn_ctx), - asn_MAP_Everything_tag2el_1, - 10, /* Count of tags in the map */ + .tag2el = asn_MAP_Everything_tag2el_1, + .tag2el_count = 10, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -291,8 +291,8 @@ asn_CHOICE_specifics_t asn_SPC_Choice1_specs_1 = { offsetof(struct Choice1, _asn_ctx), offsetof(struct Choice1, present), sizeof(((struct Choice1 *)0)->present), - asn_MAP_Choice1_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice1_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = 1 /* Extensions start */ }; @@ -403,8 +403,8 @@ asn_CHOICE_specifics_t asn_SPC_Choice2_specs_1 = { offsetof(struct Choice2, _asn_ctx), offsetof(struct Choice2, present), sizeof(((struct Choice2 *)0)->present), - asn_MAP_Choice2_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice2_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = 1 /* Extensions start */ }; @@ -515,8 +515,8 @@ static const asn_TYPE_tag2member_t asn_MAP_a_tag2el_2[] = { static asn_SEQUENCE_specifics_t asn_SPC_a_specs_2 = { sizeof(struct a), offsetof(struct a, _asn_ctx), - asn_MAP_a_tag2el_2, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_a_tag2el_2, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -644,8 +644,8 @@ asn_CHOICE_specifics_t asn_SPC_Choice3_specs_1 = { offsetof(struct Choice3, _asn_ctx), offsetof(struct Choice3, present), sizeof(((struct Choice3 *)0)->present), - asn_MAP_Choice3_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice3_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -796,8 +796,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = { static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { sizeof(struct Member), offsetof(struct Member, _asn_ctx), - asn_MAP_Member_tag2el_2, - 5, /* Count of tags in the map */ + .tag2el = asn_MAP_Member_tag2el_2, + .tag2el_count = 5, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 3, /* Start extensions */ 6 /* Stop extensions */ @@ -976,8 +976,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Sequence_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Sequence_specs_1 = { sizeof(struct Sequence), offsetof(struct Sequence, _asn_ctx), - asn_MAP_Sequence_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_Sequence_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 1, /* Start extensions */ 5 /* Stop extensions */ @@ -1127,8 +1127,8 @@ static const asn_TYPE_tag2member_t asn_MAP_b_tag2el_3[] = { static asn_SEQUENCE_specifics_t asn_SPC_b_specs_3 = { sizeof(struct b), offsetof(struct b, _asn_ctx), - asn_MAP_b_tag2el_3, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_b_tag2el_3, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -1195,8 +1195,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Alpha_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Alpha_specs_1 = { sizeof(struct Alpha), offsetof(struct Alpha, _asn_ctx), - asn_MAP_Alpha_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Alpha_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -1295,8 +1295,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Beta_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Beta_specs_1 = { sizeof(struct Beta), offsetof(struct Beta, _asn_ctx), - asn_MAP_Beta_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Beta_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -1410,8 +1410,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Gamma_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Gamma_specs_1 = { sizeof(struct Gamma), offsetof(struct Gamma, _asn_ctx), - asn_MAP_Gamma_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_Gamma_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -1513,8 +1513,8 @@ asn_SET_specifics_t asn_SPC_OneTwo_specs_1 = { sizeof(struct OneTwo), offsetof(struct OneTwo, _asn_ctx), offsetof(struct OneTwo, _presence_map), - asn_MAP_OneTwo_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_OneTwo_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ asn_MAP_OneTwo_tag2el_1, /* Same as above */ 1, /* Count of tags in the CXER map */ 0, /* Whether extensible */ @@ -1617,8 +1617,8 @@ asn_SET_specifics_t asn_SPC_TwoThree_specs_1 = { sizeof(struct TwoThree), offsetof(struct TwoThree, _asn_ctx), offsetof(struct TwoThree, _presence_map), - asn_MAP_TwoThree_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_TwoThree_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ asn_MAP_TwoThree_tag2el_1, /* Same as above */ 1, /* Count of tags in the CXER map */ 0, /* Whether extensible */ @@ -1737,8 +1737,8 @@ asn_SET_specifics_t asn_SPC_ThreeOne_specs_1 = { sizeof(struct ThreeOne), offsetof(struct ThreeOne, _asn_ctx), offsetof(struct ThreeOne, _presence_map), - asn_MAP_ThreeOne_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_ThreeOne_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ asn_MAP_ThreeOne_tag2el_1, /* Same as above */ 2, /* Count of tags in the CXER map */ 0, /* Whether extensible */ diff --git a/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfwide-types index eb6796c7..499c5700 100644 --- a/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.-Pfwide-types @@ -178,8 +178,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Everything_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Everything_specs_1 = { sizeof(struct Everything), offsetof(struct Everything, _asn_ctx), - asn_MAP_Everything_tag2el_1, - 10, /* Count of tags in the map */ + .tag2el = asn_MAP_Everything_tag2el_1, + .tag2el_count = 10, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -291,8 +291,8 @@ asn_CHOICE_specifics_t asn_SPC_Choice1_specs_1 = { offsetof(struct Choice1, _asn_ctx), offsetof(struct Choice1, present), sizeof(((struct Choice1 *)0)->present), - asn_MAP_Choice1_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice1_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = 1 /* Extensions start */ }; @@ -402,8 +402,8 @@ asn_CHOICE_specifics_t asn_SPC_Choice2_specs_1 = { offsetof(struct Choice2, _asn_ctx), offsetof(struct Choice2, present), sizeof(((struct Choice2 *)0)->present), - asn_MAP_Choice2_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice2_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = 1 /* Extensions start */ }; @@ -514,8 +514,8 @@ static const asn_TYPE_tag2member_t asn_MAP_a_tag2el_2[] = { static asn_SEQUENCE_specifics_t asn_SPC_a_specs_2 = { sizeof(struct a), offsetof(struct a, _asn_ctx), - asn_MAP_a_tag2el_2, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_a_tag2el_2, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -643,8 +643,8 @@ asn_CHOICE_specifics_t asn_SPC_Choice3_specs_1 = { offsetof(struct Choice3, _asn_ctx), offsetof(struct Choice3, present), sizeof(((struct Choice3 *)0)->present), - asn_MAP_Choice3_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice3_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -795,8 +795,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = { static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { sizeof(struct Member), offsetof(struct Member, _asn_ctx), - asn_MAP_Member_tag2el_2, - 5, /* Count of tags in the map */ + .tag2el = asn_MAP_Member_tag2el_2, + .tag2el_count = 5, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 3, /* Start extensions */ 6 /* Stop extensions */ @@ -975,8 +975,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Sequence_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Sequence_specs_1 = { sizeof(struct Sequence), offsetof(struct Sequence, _asn_ctx), - asn_MAP_Sequence_tag2el_1, - 4, /* Count of tags in the map */ + .tag2el = asn_MAP_Sequence_tag2el_1, + .tag2el_count = 4, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ 1, /* Start extensions */ 5 /* Stop extensions */ @@ -1126,8 +1126,8 @@ static const asn_TYPE_tag2member_t asn_MAP_b_tag2el_3[] = { static asn_SEQUENCE_specifics_t asn_SPC_b_specs_3 = { sizeof(struct b), offsetof(struct b, _asn_ctx), - asn_MAP_b_tag2el_3, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_b_tag2el_3, + .tag2el_count = 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -1194,8 +1194,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Alpha_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Alpha_specs_1 = { sizeof(struct Alpha), offsetof(struct Alpha, _asn_ctx), - asn_MAP_Alpha_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Alpha_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -1294,8 +1294,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Beta_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Beta_specs_1 = { sizeof(struct Beta), offsetof(struct Beta, _asn_ctx), - asn_MAP_Beta_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Beta_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -1409,8 +1409,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Gamma_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Gamma_specs_1 = { sizeof(struct Gamma), offsetof(struct Gamma, _asn_ctx), - asn_MAP_Gamma_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_Gamma_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -1512,8 +1512,8 @@ asn_SET_specifics_t asn_SPC_OneTwo_specs_1 = { sizeof(struct OneTwo), offsetof(struct OneTwo, _asn_ctx), offsetof(struct OneTwo, _presence_map), - asn_MAP_OneTwo_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_OneTwo_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ asn_MAP_OneTwo_tag2el_1, /* Same as above */ 1, /* Count of tags in the CXER map */ 0, /* Whether extensible */ @@ -1616,8 +1616,8 @@ asn_SET_specifics_t asn_SPC_TwoThree_specs_1 = { sizeof(struct TwoThree), offsetof(struct TwoThree, _asn_ctx), offsetof(struct TwoThree, _presence_map), - asn_MAP_TwoThree_tag2el_1, - 1, /* Count of tags in the map */ + .tag2el = asn_MAP_TwoThree_tag2el_1, + .tag2el_count = 1, /* Count of tags in the map */ asn_MAP_TwoThree_tag2el_1, /* Same as above */ 1, /* Count of tags in the CXER map */ 0, /* Whether extensible */ @@ -1736,8 +1736,8 @@ asn_SET_specifics_t asn_SPC_ThreeOne_specs_1 = { sizeof(struct ThreeOne), offsetof(struct ThreeOne, _asn_ctx), offsetof(struct ThreeOne, _presence_map), - asn_MAP_ThreeOne_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_ThreeOne_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ asn_MAP_ThreeOne_tag2el_1, /* Same as above */ 2, /* Count of tags in the CXER map */ 0, /* Whether extensible */ diff --git a/tests/tests-asn1c-compiler/93-asn1c-controls-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/93-asn1c-controls-OK.asn1.-Pfwide-types index 899be1d9..9257ff4d 100644 --- a/tests/tests-asn1c-compiler/93-asn1c-controls-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/93-asn1c-controls-OK.asn1.-Pfwide-types @@ -56,8 +56,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Sequence_tag2el_1[] = { asn_SEQUENCE_specifics_t asn_SPC_Sequence_specs_1 = { sizeof(struct Sequence), offsetof(struct Sequence, _asn_ctx), - asn_MAP_Sequence_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Sequence_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -173,8 +173,8 @@ asn_SET_specifics_t asn_SPC_Set_specs_1 = { sizeof(struct Set), offsetof(struct Set, _asn_ctx), offsetof(struct Set, _presence_map), - asn_MAP_Set_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Set_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ asn_MAP_Set_tag2el_1, /* Same as above */ 2, /* Count of tags in the CXER map */ 0, /* Whether extensible */ @@ -353,8 +353,8 @@ static asn_CHOICE_specifics_t asn_SPC_Choice_specs_1 = { offsetof(struct Choice, _asn_ctx), offsetof(struct Choice, present), sizeof(((struct Choice *)0)->present), - asn_MAP_Choice_tag2el_1, - 3, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice_tag2el_1, + .tag2el_count = 3, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/94-set-optionals-OK.asn1.-P b/tests/tests-asn1c-compiler/94-set-optionals-OK.asn1.-P index 67e4e94c..fd3574bb 100644 --- a/tests/tests-asn1c-compiler/94-set-optionals-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/94-set-optionals-OK.asn1.-P @@ -191,8 +191,8 @@ asn_SET_specifics_t asn_SPC_TestSet_specs_1 = { sizeof(struct TestSet), offsetof(struct TestSet, _asn_ctx), offsetof(struct TestSet, _presence_map), - asn_MAP_TestSet_tag2el_1, - 10, /* Count of tags in the map */ + .tag2el = asn_MAP_TestSet_tag2el_1, + .tag2el_count = 10, /* Count of tags in the map */ asn_MAP_TestSet_tag2el_1, /* Same as above */ 10, /* Count of tags in the CXER map */ 1, /* Whether extensible */ diff --git a/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.-Pfwide-types index 44e2aea0..0af02517 100644 --- a/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.-Pfwide-types +++ b/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.-Pfwide-types @@ -91,8 +91,8 @@ static asn_CHOICE_specifics_t asn_SPC_ch_specs_4 = { offsetof(struct ch, _asn_ctx), offsetof(struct ch, present), sizeof(((struct ch *)0)->present), - asn_MAP_ch_tag2el_4, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_ch_tag2el_4, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; @@ -180,8 +180,8 @@ static asn_CHOICE_specifics_t asn_SPC_Choice_specs_1 = { offsetof(struct Choice, _asn_ctx), offsetof(struct Choice, present), sizeof(((struct Choice *)0)->present), - asn_MAP_Choice_tag2el_1, - 5, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice_tag2el_1, + .tag2el_count = 5, /* Count of tags in the map */ .canonical_order = 0, .ext_start = 3 /* Extensions start */ }; @@ -277,8 +277,8 @@ static asn_CHOICE_specifics_t asn_SPC_Choice2_specs_1 = { offsetof(struct Choice2, _asn_ctx), offsetof(struct Choice2, present), sizeof(((struct Choice2 *)0)->present), - asn_MAP_Choice2_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice2_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.-Pgen-PER b/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.-Pgen-PER index cd43d470..8d498256 100644 --- a/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.-Pgen-PER +++ b/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.-Pgen-PER @@ -105,8 +105,8 @@ static asn_CHOICE_specifics_t asn_SPC_ch_specs_4 = { offsetof(struct ch, _asn_ctx), offsetof(struct ch, present), sizeof(((struct ch *)0)->present), - asn_MAP_ch_tag2el_4, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_ch_tag2el_4, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = asn_MAP_ch_cmap_4, /* Canonically sorted */ .ext_start = -1 /* Extensions start */ }; @@ -196,8 +196,8 @@ static asn_CHOICE_specifics_t asn_SPC_Choice_specs_1 = { offsetof(struct Choice, _asn_ctx), offsetof(struct Choice, present), sizeof(((struct Choice *)0)->present), - asn_MAP_Choice_tag2el_1, - 5, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice_tag2el_1, + .tag2el_count = 5, /* Count of tags in the map */ .canonical_order = asn_MAP_Choice_cmap_1, /* Canonically sorted */ .ext_start = 3 /* Extensions start */ }; @@ -302,8 +302,8 @@ static asn_CHOICE_specifics_t asn_SPC_Choice2_specs_1 = { offsetof(struct Choice2, _asn_ctx), offsetof(struct Choice2, present), sizeof(((struct Choice2 *)0)->present), - asn_MAP_Choice2_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Choice2_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ .canonical_order = 0, .ext_start = -1 /* Extensions start */ }; diff --git a/tests/tests-asn1c-compiler/98-attribute-class-OK.asn1.-P b/tests/tests-asn1c-compiler/98-attribute-class-OK.asn1.-P index 9723e334..7118321c 100644 --- a/tests/tests-asn1c-compiler/98-attribute-class-OK.asn1.-P +++ b/tests/tests-asn1c-compiler/98-attribute-class-OK.asn1.-P @@ -90,8 +90,8 @@ static const asn_TYPE_tag2member_t asn_MAP_Attribute_tag2el_1[] = { static asn_SEQUENCE_specifics_t asn_SPC_Attribute_specs_1 = { sizeof(struct Attribute), offsetof(struct Attribute, _asn_ctx), - asn_MAP_Attribute_tag2el_1, - 2, /* Count of tags in the map */ + .tag2el = asn_MAP_Attribute_tag2el_1, + .tag2el_count = 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */