regenerated
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 eb408fb..cdf6b67 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
@@ -76,9 +76,7 @@
.tag_mode = -1, /* IMPLICIT tag at current level */
.type = &asn_DEF_NULL,
.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 = "f"
},
@@ -87,9 +85,7 @@
.tag_mode = -1, /* IMPLICIT tag at current level */
.type = &asn_DEF_NULL,
.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 = "g"
},
@@ -113,13 +109,11 @@
"e",
"e",
&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_e_6,
2, /* Elements count */
&asn_SPC_e_specs_6 /* Additional specs */
@@ -131,9 +125,7 @@
.tag_mode = -1, /* IMPLICIT tag at current level */
.type = &asn_DEF_NULL,
.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 = "i"
},
@@ -142,9 +134,7 @@
.tag_mode = -1, /* IMPLICIT tag at current level */
.type = &asn_DEF_NULL,
.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 = "j"
},
@@ -168,13 +158,11 @@
"h",
"h",
&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_h_9,
2, /* Elements count */
&asn_SPC_h_specs_9 /* Additional specs */
@@ -186,9 +174,7 @@
.tag_mode = -1, /* IMPLICIT tag at current level */
.type = &asn_DEF_NULL,
.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"
},
@@ -197,9 +183,7 @@
.tag_mode = -1, /* IMPLICIT tag at current level */
.type = &asn_DEF_NULL,
.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 = "d"
},
@@ -208,9 +192,7 @@
.tag_mode = 0,
.type = &asn_DEF_e_6,
.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 = "e"
},
@@ -219,9 +201,7 @@
.tag_mode = +1, /* EXPLICIT tag at current level */
.type = &asn_DEF_h_9,
.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 = "h"
},
@@ -248,13 +228,11 @@
"b",
"b",
&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_b_3,
4, /* Elements count */
&asn_SPC_b_specs_3 /* Additional specs */
@@ -266,9 +244,7 @@
.tag_mode = -1, /* IMPLICIT tag at current level */
.type = &asn_DEF_NULL,
.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 = "a"
},
@@ -277,9 +253,7 @@
.tag_mode = 0,
.type = &asn_DEF_b_3,
.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 = "b"
},
@@ -309,15 +283,13 @@
"T",
"T",
&asn_OP_SEQUENCE,
- SEQUENCE_constraint,
asn_DEF_T_tags_1,
sizeof(asn_DEF_T_tags_1)
/sizeof(asn_DEF_T_tags_1[0]) - 1, /* 1 */
asn_DEF_T_tags_1, /* Same as above */
sizeof(asn_DEF_T_tags_1)
/sizeof(asn_DEF_T_tags_1[0]), /* 2 */
- 0, /* No OER visible constraints */
- 0, /* No PER visible constraints */
+ { 0, 0, SEQUENCE_constraint },
asn_MBR_T_1,
2, /* Elements count */
&asn_SPC_T_specs_1 /* Additional specs */