testing of spaces in enumeration

2 files changed, 146 insertions, 148 deletions

diff --git a/tests/70-xer-test-OK.asn1.-EF b/tests/70-xer-test-OK.asn1.-EF
index ac61aea9..e40e679a 100644
--- a/tests/70-xer-test-OK.asn1.-EF
+++ b/tests/70-xer-test-OK.asn1.-EF
@@ -31,17 +31,17 @@ Set ::= SET {
 
 ExtensibleSet ::= SET {
     string	 [0] IMPLICIT UTF8String OPTIONAL,
-    ...
+    ...,
+    enum	 [1] IMPLICIT ENUMERATED {
+        b(0),    
+        a(1)
+    }
 }
 
 ExtensibleSequence ::= SEQUENCE {
     string	 [0] IMPLICIT UTF8String OPTIONAL,
     ...,
-    integer	 [1] IMPLICIT INTEGER OPTIONAL,
-    enum	 [2] IMPLICIT ENUMERATED {
-        b(0),    
-        a(1)
-    }
+    integer	 [1] IMPLICIT INTEGER OPTIONAL
 }
 
 SetOf ::= SET OF REAL
diff --git a/tests/70-xer-test-OK.asn1.-P b/tests/70-xer-test-OK.asn1.-P
index 938d1a47..913917af 100644
--- a/tests/70-xer-test-OK.asn1.-P
+++ b/tests/70-xer-test-OK.asn1.-P
@@ -367,6 +367,7 @@ asn_TYPE_descriptor_t asn_DEF_Set = {
 /*** <<< INCLUDES [ExtensibleSet] >>> ***/
 
 #include <UTF8String.h>
+#include <ENUMERATED.h>
 #include <constr_SET.h>
 
 /*** <<< DEPS [ExtensibleSet] >>> ***/
@@ -377,7 +378,12 @@ asn_TYPE_descriptor_t asn_DEF_Set = {
  */
 typedef enum ExtensibleSet_PR {
 	ExtensibleSet_PR_string,	/* Member string is present */
+	ExtensibleSet_PR_enum,	/* Member enum is present */
 } ExtensibleSet_PR;
+typedef enum Enum {
+	enum_b	= 0,
+	enum_a	= 1
+} enum_e;
 
 /*** <<< TYPE-DECLS [ExtensibleSet] >>> ***/
 
@@ -387,10 +393,11 @@ typedef struct ExtensibleSet {
 	 * This type is extensible,
 	 * possible extensions are below.
 	 */
+	ENUMERATED_t	*Enum;
 	
 	/* Presence bitmask: ASN_SET_ISPRESENT(pExtensibleSet, ExtensibleSet_PR_x) */
 	unsigned int _presence_map
-		[((1+(8*sizeof(unsigned int))-1)/(8*sizeof(unsigned int)))];
+		[((2+(8*sizeof(unsigned int))-1)/(8*sizeof(unsigned int)))];
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
@@ -398,100 +405,13 @@ typedef struct ExtensibleSet {
 
 /*** <<< FUNC-DECLS [ExtensibleSet] >>> ***/
 
+/* extern asn_TYPE_descriptor_t asn_DEF_enum_4;	// (Use -fall-defs-global to expose) */
 extern asn_TYPE_descriptor_t asn_DEF_ExtensibleSet;
 
-/*** <<< STAT-DEFS [ExtensibleSet] >>> ***/
-
-static asn_TYPE_member_t asn_MBR_ExtensibleSet_1[] = {
-	{ ATF_POINTER, 1, offsetof(struct ExtensibleSet, string),
-		.tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-		.tag_mode = -1,	/* IMPLICIT tag at current level */
-		.type = (void *)&asn_DEF_UTF8String,
-		.memb_constraints = 0,	/* Defer constraints checking to the member type */
-		.name = "string"
-		},
-};
-static ber_tlv_tag_t asn_DEF_ExtensibleSet_1_tags[] = {
-	(ASN_TAG_CLASS_UNIVERSAL | (17 << 2))
-};
-static asn_TYPE_tag2member_t asn_MAP_ExtensibleSet_1_tag2el[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* string at 44 */
-};
-static uint8_t asn_MAP_ExtensibleSet_1_mmap[(1 + (8 * sizeof(unsigned int)) - 1) / 8] = {
-	(0 << 7)
-};
-static asn_SET_specifics_t asn_SPC_ExtensibleSet_1_specs = {
-	sizeof(struct ExtensibleSet),
-	offsetof(struct ExtensibleSet, _asn_ctx),
-	offsetof(struct ExtensibleSet, _presence_map),
-	asn_MAP_ExtensibleSet_1_tag2el,
-	1,	/* Count of tags in the map */
-	asn_MAP_ExtensibleSet_1_tag2el,	/* Same as above */
-	1,	/* Count of tags in the CXER map */
-	1,	/* Whether extensible */
-	(unsigned int *)asn_MAP_ExtensibleSet_1_mmap	/* Mandatory elements map */
-};
-asn_TYPE_descriptor_t asn_DEF_ExtensibleSet = {
-	"ExtensibleSet",
-	"ExtensibleSet",
-	SET_free,
-	SET_print,
-	SET_constraint,
-	SET_decode_ber,
-	SET_encode_der,
-	SET_decode_xer,
-	SET_encode_xer,
-	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_ExtensibleSet_1_tags,
-	sizeof(asn_DEF_ExtensibleSet_1_tags)
-		/sizeof(asn_DEF_ExtensibleSet_1_tags[0]), /* 1 */
-	asn_DEF_ExtensibleSet_1_tags,	/* Same as above */
-	sizeof(asn_DEF_ExtensibleSet_1_tags)
-		/sizeof(asn_DEF_ExtensibleSet_1_tags[0]), /* 1 */
-	asn_MBR_ExtensibleSet_1,
-	1,	/* Elements count */
-	&asn_SPC_ExtensibleSet_1_specs	/* Additional specs */
-};
-
-
-/*** <<< INCLUDES [ExtensibleSequence] >>> ***/
-
-#include <UTF8String.h>
-#include <INTEGER.h>
-#include <ENUMERATED.h>
-#include <constr_SEQUENCE.h>
-
-/*** <<< DEPS [ExtensibleSequence] >>> ***/
-
-typedef enum Enum {
-	enum_b	= 0,
-	enum_a	= 1
-} enum_e;
-
-/*** <<< TYPE-DECLS [ExtensibleSequence] >>> ***/
-
-typedef struct ExtensibleSequence {
-	UTF8String_t	*string	/* OPTIONAL */;
-	/*
-	 * This type is extensible,
-	 * possible extensions are below.
-	 */
-	INTEGER_t	*integer	/* OPTIONAL */;
-	ENUMERATED_t	*Enum;
-	
-	/* Context for parsing across buffer boundaries */
-	asn_struct_ctx_t _asn_ctx;
-} ExtensibleSequence_t;
-
-/*** <<< FUNC-DECLS [ExtensibleSequence] >>> ***/
-
-/* extern asn_TYPE_descriptor_t asn_DEF_enum_5;	// (Use -fall-defs-global to expose) */
-extern asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence;
-
-/*** <<< CODE [ExtensibleSequence] >>> ***/
+/*** <<< CODE [ExtensibleSet] >>> ***/
 
 static int
-enum_5_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
+enum_4_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	/* Replace with underlying type checker */
 	td->check_constraints = asn_DEF_ENUMERATED.check_constraints;
@@ -503,7 +423,7 @@ enum_5_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
  * so here we adjust the DEF accordingly.
  */
 static void
-enum_5_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+enum_4_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->ber_decoder    = asn_DEF_ENUMERATED.ber_decoder;
@@ -516,131 +436,209 @@ enum_5_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
 }
 
 static void
-enum_5_free(asn_TYPE_descriptor_t *td,
+enum_4_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
-	enum_5_inherit_TYPE_descriptor(td);
+	enum_4_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 static int
-enum_5_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
+enum_4_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
-	enum_5_inherit_TYPE_descriptor(td);
+	enum_4_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 static asn_dec_rval_t
-enum_5_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+enum_4_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
-	enum_5_inherit_TYPE_descriptor(td);
+	enum_4_inherit_TYPE_descriptor(td);
 	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 static asn_enc_rval_t
-enum_5_encode_der(asn_TYPE_descriptor_t *td,
+enum_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) {
-	enum_5_inherit_TYPE_descriptor(td);
+	enum_4_inherit_TYPE_descriptor(td);
 	return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
 }
 
 static asn_dec_rval_t
-enum_5_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
+enum_4_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, const char *opt_mname, void *bufptr, size_t size) {
-	enum_5_inherit_TYPE_descriptor(td);
+	enum_4_inherit_TYPE_descriptor(td);
 	return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
 }
 
 static asn_enc_rval_t
-enum_5_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
+enum_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) {
-	enum_5_inherit_TYPE_descriptor(td);
+	enum_4_inherit_TYPE_descriptor(td);
 	return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
 }
 
 
-/*** <<< STAT-DEFS [ExtensibleSequence] >>> ***/
+/*** <<< STAT-DEFS [ExtensibleSet] >>> ***/
 
-static asn_INTEGER_enum_map_t asn_MAP_enum_5_value2enum[] = {
+static asn_INTEGER_enum_map_t asn_MAP_enum_4_value2enum[] = {
 	{ 0,	1,	"b" },
 	{ 1,	1,	"a" }
 };
-static unsigned int asn_MAP_enum_5_enum2value[] = {
+static unsigned int asn_MAP_enum_4_enum2value[] = {
 	1,	/* a(1) */
 	0	/* b(0) */
 };
-static asn_INTEGER_specifics_t asn_SPC_enum_5_specs = {
-	asn_MAP_enum_5_value2enum,	/* "tag" => N; sorted by tag */
-	asn_MAP_enum_5_enum2value,	/* N => "tag"; sorted by N */
+static asn_INTEGER_specifics_t asn_SPC_enum_4_specs = {
+	asn_MAP_enum_4_value2enum,	/* "tag" => N; sorted by tag */
+	asn_MAP_enum_4_enum2value,	/* N => "tag"; sorted by N */
 	2,	/* Number of elements in the maps */
 	0,	/* Enumeration is not extensible */
 	1	/* Strict enumeration */
 };
-static ber_tlv_tag_t asn_DEF_enum_5_tags[] = {
-	(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+static ber_tlv_tag_t asn_DEF_enum_4_tags[] = {
+	(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 	(ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
 };
 static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_enum_5 = {
+asn_TYPE_descriptor_t asn_DEF_enum_4 = {
 	"enum",
 	"enum",
-	enum_5_free,
-	enum_5_print,
-	enum_5_constraint,
-	enum_5_decode_ber,
-	enum_5_encode_der,
-	enum_5_decode_xer,
-	enum_5_encode_xer,
+	enum_4_free,
+	enum_4_print,
+	enum_4_constraint,
+	enum_4_decode_ber,
+	enum_4_encode_der,
+	enum_4_decode_xer,
+	enum_4_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn_DEF_enum_5_tags,
-	sizeof(asn_DEF_enum_5_tags)
-		/sizeof(asn_DEF_enum_5_tags[0]) - 1, /* 1 */
-	asn_DEF_enum_5_tags,	/* Same as above */
-	sizeof(asn_DEF_enum_5_tags)
-		/sizeof(asn_DEF_enum_5_tags[0]), /* 2 */
+	asn_DEF_enum_4_tags,
+	sizeof(asn_DEF_enum_4_tags)
+		/sizeof(asn_DEF_enum_4_tags[0]) - 1, /* 1 */
+	asn_DEF_enum_4_tags,	/* Same as above */
+	sizeof(asn_DEF_enum_4_tags)
+		/sizeof(asn_DEF_enum_4_tags[0]), /* 2 */
 	0, 0,	/* Defined elsewhere */
-	&asn_SPC_enum_5_specs	/* Additional specs */
+	&asn_SPC_enum_4_specs	/* Additional specs */
 };
 
-static asn_TYPE_member_t asn_MBR_ExtensibleSequence_1[] = {
-	{ ATF_POINTER, 3, offsetof(struct ExtensibleSequence, string),
+static asn_TYPE_member_t asn_MBR_ExtensibleSet_1[] = {
+	{ ATF_POINTER, 2, offsetof(struct ExtensibleSet, string),
 		.tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		.tag_mode = -1,	/* IMPLICIT tag at current level */
 		.type = (void *)&asn_DEF_UTF8String,
 		.memb_constraints = 0,	/* Defer constraints checking to the member type */
 		.name = "string"
 		},
-	{ ATF_POINTER, 2, offsetof(struct ExtensibleSequence, integer),
+	{ ATF_POINTER, 0, offsetof(struct ExtensibleSet, Enum),
 		.tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)),
 		.tag_mode = -1,	/* IMPLICIT tag at current level */
-		.type = (void *)&asn_DEF_INTEGER,
+		.type = (void *)&asn_DEF_enum_4,
 		.memb_constraints = 0,	/* Defer constraints checking to the member type */
-		.name = "integer"
+		.name = "enum"
 		},
-	{ ATF_POINTER, 0, offsetof(struct ExtensibleSequence, Enum),
-		.tag = (ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+};
+static ber_tlv_tag_t asn_DEF_ExtensibleSet_1_tags[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (17 << 2))
+};
+static asn_TYPE_tag2member_t asn_MAP_ExtensibleSet_1_tag2el[] = {
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* string at 44 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* enum at 46 */
+};
+static uint8_t asn_MAP_ExtensibleSet_1_mmap[(2 + (8 * sizeof(unsigned int)) - 1) / 8] = {
+	(0 << 7) | (0 << 6)
+};
+static asn_SET_specifics_t asn_SPC_ExtensibleSet_1_specs = {
+	sizeof(struct ExtensibleSet),
+	offsetof(struct ExtensibleSet, _asn_ctx),
+	offsetof(struct ExtensibleSet, _presence_map),
+	asn_MAP_ExtensibleSet_1_tag2el,
+	2,	/* Count of tags in the map */
+	asn_MAP_ExtensibleSet_1_tag2el,	/* Same as above */
+	2,	/* Count of tags in the CXER map */
+	1,	/* Whether extensible */
+	(unsigned int *)asn_MAP_ExtensibleSet_1_mmap	/* Mandatory elements map */
+};
+asn_TYPE_descriptor_t asn_DEF_ExtensibleSet = {
+	"ExtensibleSet",
+	"ExtensibleSet",
+	SET_free,
+	SET_print,
+	SET_constraint,
+	SET_decode_ber,
+	SET_encode_der,
+	SET_decode_xer,
+	SET_encode_xer,
+	0,	/* Use generic outmost tag fetcher */
+	asn_DEF_ExtensibleSet_1_tags,
+	sizeof(asn_DEF_ExtensibleSet_1_tags)
+		/sizeof(asn_DEF_ExtensibleSet_1_tags[0]), /* 1 */
+	asn_DEF_ExtensibleSet_1_tags,	/* Same as above */
+	sizeof(asn_DEF_ExtensibleSet_1_tags)
+		/sizeof(asn_DEF_ExtensibleSet_1_tags[0]), /* 1 */
+	asn_MBR_ExtensibleSet_1,
+	2,	/* Elements count */
+	&asn_SPC_ExtensibleSet_1_specs	/* Additional specs */
+};
+
+
+/*** <<< INCLUDES [ExtensibleSequence] >>> ***/
+
+#include <UTF8String.h>
+#include <INTEGER.h>
+#include <constr_SEQUENCE.h>
+
+/*** <<< TYPE-DECLS [ExtensibleSequence] >>> ***/
+
+typedef struct ExtensibleSequence {
+	UTF8String_t	*string	/* OPTIONAL */;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	INTEGER_t	*integer	/* OPTIONAL */;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} ExtensibleSequence_t;
+
+/*** <<< FUNC-DECLS [ExtensibleSequence] >>> ***/
+
+extern asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence;
+
+/*** <<< STAT-DEFS [ExtensibleSequence] >>> ***/
+
+static asn_TYPE_member_t asn_MBR_ExtensibleSequence_1[] = {
+	{ ATF_POINTER, 2, offsetof(struct ExtensibleSequence, string),
+		.tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
 		.tag_mode = -1,	/* IMPLICIT tag at current level */
-		.type = (void *)&asn_DEF_enum_5,
+		.type = (void *)&asn_DEF_UTF8String,
 		.memb_constraints = 0,	/* Defer constraints checking to the member type */
-		.name = "enum"
+		.name = "string"
+		},
+	{ ATF_POINTER, 1, offsetof(struct ExtensibleSequence, integer),
+		.tag = (ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+		.tag_mode = -1,	/* IMPLICIT tag at current level */
+		.type = (void *)&asn_DEF_INTEGER,
+		.memb_constraints = 0,	/* Defer constraints checking to the member type */
+		.name = "integer"
 		},
 };
 static ber_tlv_tag_t asn_DEF_ExtensibleSequence_1_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static asn_TYPE_tag2member_t asn_MAP_ExtensibleSequence_1_tag2el[] = {
-    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* string at 49 */
-    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* integer at 51 */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* enum at 52 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* string at 50 */
+    { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* integer at 52 */
 };
 static asn_SEQUENCE_specifics_t asn_SPC_ExtensibleSequence_1_specs = {
 	sizeof(struct ExtensibleSequence),
 	offsetof(struct ExtensibleSequence, _asn_ctx),
 	asn_MAP_ExtensibleSequence_1_tag2el,
-	3,	/* Count of tags in the map */
+	2,	/* Count of tags in the map */
 	0,	/* Start extensions */
-	4	/* Stop extensions */
+	3	/* Stop extensions */
 };
 asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence = {
 	"ExtensibleSequence",
@@ -660,7 +658,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence = {
 	sizeof(asn_DEF_ExtensibleSequence_1_tags)
 		/sizeof(asn_DEF_ExtensibleSequence_1_tags[0]), /* 1 */
 	asn_MBR_ExtensibleSequence_1,
-	3,	/* Elements count */
+	2,	/* Elements count */
 	&asn_SPC_ExtensibleSequence_1_specs	/* Additional specs */
 };