diff options
author | Lev Walkin <vlm@lionet.info> | 2006-10-09 12:27:44 +0000 |
---|---|---|
committer | Lev Walkin <vlm@lionet.info> | 2006-10-09 12:27:44 +0000 |
commit | 4b5dae3d6407789c0276a8e2f6b64dd3328a2bc2 (patch) | |
tree | 52dd2c3992dfb68c4dcdb69cfd0f1b8407536af7 /tests | |
parent | 725883b28d721de80752cfb08be1f862fca32360 (diff) |
diffs
Diffstat (limited to 'tests')
-rw-r--r-- | tests/50-constraint-OK.asn1.-Pgen-PER | 110 | ||||
-rw-r--r-- | tests/90-cond-int-type-OK.asn1.-Pgen-PER | 60 | ||||
-rw-r--r-- | tests/95-choice-per-order-OK.asn1.-Pgen-PER | 14 |
3 files changed, 92 insertions, 92 deletions
diff --git a/tests/50-constraint-OK.asn1.-Pgen-PER b/tests/50-constraint-OK.asn1.-Pgen-PER index bb8d0e53..b0fe1c92 100644 --- a/tests/50-constraint-OK.asn1.-Pgen-PER +++ b/tests/50-constraint-OK.asn1.-Pgen-PER @@ -274,7 +274,7 @@ Int2_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Int2] >>> ***/ -static asn_per_constraints_t asn_PER_Int2_constr_1 = { +static asn_per_constraints_t asn_PER_type_Int2_constr_1 = { { APC_SEMI_CONSTRAINED, -1, -1, 0, 0 } /* (0..MAX) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -304,7 +304,7 @@ asn_TYPE_descriptor_t asn_DEF_Int2 = { asn_DEF_Int2_tags_1, /* Same as above */ sizeof(asn_DEF_Int2_tags_1) /sizeof(asn_DEF_Int2_tags_1[0]), /* 1 */ - &asn_PER_Int2_constr_1, + &asn_PER_type_Int2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -447,7 +447,7 @@ Int3_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Int3] >>> ***/ -static asn_per_constraints_t asn_PER_Int3_constr_1 = { +static asn_per_constraints_t asn_PER_type_Int3_constr_1 = { { APC_CONSTRAINED, 4, 4, 0, 10 } /* (0..10) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -477,7 +477,7 @@ asn_TYPE_descriptor_t asn_DEF_Int3 = { asn_DEF_Int3_tags_1, /* Same as above */ sizeof(asn_DEF_Int3_tags_1) /sizeof(asn_DEF_Int3_tags_1[0]), /* 1 */ - &asn_PER_Int3_constr_1, + &asn_PER_type_Int3_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -620,7 +620,7 @@ Int4_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Int4] >>> ***/ -static asn_per_constraints_t asn_PER_Int4_constr_1 = { +static asn_per_constraints_t asn_PER_type_Int4_constr_1 = { { APC_CONSTRAINED | APC_EXTENSIBLE, 4, 4, 1, 10 } /* (1..10,...) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -650,7 +650,7 @@ asn_TYPE_descriptor_t asn_DEF_Int4 = { asn_DEF_Int4_tags_1, /* Same as above */ sizeof(asn_DEF_Int4_tags_1) /sizeof(asn_DEF_Int4_tags_1[0]), /* 1 */ - &asn_PER_Int4_constr_1, + &asn_PER_type_Int4_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -793,7 +793,7 @@ Int5_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Int5] >>> ***/ -static asn_per_constraints_t asn_PER_Int5_constr_1 = { +static asn_per_constraints_t asn_PER_type_Int5_constr_1 = { { APC_CONSTRAINED, 0, 0, 5, 5 } /* (5..5) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -823,7 +823,7 @@ asn_TYPE_descriptor_t asn_DEF_Int5 = { asn_DEF_Int5_tags_1, /* Same as above */ sizeof(asn_DEF_Int5_tags_1) /sizeof(asn_DEF_Int5_tags_1[0]), /* 1 */ - &asn_PER_Int5_constr_1, + &asn_PER_type_Int5_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -966,7 +966,7 @@ ExtensibleExtensions_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [ExtensibleExtensions] >>> ***/ -static asn_per_constraints_t asn_PER_ExtensibleExtensions_constr_1 = { +static asn_per_constraints_t asn_PER_type_ExtensibleExtensions_constr_1 = { { APC_CONSTRAINED | APC_EXTENSIBLE, 8, 8, 1, 256 } /* (1..256,...) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -996,7 +996,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions = { asn_DEF_ExtensibleExtensions_tags_1, /* Same as above */ sizeof(asn_DEF_ExtensibleExtensions_tags_1) /sizeof(asn_DEF_ExtensibleExtensions_tags_1[0]), /* 1 */ - &asn_PER_ExtensibleExtensions_constr_1, + &asn_PER_type_ExtensibleExtensions_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -1293,7 +1293,7 @@ Str2_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Str2] >>> ***/ -static asn_per_constraints_t asn_PER_Str2_constr_1 = { +static asn_per_constraints_t asn_PER_type_Str2_constr_1 = { { APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */, { APC_CONSTRAINED, 5, 5, 0, 30 } /* (SIZE(0..30)) */, 0, 0 /* No PER character map necessary */ @@ -1323,7 +1323,7 @@ asn_TYPE_descriptor_t asn_DEF_Str2 = { asn_DEF_Str2_tags_1, /* Same as above */ sizeof(asn_DEF_Str2_tags_1) /sizeof(asn_DEF_Str2_tags_1[0]), /* 1 */ - &asn_PER_Str2_constr_1, + &asn_PER_type_Str2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -1502,7 +1502,7 @@ Str3_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Str3] >>> ***/ -static asn_per_constraints_t asn_PER_Str3_constr_1 = { +static asn_per_constraints_t asn_PER_type_Str3_constr_1 = { { APC_CONSTRAINED, 3, 3, 65, 102 } /* (65..102) */, { APC_CONSTRAINED, 5, 5, 10, 27 } /* (SIZE(10..27)) */, asn_PER_MAP_Str3_1_v2c, /* Value to PER code map */ @@ -1533,7 +1533,7 @@ asn_TYPE_descriptor_t asn_DEF_Str3 = { asn_DEF_Str3_tags_1, /* Same as above */ sizeof(asn_DEF_Str3_tags_1) /sizeof(asn_DEF_Str3_tags_1[0]), /* 1 */ - &asn_PER_Str3_constr_1, + &asn_PER_type_Str3_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -1685,7 +1685,7 @@ Str4_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Str4] >>> ***/ -static asn_per_constraints_t asn_PER_Str4_constr_1 = { +static asn_per_constraints_t asn_PER_type_Str4_constr_1 = { { APC_CONSTRAINED, 7, 7, 0, 127 } /* (0..127) */, { APC_SEMI_CONSTRAINED, -1, -1, 0, 0 } /* (SIZE(0..MAX)) */, 0, 0 /* No PER character map necessary */ @@ -1715,7 +1715,7 @@ asn_TYPE_descriptor_t asn_DEF_Str4 = { asn_DEF_Str4_tags_1, /* Same as above */ sizeof(asn_DEF_Str4_tags_1) /sizeof(asn_DEF_Str4_tags_1[0]), /* 1 */ - &asn_PER_Str4_constr_1, + &asn_PER_type_Str4_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -1867,7 +1867,7 @@ PER_Visible_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [PER-Visible] >>> ***/ -static asn_per_constraints_t asn_PER_PER_Visible_constr_1 = { +static asn_per_constraints_t asn_PER_type_PER_Visible_constr_1 = { { APC_CONSTRAINED, 3, 3, 65, 70 } /* (65..70) */, { APC_SEMI_CONSTRAINED, -1, -1, 0, 0 } /* (SIZE(0..MAX)) */, 0, 0 /* No PER character map necessary */ @@ -1897,7 +1897,7 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible = { asn_DEF_PER_Visible_tags_1, /* Same as above */ sizeof(asn_DEF_PER_Visible_tags_1) /sizeof(asn_DEF_PER_Visible_tags_1[0]), /* 1 */ - &asn_PER_PER_Visible_constr_1, + &asn_PER_type_PER_Visible_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -2049,7 +2049,7 @@ PER_Visible_2_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [PER-Visible-2] >>> ***/ -static asn_per_constraints_t asn_PER_PER_Visible_2_constr_1 = { +static asn_per_constraints_t asn_PER_type_PER_Visible_2_constr_1 = { { APC_CONSTRAINED, 1, 1, 69, 70 } /* (69..70) */, { APC_SEMI_CONSTRAINED, -1, -1, 0, 0 } /* (SIZE(0..MAX)) */, 0, 0 /* No PER character map necessary */ @@ -2079,7 +2079,7 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible_2 = { asn_DEF_PER_Visible_2_tags_1, /* Same as above */ sizeof(asn_DEF_PER_Visible_2_tags_1) /sizeof(asn_DEF_PER_Visible_2_tags_1[0]), /* 1 */ - &asn_PER_PER_Visible_2_constr_1, + &asn_PER_type_PER_Visible_2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -2231,7 +2231,7 @@ Not_PER_Visible_1_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Not-PER-Visible-1] >>> ***/ -static asn_per_constraints_t asn_PER_Not_PER_Visible_1_constr_1 = { +static asn_per_constraints_t asn_PER_type_Not_PER_Visible_1_constr_1 = { { APC_CONSTRAINED, 3, 3, 65, 70 } /* (65..70) */, { APC_SEMI_CONSTRAINED, -1, -1, 0, 0 } /* (SIZE(0..MAX)) */, 0, 0 /* No PER character map necessary */ @@ -2261,7 +2261,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1 = { asn_DEF_Not_PER_Visible_1_tags_1, /* Same as above */ sizeof(asn_DEF_Not_PER_Visible_1_tags_1) /sizeof(asn_DEF_Not_PER_Visible_1_tags_1[0]), /* 1 */ - &asn_PER_Not_PER_Visible_1_constr_1, + &asn_PER_type_Not_PER_Visible_1_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -2413,7 +2413,7 @@ Not_PER_Visible_2_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Not-PER-Visible-2] >>> ***/ -static asn_per_constraints_t asn_PER_Not_PER_Visible_2_constr_1 = { +static asn_per_constraints_t asn_PER_type_Not_PER_Visible_2_constr_1 = { { APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_SEMI_CONSTRAINED, -1, -1, 0, 0 } /* (SIZE(0..MAX)) */, 0, 0 /* No PER character map necessary */ @@ -2443,7 +2443,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2 = { asn_DEF_Not_PER_Visible_2_tags_1, /* Same as above */ sizeof(asn_DEF_Not_PER_Visible_2_tags_1) /sizeof(asn_DEF_Not_PER_Visible_2_tags_1[0]), /* 1 */ - &asn_PER_Not_PER_Visible_2_constr_1, + &asn_PER_type_Not_PER_Visible_2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -2595,7 +2595,7 @@ Not_PER_Visible_3_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Not-PER-Visible-3] >>> ***/ -static asn_per_constraints_t asn_PER_Not_PER_Visible_3_constr_1 = { +static asn_per_constraints_t asn_PER_type_Not_PER_Visible_3_constr_1 = { { APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_SEMI_CONSTRAINED, -1, -1, 0, 0 } /* (SIZE(0..MAX)) */, 0, 0 /* No PER character map necessary */ @@ -2625,7 +2625,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3 = { asn_DEF_Not_PER_Visible_3_tags_1, /* Same as above */ sizeof(asn_DEF_Not_PER_Visible_3_tags_1) /sizeof(asn_DEF_Not_PER_Visible_3_tags_1[0]), /* 1 */ - &asn_PER_Not_PER_Visible_3_constr_1, + &asn_PER_type_Not_PER_Visible_3_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -2780,7 +2780,7 @@ SIZE_but_not_FROM_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [SIZE-but-not-FROM] >>> ***/ -static asn_per_constraints_t asn_PER_SIZE_but_not_FROM_constr_1 = { +static asn_per_constraints_t asn_PER_type_SIZE_but_not_FROM_constr_1 = { { APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_CONSTRAINED, 2, 2, 1, 4 } /* (SIZE(1..4)) */, 0, 0 /* No PER character map necessary */ @@ -2810,7 +2810,7 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM = { asn_DEF_SIZE_but_not_FROM_tags_1, /* Same as above */ sizeof(asn_DEF_SIZE_but_not_FROM_tags_1) /sizeof(asn_DEF_SIZE_but_not_FROM_tags_1[0]), /* 1 */ - &asn_PER_SIZE_but_not_FROM_constr_1, + &asn_PER_type_SIZE_but_not_FROM_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -2965,7 +2965,7 @@ SIZE_and_FROM_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [SIZE-and-FROM] >>> ***/ -static asn_per_constraints_t asn_PER_SIZE_and_FROM_constr_1 = { +static asn_per_constraints_t asn_PER_type_SIZE_and_FROM_constr_1 = { { APC_CONSTRAINED, 2, 2, 65, 68 } /* (65..68) */, { APC_CONSTRAINED, 2, 2, 1, 4 } /* (SIZE(1..4)) */, 0, 0 /* No PER character map necessary */ @@ -2995,7 +2995,7 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM = { asn_DEF_SIZE_and_FROM_tags_1, /* Same as above */ sizeof(asn_DEF_SIZE_and_FROM_tags_1) /sizeof(asn_DEF_SIZE_and_FROM_tags_1[0]), /* 1 */ - &asn_PER_SIZE_and_FROM_constr_1, + &asn_PER_type_SIZE_and_FROM_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -3147,7 +3147,7 @@ Neither_SIZE_nor_FROM_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Neither-SIZE-nor-FROM] >>> ***/ -static asn_per_constraints_t asn_PER_Neither_SIZE_nor_FROM_constr_1 = { +static asn_per_constraints_t asn_PER_type_Neither_SIZE_nor_FROM_constr_1 = { { APC_CONSTRAINED, 3, 3, 65, 70 } /* (65..70) */, { APC_SEMI_CONSTRAINED, -1, -1, 0, 0 } /* (SIZE(0..MAX)) */, 0, 0 /* No PER character map necessary */ @@ -3177,7 +3177,7 @@ asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM = { asn_DEF_Neither_SIZE_nor_FROM_tags_1, /* Same as above */ sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags_1) /sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags_1[0]), /* 1 */ - &asn_PER_Neither_SIZE_nor_FROM_constr_1, + &asn_PER_type_Neither_SIZE_nor_FROM_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -3323,7 +3323,7 @@ Utf8_4_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Utf8-4] >>> ***/ -static asn_per_constraints_t asn_PER_Utf8_4_constr_1 = { +static asn_per_constraints_t asn_PER_type_Utf8_4_constr_1 = { { APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -3353,7 +3353,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_4 = { asn_DEF_Utf8_4_tags_1, /* Same as above */ sizeof(asn_DEF_Utf8_4_tags_1) /sizeof(asn_DEF_Utf8_4_tags_1[0]), /* 1 */ - &asn_PER_Utf8_4_constr_1, + &asn_PER_type_Utf8_4_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -3527,7 +3527,7 @@ Utf8_3_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Utf8-3] >>> ***/ -static asn_per_constraints_t asn_PER_Utf8_3_constr_1 = { +static asn_per_constraints_t asn_PER_type_Utf8_3_constr_1 = { { APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -3557,7 +3557,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_3 = { asn_DEF_Utf8_3_tags_1, /* Same as above */ sizeof(asn_DEF_Utf8_3_tags_1) /sizeof(asn_DEF_Utf8_3_tags_1[0]), /* 1 */ - &asn_PER_Utf8_3_constr_1, + &asn_PER_type_Utf8_3_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -3701,7 +3701,7 @@ Utf8_2_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Utf8-2] >>> ***/ -static asn_per_constraints_t asn_PER_Utf8_2_constr_1 = { +static asn_per_constraints_t asn_PER_type_Utf8_2_constr_1 = { { APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -3731,7 +3731,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_2 = { asn_DEF_Utf8_2_tags_1, /* Same as above */ sizeof(asn_DEF_Utf8_2_tags_1) /sizeof(asn_DEF_Utf8_2_tags_1[0]), /* 1 */ - &asn_PER_Utf8_2_constr_1, + &asn_PER_type_Utf8_2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -4306,22 +4306,22 @@ memb_int5_c_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, /*** <<< CTDEFS [Sequence] >>> ***/ -static asn_per_constraints_t asn_PER_enum_c_constr_6 = { +static asn_per_constraints_t asn_PER_type_enum_c_constr_6 = { { APC_CONSTRAINED | APC_EXTENSIBLE, 1, 1, 0, 1 } /* (0..1,...) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ }; -static asn_per_constraints_t asn_PER_int1_c_constr_2 = { +static asn_per_constraints_t asn_PER_memb_int1_c_constr_2 = { { APC_SEMI_CONSTRAINED, -1, -1, -2, 0 } /* (-2..MAX) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ }; -static asn_per_constraints_t asn_PER_int4_c_constr_4 = { +static asn_per_constraints_t asn_PER_memb_int4_c_constr_4 = { { APC_CONSTRAINED, 2, 2, 5, 7 } /* (5..7) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ }; -static asn_per_constraints_t asn_PER_int5_c_constr_13 = { +static asn_per_constraints_t asn_PER_memb_int5_c_constr_13 = { { APC_CONSTRAINED, 0, 0, 5, 5 } /* (5..5) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -4409,7 +4409,7 @@ asn_TYPE_descriptor_t asn_DEF_enum_c_6 = { asn_DEF_enum_c_tags_6, /* Same as above */ sizeof(asn_DEF_enum_c_tags_6) /sizeof(asn_DEF_enum_c_tags_6[0]), /* 1 */ - &asn_PER_enum_c_constr_6, + &asn_PER_type_enum_c_constr_6, 0, 0, /* Defined elsewhere */ &asn_SPC_enum_c_specs_6 /* Additional specs */ }; @@ -4420,7 +4420,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_Int1, .memb_constraints = memb_int1_c_constraint_1, - .per_constraints = &asn_PER_int1_c_constr_2, + .per_constraints = &asn_PER_memb_int1_c_constr_2, .default_value = asn_DFL_2_set_3, /* DEFAULT 3 */ .name = "int1-c" }, @@ -4438,7 +4438,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_Int4, .memb_constraints = memb_int4_c_constraint_1, - .per_constraints = &asn_PER_int4_c_constr_4, + .per_constraints = &asn_PER_memb_int4_c_constr_4, .default_value = 0, .name = "int4-c" }, @@ -4456,7 +4456,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_enum_c_6, .memb_constraints = 0, /* Defer constraints checking to the member type */ - .per_constraints = &asn_PER_enum_c_constr_6, + .per_constraints = &asn_PER_memb_enum_c_constr_6, .default_value = 0, .name = "enum-c" }, @@ -4474,7 +4474,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_Int5, .memb_constraints = memb_int5_c_constraint_1, - .per_constraints = &asn_PER_int5_c_constr_13, + .per_constraints = &asn_PER_memb_int5_c_constr_13, .default_value = 0, .name = "int5-c" }, @@ -4556,7 +4556,7 @@ extern asn_TYPE_descriptor_t asn_DEF_SequenceOf; /*** <<< CTDEFS [SequenceOf] >>> ***/ -static asn_per_constraints_t asn_PER_SequenceOf_constr_1 = { +static asn_per_constraints_t asn_PER_type_SequenceOf_constr_1 = { { APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_CONSTRAINED, 1, 1, 1, 2 } /* (SIZE(1..2)) */, 0, 0 /* No PER value map */ @@ -4602,7 +4602,7 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { asn_DEF_SequenceOf_tags_1, /* Same as above */ sizeof(asn_DEF_SequenceOf_tags_1) /sizeof(asn_DEF_SequenceOf_tags_1[0]), /* 1 */ - &asn_PER_SequenceOf_constr_1, + &asn_PER_type_SequenceOf_constr_1, asn_MBR_SequenceOf_1, 1, /* Single element */ &asn_SPC_SequenceOf_specs_1 /* Additional specs */ @@ -4730,7 +4730,7 @@ Enum0_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Enum0] >>> ***/ -static asn_per_constraints_t asn_PER_Enum0_constr_1 = { +static asn_per_constraints_t asn_PER_type_Enum0_constr_1 = { { APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -4775,7 +4775,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = { asn_DEF_Enum0_tags_1, /* Same as above */ sizeof(asn_DEF_Enum0_tags_1) /sizeof(asn_DEF_Enum0_tags_1[0]), /* 1 */ - &asn_PER_Enum0_constr_1, + &asn_PER_type_Enum0_constr_1, 0, 0, /* Defined elsewhere */ &asn_SPC_Enum0_specs_1 /* Additional specs */ }; @@ -4919,7 +4919,7 @@ Enum1_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Enum1] >>> ***/ -static asn_per_constraints_t asn_PER_Enum1_constr_1 = { +static asn_per_constraints_t asn_PER_type_Enum1_constr_1 = { { APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -4964,7 +4964,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { asn_DEF_Enum1_tags_1, /* Same as above */ sizeof(asn_DEF_Enum1_tags_1) /sizeof(asn_DEF_Enum1_tags_1[0]), /* 1 */ - &asn_PER_Enum1_constr_1, + &asn_PER_type_Enum1_constr_1, 0, 0, /* Defined elsewhere */ &asn_SPC_Enum1_specs_1 /* Additional specs */ }; @@ -5148,7 +5148,7 @@ Identifier_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [Identifier] >>> ***/ -static asn_per_constraints_t asn_PER_Identifier_constr_1 = { +static asn_per_constraints_t asn_PER_type_Identifier_constr_1 = { { APC_CONSTRAINED, 6, 6, 36, 122 } /* (36..122) */, { APC_CONSTRAINED, 5, 5, 1, 32 } /* (SIZE(1..32)) */, asn_PER_MAP_Identifier_1_v2c, /* Value to PER code map */ @@ -5179,7 +5179,7 @@ asn_TYPE_descriptor_t asn_DEF_Identifier = { asn_DEF_Identifier_tags_1, /* Same as above */ sizeof(asn_DEF_Identifier_tags_1) /sizeof(asn_DEF_Identifier_tags_1[0]), /* 1 */ - &asn_PER_Identifier_constr_1, + &asn_PER_type_Identifier_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; diff --git a/tests/90-cond-int-type-OK.asn1.-Pgen-PER b/tests/90-cond-int-type-OK.asn1.-Pgen-PER index 6fac7642..c7e90db2 100644 --- a/tests/90-cond-int-type-OK.asn1.-Pgen-PER +++ b/tests/90-cond-int-type-OK.asn1.-Pgen-PER @@ -269,7 +269,7 @@ CN_IntegerMinMax_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [CN-IntegerMinMax] >>> ***/ -static asn_per_constraints_t asn_PER_CN_IntegerMinMax_constr_1 = { +static asn_per_constraints_t asn_PER_type_CN_IntegerMinMax_constr_1 = { { APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -299,7 +299,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { asn_DEF_CN_IntegerMinMax_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerMinMax_tags_1) /sizeof(asn_DEF_CN_IntegerMinMax_tags_1[0]), /* 1 */ - &asn_PER_CN_IntegerMinMax_constr_1, + &asn_PER_type_CN_IntegerMinMax_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -442,7 +442,7 @@ CN_IntegerMinLow_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [CN-IntegerMinLow] >>> ***/ -static asn_per_constraints_t asn_PER_CN_IntegerMinLow_constr_1 = { +static asn_per_constraints_t asn_PER_type_CN_IntegerMinLow_constr_1 = { { APC_UNCONSTRAINED, -1, -1, 0, 0 } /* (MIN..1) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -472,7 +472,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { asn_DEF_CN_IntegerMinLow_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerMinLow_tags_1) /sizeof(asn_DEF_CN_IntegerMinLow_tags_1[0]), /* 1 */ - &asn_PER_CN_IntegerMinLow_constr_1, + &asn_PER_type_CN_IntegerMinLow_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -615,7 +615,7 @@ NO_IntegerMinHigh_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [NO-IntegerMinHigh] >>> ***/ -static asn_per_constraints_t asn_PER_NO_IntegerMinHigh_constr_1 = { +static asn_per_constraints_t asn_PER_type_NO_IntegerMinHigh_constr_1 = { { APC_UNCONSTRAINED, -1, -1, 0, 0 } /* (MIN..3000000000) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -645,7 +645,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { asn_DEF_NO_IntegerMinHigh_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerMinHigh_tags_1) /sizeof(asn_DEF_NO_IntegerMinHigh_tags_1[0]), /* 1 */ - &asn_PER_NO_IntegerMinHigh_constr_1, + &asn_PER_type_NO_IntegerMinHigh_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -788,7 +788,7 @@ NO_IntegerLowHigh_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [NO-IntegerLowHigh] >>> ***/ -static asn_per_constraints_t asn_PER_NO_IntegerLowHigh_constr_1 = { +static asn_per_constraints_t asn_PER_type_NO_IntegerLowHigh_constr_1 = { { APC_CONSTRAINED, 32, -1, 1, 3000000000 } /* (1..3000000000) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -818,7 +818,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { asn_DEF_NO_IntegerLowHigh_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerLowHigh_tags_1) /sizeof(asn_DEF_NO_IntegerLowHigh_tags_1[0]), /* 1 */ - &asn_PER_NO_IntegerLowHigh_constr_1, + &asn_PER_type_NO_IntegerLowHigh_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -961,7 +961,7 @@ CN_IntegerLowMax_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [CN-IntegerLowMax] >>> ***/ -static asn_per_constraints_t asn_PER_CN_IntegerLowMax_constr_1 = { +static asn_per_constraints_t asn_PER_type_CN_IntegerLowMax_constr_1 = { { APC_SEMI_CONSTRAINED, -1, -1, 1, 0 } /* (1..MAX) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -991,7 +991,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { asn_DEF_CN_IntegerLowMax_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerLowMax_tags_1) /sizeof(asn_DEF_CN_IntegerLowMax_tags_1[0]), /* 1 */ - &asn_PER_CN_IntegerLowMax_constr_1, + &asn_PER_type_CN_IntegerLowMax_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -1134,7 +1134,7 @@ NO_IntegerHighMax_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [NO-IntegerHighMax] >>> ***/ -static asn_per_constraints_t asn_PER_NO_IntegerHighMax_constr_1 = { +static asn_per_constraints_t asn_PER_type_NO_IntegerHighMax_constr_1 = { { APC_SEMI_CONSTRAINED, -1, -1, 3000000000, 0 } /* (3000000000..MAX) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -1164,7 +1164,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { asn_DEF_NO_IntegerHighMax_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerHighMax_tags_1) /sizeof(asn_DEF_NO_IntegerHighMax_tags_1[0]), /* 1 */ - &asn_PER_NO_IntegerHighMax_constr_1, + &asn_PER_type_NO_IntegerHighMax_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -1307,7 +1307,7 @@ NO_IntegerLowestMax_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [NO-IntegerLowestMax] >>> ***/ -static asn_per_constraints_t asn_PER_NO_IntegerLowestMax_constr_1 = { +static asn_per_constraints_t asn_PER_type_NO_IntegerLowestMax_constr_1 = { { APC_SEMI_CONSTRAINED, -1, -1, -3000000000, 0 } /* (-3000000000..MAX) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -1337,7 +1337,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { asn_DEF_NO_IntegerLowestMax_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerLowestMax_tags_1) /sizeof(asn_DEF_NO_IntegerLowestMax_tags_1[0]), /* 1 */ - &asn_PER_NO_IntegerLowestMax_constr_1, + &asn_PER_type_NO_IntegerLowestMax_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -1480,7 +1480,7 @@ NO_IntegerOutRange_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [NO-IntegerOutRange] >>> ***/ -static asn_per_constraints_t asn_PER_NO_IntegerOutRange_constr_1 = { +static asn_per_constraints_t asn_PER_type_NO_IntegerOutRange_constr_1 = { { APC_CONSTRAINED, 1, -1, 3000000000, 3000000001 } /* (3000000000..3000000001) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -1510,7 +1510,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { asn_DEF_NO_IntegerOutRange_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerOutRange_tags_1) /sizeof(asn_DEF_NO_IntegerOutRange_tags_1[0]), /* 1 */ - &asn_PER_NO_IntegerOutRange_constr_1, + &asn_PER_type_NO_IntegerOutRange_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -1653,7 +1653,7 @@ NO_IntegerOutValue_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [NO-IntegerOutValue] >>> ***/ -static asn_per_constraints_t asn_PER_NO_IntegerOutValue_constr_1 = { +static asn_per_constraints_t asn_PER_type_NO_IntegerOutValue_constr_1 = { { APC_CONSTRAINED, 0, -1, 3000000000, 3000000000 } /* (3000000000..3000000000) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -1683,7 +1683,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { asn_DEF_NO_IntegerOutValue_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerOutValue_tags_1) /sizeof(asn_DEF_NO_IntegerOutValue_tags_1[0]), /* 1 */ - &asn_PER_NO_IntegerOutValue_constr_1, + &asn_PER_type_NO_IntegerOutValue_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -1820,7 +1820,7 @@ OK_IntegerInRange1_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [OK-IntegerInRange1] >>> ***/ -static asn_per_constraints_t asn_PER_OK_IntegerInRange1_constr_1 = { +static asn_per_constraints_t asn_PER_type_OK_IntegerInRange1_constr_1 = { { APC_CONSTRAINED, 8, 8, -100, 100 } /* (-100..100) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -1850,7 +1850,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { asn_DEF_OK_IntegerInRange1_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange1_tags_1) /sizeof(asn_DEF_OK_IntegerInRange1_tags_1[0]), /* 1 */ - &asn_PER_OK_IntegerInRange1_constr_1, + &asn_PER_type_OK_IntegerInRange1_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -1987,7 +1987,7 @@ OK_IntegerInRange2_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [OK-IntegerInRange2] >>> ***/ -static asn_per_constraints_t asn_PER_OK_IntegerInRange2_constr_1 = { +static asn_per_constraints_t asn_PER_type_OK_IntegerInRange2_constr_1 = { { APC_CONSTRAINED, 8, 8, -100, 100 } /* (-100..100) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -2017,7 +2017,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { asn_DEF_OK_IntegerInRange2_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange2_tags_1) /sizeof(asn_DEF_OK_IntegerInRange2_tags_1[0]), /* 1 */ - &asn_PER_OK_IntegerInRange2_constr_1, + &asn_PER_type_OK_IntegerInRange2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -2154,7 +2154,7 @@ OK_IntegerInRange3_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [OK-IntegerInRange3] >>> ***/ -static asn_per_constraints_t asn_PER_OK_IntegerInRange3_constr_1 = { +static asn_per_constraints_t asn_PER_type_OK_IntegerInRange3_constr_1 = { { APC_CONSTRAINED, 32, -1, -2147483648, 2147483647 } /* (-2147483648..2147483647) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -2184,7 +2184,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { asn_DEF_OK_IntegerInRange3_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange3_tags_1) /sizeof(asn_DEF_OK_IntegerInRange3_tags_1[0]), /* 1 */ - &asn_PER_OK_IntegerInRange3_constr_1, + &asn_PER_type_OK_IntegerInRange3_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -2321,7 +2321,7 @@ OK_IntegerInRange4_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [OK-IntegerInRange4] >>> ***/ -static asn_per_constraints_t asn_PER_OK_IntegerInRange4_constr_1 = { +static asn_per_constraints_t asn_PER_type_OK_IntegerInRange4_constr_1 = { { APC_CONSTRAINED, 32, -1, -2147483648, 2147483647 } /* (-2147483648..2147483647) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -2351,7 +2351,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { asn_DEF_OK_IntegerInRange4_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange4_tags_1) /sizeof(asn_DEF_OK_IntegerInRange4_tags_1[0]), /* 1 */ - &asn_PER_OK_IntegerInRange4_constr_1, + &asn_PER_type_OK_IntegerInRange4_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -2494,7 +2494,7 @@ OK_IntegerInRange5_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [OK-IntegerInRange5] >>> ***/ -static asn_per_constraints_t asn_PER_OK_IntegerInRange5_constr_1 = { +static asn_per_constraints_t asn_PER_type_OK_IntegerInRange5_constr_1 = { { APC_CONSTRAINED | APC_EXTENSIBLE, 32, -1, -2147483648, 2147483647 } /* (-2147483648..2147483647,...) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -2524,7 +2524,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { asn_DEF_OK_IntegerInRange5_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange5_tags_1) /sizeof(asn_DEF_OK_IntegerInRange5_tags_1[0]), /* 1 */ - &asn_PER_OK_IntegerInRange5_constr_1, + &asn_PER_type_OK_IntegerInRange5_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; @@ -2667,7 +2667,7 @@ NO_IntegerInRange6_encode_uper(asn_TYPE_descriptor_t *td, /*** <<< CTDEFS [NO-IntegerInRange6] >>> ***/ -static asn_per_constraints_t asn_PER_NO_IntegerInRange6_constr_1 = { +static asn_per_constraints_t asn_PER_type_NO_IntegerInRange6_constr_1 = { { APC_CONSTRAINED, 32, -1, 0, 4294967295 } /* (0..4294967295) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -2697,7 +2697,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { asn_DEF_NO_IntegerInRange6_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerInRange6_tags_1) /sizeof(asn_DEF_NO_IntegerInRange6_tags_1[0]), /* 1 */ - &asn_PER_NO_IntegerInRange6_constr_1, + &asn_PER_type_NO_IntegerInRange6_constr_1, 0, 0, /* No members */ 0 /* No specifics */ }; diff --git a/tests/95-choice-per-order-OK.asn1.-Pgen-PER b/tests/95-choice-per-order-OK.asn1.-Pgen-PER index b5429769..1c31d7d0 100644 --- a/tests/95-choice-per-order-OK.asn1.-Pgen-PER +++ b/tests/95-choice-per-order-OK.asn1.-Pgen-PER @@ -58,12 +58,12 @@ extern asn_TYPE_descriptor_t asn_DEF_Choice; /*** <<< CTDEFS [Choice] >>> ***/ -static asn_per_constraints_t asn_PER_ch_constr_4 = { +static asn_per_constraints_t asn_PER_type_ch_constr_4 = { { APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ }; -static asn_per_constraints_t asn_PER_Choice_constr_1 = { +static asn_per_constraints_t asn_PER_type_Choice_constr_1 = { { APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 2 } /* (0..2,...) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -124,7 +124,7 @@ asn_TYPE_descriptor_t asn_DEF_ch_4 = { 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ - &asn_PER_ch_constr_4, + &asn_PER_type_ch_constr_4, asn_MBR_ch_4, 2, /* Elements count */ &asn_SPC_ch_specs_4 /* Additional specs */ @@ -154,7 +154,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = 0, .type = &asn_DEF_ch_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ - .per_constraints = &asn_PER_ch_constr_4, + .per_constraints = &asn_PER_memb_ch_constr_4, .default_value = 0, .name = "ch" }, @@ -203,7 +203,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ - &asn_PER_Choice_constr_1, + &asn_PER_type_Choice_constr_1, asn_MBR_Choice_1, 4, /* Elements count */ &asn_SPC_Choice_specs_1 /* Additional specs */ @@ -243,7 +243,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Choice2; /*** <<< CTDEFS [Choice2] >>> ***/ -static asn_per_constraints_t asn_PER_Choice2_constr_1 = { +static asn_per_constraints_t asn_PER_type_Choice2_constr_1 = { { APC_CONSTRAINED, 1, 1, 0, 1 } /* (0..1) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ @@ -302,7 +302,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ - &asn_PER_Choice2_constr_1, + &asn_PER_type_Choice2_constr_1, asn_MBR_Choice2_1, 2, /* Elements count */ &asn_SPC_Choice2_specs_1 /* Additional specs */ |