proper handling of reserved identifiers
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@752 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/tests/19-param-OK.asn1.-P b/tests/19-param-OK.asn1.-P
index 868d595..85f3f05 100644
--- a/tests/19-param-OK.asn1.-P
+++ b/tests/19-param-OK.asn1.-P
@@ -278,7 +278,7 @@
/*** <<< CTABLES [RelativeDistinguishedName] >>> ***/
-static int permitted_alphabet_table_1[256] = {
+static int permitted_alphabet_table_0[256] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0, /* ,-. */
@@ -289,8 +289,8 @@
1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0, /* pqrstuvwxyz */
};
-static int check_permitted_alphabet_1(const void *sptr) {
- int *table = permitted_alphabet_table_1;
+static int check_permitted_alphabet_0(const void *sptr) {
+ int *table = permitted_alphabet_table_0;
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -319,7 +319,7 @@
}
- if(!check_permitted_alphabet_1(sptr)) {
+ if(!check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
diff --git a/tests/46-redefine-OK.asn1.-PR b/tests/46-redefine-OK.asn1.-PR
index 139fd6a..e23cab9 100644
--- a/tests/46-redefine-OK.asn1.-PR
+++ b/tests/46-redefine-OK.asn1.-PR
@@ -9,12 +9,112 @@
/*** <<< FUNC-DECLS [PrimitiveType] >>> ***/
-/* This type is equivalent to OCTET_STRING */
-#define asn_DEF_PrimitiveType asn_DEF_OCTET_STRING
+extern asn_TYPE_descriptor_t asn_DEF_PrimitiveType;
+asn_struct_free_f PrimitiveType_free;
+asn_struct_print_f PrimitiveType_print;
+asn_constr_check_f PrimitiveType_constraint;
+ber_type_decoder_f PrimitiveType_decode_ber;
+der_type_encoder_f PrimitiveType_encode_der;
+xer_type_decoder_f PrimitiveType_decode_xer;
+xer_type_encoder_f PrimitiveType_encode_xer;
/*** <<< CODE [PrimitiveType] >>> ***/
-/* This type is equivalent to OCTET_STRING */
+int
+PrimitiveType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
+ asn_app_consume_bytes_f *app_errlog, void *app_key) {
+ /* Replace with underlying type checker */
+ td->check_constraints = asn_DEF_OCTET_STRING.check_constraints;
+ return td->check_constraints(td, sptr, app_errlog, app_key);
+}
+
+/*
+ * This type is implemented using OCTET_STRING,
+ * so here we adjust the DEF accordingly.
+ */
+static void
+PrimitiveType_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+ td->free_struct = asn_DEF_OCTET_STRING.free_struct;
+ td->print_struct = asn_DEF_OCTET_STRING.print_struct;
+ td->ber_decoder = asn_DEF_OCTET_STRING.ber_decoder;
+ td->der_encoder = asn_DEF_OCTET_STRING.der_encoder;
+ td->xer_decoder = asn_DEF_OCTET_STRING.xer_decoder;
+ td->xer_encoder = asn_DEF_OCTET_STRING.xer_encoder;
+ td->elements = asn_DEF_OCTET_STRING.elements;
+ td->elements_count = asn_DEF_OCTET_STRING.elements_count;
+ td->specifics = asn_DEF_OCTET_STRING.specifics;
+}
+
+void
+PrimitiveType_free(asn_TYPE_descriptor_t *td,
+ void *struct_ptr, int contents_only) {
+ PrimitiveType_0_inherit_TYPE_descriptor(td);
+ td->free_struct(td, struct_ptr, contents_only);
+}
+
+int
+PrimitiveType_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
+ int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
+ PrimitiveType_0_inherit_TYPE_descriptor(td);
+ return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
+}
+
+asn_dec_rval_t
+PrimitiveType_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, void *bufptr, size_t size, int tag_mode) {
+ PrimitiveType_0_inherit_TYPE_descriptor(td);
+ return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
+}
+
+asn_enc_rval_t
+PrimitiveType_encode_der(asn_TYPE_descriptor_t *td,
+ void *structure, int tag_mode, ber_tlv_tag_t tag,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ PrimitiveType_0_inherit_TYPE_descriptor(td);
+ return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+}
+
+asn_dec_rval_t
+PrimitiveType_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, const char *opt_mname, void *bufptr, size_t size) {
+ PrimitiveType_0_inherit_TYPE_descriptor(td);
+ return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
+}
+
+asn_enc_rval_t
+PrimitiveType_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
+ int ilevel, enum xer_encoder_flags_e flags,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ PrimitiveType_0_inherit_TYPE_descriptor(td);
+ return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
+}
+
+
+/*** <<< STAT-DEFS [PrimitiveType] >>> ***/
+
+static ber_tlv_tag_t asn_DEF_PrimitiveType_0_tags[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (4 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_PrimitiveType = {
+ "PrimitiveType",
+ "PrimitiveType",
+ PrimitiveType_free,
+ PrimitiveType_print,
+ PrimitiveType_constraint,
+ PrimitiveType_decode_ber,
+ PrimitiveType_encode_der,
+ PrimitiveType_decode_xer,
+ PrimitiveType_encode_xer,
+ 0, /* Use generic outmost tag fetcher */
+ asn_DEF_PrimitiveType_0_tags,
+ sizeof(asn_DEF_PrimitiveType_0_tags)
+ /sizeof(asn_DEF_PrimitiveType_0_tags[0]), /* 1 */
+ asn_DEF_PrimitiveType_0_tags, /* Same as above */
+ sizeof(asn_DEF_PrimitiveType_0_tags)
+ /sizeof(asn_DEF_PrimitiveType_0_tags[0]), /* 1 */
+ 0, 0, /* No members */
+ 0 /* No specifics */
+};
/*** <<< INCLUDES [ConstructedType] >>> ***/
diff --git a/tests/50-constraint-OK.asn1.-P b/tests/50-constraint-OK.asn1.-P
index 47d84e6..56acdb9 100644
--- a/tests/50-constraint-OK.asn1.-P
+++ b/tests/50-constraint-OK.asn1.-P
@@ -9,12 +9,112 @@
/*** <<< FUNC-DECLS [Int1] >>> ***/
-/* This type is equivalent to INTEGER */
-#define asn_DEF_Int1 asn_DEF_INTEGER
+extern asn_TYPE_descriptor_t asn_DEF_Int1;
+asn_struct_free_f Int1_free;
+asn_struct_print_f Int1_print;
+asn_constr_check_f Int1_constraint;
+ber_type_decoder_f Int1_decode_ber;
+der_type_encoder_f Int1_encode_der;
+xer_type_decoder_f Int1_decode_xer;
+xer_type_encoder_f Int1_encode_xer;
/*** <<< CODE [Int1] >>> ***/
-/* This type is equivalent to INTEGER */
+int
+Int1_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
+ asn_app_consume_bytes_f *app_errlog, void *app_key) {
+ /* Replace with underlying type checker */
+ td->check_constraints = asn_DEF_INTEGER.check_constraints;
+ return td->check_constraints(td, sptr, app_errlog, app_key);
+}
+
+/*
+ * This type is implemented using INTEGER,
+ * so here we adjust the DEF accordingly.
+ */
+static void
+Int1_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+ td->free_struct = asn_DEF_INTEGER.free_struct;
+ td->print_struct = asn_DEF_INTEGER.print_struct;
+ td->ber_decoder = asn_DEF_INTEGER.ber_decoder;
+ td->der_encoder = asn_DEF_INTEGER.der_encoder;
+ td->xer_decoder = asn_DEF_INTEGER.xer_decoder;
+ td->xer_encoder = asn_DEF_INTEGER.xer_encoder;
+ td->elements = asn_DEF_INTEGER.elements;
+ td->elements_count = asn_DEF_INTEGER.elements_count;
+ td->specifics = asn_DEF_INTEGER.specifics;
+}
+
+void
+Int1_free(asn_TYPE_descriptor_t *td,
+ void *struct_ptr, int contents_only) {
+ Int1_0_inherit_TYPE_descriptor(td);
+ td->free_struct(td, struct_ptr, contents_only);
+}
+
+int
+Int1_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
+ int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
+ Int1_0_inherit_TYPE_descriptor(td);
+ return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
+}
+
+asn_dec_rval_t
+Int1_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, void *bufptr, size_t size, int tag_mode) {
+ Int1_0_inherit_TYPE_descriptor(td);
+ return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
+}
+
+asn_enc_rval_t
+Int1_encode_der(asn_TYPE_descriptor_t *td,
+ void *structure, int tag_mode, ber_tlv_tag_t tag,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ Int1_0_inherit_TYPE_descriptor(td);
+ return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+}
+
+asn_dec_rval_t
+Int1_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, const char *opt_mname, void *bufptr, size_t size) {
+ Int1_0_inherit_TYPE_descriptor(td);
+ return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
+}
+
+asn_enc_rval_t
+Int1_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
+ int ilevel, enum xer_encoder_flags_e flags,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ Int1_0_inherit_TYPE_descriptor(td);
+ return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
+}
+
+
+/*** <<< STAT-DEFS [Int1] >>> ***/
+
+static ber_tlv_tag_t asn_DEF_Int1_0_tags[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_Int1 = {
+ "Int1",
+ "Int1",
+ Int1_free,
+ Int1_print,
+ Int1_constraint,
+ Int1_decode_ber,
+ Int1_encode_der,
+ Int1_decode_xer,
+ Int1_encode_xer,
+ 0, /* Use generic outmost tag fetcher */
+ asn_DEF_Int1_0_tags,
+ sizeof(asn_DEF_Int1_0_tags)
+ /sizeof(asn_DEF_Int1_0_tags[0]), /* 1 */
+ asn_DEF_Int1_0_tags, /* Same as above */
+ sizeof(asn_DEF_Int1_0_tags)
+ /sizeof(asn_DEF_Int1_0_tags[0]), /* 1 */
+ 0, 0, /* No members */
+ 0 /* No specifics */
+};
/*** <<< INCLUDES [Int2] >>> ***/
@@ -728,12 +828,112 @@
/*** <<< FUNC-DECLS [Str1] >>> ***/
-/* This type is equivalent to IA5String */
-#define asn_DEF_Str1 asn_DEF_IA5String
+extern asn_TYPE_descriptor_t asn_DEF_Str1;
+asn_struct_free_f Str1_free;
+asn_struct_print_f Str1_print;
+asn_constr_check_f Str1_constraint;
+ber_type_decoder_f Str1_decode_ber;
+der_type_encoder_f Str1_encode_der;
+xer_type_decoder_f Str1_decode_xer;
+xer_type_encoder_f Str1_encode_xer;
/*** <<< CODE [Str1] >>> ***/
-/* This type is equivalent to IA5String */
+int
+Str1_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
+ asn_app_consume_bytes_f *app_errlog, void *app_key) {
+ /* Replace with underlying type checker */
+ td->check_constraints = asn_DEF_IA5String.check_constraints;
+ return td->check_constraints(td, sptr, app_errlog, app_key);
+}
+
+/*
+ * This type is implemented using IA5String,
+ * so here we adjust the DEF accordingly.
+ */
+static void
+Str1_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+ td->free_struct = asn_DEF_IA5String.free_struct;
+ td->print_struct = asn_DEF_IA5String.print_struct;
+ td->ber_decoder = asn_DEF_IA5String.ber_decoder;
+ td->der_encoder = asn_DEF_IA5String.der_encoder;
+ td->xer_decoder = asn_DEF_IA5String.xer_decoder;
+ td->xer_encoder = asn_DEF_IA5String.xer_encoder;
+ td->elements = asn_DEF_IA5String.elements;
+ td->elements_count = asn_DEF_IA5String.elements_count;
+ td->specifics = asn_DEF_IA5String.specifics;
+}
+
+void
+Str1_free(asn_TYPE_descriptor_t *td,
+ void *struct_ptr, int contents_only) {
+ Str1_0_inherit_TYPE_descriptor(td);
+ td->free_struct(td, struct_ptr, contents_only);
+}
+
+int
+Str1_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
+ int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
+ Str1_0_inherit_TYPE_descriptor(td);
+ return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
+}
+
+asn_dec_rval_t
+Str1_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, void *bufptr, size_t size, int tag_mode) {
+ Str1_0_inherit_TYPE_descriptor(td);
+ return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
+}
+
+asn_enc_rval_t
+Str1_encode_der(asn_TYPE_descriptor_t *td,
+ void *structure, int tag_mode, ber_tlv_tag_t tag,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ Str1_0_inherit_TYPE_descriptor(td);
+ return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+}
+
+asn_dec_rval_t
+Str1_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, const char *opt_mname, void *bufptr, size_t size) {
+ Str1_0_inherit_TYPE_descriptor(td);
+ return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
+}
+
+asn_enc_rval_t
+Str1_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
+ int ilevel, enum xer_encoder_flags_e flags,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ Str1_0_inherit_TYPE_descriptor(td);
+ return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
+}
+
+
+/*** <<< STAT-DEFS [Str1] >>> ***/
+
+static ber_tlv_tag_t asn_DEF_Str1_0_tags[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_Str1 = {
+ "Str1",
+ "Str1",
+ Str1_free,
+ Str1_print,
+ Str1_constraint,
+ Str1_decode_ber,
+ Str1_encode_der,
+ Str1_decode_xer,
+ Str1_encode_xer,
+ 0, /* Use generic outmost tag fetcher */
+ asn_DEF_Str1_0_tags,
+ sizeof(asn_DEF_Str1_0_tags)
+ /sizeof(asn_DEF_Str1_0_tags[0]), /* 1 */
+ asn_DEF_Str1_0_tags, /* Same as above */
+ sizeof(asn_DEF_Str1_0_tags)
+ /sizeof(asn_DEF_Str1_0_tags[0]), /* 1 */
+ 0, 0, /* No members */
+ 0 /* No specifics */
+};
/*** <<< INCLUDES [Str2] >>> ***/
@@ -757,7 +957,7 @@
/*** <<< CTABLES [Str2] >>> ***/
-static int check_permitted_alphabet_1(const void *sptr) {
+static int check_permitted_alphabet_0(const void *sptr) {
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -789,7 +989,7 @@
size = st->size;
if(((size <= 20) || (size >= 25 && size <= 30))
- && !check_permitted_alphabet_1(sptr)) {
+ && !check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -910,7 +1110,7 @@
/*** <<< CTABLES [Str3] >>> ***/
-static int permitted_alphabet_table_2[256] = {
+static int permitted_alphabet_table_0[256] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
@@ -920,8 +1120,8 @@
0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0, /* def */
};
-static int check_permitted_alphabet_2(const void *sptr) {
- int *table = permitted_alphabet_table_2;
+static int check_permitted_alphabet_0(const void *sptr) {
+ int *table = permitted_alphabet_table_0;
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -953,7 +1153,7 @@
size = st->size;
if(((size >= 10 && size <= 20) || (size >= 25 && size <= 27))
- && !check_permitted_alphabet_2(sptr)) {
+ && !check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -1074,7 +1274,7 @@
/*** <<< CTABLES [Str4] >>> ***/
-static int check_permitted_alphabet_3(const void *sptr) {
+static int check_permitted_alphabet_0(const void *sptr) {
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -1103,7 +1303,7 @@
}
- if(!check_permitted_alphabet_3(sptr)) {
+ if(!check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -1224,7 +1424,7 @@
/*** <<< CTABLES [PER-Visible] >>> ***/
-static int check_permitted_alphabet_4(const void *sptr) {
+static int check_permitted_alphabet_0(const void *sptr) {
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -1253,7 +1453,7 @@
}
- if(!check_permitted_alphabet_4(sptr)) {
+ if(!check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -1374,7 +1574,7 @@
/*** <<< CTABLES [PER-Visible-2] >>> ***/
-static int check_permitted_alphabet_5(const void *sptr) {
+static int check_permitted_alphabet_0(const void *sptr) {
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -1403,7 +1603,7 @@
}
- if(!check_permitted_alphabet_5(sptr)) {
+ if(!check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -1524,7 +1724,7 @@
/*** <<< CTABLES [Not-PER-Visible-1] >>> ***/
-static int check_permitted_alphabet_6(const void *sptr) {
+static int check_permitted_alphabet_0(const void *sptr) {
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -1553,7 +1753,7 @@
}
- if(!check_permitted_alphabet_6(sptr)) {
+ if(!check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -1674,7 +1874,7 @@
/*** <<< CTABLES [Not-PER-Visible-2] >>> ***/
-static int check_permitted_alphabet_7(const void *sptr) {
+static int check_permitted_alphabet_0(const void *sptr) {
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -1703,7 +1903,7 @@
}
- if(!check_permitted_alphabet_7(sptr)) {
+ if(!check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -1824,7 +2024,7 @@
/*** <<< CTABLES [Not-PER-Visible-3] >>> ***/
-static int check_permitted_alphabet_8(const void *sptr) {
+static int check_permitted_alphabet_0(const void *sptr) {
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -1853,7 +2053,7 @@
}
- if(!check_permitted_alphabet_8(sptr)) {
+ if(!check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -1974,7 +2174,7 @@
/*** <<< CTABLES [SIZE-but-not-FROM] >>> ***/
-static int check_permitted_alphabet_9(const void *sptr) {
+static int check_permitted_alphabet_0(const void *sptr) {
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -2006,7 +2206,7 @@
size = st->size;
if((size >= 1 && size <= 4)
- && !check_permitted_alphabet_9(sptr)) {
+ && !check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -2127,7 +2327,7 @@
/*** <<< CTABLES [SIZE-and-FROM] >>> ***/
-static int check_permitted_alphabet_10(const void *sptr) {
+static int check_permitted_alphabet_0(const void *sptr) {
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -2159,7 +2359,7 @@
size = st->size;
if((size >= 1 && size <= 4)
- && !check_permitted_alphabet_10(sptr)) {
+ && !check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -2280,7 +2480,7 @@
/*** <<< CTABLES [Neither-SIZE-nor-FROM] >>> ***/
-static int check_permitted_alphabet_11(const void *sptr) {
+static int check_permitted_alphabet_0(const void *sptr) {
/* The underlying type is IA5String */
const IA5String_t *st = (const IA5String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -2309,7 +2509,7 @@
}
- if(!check_permitted_alphabet_11(sptr)) {
+ if(!check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -2430,7 +2630,7 @@
/*** <<< CTABLES [Utf8-4] >>> ***/
-static int check_permitted_alphabet_12(const void *sptr) {
+static int check_permitted_alphabet_0(const void *sptr) {
if(UTF8String_length((const UTF8String_t *)sptr) < 0)
return -1; /* Alphabet (sic!) test failed. */
@@ -2453,7 +2653,7 @@
}
- if(!check_permitted_alphabet_12(sptr)) {
+ if(!check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -2574,7 +2774,7 @@
/*** <<< CTABLES [Utf8-3] >>> ***/
-static int permitted_alphabet_table_13[128] = {
+static int permitted_alphabet_table_0[128] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
@@ -2585,8 +2785,8 @@
1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0, /* pqrstuvwxyz */
};
-static int check_permitted_alphabet_13(const void *sptr) {
- int *table = permitted_alphabet_table_13;
+static int check_permitted_alphabet_0(const void *sptr) {
+ int *table = permitted_alphabet_table_0;
/* The underlying type is UTF8String */
const UTF8String_t *st = (const UTF8String_t *)sptr;
const uint8_t *ch = st->buf;
@@ -2625,7 +2825,7 @@
}
if((size >= 1 && size <= 2)
- && !check_permitted_alphabet_13(sptr)) {
+ && !check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
@@ -2877,12 +3077,112 @@
/*** <<< FUNC-DECLS [Utf8-1] >>> ***/
-/* This type is equivalent to UTF8String */
-#define asn_DEF_Utf8_1 asn_DEF_UTF8String
+extern asn_TYPE_descriptor_t asn_DEF_Utf8_1;
+asn_struct_free_f Utf8_1_free;
+asn_struct_print_f Utf8_1_print;
+asn_constr_check_f Utf8_1_constraint;
+ber_type_decoder_f Utf8_1_decode_ber;
+der_type_encoder_f Utf8_1_encode_der;
+xer_type_decoder_f Utf8_1_decode_xer;
+xer_type_encoder_f Utf8_1_encode_xer;
/*** <<< CODE [Utf8-1] >>> ***/
-/* This type is equivalent to UTF8String */
+int
+Utf8_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
+ asn_app_consume_bytes_f *app_errlog, void *app_key) {
+ /* Replace with underlying type checker */
+ td->check_constraints = asn_DEF_UTF8String.check_constraints;
+ return td->check_constraints(td, sptr, app_errlog, app_key);
+}
+
+/*
+ * This type is implemented using UTF8String,
+ * so here we adjust the DEF accordingly.
+ */
+static void
+Utf8_1_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+ td->free_struct = asn_DEF_UTF8String.free_struct;
+ td->print_struct = asn_DEF_UTF8String.print_struct;
+ td->ber_decoder = asn_DEF_UTF8String.ber_decoder;
+ td->der_encoder = asn_DEF_UTF8String.der_encoder;
+ td->xer_decoder = asn_DEF_UTF8String.xer_decoder;
+ td->xer_encoder = asn_DEF_UTF8String.xer_encoder;
+ td->elements = asn_DEF_UTF8String.elements;
+ td->elements_count = asn_DEF_UTF8String.elements_count;
+ td->specifics = asn_DEF_UTF8String.specifics;
+}
+
+void
+Utf8_1_free(asn_TYPE_descriptor_t *td,
+ void *struct_ptr, int contents_only) {
+ Utf8_1_0_inherit_TYPE_descriptor(td);
+ td->free_struct(td, struct_ptr, contents_only);
+}
+
+int
+Utf8_1_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
+ int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
+ Utf8_1_0_inherit_TYPE_descriptor(td);
+ return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
+}
+
+asn_dec_rval_t
+Utf8_1_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, void *bufptr, size_t size, int tag_mode) {
+ Utf8_1_0_inherit_TYPE_descriptor(td);
+ return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
+}
+
+asn_enc_rval_t
+Utf8_1_encode_der(asn_TYPE_descriptor_t *td,
+ void *structure, int tag_mode, ber_tlv_tag_t tag,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ Utf8_1_0_inherit_TYPE_descriptor(td);
+ return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+}
+
+asn_dec_rval_t
+Utf8_1_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, const char *opt_mname, void *bufptr, size_t size) {
+ Utf8_1_0_inherit_TYPE_descriptor(td);
+ return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
+}
+
+asn_enc_rval_t
+Utf8_1_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
+ int ilevel, enum xer_encoder_flags_e flags,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ Utf8_1_0_inherit_TYPE_descriptor(td);
+ return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
+}
+
+
+/*** <<< STAT-DEFS [Utf8-1] >>> ***/
+
+static ber_tlv_tag_t asn_DEF_Utf8_1_0_tags[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (12 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_Utf8_1 = {
+ "Utf8-1",
+ "Utf8-1",
+ Utf8_1_free,
+ Utf8_1_print,
+ Utf8_1_constraint,
+ Utf8_1_decode_ber,
+ Utf8_1_encode_der,
+ Utf8_1_decode_xer,
+ Utf8_1_encode_xer,
+ 0, /* Use generic outmost tag fetcher */
+ asn_DEF_Utf8_1_0_tags,
+ sizeof(asn_DEF_Utf8_1_0_tags)
+ /sizeof(asn_DEF_Utf8_1_0_tags[0]), /* 1 */
+ asn_DEF_Utf8_1_0_tags, /* Same as above */
+ sizeof(asn_DEF_Utf8_1_0_tags)
+ /sizeof(asn_DEF_Utf8_1_0_tags[0]), /* 1 */
+ 0, 0, /* No members */
+ 0 /* No specifics */
+};
/*** <<< INCLUDES [VisibleIdentifier] >>> ***/
@@ -2895,12 +3195,159 @@
/*** <<< FUNC-DECLS [VisibleIdentifier] >>> ***/
-/* This type is equivalent to Identifier */
-#define asn_DEF_VisibleIdentifier asn_DEF_Identifier
+extern asn_TYPE_descriptor_t asn_DEF_VisibleIdentifier;
+asn_struct_free_f VisibleIdentifier_free;
+asn_struct_print_f VisibleIdentifier_print;
+asn_constr_check_f VisibleIdentifier_constraint;
+ber_type_decoder_f VisibleIdentifier_decode_ber;
+der_type_encoder_f VisibleIdentifier_encode_der;
+xer_type_decoder_f VisibleIdentifier_decode_xer;
+xer_type_encoder_f VisibleIdentifier_encode_xer;
+
+/*** <<< CTABLES [VisibleIdentifier] >>> ***/
+
+static int permitted_alphabet_table_0[256] = {
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0, /* $ */
+1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0, /* 0123456789 */
+0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* ABCDEFGHIJKLMNO */
+1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,1, /* PQRSTUVWXYZ _ */
+0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* abcdefghijklmno */
+1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0, /* pqrstuvwxyz */
+};
+
+static int check_permitted_alphabet_0(const void *sptr) {
+ int *table = permitted_alphabet_table_0;
+ /* The underlying type is VisibleString */
+ const VisibleString_t *st = (const VisibleString_t *)sptr;
+ const uint8_t *ch = st->buf;
+ const uint8_t *end = ch + st->size;
+
+ for(; ch < end; ch++) {
+ uint8_t cv = *ch;
+ if(!table[cv]) return -1;
+ }
+ return 0;
+}
+
/*** <<< CODE [VisibleIdentifier] >>> ***/
-/* This type is equivalent to Identifier */
+int
+VisibleIdentifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
+ asn_app_consume_bytes_f *app_errlog, void *app_key) {
+ const Identifier_t *st = (const Identifier_t *)sptr;
+ size_t size;
+
+ if(!sptr) {
+ _ASN_ERRLOG(app_errlog, app_key,
+ "%s: value not given (%s:%d)",
+ td->name, __FILE__, __LINE__);
+ return -1;
+ }
+
+ size = st->size;
+
+ if((size >= 1 && size <= 32)
+ && !check_permitted_alphabet_0(st)) {
+ /* Constraint check succeeded */
+ return 0;
+ } else {
+ _ASN_ERRLOG(app_errlog, app_key,
+ "%s: constraint failed (%s:%d)",
+ td->name, __FILE__, __LINE__);
+ return -1;
+ }
+}
+
+/*
+ * This type is implemented using Identifier,
+ * so here we adjust the DEF accordingly.
+ */
+static void
+VisibleIdentifier_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+ td->free_struct = asn_DEF_Identifier.free_struct;
+ td->print_struct = asn_DEF_Identifier.print_struct;
+ td->ber_decoder = asn_DEF_Identifier.ber_decoder;
+ td->der_encoder = asn_DEF_Identifier.der_encoder;
+ td->xer_decoder = asn_DEF_Identifier.xer_decoder;
+ td->xer_encoder = asn_DEF_Identifier.xer_encoder;
+ td->elements = asn_DEF_Identifier.elements;
+ td->elements_count = asn_DEF_Identifier.elements_count;
+ td->specifics = asn_DEF_Identifier.specifics;
+}
+
+void
+VisibleIdentifier_free(asn_TYPE_descriptor_t *td,
+ void *struct_ptr, int contents_only) {
+ VisibleIdentifier_0_inherit_TYPE_descriptor(td);
+ td->free_struct(td, struct_ptr, contents_only);
+}
+
+int
+VisibleIdentifier_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
+ int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
+ VisibleIdentifier_0_inherit_TYPE_descriptor(td);
+ return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
+}
+
+asn_dec_rval_t
+VisibleIdentifier_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, void *bufptr, size_t size, int tag_mode) {
+ VisibleIdentifier_0_inherit_TYPE_descriptor(td);
+ return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
+}
+
+asn_enc_rval_t
+VisibleIdentifier_encode_der(asn_TYPE_descriptor_t *td,
+ void *structure, int tag_mode, ber_tlv_tag_t tag,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ VisibleIdentifier_0_inherit_TYPE_descriptor(td);
+ return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+}
+
+asn_dec_rval_t
+VisibleIdentifier_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, const char *opt_mname, void *bufptr, size_t size) {
+ VisibleIdentifier_0_inherit_TYPE_descriptor(td);
+ return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
+}
+
+asn_enc_rval_t
+VisibleIdentifier_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
+ int ilevel, enum xer_encoder_flags_e flags,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ VisibleIdentifier_0_inherit_TYPE_descriptor(td);
+ return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
+}
+
+
+/*** <<< STAT-DEFS [VisibleIdentifier] >>> ***/
+
+static ber_tlv_tag_t asn_DEF_VisibleIdentifier_0_tags[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (26 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_VisibleIdentifier = {
+ "VisibleIdentifier",
+ "VisibleIdentifier",
+ VisibleIdentifier_free,
+ VisibleIdentifier_print,
+ VisibleIdentifier_constraint,
+ VisibleIdentifier_decode_ber,
+ VisibleIdentifier_encode_der,
+ VisibleIdentifier_decode_xer,
+ VisibleIdentifier_encode_xer,
+ 0, /* Use generic outmost tag fetcher */
+ asn_DEF_VisibleIdentifier_0_tags,
+ sizeof(asn_DEF_VisibleIdentifier_0_tags)
+ /sizeof(asn_DEF_VisibleIdentifier_0_tags[0]), /* 1 */
+ asn_DEF_VisibleIdentifier_0_tags, /* Same as above */
+ sizeof(asn_DEF_VisibleIdentifier_0_tags)
+ /sizeof(asn_DEF_VisibleIdentifier_0_tags[0]), /* 1 */
+ 0, 0, /* No members */
+ 0 /* No specifics */
+};
/*** <<< INCLUDES [Identifier] >>> ***/
@@ -2924,7 +3371,7 @@
/*** <<< CTABLES [Identifier] >>> ***/
-static int permitted_alphabet_table_15[256] = {
+static int permitted_alphabet_table_0[256] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* */
0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0, /* $ */
@@ -2935,8 +3382,8 @@
1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0, /* pqrstuvwxyz */
};
-static int check_permitted_alphabet_15(const void *sptr) {
- int *table = permitted_alphabet_table_15;
+static int check_permitted_alphabet_0(const void *sptr) {
+ int *table = permitted_alphabet_table_0;
/* The underlying type is VisibleString */
const VisibleString_t *st = (const VisibleString_t *)sptr;
const uint8_t *ch = st->buf;
@@ -2968,7 +3415,7 @@
size = st->size;
if((size >= 1 && size <= 32)
- && !check_permitted_alphabet_15(sptr)) {
+ && !check_permitted_alphabet_0(st)) {
/* Constraint check succeeded */
return 0;
} else {
diff --git a/tests/65-multi-tag-OK.asn1.-P b/tests/65-multi-tag-OK.asn1.-P
index a85fc18..44d700e 100644
--- a/tests/65-multi-tag-OK.asn1.-P
+++ b/tests/65-multi-tag-OK.asn1.-P
@@ -629,12 +629,112 @@
/*** <<< FUNC-DECLS [T6] >>> ***/
-/* This type is equivalent to REAL */
-#define asn_DEF_T6 asn_DEF_REAL
+extern asn_TYPE_descriptor_t asn_DEF_T6;
+asn_struct_free_f T6_free;
+asn_struct_print_f T6_print;
+asn_constr_check_f T6_constraint;
+ber_type_decoder_f T6_decode_ber;
+der_type_encoder_f T6_encode_der;
+xer_type_decoder_f T6_decode_xer;
+xer_type_encoder_f T6_encode_xer;
/*** <<< CODE [T6] >>> ***/
-/* This type is equivalent to REAL */
+int
+T6_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
+ asn_app_consume_bytes_f *app_errlog, void *app_key) {
+ /* Replace with underlying type checker */
+ td->check_constraints = asn_DEF_REAL.check_constraints;
+ return td->check_constraints(td, sptr, app_errlog, app_key);
+}
+
+/*
+ * This type is implemented using REAL,
+ * so here we adjust the DEF accordingly.
+ */
+static void
+T6_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+ td->free_struct = asn_DEF_REAL.free_struct;
+ td->print_struct = asn_DEF_REAL.print_struct;
+ td->ber_decoder = asn_DEF_REAL.ber_decoder;
+ td->der_encoder = asn_DEF_REAL.der_encoder;
+ td->xer_decoder = asn_DEF_REAL.xer_decoder;
+ td->xer_encoder = asn_DEF_REAL.xer_encoder;
+ td->elements = asn_DEF_REAL.elements;
+ td->elements_count = asn_DEF_REAL.elements_count;
+ td->specifics = asn_DEF_REAL.specifics;
+}
+
+void
+T6_free(asn_TYPE_descriptor_t *td,
+ void *struct_ptr, int contents_only) {
+ T6_0_inherit_TYPE_descriptor(td);
+ td->free_struct(td, struct_ptr, contents_only);
+}
+
+int
+T6_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
+ int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
+ T6_0_inherit_TYPE_descriptor(td);
+ return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
+}
+
+asn_dec_rval_t
+T6_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, void *bufptr, size_t size, int tag_mode) {
+ T6_0_inherit_TYPE_descriptor(td);
+ return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
+}
+
+asn_enc_rval_t
+T6_encode_der(asn_TYPE_descriptor_t *td,
+ void *structure, int tag_mode, ber_tlv_tag_t tag,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ T6_0_inherit_TYPE_descriptor(td);
+ return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+}
+
+asn_dec_rval_t
+T6_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, const char *opt_mname, void *bufptr, size_t size) {
+ T6_0_inherit_TYPE_descriptor(td);
+ return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
+}
+
+asn_enc_rval_t
+T6_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
+ int ilevel, enum xer_encoder_flags_e flags,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ T6_0_inherit_TYPE_descriptor(td);
+ return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
+}
+
+
+/*** <<< STAT-DEFS [T6] >>> ***/
+
+static ber_tlv_tag_t asn_DEF_T6_0_tags[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (9 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_T6 = {
+ "T6",
+ "T6",
+ T6_free,
+ T6_print,
+ T6_constraint,
+ T6_decode_ber,
+ T6_encode_der,
+ T6_decode_xer,
+ T6_encode_xer,
+ 0, /* Use generic outmost tag fetcher */
+ asn_DEF_T6_0_tags,
+ sizeof(asn_DEF_T6_0_tags)
+ /sizeof(asn_DEF_T6_0_tags[0]), /* 1 */
+ asn_DEF_T6_0_tags, /* Same as above */
+ sizeof(asn_DEF_T6_0_tags)
+ /sizeof(asn_DEF_T6_0_tags[0]), /* 1 */
+ 0, 0, /* No members */
+ 0 /* No specifics */
+};
/*** <<< INCLUDES [T] >>> ***/
diff --git a/tests/65-multi-tag-OK.asn1.-Pfnative-types b/tests/65-multi-tag-OK.asn1.-Pfnative-types
index 6a35789..c82a75b 100644
--- a/tests/65-multi-tag-OK.asn1.-Pfnative-types
+++ b/tests/65-multi-tag-OK.asn1.-Pfnative-types
@@ -629,12 +629,112 @@
/*** <<< FUNC-DECLS [T6] >>> ***/
-/* This type is equivalent to NativeReal */
-#define asn_DEF_T6 asn_DEF_NativeReal
+extern asn_TYPE_descriptor_t asn_DEF_T6;
+asn_struct_free_f T6_free;
+asn_struct_print_f T6_print;
+asn_constr_check_f T6_constraint;
+ber_type_decoder_f T6_decode_ber;
+der_type_encoder_f T6_encode_der;
+xer_type_decoder_f T6_decode_xer;
+xer_type_encoder_f T6_encode_xer;
/*** <<< CODE [T6] >>> ***/
-/* This type is equivalent to NativeReal */
+int
+T6_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
+ asn_app_consume_bytes_f *app_errlog, void *app_key) {
+ /* Replace with underlying type checker */
+ td->check_constraints = asn_DEF_NativeReal.check_constraints;
+ return td->check_constraints(td, sptr, app_errlog, app_key);
+}
+
+/*
+ * This type is implemented using NativeReal,
+ * so here we adjust the DEF accordingly.
+ */
+static void
+T6_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+ td->free_struct = asn_DEF_NativeReal.free_struct;
+ td->print_struct = asn_DEF_NativeReal.print_struct;
+ td->ber_decoder = asn_DEF_NativeReal.ber_decoder;
+ td->der_encoder = asn_DEF_NativeReal.der_encoder;
+ td->xer_decoder = asn_DEF_NativeReal.xer_decoder;
+ td->xer_encoder = asn_DEF_NativeReal.xer_encoder;
+ td->elements = asn_DEF_NativeReal.elements;
+ td->elements_count = asn_DEF_NativeReal.elements_count;
+ td->specifics = asn_DEF_NativeReal.specifics;
+}
+
+void
+T6_free(asn_TYPE_descriptor_t *td,
+ void *struct_ptr, int contents_only) {
+ T6_0_inherit_TYPE_descriptor(td);
+ td->free_struct(td, struct_ptr, contents_only);
+}
+
+int
+T6_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
+ int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
+ T6_0_inherit_TYPE_descriptor(td);
+ return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
+}
+
+asn_dec_rval_t
+T6_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, void *bufptr, size_t size, int tag_mode) {
+ T6_0_inherit_TYPE_descriptor(td);
+ return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
+}
+
+asn_enc_rval_t
+T6_encode_der(asn_TYPE_descriptor_t *td,
+ void *structure, int tag_mode, ber_tlv_tag_t tag,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ T6_0_inherit_TYPE_descriptor(td);
+ return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+}
+
+asn_dec_rval_t
+T6_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, const char *opt_mname, void *bufptr, size_t size) {
+ T6_0_inherit_TYPE_descriptor(td);
+ return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
+}
+
+asn_enc_rval_t
+T6_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
+ int ilevel, enum xer_encoder_flags_e flags,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ T6_0_inherit_TYPE_descriptor(td);
+ return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
+}
+
+
+/*** <<< STAT-DEFS [T6] >>> ***/
+
+static ber_tlv_tag_t asn_DEF_T6_0_tags[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (9 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_T6 = {
+ "T6",
+ "T6",
+ T6_free,
+ T6_print,
+ T6_constraint,
+ T6_decode_ber,
+ T6_encode_der,
+ T6_decode_xer,
+ T6_encode_xer,
+ 0, /* Use generic outmost tag fetcher */
+ asn_DEF_T6_0_tags,
+ sizeof(asn_DEF_T6_0_tags)
+ /sizeof(asn_DEF_T6_0_tags[0]), /* 1 */
+ asn_DEF_T6_0_tags, /* Same as above */
+ sizeof(asn_DEF_T6_0_tags)
+ /sizeof(asn_DEF_T6_0_tags[0]), /* 1 */
+ 0, 0, /* No members */
+ 0 /* No specifics */
+};
/*** <<< INCLUDES [T] >>> ***/
diff --git a/tests/73-circular-OK.asn1 b/tests/73-circular-OK.asn1
index 4b86c0e..f2620d7 100644
--- a/tests/73-circular-OK.asn1
+++ b/tests/73-circular-OK.asn1
@@ -12,10 +12,10 @@
BEGIN
Type ::= SEQUENCE {
- data SEQUENCE OF Epyt
+ data SEQUENCE OF EpytRef
}
- -- EpytRef ::= Epyt
+ EpytRef ::= Epyt
Epyt ::= SEQUENCE {
stype SET OF Type,
diff --git a/tests/73-circular-OK.asn1.-P b/tests/73-circular-OK.asn1.-P
index de24047..837f6f7 100644
--- a/tests/73-circular-OK.asn1.-P
+++ b/tests/73-circular-OK.asn1.-P
@@ -29,7 +29,7 @@
/*** <<< POST-INCLUDE [Type] >>> ***/
-#include <Epyt.h>
+#include <EpytRef.h>
/*** <<< STAT-DEFS [Type] >>> ***/
@@ -37,7 +37,7 @@
{ ATF_NOFLAGS, 0, 0,
.tag = (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
.tag_mode = 0,
- .type = (void *)&asn_DEF_Epyt,
+ .type = (void *)&asn_DEF_EpytRef,
.memb_constraints = 0, /* Defer constraints checking to the member type */
.name = ""
},
@@ -119,6 +119,124 @@
};
+/*** <<< INCLUDES [EpytRef] >>> ***/
+
+#include <Epyt.h>
+
+/*** <<< TYPE-DECLS [EpytRef] >>> ***/
+
+typedef Epyt_t EpytRef_t;
+
+/*** <<< FUNC-DECLS [EpytRef] >>> ***/
+
+extern asn_TYPE_descriptor_t asn_DEF_EpytRef;
+asn_struct_free_f EpytRef_free;
+asn_struct_print_f EpytRef_print;
+asn_constr_check_f EpytRef_constraint;
+ber_type_decoder_f EpytRef_decode_ber;
+der_type_encoder_f EpytRef_encode_der;
+xer_type_decoder_f EpytRef_decode_xer;
+xer_type_encoder_f EpytRef_encode_xer;
+
+/*** <<< CODE [EpytRef] >>> ***/
+
+int
+EpytRef_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
+ asn_app_consume_bytes_f *app_errlog, void *app_key) {
+ /* Replace with underlying type checker */
+ td->check_constraints = asn_DEF_Epyt.check_constraints;
+ return td->check_constraints(td, sptr, app_errlog, app_key);
+}
+
+/*
+ * This type is implemented using Epyt,
+ * so here we adjust the DEF accordingly.
+ */
+static void
+EpytRef_0_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+ td->free_struct = asn_DEF_Epyt.free_struct;
+ td->print_struct = asn_DEF_Epyt.print_struct;
+ td->ber_decoder = asn_DEF_Epyt.ber_decoder;
+ td->der_encoder = asn_DEF_Epyt.der_encoder;
+ td->xer_decoder = asn_DEF_Epyt.xer_decoder;
+ td->xer_encoder = asn_DEF_Epyt.xer_encoder;
+ td->elements = asn_DEF_Epyt.elements;
+ td->elements_count = asn_DEF_Epyt.elements_count;
+ td->specifics = asn_DEF_Epyt.specifics;
+}
+
+void
+EpytRef_free(asn_TYPE_descriptor_t *td,
+ void *struct_ptr, int contents_only) {
+ EpytRef_0_inherit_TYPE_descriptor(td);
+ td->free_struct(td, struct_ptr, contents_only);
+}
+
+int
+EpytRef_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
+ int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
+ EpytRef_0_inherit_TYPE_descriptor(td);
+ return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
+}
+
+asn_dec_rval_t
+EpytRef_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, void *bufptr, size_t size, int tag_mode) {
+ EpytRef_0_inherit_TYPE_descriptor(td);
+ return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
+}
+
+asn_enc_rval_t
+EpytRef_encode_der(asn_TYPE_descriptor_t *td,
+ void *structure, int tag_mode, ber_tlv_tag_t tag,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ EpytRef_0_inherit_TYPE_descriptor(td);
+ return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
+}
+
+asn_dec_rval_t
+EpytRef_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+ void **structure, const char *opt_mname, void *bufptr, size_t size) {
+ EpytRef_0_inherit_TYPE_descriptor(td);
+ return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
+}
+
+asn_enc_rval_t
+EpytRef_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
+ int ilevel, enum xer_encoder_flags_e flags,
+ asn_app_consume_bytes_f *cb, void *app_key) {
+ EpytRef_0_inherit_TYPE_descriptor(td);
+ return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
+}
+
+
+/*** <<< STAT-DEFS [EpytRef] >>> ***/
+
+static ber_tlv_tag_t asn_DEF_EpytRef_0_tags[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_EpytRef = {
+ "EpytRef",
+ "EpytRef",
+ EpytRef_free,
+ EpytRef_print,
+ EpytRef_constraint,
+ EpytRef_decode_ber,
+ EpytRef_encode_der,
+ EpytRef_decode_xer,
+ EpytRef_encode_xer,
+ 0, /* Use generic outmost tag fetcher */
+ asn_DEF_EpytRef_0_tags,
+ sizeof(asn_DEF_EpytRef_0_tags)
+ /sizeof(asn_DEF_EpytRef_0_tags[0]), /* 1 */
+ asn_DEF_EpytRef_0_tags, /* Same as above */
+ sizeof(asn_DEF_EpytRef_0_tags)
+ /sizeof(asn_DEF_EpytRef_0_tags[0]), /* 1 */
+ 0, 0, /* Defined elsewhere */
+ 0 /* No specifics */
+};
+
+
/*** <<< INCLUDES [Epyt] >>> ***/
#include <asn_SET_OF.h>