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/70-xer-test-OK.asn1.-Pfwide-types b/tests/tests-asn1c-compiler/70-xer-test-OK.asn1.-Pfwide-types
index db026ff..0bda67c 100644
--- a/tests/tests-asn1c-compiler/70-xer-test-OK.asn1.-Pfwide-types
+++ b/tests/tests-asn1c-compiler/70-xer-test-OK.asn1.-Pfwide-types
@@ -274,17 +274,8 @@
asn_TYPE_descriptor_t asn_DEF_PDU = {
"PDU",
"PDU",
- 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) */
@@ -399,17 +390,8 @@
asn_TYPE_descriptor_t asn_DEF_Sequence = {
"Sequence",
"Sequence",
- 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_Sequence_tags_1,
sizeof(asn_DEF_Sequence_tags_1)
/sizeof(asn_DEF_Sequence_tags_1[0]), /* 1 */
@@ -511,17 +493,8 @@
asn_TYPE_descriptor_t asn_DEF_Set = {
"Set",
"Set",
- SET_free,
- SET_print,
- SET_compare,
+ &asn_OP_SET,
SET_constraint,
- SET_decode_ber,
- SET_encode_der,
- SET_decode_xer,
- SET_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_Set_tags_1,
sizeof(asn_DEF_Set_tags_1)
/sizeof(asn_DEF_Set_tags_1[0]), /* 1 */
@@ -616,17 +589,8 @@
asn_TYPE_descriptor_t asn_DEF_enum_4 = {
"enum",
"enum",
- ENUMERATED_free,
- ENUMERATED_print,
- ENUMERATED_compare,
+ &asn_OP_ENUMERATED,
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 */
asn_DEF_enum_tags_4,
sizeof(asn_DEF_enum_tags_4)
/sizeof(asn_DEF_enum_tags_4[0]) - 1, /* 1 */
@@ -687,17 +651,8 @@
asn_TYPE_descriptor_t asn_DEF_ExtensibleSet = {
"ExtensibleSet",
"ExtensibleSet",
- SET_free,
- SET_print,
- SET_compare,
+ &asn_OP_SET,
SET_constraint,
- SET_decode_ber,
- SET_encode_der,
- SET_decode_xer,
- SET_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_ExtensibleSet_tags_1,
sizeof(asn_DEF_ExtensibleSet_tags_1)
/sizeof(asn_DEF_ExtensibleSet_tags_1[0]), /* 1 */
@@ -797,17 +752,8 @@
asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence = {
"ExtensibleSequence",
"ExtensibleSequence",
- 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_ExtensibleSequence_tags_1,
sizeof(asn_DEF_ExtensibleSequence_tags_1)
/sizeof(asn_DEF_ExtensibleSequence_tags_1[0]), /* 1 */
@@ -893,17 +839,8 @@
asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence2 = {
"ExtensibleSequence2",
"ExtensibleSequence2",
- 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_ExtensibleSequence2_tags_1,
sizeof(asn_DEF_ExtensibleSequence2_tags_1)
/sizeof(asn_DEF_ExtensibleSequence2_tags_1[0]), /* 1 */
@@ -965,17 +902,8 @@
asn_TYPE_descriptor_t asn_DEF_SetOfNULL = {
"SetOfNULL",
"SetOfNULL",
- 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_SetOfNULL_tags_1,
sizeof(asn_DEF_SetOfNULL_tags_1)
/sizeof(asn_DEF_SetOfNULL_tags_1[0]), /* 1 */
@@ -1037,17 +965,8 @@
asn_TYPE_descriptor_t asn_DEF_SetOfREAL = {
"SetOfREAL",
"SetOfREAL",
- 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_SetOfREAL_tags_1,
sizeof(asn_DEF_SetOfREAL_tags_1)
/sizeof(asn_DEF_SetOfREAL_tags_1[0]), /* 1 */
@@ -1124,17 +1043,8 @@
asn_TYPE_descriptor_t asn_DEF_Member_2 = {
"ENUMERATED",
"ENUMERATED",
- ENUMERATED_free,
- ENUMERATED_print,
- ENUMERATED_compare,
+ &asn_OP_ENUMERATED,
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 */
asn_DEF_Member_tags_2,
sizeof(asn_DEF_Member_tags_2)
/sizeof(asn_DEF_Member_tags_2[0]), /* 1 */
@@ -1171,17 +1081,8 @@
asn_TYPE_descriptor_t asn_DEF_SetOfEnums = {
"SetOfEnums",
"SetOfEnums",
- 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_SetOfEnums_tags_1,
sizeof(asn_DEF_SetOfEnums_tags_1)
/sizeof(asn_DEF_SetOfEnums_tags_1[0]), /* 1 */
@@ -1243,17 +1144,8 @@
asn_TYPE_descriptor_t asn_DEF_NamedSetOfNULL = {
"NamedSetOfNULL",
"NamedSetOfNULL",
- 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_NamedSetOfNULL_tags_1,
sizeof(asn_DEF_NamedSetOfNULL_tags_1)
/sizeof(asn_DEF_NamedSetOfNULL_tags_1[0]), /* 1 */
@@ -1315,17 +1207,8 @@
asn_TYPE_descriptor_t asn_DEF_NamedSetOfREAL = {
"NamedSetOfREAL",
"NamedSetOfREAL",
- 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_NamedSetOfREAL_tags_1,
sizeof(asn_DEF_NamedSetOfREAL_tags_1)
/sizeof(asn_DEF_NamedSetOfREAL_tags_1[0]), /* 1 */
@@ -1402,17 +1285,8 @@
asn_TYPE_descriptor_t asn_DEF_name_2 = {
"ENUMERATED",
"ENUMERATED",
- ENUMERATED_free,
- ENUMERATED_print,
- ENUMERATED_compare,
+ &asn_OP_ENUMERATED,
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 */
asn_DEF_name_tags_2,
sizeof(asn_DEF_name_tags_2)
/sizeof(asn_DEF_name_tags_2[0]), /* 1 */
@@ -1449,17 +1323,8 @@
asn_TYPE_descriptor_t asn_DEF_NamedSetOfEnums = {
"NamedSetOfEnums",
"NamedSetOfEnums",
- 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_NamedSetOfEnums_tags_1,
sizeof(asn_DEF_NamedSetOfEnums_tags_1)
/sizeof(asn_DEF_NamedSetOfEnums_tags_1[0]), /* 1 */
@@ -1521,17 +1386,8 @@
asn_TYPE_descriptor_t asn_DEF_SequenceOf = {
"SequenceOf",
"SequenceOf",
- 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_SequenceOf_tags_1,
sizeof(asn_DEF_SequenceOf_tags_1)
/sizeof(asn_DEF_SequenceOf_tags_1[0]), /* 1 */
@@ -1593,17 +1449,8 @@
asn_TYPE_descriptor_t asn_DEF_SeqOfZuka = {
"SeqOfZuka",
"SeqOfZuka",
- 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_SeqOfZuka_tags_1,
sizeof(asn_DEF_SeqOfZuka_tags_1)
/sizeof(asn_DEF_SeqOfZuka_tags_1[0]), /* 1 */
@@ -1672,17 +1519,8 @@
asn_TYPE_descriptor_t asn_DEF_SetOfChoice = {
"SetOfChoice",
"SetOfChoice",
- 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_SetOfChoice_tags_1,
sizeof(asn_DEF_SetOfChoice_tags_1)
/sizeof(asn_DEF_SetOfChoice_tags_1[0]), /* 1 */
@@ -1751,17 +1589,8 @@
asn_TYPE_descriptor_t asn_DEF_NamedSetOfChoice = {
"NamedSetOfChoice",
"NamedSetOfChoice",
- 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_NamedSetOfChoice_tags_1,
sizeof(asn_DEF_NamedSetOfChoice_tags_1)
/sizeof(asn_DEF_NamedSetOfChoice_tags_1[0]), /* 1 */
@@ -1852,17 +1681,8 @@
asn_TYPE_descriptor_t asn_DEF_SimpleChoice = {
"SimpleChoice",
"SimpleChoice",
- 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) */