diff --git a/tests/30-set-OK.asn1.-P b/tests/30-set-OK.asn1.-P index 5da52a98..ecb5e29e 100644 --- a/tests/30-set-OK.asn1.-P +++ b/tests/30-set-OK.asn1.-P @@ -70,7 +70,7 @@ static ber_tlv_tag_t asn_DEF_T_tags[] = { static asn_TYPE_tag2member_t asn_DEF_T_tag2el[] = { { (ASN_TAG_CLASS_UNIVERSAL | (22 << 2)), 1, 0, 0 }, /* s at 16 */ { (ASN_TAG_CLASS_APPLICATION | (3 << 2)), 0, 0, 0 }, /* i at 15 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* b at 18 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* b at 18 */ }; static uint8_t asn_DEF_T_mmap[(3 + (8 * sizeof(unsigned int)) - 1) / 8] = { (1 << 7) | (1 << 6) | (0 << 5) @@ -82,7 +82,7 @@ static asn_SET_specifics_t asn_DEF_T_specs = { asn_DEF_T_tag2el, 3, /* Count of tags in the map */ asn_DEF_T_tag2el, /* Same as above */ - 3, /* Count of tags in the CANONICAL-XER map */ + 3, /* Count of tags in the CXER map */ 1, /* Whether extensible */ (unsigned int *)asn_DEF_T_mmap /* Mandatory elements map */ }; diff --git a/tests/31-set-of-OK.asn1.-P b/tests/31-set-of-OK.asn1.-P index ec23f685..e9e8776c 100644 --- a/tests/31-set-of-OK.asn1.-P +++ b/tests/31-set-of-OK.asn1.-P @@ -104,7 +104,7 @@ static ber_tlv_tag_t asn_DEF_Tree_tags[] = { }; static asn_TYPE_tag2member_t asn_DEF_Tree_tag2el[] = { { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* height at 17 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* width at 19 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* width at 19 */ }; static asn_SEQUENCE_specifics_t asn_DEF_Tree_specs = { sizeof(struct Tree), @@ -270,7 +270,7 @@ static ber_tlv_tag_t asn_DEF_anything_Member_tags[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_DEF_anything_Member_tag2el[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (3 << 2)), 0, 0, 0 }, /* cup-of-coffee at 32 */ + { (ASN_TAG_CLASS_UNIVERSAL | (3 << 2)), 0, 0, 0 } /* cup-of-coffee at 32 */ }; static asn_SEQUENCE_specifics_t asn_DEF_anything_Member_specs = { sizeof(struct anything_Member), @@ -362,7 +362,7 @@ static asn_TYPE_member_t asn_MBR_other[] = { }; static asn_TYPE_tag2member_t asn_DEF_other_tag2el[] = { { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* a at 26 */ - { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 1, 0, 0 }, /* b at 28 */ + { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 1, 0, 0 } /* b at 28 */ }; static asn_CHOICE_specifics_t asn_DEF_other_specs = { sizeof(struct other), @@ -424,12 +424,12 @@ static asn_TYPE_tag2member_t asn_DEF_Stuff_tag2el[] = { { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 2, 0, 0 }, /* a at 26 */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* trees at 23 */ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* anything at 34 */ - { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 2, 0, 0 }, /* b at 28 */ + { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 2, 0, 0 } /* b at 28 */ }; static asn_TYPE_tag2member_t asn_DEF_Stuff_tag2el_cxer[] = { { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* trees at 23 */ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* anything at 34 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 2, 0, 0 }, /* a at 26 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 2, 0, 0 } /* a at 26 */ }; static uint8_t asn_DEF_Stuff_mmap[(3 + (8 * sizeof(unsigned int)) - 1) / 8] = { (0 << 7) | (0 << 6) | (0 << 5) @@ -441,7 +441,7 @@ static asn_SET_specifics_t asn_DEF_Stuff_specs = { asn_DEF_Stuff_tag2el, 4, /* Count of tags in the map */ asn_DEF_Stuff_tag2el_cxer, - 3, /* Count of tags in the CANONICAL-XER map */ + 3, /* Count of tags in the CXER map */ 1, /* Whether extensible */ (unsigned int *)asn_DEF_Stuff_mmap /* Mandatory elements map */ }; diff --git a/tests/43-recursion-OK.asn1.-P b/tests/43-recursion-OK.asn1.-P index 16eea0ab..a5f86546 100644 --- a/tests/43-recursion-OK.asn1.-P +++ b/tests/43-recursion-OK.asn1.-P @@ -157,7 +157,7 @@ static asn_TYPE_tag2member_t asn_DEF_Test_structure_1_tag2el[] = { { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, 0, 0 }, /* t-member4 at 19 */ { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 1 }, /* t-member2 at 16 */ { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 2, -1, 0 }, /* t-member3 at 17 */ - { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 0, 0, 0 }, /* t-member1 at 15 */ + { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 0, 0, 0 } /* t-member1 at 15 */ }; static asn_SEQUENCE_specifics_t asn_DEF_Test_structure_1_specs = { sizeof(struct Test_structure_1), @@ -311,7 +311,7 @@ static asn_TYPE_tag2member_t asn_DEF_Choice_1_tag2el[] = { { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* and at 22 */ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* or at 23 */ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 2, 0, 0 }, /* not at 24 */ - { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 3, 0, 0 }, /* other at 26 */ + { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 3, 0, 0 } /* other at 26 */ }; static asn_CHOICE_specifics_t asn_DEF_Choice_1_specs = { sizeof(struct Choice_1), @@ -390,7 +390,7 @@ static ber_tlv_tag_t asn_DEF_Test_structure_2_tags[] = { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)) }; static asn_TYPE_tag2member_t asn_DEF_Test_structure_2_tag2el[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 0, 0, 0 }, /* m1 at 28 */ + { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 0, 0, 0 } /* m1 at 28 */ }; static uint8_t asn_DEF_Test_structure_2_mmap[(1 + (8 * sizeof(unsigned int)) - 1) / 8] = { (0 << 7) @@ -402,7 +402,7 @@ static asn_SET_specifics_t asn_DEF_Test_structure_2_specs = { asn_DEF_Test_structure_2_tag2el, 1, /* Count of tags in the map */ asn_DEF_Test_structure_2_tag2el, /* Same as above */ - 1, /* Count of tags in the CANONICAL-XER map */ + 1, /* Count of tags in the CXER map */ 0, /* Whether extensible */ (unsigned int *)asn_DEF_Test_structure_2_mmap /* Mandatory elements map */ }; @@ -476,7 +476,7 @@ static ber_tlv_tag_t asn_DEF_Test_structure_3_tags[] = { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)) }; static asn_TYPE_tag2member_t asn_DEF_Test_structure_3_tag2el[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 0, 0, 0 }, /* m1 at 29 */ + { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 0, 0, 0 } /* m1 at 29 */ }; static uint8_t asn_DEF_Test_structure_3_mmap[(1 + (8 * sizeof(unsigned int)) - 1) / 8] = { (0 << 7) @@ -488,7 +488,7 @@ static asn_SET_specifics_t asn_DEF_Test_structure_3_specs = { asn_DEF_Test_structure_3_tag2el, 1, /* Count of tags in the map */ asn_DEF_Test_structure_3_tag2el, /* Same as above */ - 1, /* Count of tags in the CANONICAL-XER map */ + 1, /* Count of tags in the CXER map */ 0, /* Whether extensible */ (unsigned int *)asn_DEF_Test_structure_3_mmap /* Mandatory elements map */ }; diff --git a/tests/47-set-ext-OK.asn1.-P b/tests/47-set-ext-OK.asn1.-P index 354dc5db..d6397013 100644 --- a/tests/47-set-ext-OK.asn1.-P +++ b/tests/47-set-ext-OK.asn1.-P @@ -48,7 +48,7 @@ static ber_tlv_tag_t asn_DEF_T1_tags[] = { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)) }; static asn_TYPE_tag2member_t asn_DEF_T1_tag2el[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* i at 14 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* i at 14 */ }; static uint8_t asn_DEF_T1_mmap[(1 + (8 * sizeof(unsigned int)) - 1) / 8] = { (1 << 7) @@ -60,7 +60,7 @@ static asn_SET_specifics_t asn_DEF_T1_specs = { asn_DEF_T1_tag2el, 1, /* Count of tags in the map */ asn_DEF_T1_tag2el, /* Same as above */ - 1, /* Count of tags in the CANONICAL-XER map */ + 1, /* Count of tags in the CXER map */ 1, /* Whether extensible */ (unsigned int *)asn_DEF_T1_mmap /* Mandatory elements map */ }; @@ -136,7 +136,7 @@ static ber_tlv_tag_t asn_DEF_T2_tags[] = { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)) }; static asn_TYPE_tag2member_t asn_DEF_T2_tag2el[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* i at 15 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* i at 15 */ }; static uint8_t asn_DEF_T2_mmap[(1 + (8 * sizeof(unsigned int)) - 1) / 8] = { (1 << 7) @@ -148,7 +148,7 @@ static asn_SET_specifics_t asn_DEF_T2_specs = { asn_DEF_T2_tag2el, 1, /* Count of tags in the map */ asn_DEF_T2_tag2el, /* Same as above */ - 1, /* Count of tags in the CANONICAL-XER map */ + 1, /* Count of tags in the CXER map */ 1, /* Whether extensible */ (unsigned int *)asn_DEF_T2_mmap /* Mandatory elements map */ }; @@ -218,7 +218,7 @@ static asn_TYPE_member_t asn_MBR_T3[] = { }, }; static asn_TYPE_tag2member_t asn_DEF_T3_tag2el[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* i at 16 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* i at 16 */ }; static asn_CHOICE_specifics_t asn_DEF_T3_specs = { sizeof(struct T3), @@ -293,7 +293,7 @@ static asn_TYPE_member_t asn_MBR_T4[] = { }, }; static asn_TYPE_tag2member_t asn_DEF_T4_tag2el[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* i at 17 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* i at 17 */ }; static asn_CHOICE_specifics_t asn_DEF_T4_specs = { sizeof(struct T4), diff --git a/tests/69-reserved-words-OK.asn1.-P b/tests/69-reserved-words-OK.asn1.-P index 32714f55..a3a9f054 100644 --- a/tests/69-reserved-words-OK.asn1.-P +++ b/tests/69-reserved-words-OK.asn1.-P @@ -88,7 +88,7 @@ static asn_SET_specifics_t asn_DEF_class_specs = { asn_DEF_class_tag2el, 0, /* Count of tags in the map */ asn_DEF_class_tag2el, /* Same as above */ - 0, /* Count of tags in the CANONICAL-XER map */ + 0, /* Count of tags in the CXER map */ 1, /* Whether extensible */ (unsigned int *)asn_DEF_class_mmap /* Mandatory elements map */ }; @@ -151,7 +151,7 @@ static asn_TYPE_tag2member_t asn_DEF_T_tag2el[] = { { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* int at 15 */ { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 }, /* char at 16 */ { (ASN_TAG_CLASS_UNIVERSAL | (9 << 2)), 3, 0, 0 }, /* double at 18 */ - { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 2, 0, 0 }, /* class at 17 */ + { (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 2, 0, 0 } /* class at 17 */ }; static asn_SEQUENCE_specifics_t asn_DEF_T_specs = { sizeof(struct T),