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/66-ref-simple-OK.asn1.-P b/tests/66-ref-simple-OK.asn1.-P
index 121e6c8..1e6f4ed 100644
--- a/tests/66-ref-simple-OK.asn1.-P
+++ b/tests/66-ref-simple-OK.asn1.-P
@@ -26,13 +26,15 @@
.tag_mode = 0,
.type = &asn_DEF_SimpleType,
.memb_constraints = 0, /* Defer constraints checking to the member type */
+ .per_constraints = 0, /* PER is not compiled, use -gen-PER */
+ .default_value = 0,
.name = "named"
},
};
-static ber_tlv_tag_t asn_DEF_T_1_tags[] = {
+static ber_tlv_tag_t asn_DEF_T_tags_1[] = {
(ASN_TAG_CLASS_UNIVERSAL | (17 << 2))
};
-static asn_SET_OF_specifics_t asn_SPC_T_1_specs = {
+static asn_SET_OF_specifics_t asn_SPC_T_specs_1 = {
sizeof(struct T),
offsetof(struct T, _asn_ctx),
1, /* XER encoding is XMLValueList */
@@ -47,16 +49,18 @@
SET_OF_encode_der,
SET_OF_decode_xer,
SET_OF_encode_xer,
+ 0, /* No PER decoder, -gen-PER to enable */
0, /* Use generic outmost tag fetcher */
- asn_DEF_T_1_tags,
- sizeof(asn_DEF_T_1_tags)
- /sizeof(asn_DEF_T_1_tags[0]), /* 1 */
- asn_DEF_T_1_tags, /* Same as above */
- sizeof(asn_DEF_T_1_tags)
- /sizeof(asn_DEF_T_1_tags[0]), /* 1 */
+ asn_DEF_T_tags_1,
+ sizeof(asn_DEF_T_tags_1)
+ /sizeof(asn_DEF_T_tags_1[0]), /* 1 */
+ asn_DEF_T_tags_1, /* Same as above */
+ sizeof(asn_DEF_T_tags_1)
+ /sizeof(asn_DEF_T_tags_1[0]), /* 1 */
+ 0, /* No PER visible constraints */
asn_MBR_T_1,
1, /* Single element */
- &asn_SPC_T_1_specs /* Additional specs */
+ &asn_SPC_T_specs_1 /* Additional specs */
};
@@ -109,6 +113,9 @@
td->der_encoder = asn_DEF_ENUMERATED.der_encoder;
td->xer_decoder = asn_DEF_ENUMERATED.xer_decoder;
td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder;
+ td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder;
+ if(!td->per_constraints)
+ td->per_constraints = asn_DEF_ENUMERATED.per_constraints;
td->elements = asn_DEF_ENUMERATED.elements;
td->elements_count = asn_DEF_ENUMERATED.elements_count;
/* td->specifics = asn_DEF_ENUMERATED.specifics; // Defined explicitly */
@@ -161,24 +168,24 @@
/*** <<< STAT-DEFS [SimpleType] >>> ***/
-static asn_INTEGER_enum_map_t asn_MAP_SimpleType_1_value2enum[] = {
+static asn_INTEGER_enum_map_t asn_MAP_SimpleType_value2enum_1[] = {
{ 0, 3, "one" },
{ 1, 3, "two" },
{ 2, 5, "three" }
};
-static unsigned int asn_MAP_SimpleType_1_enum2value[] = {
+static unsigned int asn_MAP_SimpleType_enum2value_1[] = {
0, /* one(0) */
2, /* three(2) */
1 /* two(1) */
};
-static asn_INTEGER_specifics_t asn_SPC_SimpleType_1_specs = {
- asn_MAP_SimpleType_1_value2enum, /* "tag" => N; sorted by tag */
- asn_MAP_SimpleType_1_enum2value, /* N => "tag"; sorted by N */
+static asn_INTEGER_specifics_t asn_SPC_SimpleType_specs_1 = {
+ asn_MAP_SimpleType_value2enum_1, /* "tag" => N; sorted by tag */
+ asn_MAP_SimpleType_enum2value_1, /* N => "tag"; sorted by N */
3, /* Number of elements in the maps */
0, /* Enumeration is not extensible */
1 /* Strict enumeration */
};
-static ber_tlv_tag_t asn_DEF_SimpleType_1_tags[] = {
+static ber_tlv_tag_t asn_DEF_SimpleType_tags_1[] = {
(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
};
asn_TYPE_descriptor_t asn_DEF_SimpleType = {
@@ -191,14 +198,16 @@
SimpleType_encode_der,
SimpleType_decode_xer,
SimpleType_encode_xer,
+ 0, /* No PER decoder, -gen-PER to enable */
0, /* Use generic outmost tag fetcher */
- asn_DEF_SimpleType_1_tags,
- sizeof(asn_DEF_SimpleType_1_tags)
- /sizeof(asn_DEF_SimpleType_1_tags[0]), /* 1 */
- asn_DEF_SimpleType_1_tags, /* Same as above */
- sizeof(asn_DEF_SimpleType_1_tags)
- /sizeof(asn_DEF_SimpleType_1_tags[0]), /* 1 */
+ asn_DEF_SimpleType_tags_1,
+ sizeof(asn_DEF_SimpleType_tags_1)
+ /sizeof(asn_DEF_SimpleType_tags_1[0]), /* 1 */
+ asn_DEF_SimpleType_tags_1, /* Same as above */
+ sizeof(asn_DEF_SimpleType_tags_1)
+ /sizeof(asn_DEF_SimpleType_tags_1[0]), /* 1 */
+ 0, /* No PER visible constraints */
0, 0, /* Defined elsewhere */
- &asn_SPC_SimpleType_1_specs /* Additional specs */
+ &asn_SPC_SimpleType_specs_1 /* Additional specs */
};