Move type operations to another structure
Every type has free, print, check_constraints, ber_decoder, der_encoder,
xer_decoder, xer_encoder, uper_decoder, uper_encoder and outmost_tag
operations. We move them out to a separate structure asn_TYPE_operation_t.
Combined with previous logic simplification, these operations are based
on ASN.1 basic types, constructed types and string types. So we can
reduce the space occupied by asn_TYPE_descriptor_t variables.
diff --git a/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR b/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR
index 06dd0e4..5b965c1 100644
--- a/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR
+++ b/tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR
@@ -93,17 +93,8 @@
asn_TYPE_descriptor_t asn_DEF_varsets_3 = {
"varsets",
"varsets",
- SEQUENCE_OF_free,
- SEQUENCE_OF_print,
- SEQUENCE_OF_compare,
+ &asn_OP_SEQUENCE_OF,
SEQUENCE_OF_constraint,
- SEQUENCE_OF_decode_ber,
- SEQUENCE_OF_encode_der,
- SEQUENCE_OF_decode_xer,
- SEQUENCE_OF_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 */
asn_DEF_varsets_tags_3,
sizeof(asn_DEF_varsets_tags_3)
/sizeof(asn_DEF_varsets_tags_3[0]), /* 1 */
@@ -160,17 +151,8 @@
asn_TYPE_descriptor_t asn_DEF_LogLine = {
"LogLine",
"LogLine",
- SEQUENCE_free,
- SEQUENCE_print,
- SEQUENCE_compare,
+ &asn_OP_SEQUENCE,
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 */
asn_DEF_LogLine_tags_1,
sizeof(asn_DEF_LogLine_tags_1)
/sizeof(asn_DEF_LogLine_tags_1[0]), /* 1 */
@@ -274,17 +256,8 @@
asn_TYPE_descriptor_t asn_DEF_vparts_2 = {
"vparts",
"vparts",
- SEQUENCE_OF_free,
- SEQUENCE_OF_print,
- SEQUENCE_OF_compare,
+ &asn_OP_SEQUENCE_OF,
SEQUENCE_OF_constraint,
- SEQUENCE_OF_decode_ber,
- SEQUENCE_OF_encode_der,
- SEQUENCE_OF_decode_xer,
- SEQUENCE_OF_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 */
asn_DEF_vparts_tags_2,
sizeof(asn_DEF_vparts_tags_2)
/sizeof(asn_DEF_vparts_tags_2[0]), /* 1 */
@@ -341,17 +314,8 @@
asn_TYPE_descriptor_t asn_DEF_VariablePartSet = {
"VariablePartSet",
"VariablePartSet",
- SEQUENCE_free,
- SEQUENCE_print,
- SEQUENCE_compare,
+ &asn_OP_SEQUENCE,
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 */
asn_DEF_VariablePartSet_tags_1,
sizeof(asn_DEF_VariablePartSet_tags_1)
/sizeof(asn_DEF_VariablePartSet_tags_1[0]), /* 1 */
@@ -478,17 +442,8 @@
asn_TYPE_descriptor_t asn_DEF_vset_2 = {
"vset",
"vset",
- SET_OF_free,
- SET_OF_print,
- SET_OF_compare,
+ &asn_OP_SET_OF,
SET_OF_constraint,
- SET_OF_decode_ber,
- SET_OF_encode_der,
- SET_OF_decode_xer,
- SET_OF_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 */
asn_DEF_vset_tags_2,
sizeof(asn_DEF_vset_tags_2)
/sizeof(asn_DEF_vset_tags_2[0]), /* 1 */
@@ -546,17 +501,8 @@
asn_TYPE_descriptor_t asn_DEF_vrange_4 = {
"vrange",
"vrange",
- SEQUENCE_free,
- SEQUENCE_print,
- SEQUENCE_compare,
+ &asn_OP_SEQUENCE,
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 */
asn_DEF_vrange_tags_4,
sizeof(asn_DEF_vrange_tags_4)
/sizeof(asn_DEF_vrange_tags_4[0]), /* 1 */
@@ -611,17 +557,8 @@
asn_TYPE_descriptor_t asn_DEF_VariablePart = {
"VariablePart",
"VariablePart",
- CHOICE_free,
- CHOICE_print,
- CHOICE_compare,
+ &asn_OP_CHOICE,
CHOICE_constraint,
- CHOICE_decode_ber,
- CHOICE_encode_der,
- CHOICE_decode_xer,
- CHOICE_encode_xer,
- 0, 0, /* No OER support, use "-gen-OER" to enable */
- 0, 0, /* No PER support, use "-gen-PER" to enable */
- CHOICE_outmost_tag,
0, /* No effective tags (pointer) */
0, /* No effective tags (count) */
0, /* No tags (pointer) */
@@ -727,17 +664,8 @@
asn_TYPE_descriptor_t asn_DEF_accept_as_2 = {
"accept-as",
"accept-as",
- NativeEnumerated_free,
- NativeEnumerated_print,
- NativeEnumerated_compare,
+ &asn_OP_NativeEnumerated,
NativeEnumerated_constraint,
- NativeEnumerated_decode_ber,
- NativeEnumerated_encode_der,
- NativeEnumerated_decode_xer,
- NativeEnumerated_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 */
asn_DEF_accept_as_tags_2,
sizeof(asn_DEF_accept_as_tags_2)
/sizeof(asn_DEF_accept_as_tags_2[0]), /* 1 */
@@ -775,17 +703,8 @@
asn_TYPE_descriptor_t asn_DEF_email_9 = {
"email",
"email",
- SET_OF_free,
- SET_OF_print,
- SET_OF_compare,
+ &asn_OP_SET_OF,
SET_OF_constraint,
- SET_OF_decode_ber,
- SET_OF_encode_der,
- SET_OF_decode_xer,
- SET_OF_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 */
asn_DEF_email_tags_9,
sizeof(asn_DEF_email_tags_9)
/sizeof(asn_DEF_email_tags_9[0]), /* 1 */
@@ -843,17 +762,8 @@
asn_TYPE_descriptor_t asn_DEF_notify_7 = {
"notify",
"notify",
- SEQUENCE_free,
- SEQUENCE_print,
- SEQUENCE_compare,
+ &asn_OP_SEQUENCE,
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 */
asn_DEF_notify_tags_7,
sizeof(asn_DEF_notify_tags_7)
/sizeof(asn_DEF_notify_tags_7[0]), /* 1 */
@@ -910,17 +820,8 @@
asn_TYPE_descriptor_t asn_DEF_ActionItem = {
"ActionItem",
"ActionItem",
- SEQUENCE_free,
- SEQUENCE_print,
- SEQUENCE_compare,
+ &asn_OP_SEQUENCE,
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 */
asn_DEF_ActionItem_tags_1,
sizeof(asn_DEF_ActionItem_tags_1)
/sizeof(asn_DEF_ActionItem_tags_1[0]), /* 1 */