upgrade: PER related changes
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@1011 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/tests/60-any-OK.asn1.-P b/tests/60-any-OK.asn1.-P
index 4d2f7e8..d385a4e 100644
--- a/tests/60-any-OK.asn1.-P
+++ b/tests/60-any-OK.asn1.-P
@@ -27,6 +27,8 @@
.tag_mode = 0,
.type = &asn_DEF_INTEGER,
.memb_constraints = 0, /* Defer constraints checking to the member type */
+ .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ .default_value = 0,
.name = "i"
},
{ ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct T1, any),
@@ -34,20 +36,23 @@
.tag_mode = 0,
.type = &asn_DEF_ANY,
.memb_constraints = 0, /* Defer constraints checking to the member type */
+ .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ .default_value = 0,
.name = "any"
},
};
-static ber_tlv_tag_t asn_DEF_T1_1_tags[] = {
+static ber_tlv_tag_t asn_DEF_T1_tags_1[] = {
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
};
-static asn_TYPE_tag2member_t asn_MAP_T1_1_tag2el[] = {
+static asn_TYPE_tag2member_t asn_MAP_T1_tag2el_1[] = {
{ (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* i at 15 */
};
-static asn_SEQUENCE_specifics_t asn_SPC_T1_1_specs = {
+static asn_SEQUENCE_specifics_t asn_SPC_T1_specs_1 = {
sizeof(struct T1),
offsetof(struct T1, _asn_ctx),
- asn_MAP_T1_1_tag2el,
+ asn_MAP_T1_tag2el_1,
1, /* Count of tags in the map */
+ 0, 0, 0, /* Optional elements (not needed) */
-1, /* Start extensions */
-1 /* Stop extensions */
};
@@ -61,16 +66,18 @@
SEQUENCE_encode_der,
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
+ 0, /* No PER decoder, -gen-PER to enable */
0, /* Use generic outmost tag fetcher */
- asn_DEF_T1_1_tags,
- sizeof(asn_DEF_T1_1_tags)
- /sizeof(asn_DEF_T1_1_tags[0]), /* 1 */
- asn_DEF_T1_1_tags, /* Same as above */
- sizeof(asn_DEF_T1_1_tags)
- /sizeof(asn_DEF_T1_1_tags[0]), /* 1 */
+ asn_DEF_T1_tags_1,
+ sizeof(asn_DEF_T1_tags_1)
+ /sizeof(asn_DEF_T1_tags_1[0]), /* 1 */
+ asn_DEF_T1_tags_1, /* Same as above */
+ sizeof(asn_DEF_T1_tags_1)
+ /sizeof(asn_DEF_T1_tags_1[0]), /* 1 */
+ 0, /* No PER visible constraints */
asn_MBR_T1_1,
2, /* Elements count */
- &asn_SPC_T1_1_specs /* Additional specs */
+ &asn_SPC_T1_specs_1 /* Additional specs */
};
@@ -102,6 +109,8 @@
.tag_mode = 0,
.type = &asn_DEF_INTEGER,
.memb_constraints = 0, /* Defer constraints checking to the member type */
+ .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ .default_value = 0,
.name = "i"
},
{ ATF_POINTER, 1, offsetof(struct T2, any),
@@ -109,21 +118,24 @@
.tag_mode = +1, /* EXPLICIT tag at current level */
.type = &asn_DEF_ANY,
.memb_constraints = 0, /* Defer constraints checking to the member type */
+ .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ .default_value = 0,
.name = "any"
},
};
-static ber_tlv_tag_t asn_DEF_T2_1_tags[] = {
+static ber_tlv_tag_t asn_DEF_T2_tags_1[] = {
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
};
-static asn_TYPE_tag2member_t asn_MAP_T2_1_tag2el[] = {
+static asn_TYPE_tag2member_t asn_MAP_T2_tag2el_1[] = {
{ (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* i at 20 */
{ (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 } /* any at 21 */
};
-static asn_SEQUENCE_specifics_t asn_SPC_T2_1_specs = {
+static asn_SEQUENCE_specifics_t asn_SPC_T2_specs_1 = {
sizeof(struct T2),
offsetof(struct T2, _asn_ctx),
- asn_MAP_T2_1_tag2el,
+ asn_MAP_T2_tag2el_1,
2, /* Count of tags in the map */
+ 0, 0, 0, /* Optional elements (not needed) */
-1, /* Start extensions */
-1 /* Stop extensions */
};
@@ -137,16 +149,18 @@
SEQUENCE_encode_der,
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
+ 0, /* No PER decoder, -gen-PER to enable */
0, /* Use generic outmost tag fetcher */
- asn_DEF_T2_1_tags,
- sizeof(asn_DEF_T2_1_tags)
- /sizeof(asn_DEF_T2_1_tags[0]), /* 1 */
- asn_DEF_T2_1_tags, /* Same as above */
- sizeof(asn_DEF_T2_1_tags)
- /sizeof(asn_DEF_T2_1_tags[0]), /* 1 */
+ asn_DEF_T2_tags_1,
+ sizeof(asn_DEF_T2_tags_1)
+ /sizeof(asn_DEF_T2_tags_1[0]), /* 1 */
+ asn_DEF_T2_tags_1, /* Same as above */
+ sizeof(asn_DEF_T2_tags_1)
+ /sizeof(asn_DEF_T2_tags_1[0]), /* 1 */
+ 0, /* No PER visible constraints */
asn_MBR_T2_1,
2, /* Elements count */
- &asn_SPC_T2_1_specs /* Additional specs */
+ &asn_SPC_T2_specs_1 /* Additional specs */
};
@@ -177,6 +191,8 @@
.tag_mode = 0,
.type = &asn_DEF_ANY,
.memb_constraints = 0, /* Defer constraints checking to the member type */
+ .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ .default_value = 0,
.name = "any1"
},
{ ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct T3, any2),
@@ -184,17 +200,20 @@
.tag_mode = 0,
.type = &asn_DEF_ANY,
.memb_constraints = 0, /* Defer constraints checking to the member type */
+ .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ .default_value = 0,
.name = "any2"
},
};
-static ber_tlv_tag_t asn_DEF_T3_1_tags[] = {
+static ber_tlv_tag_t asn_DEF_T3_tags_1[] = {
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
};
-static asn_SEQUENCE_specifics_t asn_SPC_T3_1_specs = {
+static asn_SEQUENCE_specifics_t asn_SPC_T3_specs_1 = {
sizeof(struct T3),
offsetof(struct T3, _asn_ctx),
0, /* No top level tags */
0, /* No tags in the map */
+ 0, 0, 0, /* Optional elements (not needed) */
-1, /* Start extensions */
-1 /* Stop extensions */
};
@@ -208,15 +227,17 @@
SEQUENCE_encode_der,
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
+ 0, /* No PER decoder, -gen-PER to enable */
0, /* Use generic outmost tag fetcher */
- asn_DEF_T3_1_tags,
- sizeof(asn_DEF_T3_1_tags)
- /sizeof(asn_DEF_T3_1_tags[0]), /* 1 */
- asn_DEF_T3_1_tags, /* Same as above */
- sizeof(asn_DEF_T3_1_tags)
- /sizeof(asn_DEF_T3_1_tags[0]), /* 1 */
+ asn_DEF_T3_tags_1,
+ sizeof(asn_DEF_T3_tags_1)
+ /sizeof(asn_DEF_T3_tags_1[0]), /* 1 */
+ asn_DEF_T3_tags_1, /* Same as above */
+ sizeof(asn_DEF_T3_tags_1)
+ /sizeof(asn_DEF_T3_tags_1[0]), /* 1 */
+ 0, /* No PER visible constraints */
asn_MBR_T3_1,
2, /* Elements count */
- &asn_SPC_T3_1_specs /* Additional specs */
+ &asn_SPC_T3_specs_1 /* Additional specs */
};