proper handling of reserved identifiers

1 files changed, 120 insertions, 2 deletions

diff --git a/tests/73-circular-OK.asn1.-P b/tests/73-circular-OK.asn1.-P
index de24047f..837f6f71 100644
--- a/tests/73-circular-OK.asn1.-P
+++ b/tests/73-circular-OK.asn1.-P
@@ -29,7 +29,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Type;
 
 /*** <<< POST-INCLUDE [Type] >>> ***/
 
-#include <Epyt.h>
+#include <EpytRef.h>
 
 /*** <<< STAT-DEFS [Type] >>> ***/
 
@@ -37,7 +37,7 @@ static asn_TYPE_member_t asn_MBR_data_2[] = {
 	{ 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 @@ asn_TYPE_descriptor_t asn_DEF_Type = {
 };
 
 
+/*** <<< 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>