constness fixes, round-trip and fuzz-testing for CHOICE
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 51f08c4..4ab6ef1 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
@@ -55,7 +55,7 @@
.type = &asn_DEF_Choice1,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "ch1"
},
{ ATF_POINTER, 0, offsetof(struct Everything, ch2),
@@ -64,7 +64,7 @@
.type = &asn_DEF_Choice2,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "ch2"
},
{ ATF_POINTER, 0, offsetof(struct Everything, ch3),
@@ -73,7 +73,7 @@
.type = &asn_DEF_Choice3,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "ch3"
},
{ ATF_NOFLAGS, 0, offsetof(struct Everything, set),
@@ -82,7 +82,7 @@
.type = &asn_DEF_Set,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "set"
},
{ ATF_NOFLAGS, 0, offsetof(struct Everything, a),
@@ -91,7 +91,7 @@
.type = &asn_DEF_Alpha,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "a"
},
{ ATF_NOFLAGS, 0, offsetof(struct Everything, b),
@@ -100,7 +100,7 @@
.type = &asn_DEF_Beta,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "b"
},
{ ATF_NOFLAGS, 0, offsetof(struct Everything, g),
@@ -109,7 +109,7 @@
.type = &asn_DEF_Gamma,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "g"
},
{ ATF_NOFLAGS, 0, offsetof(struct Everything, ot),
@@ -118,7 +118,7 @@
.type = &asn_DEF_OneTwo,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "ot"
},
{ ATF_NOFLAGS, 0, offsetof(struct Everything, tt),
@@ -127,7 +127,7 @@
.type = &asn_DEF_TwoThree,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "tt"
},
{ ATF_NOFLAGS, 0, offsetof(struct Everything, to),
@@ -136,7 +136,7 @@
.type = &asn_DEF_ThreeOne,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "to"
},
};
@@ -234,7 +234,7 @@
.type = &asn_DEF_Everything,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "something"
},
{ ATF_POINTER, 0, offsetof(struct Choice1, choice.some2),
@@ -243,7 +243,7 @@
.type = &asn_DEF_Everything,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "some2"
},
};
@@ -258,7 +258,7 @@
sizeof(((struct Choice1 *)0)->present),
.tag2el = asn_MAP_Choice1_tag2el_1,
.tag2el_count = 2, /* Count of tags in the map */
- .canonical_order = 0,
+ 0, 0,
.ext_start = 1 /* Extensions start */
};
asn_TYPE_descriptor_t asn_DEF_Choice1 = {
@@ -331,7 +331,7 @@
.type = &asn_DEF_TypeRef,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "typeref"
},
{ ATF_POINTER, 0, offsetof(struct Choice2, choice.some3),
@@ -340,7 +340,7 @@
.type = &asn_DEF_Everything,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "some3"
},
};
@@ -355,7 +355,7 @@
sizeof(((struct Choice2 *)0)->present),
.tag2el = asn_MAP_Choice2_tag2el_1,
.tag2el_count = 2, /* Count of tags in the map */
- .canonical_order = 0,
+ 0, 0,
.ext_start = 1 /* Extensions start */
};
asn_TYPE_descriptor_t asn_DEF_Choice2 = {
@@ -438,7 +438,7 @@
.type = &asn_DEF_Everything,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "aa"
},
};
@@ -482,7 +482,7 @@
.type = &asn_DEF_Choice3,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = ""
},
};
@@ -519,7 +519,7 @@
.type = &asn_DEF_a_2,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "a"
},
{ ATF_POINTER, 0, offsetof(struct Choice3, choice.b),
@@ -528,7 +528,7 @@
.type = &asn_DEF_Everything,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "b"
},
{ ATF_POINTER, 0, offsetof(struct Choice3, choice.c),
@@ -537,7 +537,7 @@
.type = &asn_DEF_c_5,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "c"
},
};
@@ -553,7 +553,7 @@
sizeof(((struct Choice3 *)0)->present),
.tag2el = asn_MAP_Choice3_tag2el_1,
.tag2el_count = 3, /* Count of tags in the map */
- .canonical_order = 0,
+ 0, 0,
.ext_start = -1 /* Extensions start */
};
asn_TYPE_descriptor_t asn_DEF_Choice3 = {
@@ -629,7 +629,7 @@
.type = &asn_DEF_NativeInteger,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "int"
},
{ ATF_POINTER, 0, offsetof(struct Member, set),
@@ -638,7 +638,7 @@
.type = &asn_DEF_Set,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "set"
},
{ ATF_POINTER, 0, offsetof(struct Member, seq),
@@ -647,7 +647,7 @@
.type = &asn_DEF_Sequence,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "seq"
},
{ ATF_POINTER, 2, offsetof(struct Member, set2),
@@ -656,7 +656,7 @@
.type = &asn_DEF_Set,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "set2"
},
{ ATF_POINTER, 1, offsetof(struct Member, set3),
@@ -665,7 +665,7 @@
.type = &asn_DEF_Set,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "set3"
},
};
@@ -712,7 +712,7 @@
.type = &asn_DEF_Member_2,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = ""
},
};
@@ -787,7 +787,7 @@
.type = &asn_DEF_NativeInteger,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "a"
},
{ ATF_POINTER, 3, offsetof(struct Sequence, seq),
@@ -796,7 +796,7 @@
.type = &asn_DEF_Sequence,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "seq"
},
{ ATF_POINTER, 2, offsetof(struct Sequence, b),
@@ -805,7 +805,7 @@
.type = &asn_DEF_NativeInteger,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "b"
},
{ ATF_POINTER, 1, offsetof(struct Sequence, set),
@@ -814,7 +814,7 @@
.type = &asn_DEF_Set,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "set"
},
};
@@ -943,7 +943,7 @@
.type = &asn_DEF_Beta,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "b"
},
};
@@ -987,7 +987,7 @@
.type = &asn_DEF_Beta,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "a"
},
{ ATF_NOFLAGS, 0, offsetof(struct Alpha, b),
@@ -996,7 +996,7 @@
.type = &asn_DEF_b_3,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "b"
},
};
@@ -1072,7 +1072,7 @@
.type = &asn_DEF_Alpha,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "b"
},
{ ATF_POINTER, 1, offsetof(struct Beta, g),
@@ -1081,7 +1081,7 @@
.type = &asn_DEF_Gamma,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "g"
},
};
@@ -1160,7 +1160,7 @@
.type = &asn_DEF_TwoThree,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "o"
},
{ ATF_POINTER, 0, offsetof(struct Gamma, a),
@@ -1169,7 +1169,7 @@
.type = &asn_DEF_Alpha,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "a"
},
{ ATF_POINTER, 0, offsetof(struct Gamma, b),
@@ -1178,7 +1178,7 @@
.type = &asn_DEF_Beta,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "b"
},
};
@@ -1266,7 +1266,7 @@
.type = &asn_DEF_TwoThree,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "m12"
},
};
@@ -1357,7 +1357,7 @@
.type = &asn_DEF_ThreeOne,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "m23"
},
};
@@ -1452,7 +1452,7 @@
.type = &asn_DEF_OneTwo,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "m31"
},
{ ATF_POINTER, 0, offsetof(struct ThreeOne, g),
@@ -1461,7 +1461,7 @@
.type = &asn_DEF_Gamma,
.type_selector = 0,
{ .oer_constraints = 0, .per_constraints = 0, .general_constraints = 0 },
- .default_value = 0,
+ 0, 0, /* No default value */
.name = "g"
},
};