Simplify the logic of accessing codec function for specific TYPE
diff --git a/tests/66-ref-simple-OK.asn1.-Pfwide-types b/tests/66-ref-simple-OK.asn1.-Pfwide-types
index 8f37082..07aa780 100644
--- a/tests/66-ref-simple-OK.asn1.-Pfwide-types
+++ b/tests/66-ref-simple-OK.asn1.-Pfwide-types
@@ -86,6 +86,7 @@
/*** <<< FUNC-DECLS [SimpleType] >>> ***/
extern asn_TYPE_descriptor_t asn_DEF_SimpleType;
+extern asn_INTEGER_specifics_t asn_SPC_SimpleType_specs_1;
asn_struct_free_f SimpleType_free;
asn_struct_print_f SimpleType_print;
asn_constr_check_f SimpleType_constraint;
@@ -96,84 +97,10 @@
/*** <<< CODE [SimpleType] >>> ***/
-int
-SimpleType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
- asn_app_constraint_failed_f *ctfailcb, void *app_key) {
- /* Replace with underlying type checker */
- td->check_constraints = asn_DEF_ENUMERATED.check_constraints;
- return td->check_constraints(td, sptr, ctfailcb, app_key);
-}
-
/*
* This type is implemented using ENUMERATED,
* so here we adjust the DEF accordingly.
*/
-static void
-SimpleType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
- td->free_struct = asn_DEF_ENUMERATED.free_struct;
- td->print_struct = asn_DEF_ENUMERATED.print_struct;
- td->check_constraints = asn_DEF_ENUMERATED.check_constraints;
- td->ber_decoder = asn_DEF_ENUMERATED.ber_decoder;
- 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;
- td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder;
- td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder;
- td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder;
- if(!td->oer_constraints)
- td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints;
- 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 */
-}
-
-void
-SimpleType_free(asn_TYPE_descriptor_t *td,
- void *struct_ptr, int contents_only) {
- SimpleType_1_inherit_TYPE_descriptor(td);
- td->free_struct(td, struct_ptr, contents_only);
-}
-
-int
-SimpleType_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
- int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
- SimpleType_1_inherit_TYPE_descriptor(td);
- return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
-}
-
-asn_dec_rval_t
-SimpleType_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
- void **structure, const void *bufptr, size_t size, int tag_mode) {
- SimpleType_1_inherit_TYPE_descriptor(td);
- return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
-}
-
-asn_enc_rval_t
-SimpleType_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) {
- SimpleType_1_inherit_TYPE_descriptor(td);
- return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
-}
-
-asn_dec_rval_t
-SimpleType_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
- void **structure, const char *opt_mname, const void *bufptr, size_t size) {
- SimpleType_1_inherit_TYPE_descriptor(td);
- return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
-}
-
-asn_enc_rval_t
-SimpleType_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) {
- SimpleType_1_inherit_TYPE_descriptor(td);
- return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
-}
-
/*** <<< STAT-DEFS [SimpleType] >>> ***/
@@ -187,7 +114,7 @@
2, /* three(2) */
1 /* two(1) */
};
-static asn_INTEGER_specifics_t asn_SPC_SimpleType_specs_1 = {
+const 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 */
@@ -202,13 +129,13 @@
asn_TYPE_descriptor_t asn_DEF_SimpleType = {
"SimpleType",
"SimpleType",
- SimpleType_free,
- SimpleType_print,
- SimpleType_constraint,
- SimpleType_decode_ber,
- SimpleType_encode_der,
- SimpleType_decode_xer,
- SimpleType_encode_xer,
+ ENUMERATED_free,
+ ENUMERATED_print,
+ ENUMERATED_constraint,
+ ENUMERATED_decode_ber,
+ ENUMERATED_encode_der,
+ ENUMERATED_decode_xer,
+ ENUMERATED_encode_xer,
0, 0, /* No OER support, use "-gen-OER" to enable */
0, 0, /* No PER support, use "-gen-PER" to enable */
0, /* Use generic outmost tag fetcher */