regenerated
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 dfd38f3..a338bf2 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
@@ -44,9 +44,7 @@
.tag_mode = 0,
.type = &asn_DEF_INTEGER,
.type_selector = 0,
- .memb_constraints = 0, /* Defer constraints checking to the member type */
- .oer_constraints = 0, /* OER is not compiled, use -gen-OER */
- .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ { .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
.default_value = 0,
.name = "t-a"
},
@@ -55,9 +53,7 @@
.tag_mode = 0,
.type = &asn_DEF_OCTET_STRING,
.type_selector = 0,
- .memb_constraints = 0, /* Defer constraints checking to the member type */
- .oer_constraints = 0, /* OER is not compiled, use -gen-OER */
- .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ { .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
.default_value = 0,
.name = "t-b"
},
@@ -66,9 +62,7 @@
.tag_mode = +1, /* EXPLICIT tag at current level */
.type = &asn_DEF_Choice1,
.type_selector = 0,
- .memb_constraints = 0, /* Defer constraints checking to the member type */
- .oer_constraints = 0, /* OER is not compiled, use -gen-OER */
- .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ { .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
.default_value = 0,
.name = "t-c"
},
@@ -77,9 +71,7 @@
.tag_mode = -1, /* IMPLICIT tag at current level */
.type = &asn_DEF_Choice2,
.type_selector = 0,
- .memb_constraints = 0, /* Defer constraints checking to the member type */
- .oer_constraints = 0, /* OER is not compiled, use -gen-OER */
- .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ { .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
.default_value = 0,
.name = "t-d"
},
@@ -104,13 +96,11 @@
"T",
"T",
&asn_OP_CHOICE,
- CHOICE_constraint,
0, /* No effective tags (pointer) */
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- 0, /* No OER visible constraints */
- 0, /* No PER visible constraints */
+ { 0, 0, CHOICE_constraint },
asn_MBR_T_1,
4, /* Elements count */
&asn_SPC_T_specs_1 /* Additional specs */
@@ -158,9 +148,7 @@
.tag_mode = 0,
.type = &asn_DEF_OCTET_STRING,
.type_selector = 0,
- .memb_constraints = 0, /* Defer constraints checking to the member type */
- .oer_constraints = 0, /* OER is not compiled, use -gen-OER */
- .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ { .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
.default_value = 0,
.name = "c-a"
},
@@ -169,9 +157,7 @@
.tag_mode = 0,
.type = &asn_DEF_INTEGER,
.type_selector = 0,
- .memb_constraints = 0, /* Defer constraints checking to the member type */
- .oer_constraints = 0, /* OER is not compiled, use -gen-OER */
- .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ { .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
.default_value = 0,
.name = "c-b"
},
@@ -194,13 +180,11 @@
"Choice1",
"Choice1",
&asn_OP_CHOICE,
- CHOICE_constraint,
0, /* No effective tags (pointer) */
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- 0, /* No OER visible constraints */
- 0, /* No PER visible constraints */
+ { 0, 0, CHOICE_constraint },
asn_MBR_Choice1_1,
2, /* Elements count */
&asn_SPC_Choice1_specs_1 /* Additional specs */
@@ -253,9 +237,7 @@
.tag_mode = 0,
.type = &asn_DEF_OCTET_STRING,
.type_selector = 0,
- .memb_constraints = 0, /* Defer constraints checking to the member type */
- .oer_constraints = 0, /* OER is not compiled, use -gen-OER */
- .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ { .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
.default_value = 0,
.name = "c-a"
},
@@ -264,9 +246,7 @@
.tag_mode = 0,
.type = &asn_DEF_INTEGER,
.type_selector = 0,
- .memb_constraints = 0, /* Defer constraints checking to the member type */
- .oer_constraints = 0, /* OER is not compiled, use -gen-OER */
- .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ { .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
.default_value = 0,
.name = "c-b"
},
@@ -275,9 +255,7 @@
.tag_mode = +1, /* EXPLICIT tag at current level */
.type = &asn_DEF_Choice1,
.type_selector = 0,
- .memb_constraints = 0, /* Defer constraints checking to the member type */
- .oer_constraints = 0, /* OER is not compiled, use -gen-OER */
- .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ { .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
.default_value = 0,
.name = "c-d"
},
@@ -286,9 +264,7 @@
.tag_mode = +1, /* EXPLICIT tag at current level */
.type = &asn_DEF_Choice1,
.type_selector = 0,
- .memb_constraints = 0, /* Defer constraints checking to the member type */
- .oer_constraints = 0, /* OER is not compiled, use -gen-OER */
- .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ { .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
.default_value = 0,
.name = "c-e"
},
@@ -316,15 +292,13 @@
"Choice2",
"Choice2",
&asn_OP_CHOICE,
- CHOICE_constraint,
asn_DEF_Choice2_tags_1,
sizeof(asn_DEF_Choice2_tags_1)
/sizeof(asn_DEF_Choice2_tags_1[0]), /* 1 */
asn_DEF_Choice2_tags_1, /* Same as above */
sizeof(asn_DEF_Choice2_tags_1)
/sizeof(asn_DEF_Choice2_tags_1[0]), /* 1 */
- 0, /* No OER visible constraints */
- 0, /* No PER visible constraints */
+ { 0, 0, CHOICE_constraint },
asn_MBR_Choice2_1,
4, /* Elements count */
&asn_SPC_Choice2_specs_1 /* Additional specs */
@@ -367,15 +341,13 @@
"Choice3",
"Choice3",
&asn_OP_CHOICE,
- CHOICE_constraint,
asn_DEF_Choice3_tags_1,
sizeof(asn_DEF_Choice3_tags_1)
/sizeof(asn_DEF_Choice3_tags_1[0]), /* 2 */
asn_DEF_Choice3_tags_1, /* Same as above */
sizeof(asn_DEF_Choice3_tags_1)
/sizeof(asn_DEF_Choice3_tags_1[0]), /* 2 */
- 0, /* No OER visible constraints */
- 0, /* No PER visible constraints */
+ { 0, 0, CHOICE_constraint },
asn_MBR_Choice2_1,
4, /* Elements count */
&asn_SPC_Choice2_specs_1 /* Additional specs */
@@ -418,15 +390,13 @@
"Choice4",
"Choice4",
&asn_OP_CHOICE,
- CHOICE_constraint,
asn_DEF_Choice4_tags_1,
sizeof(asn_DEF_Choice4_tags_1)
/sizeof(asn_DEF_Choice4_tags_1[0]) - 1, /* 1 */
asn_DEF_Choice4_tags_1, /* Same as above */
sizeof(asn_DEF_Choice4_tags_1)
/sizeof(asn_DEF_Choice4_tags_1[0]), /* 2 */
- 0, /* No OER visible constraints */
- 0, /* No PER visible constraints */
+ { 0, 0, CHOICE_constraint },
asn_MBR_Choice2_1,
4, /* Elements count */
&asn_SPC_Choice2_specs_1 /* Additional specs */
@@ -468,15 +438,13 @@
"Choice5",
"Choice5",
&asn_OP_CHOICE,
- CHOICE_constraint,
asn_DEF_Choice5_tags_1,
sizeof(asn_DEF_Choice5_tags_1)
/sizeof(asn_DEF_Choice5_tags_1[0]), /* 1 */
asn_DEF_Choice5_tags_1, /* Same as above */
sizeof(asn_DEF_Choice5_tags_1)
/sizeof(asn_DEF_Choice5_tags_1[0]), /* 1 */
- 0, /* No OER visible constraints */
- 0, /* No PER visible constraints */
+ { 0, 0, CHOICE_constraint },
asn_MBR_Choice2_1,
4, /* Elements count */
&asn_SPC_Choice2_specs_1 /* Additional specs */
@@ -515,13 +483,11 @@
"Choice6",
"Choice6",
&asn_OP_CHOICE,
- CHOICE_constraint,
0, /* No effective tags (pointer) */
0, /* No effective tags (count) */
0, /* No tags (pointer) */
0, /* No tags (count) */
- 0, /* No OER visible constraints */
- 0, /* No PER visible constraints */
+ { 0, 0, CHOICE_constraint },
asn_MBR_Choice1_1,
2, /* Elements count */
&asn_SPC_Choice1_specs_1 /* Additional specs */