Simplify the logic of accessing codec function for specific TYPE
diff --git a/tests/127-per-long-OK.asn1.-Pgen-PER b/tests/127-per-long-OK.asn1.-Pgen-PER
index 8334d94..f9d3c80 100644
--- a/tests/127-per-long-OK.asn1.-Pgen-PER
+++ b/tests/127-per-long-OK.asn1.-Pgen-PER
@@ -44,87 +44,6 @@
* This type is implemented using NativeInteger,
* so here we adjust the DEF accordingly.
*/
-static void
-unsigned32_4_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
- td->free_struct = asn_DEF_NativeInteger.free_struct;
- td->print_struct = asn_DEF_NativeInteger.print_struct;
- td->check_constraints = asn_DEF_NativeInteger.check_constraints;
- td->ber_decoder = asn_DEF_NativeInteger.ber_decoder;
- td->der_encoder = asn_DEF_NativeInteger.der_encoder;
- td->xer_decoder = asn_DEF_NativeInteger.xer_decoder;
- td->xer_encoder = asn_DEF_NativeInteger.xer_encoder;
- td->uper_decoder = asn_DEF_NativeInteger.uper_decoder;
- td->uper_encoder = asn_DEF_NativeInteger.uper_encoder;
- td->oer_decoder = asn_DEF_NativeInteger.oer_decoder;
- td->oer_encoder = asn_DEF_NativeInteger.oer_encoder;
- if(!td->oer_constraints)
- td->oer_constraints = asn_DEF_NativeInteger.oer_constraints;
- if(!td->per_constraints)
- td->per_constraints = asn_DEF_NativeInteger.per_constraints;
- td->elements = asn_DEF_NativeInteger.elements;
- td->elements_count = asn_DEF_NativeInteger.elements_count;
- /* td->specifics = asn_DEF_NativeInteger.specifics; // Defined explicitly */
-}
-
-static void
-unsigned32_4_free(asn_TYPE_descriptor_t *td,
- void *struct_ptr, int contents_only) {
- unsigned32_4_inherit_TYPE_descriptor(td);
- td->free_struct(td, struct_ptr, contents_only);
-}
-
-static int
-unsigned32_4_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
- int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
- unsigned32_4_inherit_TYPE_descriptor(td);
- return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
-}
-
-static asn_dec_rval_t
-unsigned32_4_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) {
- unsigned32_4_inherit_TYPE_descriptor(td);
- return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
-}
-
-static asn_enc_rval_t
-unsigned32_4_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) {
- unsigned32_4_inherit_TYPE_descriptor(td);
- return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
-}
-
-static asn_dec_rval_t
-unsigned32_4_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) {
- unsigned32_4_inherit_TYPE_descriptor(td);
- return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
-}
-
-static asn_enc_rval_t
-unsigned32_4_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) {
- unsigned32_4_inherit_TYPE_descriptor(td);
- return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
-}
-
-static asn_dec_rval_t
-unsigned32_4_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
- asn_per_constraints_t *constraints, void **structure, asn_per_data_t *per_data) {
- unsigned32_4_inherit_TYPE_descriptor(td);
- return td->uper_decoder(opt_codec_ctx, td, constraints, structure, per_data);
-}
-
-static asn_enc_rval_t
-unsigned32_4_encode_uper(asn_TYPE_descriptor_t *td,
- asn_per_constraints_t *constraints,
- void *structure, asn_per_outp_t *per_out) {
- unsigned32_4_inherit_TYPE_descriptor(td);
- return td->uper_encoder(td, constraints, structure, per_out);
-}
-
static int
unsplit32_5_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
asn_app_constraint_failed_f *ctfailcb, void *app_key) {
@@ -154,87 +73,6 @@
* This type is implemented using NativeInteger,
* so here we adjust the DEF accordingly.
*/
-static void
-unsplit32_5_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
- td->free_struct = asn_DEF_NativeInteger.free_struct;
- td->print_struct = asn_DEF_NativeInteger.print_struct;
- td->check_constraints = asn_DEF_NativeInteger.check_constraints;
- td->ber_decoder = asn_DEF_NativeInteger.ber_decoder;
- td->der_encoder = asn_DEF_NativeInteger.der_encoder;
- td->xer_decoder = asn_DEF_NativeInteger.xer_decoder;
- td->xer_encoder = asn_DEF_NativeInteger.xer_encoder;
- td->uper_decoder = asn_DEF_NativeInteger.uper_decoder;
- td->uper_encoder = asn_DEF_NativeInteger.uper_encoder;
- td->oer_decoder = asn_DEF_NativeInteger.oer_decoder;
- td->oer_encoder = asn_DEF_NativeInteger.oer_encoder;
- if(!td->oer_constraints)
- td->oer_constraints = asn_DEF_NativeInteger.oer_constraints;
- if(!td->per_constraints)
- td->per_constraints = asn_DEF_NativeInteger.per_constraints;
- td->elements = asn_DEF_NativeInteger.elements;
- td->elements_count = asn_DEF_NativeInteger.elements_count;
- /* td->specifics = asn_DEF_NativeInteger.specifics; // Defined explicitly */
-}
-
-static void
-unsplit32_5_free(asn_TYPE_descriptor_t *td,
- void *struct_ptr, int contents_only) {
- unsplit32_5_inherit_TYPE_descriptor(td);
- td->free_struct(td, struct_ptr, contents_only);
-}
-
-static int
-unsplit32_5_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
- int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
- unsplit32_5_inherit_TYPE_descriptor(td);
- return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
-}
-
-static asn_dec_rval_t
-unsplit32_5_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) {
- unsplit32_5_inherit_TYPE_descriptor(td);
- return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
-}
-
-static asn_enc_rval_t
-unsplit32_5_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) {
- unsplit32_5_inherit_TYPE_descriptor(td);
- return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
-}
-
-static asn_dec_rval_t
-unsplit32_5_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) {
- unsplit32_5_inherit_TYPE_descriptor(td);
- return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
-}
-
-static asn_enc_rval_t
-unsplit32_5_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) {
- unsplit32_5_inherit_TYPE_descriptor(td);
- return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
-}
-
-static asn_dec_rval_t
-unsplit32_5_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
- asn_per_constraints_t *constraints, void **structure, asn_per_data_t *per_data) {
- unsplit32_5_inherit_TYPE_descriptor(td);
- return td->uper_decoder(opt_codec_ctx, td, constraints, structure, per_data);
-}
-
-static asn_enc_rval_t
-unsplit32_5_encode_uper(asn_TYPE_descriptor_t *td,
- asn_per_constraints_t *constraints,
- void *structure, asn_per_outp_t *per_out) {
- unsplit32_5_inherit_TYPE_descriptor(td);
- return td->uper_encoder(td, constraints, structure, per_out);
-}
-
static int
memb_small32range_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
asn_app_constraint_failed_f *ctfailcb, void *app_key) {
@@ -362,7 +200,7 @@
/*** <<< STAT-DEFS [T] >>> ***/
-static asn_INTEGER_specifics_t asn_SPC_unsigned32_specs_4 = {
+static const asn_INTEGER_specifics_t asn_SPC_unsigned32_specs_4 = {
0, 0, 0, 0, 0,
0, /* Native long size */
1 /* Unsigned representation */
@@ -375,16 +213,16 @@
asn_TYPE_descriptor_t asn_DEF_unsigned32_4 = {
"unsigned32",
"unsigned32",
- unsigned32_4_free,
- unsigned32_4_print,
+ NativeInteger_free,
+ NativeInteger_print,
unsigned32_4_constraint,
- unsigned32_4_decode_ber,
- unsigned32_4_encode_der,
- unsigned32_4_decode_xer,
- unsigned32_4_encode_xer,
+ NativeInteger_decode_ber,
+ NativeInteger_encode_der,
+ NativeInteger_decode_xer,
+ NativeInteger_encode_xer,
0, 0, /* No OER support, use "-gen-OER" to enable */
- unsigned32_4_decode_uper,
- unsigned32_4_encode_uper,
+ NativeInteger_decode_uper,
+ NativeInteger_encode_uper,
0, /* Use generic outmost tag fetcher */
asn_DEF_unsigned32_tags_4,
sizeof(asn_DEF_unsigned32_tags_4)
@@ -398,7 +236,7 @@
&asn_SPC_unsigned32_specs_4 /* Additional specs */
};
-static asn_INTEGER_specifics_t asn_SPC_unsplit32_specs_5 = {
+static const asn_INTEGER_specifics_t asn_SPC_unsplit32_specs_5 = {
0, 0, 0, 0, 0,
0, /* Native long size */
1 /* Unsigned representation */
@@ -411,16 +249,16 @@
asn_TYPE_descriptor_t asn_DEF_unsplit32_5 = {
"unsplit32",
"unsplit32",
- unsplit32_5_free,
- unsplit32_5_print,
+ NativeInteger_free,
+ NativeInteger_print,
unsplit32_5_constraint,
- unsplit32_5_decode_ber,
- unsplit32_5_encode_der,
- unsplit32_5_decode_xer,
- unsplit32_5_encode_xer,
+ NativeInteger_decode_ber,
+ NativeInteger_encode_der,
+ NativeInteger_decode_xer,
+ NativeInteger_encode_xer,
0, 0, /* No OER support, use "-gen-OER" to enable */
- unsplit32_5_decode_uper,
- unsplit32_5_encode_uper,
+ NativeInteger_decode_uper,
+ NativeInteger_encode_uper,
0, /* Use generic outmost tag fetcher */
asn_DEF_unsplit32_tags_5,
sizeof(asn_DEF_unsplit32_tags_5)