Simplify the logic of accessing codec function for specific TYPE
diff --git a/tests/105-param-2-OK.asn1.-Pfwide-types b/tests/105-param-2-OK.asn1.-Pfwide-types
index 4a6f995..4727e08 100644
--- a/tests/105-param-2-OK.asn1.-Pfwide-types
+++ b/tests/105-param-2-OK.asn1.-Pfwide-types
@@ -43,11 +43,15 @@
/*** <<< FUNC-DECLS [SIGNED] >>> ***/
extern asn_TYPE_descriptor_t asn_DEF_SIGNED_16P0;
+extern asn_SEQUENCE_specifics_t asn_SPC_SIGNED_16P0_specs_1;
+extern asn_TYPE_member_t asn_MBR_SIGNED_16P0_1[1];
extern asn_TYPE_descriptor_t asn_DEF_SIGNED_16P1;
+extern asn_SEQUENCE_specifics_t asn_SPC_SIGNED_16P1_specs_3;
+extern asn_TYPE_member_t asn_MBR_SIGNED_16P1_3[1];
/*** <<< STAT-DEFS [SIGNED] >>> ***/
-static asn_TYPE_member_t asn_MBR_SIGNED_16P0_1[] = {
+asn_TYPE_member_t asn_MBR_SIGNED_16P0_1[] = {
{ ATF_NOFLAGS, 0, offsetof(struct SIGNED_16P0, Signed),
.tag = (ASN_TAG_CLASS_UNIVERSAL | (9 << 2)),
.tag_mode = 0,
@@ -65,7 +69,7 @@
static const asn_TYPE_tag2member_t asn_MAP_SIGNED_16P0_tag2el_1[] = {
{ (ASN_TAG_CLASS_UNIVERSAL | (9 << 2)), 0, 0, 0 } /* signed */
};
-static asn_SEQUENCE_specifics_t asn_SPC_SIGNED_16P0_specs_1 = {
+asn_SEQUENCE_specifics_t asn_SPC_SIGNED_16P0_specs_1 = {
sizeof(struct SIGNED_16P0),
offsetof(struct SIGNED_16P0, _asn_ctx),
asn_MAP_SIGNED_16P0_tag2el_1,
@@ -121,7 +125,8 @@
static const uint8_t asn_MAP_signed_mmap_4[(1 + (8 * sizeof(unsigned int)) - 1) / 8] = {
(1 << 7)
};
-static asn_SET_specifics_t asn_SPC_signed_specs_4 = {
+static
+asn_SET_specifics_t asn_SPC_signed_specs_4 = {
sizeof(struct Signed),
offsetof(struct Signed, _asn_ctx),
offsetof(struct Signed, _presence_map),
@@ -159,7 +164,7 @@
&asn_SPC_signed_specs_4 /* Additional specs */
};
-static asn_TYPE_member_t asn_MBR_SIGNED_16P1_3[] = {
+asn_TYPE_member_t asn_MBR_SIGNED_16P1_3[] = {
{ ATF_NOFLAGS, 0, offsetof(struct SIGNED_16P1, Signed),
.tag = (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)),
.tag_mode = 0,
@@ -177,7 +182,7 @@
static const asn_TYPE_tag2member_t asn_MAP_SIGNED_16P1_tag2el_3[] = {
{ (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)), 0, 0, 0 } /* signed */
};
-static asn_SEQUENCE_specifics_t asn_SPC_SIGNED_16P1_specs_3 = {
+asn_SEQUENCE_specifics_t asn_SPC_SIGNED_16P1_specs_3 = {
sizeof(struct SIGNED_16P1),
offsetof(struct SIGNED_16P1, _asn_ctx),
asn_MAP_SIGNED_16P1_tag2el_3,
@@ -234,84 +239,10 @@
/*** <<< CODE [SignedREAL] >>> ***/
-int
-SignedREAL_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_SIGNED_16P0.check_constraints;
- return td->check_constraints(td, sptr, ctfailcb, app_key);
-}
-
/*
* This type is implemented using SIGNED_16P0,
* so here we adjust the DEF accordingly.
*/
-static void
-SignedREAL_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
- td->free_struct = asn_DEF_SIGNED_16P0.free_struct;
- td->print_struct = asn_DEF_SIGNED_16P0.print_struct;
- td->check_constraints = asn_DEF_SIGNED_16P0.check_constraints;
- td->ber_decoder = asn_DEF_SIGNED_16P0.ber_decoder;
- td->der_encoder = asn_DEF_SIGNED_16P0.der_encoder;
- td->xer_decoder = asn_DEF_SIGNED_16P0.xer_decoder;
- td->xer_encoder = asn_DEF_SIGNED_16P0.xer_encoder;
- td->uper_decoder = asn_DEF_SIGNED_16P0.uper_decoder;
- td->uper_encoder = asn_DEF_SIGNED_16P0.uper_encoder;
- td->oer_decoder = asn_DEF_SIGNED_16P0.oer_decoder;
- td->oer_encoder = asn_DEF_SIGNED_16P0.oer_encoder;
- if(!td->oer_constraints)
- td->oer_constraints = asn_DEF_SIGNED_16P0.oer_constraints;
- if(!td->per_constraints)
- td->per_constraints = asn_DEF_SIGNED_16P0.per_constraints;
- td->elements = asn_DEF_SIGNED_16P0.elements;
- td->elements_count = asn_DEF_SIGNED_16P0.elements_count;
- td->specifics = asn_DEF_SIGNED_16P0.specifics;
-}
-
-void
-SignedREAL_free(asn_TYPE_descriptor_t *td,
- void *struct_ptr, int contents_only) {
- SignedREAL_1_inherit_TYPE_descriptor(td);
- td->free_struct(td, struct_ptr, contents_only);
-}
-
-int
-SignedREAL_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
- int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
- SignedREAL_1_inherit_TYPE_descriptor(td);
- return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
-}
-
-asn_dec_rval_t
-SignedREAL_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) {
- SignedREAL_1_inherit_TYPE_descriptor(td);
- return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
-}
-
-asn_enc_rval_t
-SignedREAL_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) {
- SignedREAL_1_inherit_TYPE_descriptor(td);
- return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
-}
-
-asn_dec_rval_t
-SignedREAL_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) {
- SignedREAL_1_inherit_TYPE_descriptor(td);
- return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
-}
-
-asn_enc_rval_t
-SignedREAL_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) {
- SignedREAL_1_inherit_TYPE_descriptor(td);
- return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
-}
-
/*** <<< STAT-DEFS [SignedREAL] >>> ***/
@@ -321,13 +252,13 @@
asn_TYPE_descriptor_t asn_DEF_SignedREAL = {
"SignedREAL",
"SignedREAL",
- SignedREAL_free,
- SignedREAL_print,
- SignedREAL_constraint,
- SignedREAL_decode_ber,
- SignedREAL_encode_der,
- SignedREAL_decode_xer,
- SignedREAL_encode_xer,
+ SEQUENCE_free,
+ SEQUENCE_print,
+ SEQUENCE_constraint,
+ SEQUENCE_decode_ber,
+ SEQUENCE_encode_der,
+ SEQUENCE_decode_xer,
+ SEQUENCE_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 */
@@ -339,8 +270,9 @@
/sizeof(asn_DEF_SignedREAL_tags_1[0]), /* 1 */
0, /* No OER visible constraints */
0, /* No PER visible constraints */
- 0, 0, /* Defined elsewhere */
- 0 /* No specifics */
+ asn_MBR_SIGNED_16P0_1,
+ 1, /* Elements count */
+ &asn_SPC_SIGNED_16P0_specs_1 /* Additional specs */
};
@@ -365,84 +297,10 @@
/*** <<< CODE [SignedSET] >>> ***/
-int
-SignedSET_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_SIGNED_16P1.check_constraints;
- return td->check_constraints(td, sptr, ctfailcb, app_key);
-}
-
/*
* This type is implemented using SIGNED_16P1,
* so here we adjust the DEF accordingly.
*/
-static void
-SignedSET_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
- td->free_struct = asn_DEF_SIGNED_16P1.free_struct;
- td->print_struct = asn_DEF_SIGNED_16P1.print_struct;
- td->check_constraints = asn_DEF_SIGNED_16P1.check_constraints;
- td->ber_decoder = asn_DEF_SIGNED_16P1.ber_decoder;
- td->der_encoder = asn_DEF_SIGNED_16P1.der_encoder;
- td->xer_decoder = asn_DEF_SIGNED_16P1.xer_decoder;
- td->xer_encoder = asn_DEF_SIGNED_16P1.xer_encoder;
- td->uper_decoder = asn_DEF_SIGNED_16P1.uper_decoder;
- td->uper_encoder = asn_DEF_SIGNED_16P1.uper_encoder;
- td->oer_decoder = asn_DEF_SIGNED_16P1.oer_decoder;
- td->oer_encoder = asn_DEF_SIGNED_16P1.oer_encoder;
- if(!td->oer_constraints)
- td->oer_constraints = asn_DEF_SIGNED_16P1.oer_constraints;
- if(!td->per_constraints)
- td->per_constraints = asn_DEF_SIGNED_16P1.per_constraints;
- td->elements = asn_DEF_SIGNED_16P1.elements;
- td->elements_count = asn_DEF_SIGNED_16P1.elements_count;
- td->specifics = asn_DEF_SIGNED_16P1.specifics;
-}
-
-void
-SignedSET_free(asn_TYPE_descriptor_t *td,
- void *struct_ptr, int contents_only) {
- SignedSET_1_inherit_TYPE_descriptor(td);
- td->free_struct(td, struct_ptr, contents_only);
-}
-
-int
-SignedSET_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
- int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
- SignedSET_1_inherit_TYPE_descriptor(td);
- return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
-}
-
-asn_dec_rval_t
-SignedSET_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) {
- SignedSET_1_inherit_TYPE_descriptor(td);
- return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
-}
-
-asn_enc_rval_t
-SignedSET_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) {
- SignedSET_1_inherit_TYPE_descriptor(td);
- return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
-}
-
-asn_dec_rval_t
-SignedSET_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) {
- SignedSET_1_inherit_TYPE_descriptor(td);
- return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
-}
-
-asn_enc_rval_t
-SignedSET_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) {
- SignedSET_1_inherit_TYPE_descriptor(td);
- return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
-}
-
/*** <<< STAT-DEFS [SignedSET] >>> ***/
@@ -452,13 +310,13 @@
asn_TYPE_descriptor_t asn_DEF_SignedSET = {
"SignedSET",
"SignedSET",
- SignedSET_free,
- SignedSET_print,
- SignedSET_constraint,
- SignedSET_decode_ber,
- SignedSET_encode_der,
- SignedSET_decode_xer,
- SignedSET_encode_xer,
+ SEQUENCE_free,
+ SEQUENCE_print,
+ SEQUENCE_constraint,
+ SEQUENCE_decode_ber,
+ SEQUENCE_encode_der,
+ SEQUENCE_decode_xer,
+ SEQUENCE_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 */
@@ -470,7 +328,8 @@
/sizeof(asn_DEF_SignedSET_tags_1[0]), /* 1 */
0, /* No OER visible constraints */
0, /* No PER visible constraints */
- 0, 0, /* Defined elsewhere */
- 0 /* No specifics */
+ asn_MBR_SIGNED_16P1_3,
+ 1, /* Elements count */
+ &asn_SPC_SIGNED_16P1_specs_3 /* Additional specs */
};