Commit 171487e6 authored by Lev Walkin's avatar Lev Walkin

some more parameterization

parent 0c0bca6b
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
(Severity: medim; Security impact: none) (Severity: medim; Security impact: none)
* Refactored Information Object Classes parsing. * Refactored Information Object Classes parsing.
* Refactored Parameterization support. * Refactored Parameterization support.
* [typedef enum foo {}] foo_e; is now e_foo, see #1287989
0.9.20: 2006-Mar-06 0.9.20: 2006-Mar-06
......
...@@ -158,9 +158,9 @@ asn1c_lang_C_type_common_INTEGER(arg_t *arg) { ...@@ -158,9 +158,9 @@ asn1c_lang_C_type_common_INTEGER(arg_t *arg) {
return -1; return -1;
} }
} }
OUT("} "); OUT("} e_");
out_name_chain(arg, ONC_noflags); out_name_chain(arg, ONC_noflags);
OUT("_e;\n"); OUT(";\n");
assert(eidx == el_count); assert(eidx == el_count);
} }
...@@ -259,9 +259,9 @@ asn1c_lang_C_type_BIT_STRING(arg_t *arg) { ...@@ -259,9 +259,9 @@ asn1c_lang_C_type_BIT_STRING(arg_t *arg) {
v->value->value.v_integer, v->value->value.v_integer,
(eidx < el_count) ? "," : ""); (eidx < el_count) ? "," : "");
} }
OUT("} "); OUT("} e_");
out_name_chain(arg, ONC_noflags); out_name_chain(arg, ONC_noflags);
OUT("_e;\n"); OUT(";\n");
assert(eidx == el_count); assert(eidx == el_count);
} }
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
-- iso.org.dod.internet.private.enterprise (1.3.6.1.4.1) -- iso.org.dod.internet.private.enterprise (1.3.6.1.4.1)
-- .spelio.software.asn1c.test (9363.1.5.1) -- .spelio.software.asn1c.test (9363.1.5.1)
-- .102 -- .103
ModuleReference ModuleReference
{ iso org(3) dod(6) internet (1) private(4) enterprise(1) { iso org(3) dod(6) internet (1) private(4) enterprise(1)
spelio(9363) software(1) asn1c(5) test(1) 102 } spelio(9363) software(1) asn1c(5) test(1) 103 }
DEFINITIONS ::= DEFINITIONS ::=
BEGIN BEGIN
IMPORTS Type FROM ModuleReference; IMPORTS Type FROM ModuleReference;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
-- .spelio.software.asn1c.test (9363.1.5.1) -- .spelio.software.asn1c.test (9363.1.5.1)
-- .104 -- .104
ModuleParametrization1 ModuleParameterization1
{ iso org(3) dod(6) internet (1) private(4) enterprise(1) { iso org(3) dod(6) internet (1) private(4) enterprise(1)
spelio(9363) software(1) asn1c(5) test(1) 104 } spelio(9363) software(1) asn1c(5) test(1) 104 }
DEFINITIONS ::= DEFINITIONS ::=
......
ModuleParametrization1 { iso org(3) dod(6) internet(1) private(4) ModuleParameterization1 { iso org(3) dod(6) internet(1) private(4)
enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 104 } enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 104 }
DEFINITIONS ::= DEFINITIONS ::=
BEGIN BEGIN
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
-- .spelio.software.asn1c.test (9363.1.5.1) -- .spelio.software.asn1c.test (9363.1.5.1)
-- .105 -- .105
ModuleParametrization2 ModuleParameterization2
{ iso org(3) dod(6) internet (1) private(4) enterprise(1) { iso org(3) dod(6) internet (1) private(4) enterprise(1)
spelio(9363) software(1) asn1c(5) test(1) 105 } spelio(9363) software(1) asn1c(5) test(1) 105 }
DEFINITIONS ::= DEFINITIONS ::=
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
-- .spelio.software.asn1c.test (9363.1.5.1) -- .spelio.software.asn1c.test (9363.1.5.1)
-- .106 -- .106
ModuleParametrizationWithConstraints ModuleParameterizationWithConstraints
{ iso org(3) dod(6) internet (1) private(4) enterprise(1) { iso org(3) dod(6) internet (1) private(4) enterprise(1)
spelio(9363) software(1) asn1c(5) test(1) 106 } spelio(9363) software(1) asn1c(5) test(1) 106 }
DEFINITIONS ::= DEFINITIONS ::=
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
-- .spelio.software.asn1c.test (9363.1.5.1) -- .spelio.software.asn1c.test (9363.1.5.1)
-- .107 -- .107
ModuleParametrizationWithConstraints2 ModuleParameterizationWithConstraints2
{ iso org(3) dod(6) internet (1) private(4) enterprise(1) { iso org(3) dod(6) internet (1) private(4) enterprise(1)
spelio(9363) software(1) asn1c(5) test(1) 107 } spelio(9363) software(1) asn1c(5) test(1) 107 }
DEFINITIONS ::= DEFINITIONS ::=
......
-- OK: Everything is fine
-- iso.org.dod.internet.private.enterprise (1.3.6.1.4.1)
-- .spelio.software.asn1c.test (9363.1.5.1)
-- .108
ModuleParameterizationWithConstraints3
{ iso org(3) dod(6) internet (1) private(4) enterprise(1)
spelio(9363) software(1) asn1c(5) test(1) 108 }
DEFINITIONS ::=
BEGIN
MinMax {Type, INTEGER:low-bound} ::= Type (low-bound..MAX)
ThreePlus ::= MinMax {INTEGER, 3}
END
/*** <<< INCLUDES [MinMax] >>> ***/
#include <INTEGER.h>
/*** <<< TYPE-DECLS [MinMax] >>> ***/
typedef INTEGER_t MinMax_16P0_t;
/*** <<< FUNC-DECLS [MinMax] >>> ***/
extern asn_TYPE_descriptor_t asn_DEF_MinMax_16P0;
asn_struct_free_f MinMax_16P0_free;
asn_struct_print_f MinMax_16P0_print;
asn_constr_check_f MinMax_16P0_constraint;
ber_type_decoder_f MinMax_16P0_decode_ber;
der_type_encoder_f MinMax_16P0_encode_der;
xer_type_decoder_f MinMax_16P0_decode_xer;
xer_type_encoder_f MinMax_16P0_encode_xer;
/*** <<< CODE [MinMax] >>> ***/
int
MinMax_16P0_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
asn_app_consume_bytes_f *app_errlog, void *app_key) {
const INTEGER_t *st = (const INTEGER_t *)sptr;
long value;
if(!sptr) {
_ASN_ERRLOG(app_errlog, app_key,
"%s: value not given (%s:%d)",
td->name, __FILE__, __LINE__);
return -1;
}
if(asn_INTEGER2long(st, &value)) {
_ASN_ERRLOG(app_errlog, app_key,
"%s: value too large (%s:%d)",
td->name, __FILE__, __LINE__);
return -1;
}
if((value >= 3)) {
/* Constraint check succeeded */
return 0;
} else {
_ASN_ERRLOG(app_errlog, app_key,
"%s: constraint failed (%s:%d)",
td->name, __FILE__, __LINE__);
return -1;
}
}
/*
* This type is implemented using INTEGER,
* so here we adjust the DEF accordingly.
*/
static void
MinMax_16P0_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->free_struct = asn_DEF_INTEGER.free_struct;
td->print_struct = asn_DEF_INTEGER.print_struct;
td->ber_decoder = asn_DEF_INTEGER.ber_decoder;
td->der_encoder = asn_DEF_INTEGER.der_encoder;
td->xer_decoder = asn_DEF_INTEGER.xer_decoder;
td->xer_encoder = asn_DEF_INTEGER.xer_encoder;
td->uper_decoder = asn_DEF_INTEGER.uper_decoder;
if(!td->per_constraints)
td->per_constraints = asn_DEF_INTEGER.per_constraints;
td->elements = asn_DEF_INTEGER.elements;
td->elements_count = asn_DEF_INTEGER.elements_count;
td->specifics = asn_DEF_INTEGER.specifics;
}
void
MinMax_16P0_free(asn_TYPE_descriptor_t *td,
void *struct_ptr, int contents_only) {
MinMax_16P0_1_inherit_TYPE_descriptor(td);
td->free_struct(td, struct_ptr, contents_only);
}
int
MinMax_16P0_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
MinMax_16P0_1_inherit_TYPE_descriptor(td);
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
asn_dec_rval_t
MinMax_16P0_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) {
MinMax_16P0_1_inherit_TYPE_descriptor(td);
return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
}
asn_enc_rval_t
MinMax_16P0_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) {
MinMax_16P0_1_inherit_TYPE_descriptor(td);
return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
}
asn_dec_rval_t
MinMax_16P0_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) {
MinMax_16P0_1_inherit_TYPE_descriptor(td);
return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
}
asn_enc_rval_t
MinMax_16P0_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) {
MinMax_16P0_1_inherit_TYPE_descriptor(td);
return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
}
/*** <<< STAT-DEFS [MinMax] >>> ***/
static ber_tlv_tag_t asn_DEF_MinMax_16P0_tags_1[] = {
(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
};
asn_TYPE_descriptor_t asn_DEF_MinMax_16P0 = {
"MinMax",
"MinMax",
MinMax_16P0_free,
MinMax_16P0_print,
MinMax_16P0_constraint,
MinMax_16P0_decode_ber,
MinMax_16P0_encode_der,
MinMax_16P0_decode_xer,
MinMax_16P0_encode_xer,
0, /* No PER decoder, -gen-PER to enable */
0, /* Use generic outmost tag fetcher */
asn_DEF_MinMax_16P0_tags_1,
sizeof(asn_DEF_MinMax_16P0_tags_1)
/sizeof(asn_DEF_MinMax_16P0_tags_1[0]), /* 1 */
asn_DEF_MinMax_16P0_tags_1, /* Same as above */
sizeof(asn_DEF_MinMax_16P0_tags_1)
/sizeof(asn_DEF_MinMax_16P0_tags_1[0]), /* 1 */
0, /* No PER visible constraints */
0, 0, /* No members */
0 /* No specifics */
};
/*** <<< INCLUDES [ThreePlus] >>> ***/
#include <MinMax.h>
/*** <<< TYPE-DECLS [ThreePlus] >>> ***/
typedef MinMax_16P0_t ThreePlus_t;
/*** <<< FUNC-DECLS [ThreePlus] >>> ***/
extern asn_TYPE_descriptor_t asn_DEF_ThreePlus;
asn_struct_free_f ThreePlus_free;
asn_struct_print_f ThreePlus_print;
asn_constr_check_f ThreePlus_constraint;
ber_type_decoder_f ThreePlus_decode_ber;
der_type_encoder_f ThreePlus_encode_der;
xer_type_decoder_f ThreePlus_decode_xer;
xer_type_encoder_f ThreePlus_encode_xer;
/*** <<< CODE [ThreePlus] >>> ***/
int
ThreePlus_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
asn_app_consume_bytes_f *app_errlog, void *app_key) {
const MinMax_16P0_t *st = (const MinMax_16P0_t *)sptr;
long value;
if(!sptr) {
_ASN_ERRLOG(app_errlog, app_key,
"%s: value not given (%s:%d)",
td->name, __FILE__, __LINE__);
return -1;
}
if(asn_INTEGER2long(st, &value)) {
_ASN_ERRLOG(app_errlog, app_key,
"%s: value too large (%s:%d)",
td->name, __FILE__, __LINE__);
return -1;
}
if((value >= 3)) {
/* Constraint check succeeded */
return 0;
} else {
_ASN_ERRLOG(app_errlog, app_key,
"%s: constraint failed (%s:%d)",
td->name, __FILE__, __LINE__);
return -1;
}
}
/*
* This type is implemented using MinMax_16P0,
* so here we adjust the DEF accordingly.
*/
static void
ThreePlus_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
td->free_struct = asn_DEF_MinMax_16P0.free_struct;
td->print_struct = asn_DEF_MinMax_16P0.print_struct;
td->ber_decoder = asn_DEF_MinMax_16P0.ber_decoder;
td->der_encoder = asn_DEF_MinMax_16P0.der_encoder;
td->xer_decoder = asn_DEF_MinMax_16P0.xer_decoder;
td->xer_encoder = asn_DEF_MinMax_16P0.xer_encoder;
td->uper_decoder = asn_DEF_MinMax_16P0.uper_decoder;
if(!td->per_constraints)
td->per_constraints = asn_DEF_MinMax_16P0.per_constraints;
td->elements = asn_DEF_MinMax_16P0.elements;
td->elements_count = asn_DEF_MinMax_16P0.elements_count;
td->specifics = asn_DEF_MinMax_16P0.specifics;
}
void
ThreePlus_free(asn_TYPE_descriptor_t *td,
void *struct_ptr, int contents_only) {
ThreePlus_1_inherit_TYPE_descriptor(td);
td->free_struct(td, struct_ptr, contents_only);
}
int
ThreePlus_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
ThreePlus_1_inherit_TYPE_descriptor(td);
return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
}
asn_dec_rval_t
ThreePlus_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) {
ThreePlus_1_inherit_TYPE_descriptor(td);
return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
}
asn_enc_rval_t
ThreePlus_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) {
ThreePlus_1_inherit_TYPE_descriptor(td);
return td->der_encoder(td, structure, tag_mode, tag, cb, app_key);
}
asn_dec_rval_t
ThreePlus_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) {
ThreePlus_1_inherit_TYPE_descriptor(td);
return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size);
}
asn_enc_rval_t
ThreePlus_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) {
ThreePlus_1_inherit_TYPE_descriptor(td);
return td->xer_encoder(td, structure, ilevel, flags, cb, app_key);
}
/*** <<< STAT-DEFS [ThreePlus] >>> ***/
static ber_tlv_tag_t asn_DEF_ThreePlus_tags_1[] = {
(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
};
asn_TYPE_descriptor_t asn_DEF_ThreePlus = {
"ThreePlus",
"ThreePlus",
ThreePlus_free,
ThreePlus_print,
ThreePlus_constraint,
ThreePlus_decode_ber,
ThreePlus_encode_der,
ThreePlus_decode_xer,
ThreePlus_encode_xer,
0, /* No PER decoder, -gen-PER to enable */
0, /* Use generic outmost tag fetcher */
asn_DEF_ThreePlus_tags_1,
sizeof(asn_DEF_ThreePlus_tags_1)
/sizeof(asn_DEF_ThreePlus_tags_1[0]), /* 1 */
asn_DEF_ThreePlus_tags_1, /* Same as above */
sizeof(asn_DEF_ThreePlus_tags_1)
/sizeof(asn_DEF_ThreePlus_tags_1[0]), /* 1 */
0, /* No PER visible constraints */
0, 0, /* No members */
0 /* No specifics */
};
-- OK: Everything is fine
-- iso.org.dod.internet.private.enterprise (1.3.6.1.4.1)
-- .spelio.software.asn1c.test (9363.1.5.1)
-- .110
ModuleParameterization3
{ iso org(3) dod(6) internet (1) private(4) enterprise(1)
spelio(9363) software(1) asn1c(5) test(1) 110 }
DEFINITIONS ::=
BEGIN
Flag{Color} ::= SEQUENCE {
field Color DEFAULT blue
}
IntegerColorFlag ::= Flag{INTEGER{ red(0), green(1), blue(5) }}
EnumeratedColorFlag ::= Flag{ENUMERATED{ red(3), green, blue }}
END
This diff is collapsed.
-- SE: Semantic error
-- iso.org.dod.internet.private.enterprise (1.3.6.1.4.1)
-- .spelio.software.asn1c.test (9363.1.5.1)
-- .111
ModuleParameterization4
{ iso org(3) dod(6) internet (1) private(4) enterprise(1)
spelio(9363) software(1) asn1c(5) test(1) 111 }
DEFINITIONS ::=
BEGIN
Flag{Color} ::= SEQUENCE {
field Color DEFAULT cyan
}
IntegerColorFlag ::= Flag{INTEGER{ red(0), green(1), blue(5) }}
EnumeratedColorFlag ::= Flag{ENUMERATED{ red(3), green, blue }}
END
...@@ -604,7 +604,7 @@ typedef enum accept_as { ...@@ -604,7 +604,7 @@ typedef enum accept_as {
/* /*
* Enumeration is extensible * Enumeration is extensible
*/ */
} accept_as_e; } e_accept_as;
/*** <<< TYPE-DECLS [ActionItem] >>> ***/ /*** <<< TYPE-DECLS [ActionItem] >>> ***/
......
...@@ -3484,7 +3484,7 @@ typedef enum enum_c { ...@@ -3484,7 +3484,7 @@ typedef enum enum_c {
* Enumeration is extensible * Enumeration is extensible
*/ */
enum_c_three = 3 enum_c_three = 3
} enum_c_e; } e_enum_c;
/*** <<< TYPE-DECLS [Sequence] >>> ***/ /*** <<< TYPE-DECLS [Sequence] >>> ***/
...@@ -3941,7 +3941,7 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { ...@@ -3941,7 +3941,7 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = {
typedef enum Enum0 { typedef enum Enum0 {
Enum0_one = 0, Enum0_one = 0,
Enum0_two = 1 Enum0_two = 1
} Enum0_e; } e_Enum0;
/*** <<< TYPE-DECLS [Enum0] >>> ***/ /*** <<< TYPE-DECLS [Enum0] >>> ***/
...@@ -4086,7 +4086,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = { ...@@ -4086,7 +4086,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = {
typedef enum Enum1 { typedef enum Enum1 {
Enum1_one = 0, Enum1_one = 0,
Enum1_two = 1 Enum1_two = 1
} Enum1_e; } e_Enum1;
/*** <<< TYPE-DECLS [Enum1] >>> ***/ /*** <<< TYPE-DECLS [Enum1] >>> ***/
......
...@@ -3744,7 +3744,7 @@ typedef enum enum_c { ...@@ -3744,7 +3744,7 @@ typedef enum enum_c {
* Enumeration is extensible * Enumeration is extensible
*/ */
enum_c_three = 3 enum_c_three = 3
} enum_c_e; } e_enum_c;
/*** <<< TYPE-DECLS [Sequence] >>> ***/ /*** <<< TYPE-DECLS [Sequence] >>> ***/
...@@ -4234,7 +4234,7 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { ...@@ -4234,7 +4234,7 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = {
typedef enum Enum0 { typedef enum Enum0 {
Enum0_one = 0, Enum0_one = 0,
Enum0_two = 1 Enum0_two = 1
} Enum0_e; } e_Enum0;
/*** <<< TYPE-DECLS [Enum0] >>> ***/ /*** <<< TYPE-DECLS [Enum0] >>> ***/
...@@ -4391,7 +4391,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = { ...@@ -4391,7 +4391,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = {
typedef enum Enum1 { typedef enum Enum1 {
Enum1_one = 0, Enum1_one = 0,
Enum1_two = 1 Enum1_two = 1
} Enum1_e; } e_Enum1;
/*** <<< TYPE-DECLS [Enum1] >>> ***/ /*** <<< TYPE-DECLS [Enum1] >>> ***/
......
...@@ -74,7 +74,7 @@ typedef enum SimpleType { ...@@ -74,7 +74,7 @@ typedef enum SimpleType {
SimpleType_one = 0, SimpleType_one = 0,
SimpleType_two = 1, SimpleType_two = 1,
SimpleType_three = 2 SimpleType_three = 2
} SimpleType_e; } e_SimpleType;
/*** <<< TYPE-DECLS [SimpleType] >>> ***/ /*** <<< TYPE-DECLS [SimpleType] >>> ***/
......
...@@ -499,7 +499,7 @@ typedef enum ExtensibleSet_PR { ...@@ -499,7 +499,7 @@ typedef enum ExtensibleSet_PR {
typedef enum Enum { typedef enum Enum {
enum_b = 0, enum_b = 0,
enum_a = 1 enum_a = 1
} enum_e; } e_enum;
/*** <<< TYPE-DECLS [ExtensibleSet] >>> ***/ /*** <<< TYPE-DECLS [ExtensibleSet] >>> ***/
...@@ -1037,7 +1037,7 @@ asn_TYPE_descriptor_t asn_DEF_SetOfREAL = { ...@@ -1037,7 +1037,7 @@ asn_TYPE_descriptor_t asn_DEF_SetOfREAL = {
typedef enum Member { typedef enum Member {
Member_one = 0, Member_one = 0,
Member_oneMore = 1 Member_oneMore = 1
} Member_e; } e_Member;
/*** <<< TYPE-DECLS [SetOfEnums] >>> ***/ /*** <<< TYPE-DECLS [SetOfEnums] >>> ***/
...@@ -1357,7 +1357,7 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfREAL = { ...@@ -1357,7 +1357,7 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfREAL = {
typedef enum name { typedef enum name {
name_one = 0, name_one = 0,
name_oneMore = 1 name_oneMore = 1
} name_e; } e_name;
/*** <<< TYPE-DECLS [NamedSetOfEnums] >>> ***/ /*** <<< TYPE-DECLS [NamedSetOfEnums] >>> ***/
......
...@@ -352,7 +352,7 @@ typedef enum Type2_PR { ...@@ -352,7 +352,7 @@ typedef enum Type2_PR {
} Type2_PR; } Type2_PR;
typedef enum a { typedef enum a {
a_one = 0 a_one = 0
} a_e; } e_a;
/* /*
* Method of determining the components presence * Method of determining the components presence
...@@ -362,7 +362,7 @@ typedef enum two_name_PR { ...@@ -362,7 +362,7 @@ typedef enum two_name_PR {
} two_name_PR; } two_name_PR;
typedef enum a { typedef enum a {
a_one = 0 a_one = 0
} a_e; } e_a;
/*** <<< TYPE-DECLS [Type2] >>> ***/ /*** <<< TYPE-DECLS [Type2] >>> ***/
......
...@@ -703,7 +703,7 @@ asn_TYPE_descriptor_t asn_DEF_Ypet = { ...@@ -703,7 +703,7 @@ asn_TYPE_descriptor_t asn_DEF_Ypet = {
typedef enum EnumType { typedef enum EnumType {
EnumType_one = 0, EnumType_one = 0,
EnumType_two = 1 EnumType_two = 1
} EnumType_e; } e_EnumType;
/*** <<< TYPE-DECLS [EnumType] >>> ***/ /*** <<< TYPE-DECLS [EnumType] >>> ***/
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- .84 1 -- .84 1
-- .84 2 -- .84 2
ModuleTestParametrizationTags1 ModuleTestParameterizationTags1
{ iso org(3) dod(6) internet(1) private(4) enterprise(1) { iso org(3) dod(6) internet(1) private(4) enterprise(1)
spelio(9363) software(1) asn1c(5) test(1) 84 1 } spelio(9363) software(1) asn1c(5) test(1) 84 1 }
DEFINITIONS ::= DEFINITIONS ::=
...@@ -23,7 +23,7 @@ BEGIN ...@@ -23,7 +23,7 @@ BEGIN
END END
ModuleTestParametrizationTagsAuto2 ModuleTestParameterizationTagsAuto2
{ iso org(3) dod(6) internet(1) private(4) enterprise(1) { iso org(3) dod(6) internet(1) private(4) enterprise(1)
spelio(9363) software(1) asn1c(5) test(1) 84 2 } spelio(9363) software(1) asn1c(5) test(1) 84 2 }
DEFINITIONS AUTOMATIC TAGS ::= DEFINITIONS AUTOMATIC TAGS ::=
......
ModuleTestParametrizationTags1 { iso org(3) dod(6) internet(1) private(4) ModuleTestParameterizationTags1 { iso org(3) dod(6) internet(1) private(4)
enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 84 1 } enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 84 1 }
DEFINITIONS ::= DEFINITIONS ::=
BEGIN BEGIN
...@@ -14,7 +14,7 @@ TestChoice ::= CHOICE { ...@@ -14,7 +14,7 @@ TestChoice ::= CHOICE {
END END
ModuleTestParametrizationTagsAuto2 { iso org(3) dod(6) internet(1) private(4) ModuleTestParameterizationTagsAuto2 { iso org(3) dod(6) internet(1) private(4)
enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 84 2 } enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 84 2 }
DEFINITIONS AUTOMATIC TAGS ::= DEFINITIONS AUTOMATIC TAGS ::=
BEGIN BEGIN
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
typedef enum T { typedef enum T {
T_a = 1, T_a = 1,
T_b = 2 T_b = 2
} T_e; } e_T;
/*** <<< TYPE-DECLS [T] >>> ***/ /*** <<< TYPE-DECLS [T] >>> ***/
......
...@@ -13,7 +13,7 @@ typedef enum T_PR { ...@@ -13,7 +13,7 @@ typedef enum T_PR {
typedef enum bs { typedef enum bs {
bs_a = 1, bs_a = 1,
bs_b = 2 bs_b = 2
} bs_e; } e_bs;
/*** <<< TYPE-DECLS [T] >>> ***/ /*** <<< TYPE-DECLS [T] >>> ***/
......
...@@ -13,7 +13,7 @@ typedef enum T_PR { ...@@ -13,7 +13,7 @@ typedef enum T_PR {
typedef enum T__bs { typedef enum T__bs {
T__bs_a = 1, T__bs_a = 1,
T__bs_b = 2 T__bs_b = 2
} T__bs_e; } e_T__bs;
/*** <<< TYPE-DECLS [T] >>> ***/ /*** <<< TYPE-DECLS [T] >>> ***/
......
...@@ -2288,7 +2288,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { ...@@ -2288,7 +2288,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = {
typedef enum CN_IntegerEnumerated1 { typedef enum CN_IntegerEnumerated1 {
CN_IntegerEnumerated1_a = 1, CN_IntegerEnumerated1_a = 1,
CN_IntegerEnumerated1_b = 2 CN_IntegerEnumerated1_b = 2
} CN_IntegerEnumerated1_e; } e_CN_IntegerEnumerated1;
/*** <<< TYPE-DECLS [CN-IntegerEnumerated1] >>> ***/ /*** <<< TYPE-DECLS [CN-IntegerEnumerated1] >>> ***/
...@@ -2418,7 +2418,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { ...@@ -2418,7 +2418,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = {
typedef enum NO_IntegerEnumerated2 { typedef enum NO_IntegerEnumerated2 {
NO_IntegerEnumerated2_a = 1, NO_IntegerEnumerated2_a = 1,
NO_IntegerEnumerated2_b = 3000000000 NO_IntegerEnumerated2_b = 3000000000
} NO_IntegerEnumerated2_e; } e_NO_IntegerEnumerated2;
/*** <<< TYPE-DECLS [NO-IntegerEnumerated2] >>> ***/ /*** <<< TYPE-DECLS [NO-IntegerEnumerated2] >>> ***/
......
...@@ -2269,7 +2269,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { ...@@ -2269,7 +2269,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = {
typedef enum CN_IntegerEnumerated1 { typedef enum CN_IntegerEnumerated1 {
CN_IntegerEnumerated1_a = 1, CN_IntegerEnumerated1_a = 1,
CN_IntegerEnumerated1_b = 2 CN_IntegerEnumerated1_b = 2
} CN_IntegerEnumerated1_e; } e_CN_IntegerEnumerated1;
/*** <<< TYPE-DECLS [CN-IntegerEnumerated1] >>> ***/ /*** <<< TYPE-DECLS [CN-IntegerEnumerated1] >>> ***/
...@@ -2399,7 +2399,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { ...@@ -2399,7 +2399,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = {
typedef enum NO_IntegerEnumerated2 { typedef enum NO_IntegerEnumerated2 {
NO_IntegerEnumerated2_a = 1, NO_IntegerEnumerated2_a = 1,
NO_IntegerEnumerated2_b = 3000000000 NO_IntegerEnumerated2_b = 3000000000
} NO_IntegerEnumerated2_e; } e_NO_IntegerEnumerated2;
/*** <<< TYPE-DECLS [NO-IntegerEnumerated2] >>> ***/ /*** <<< TYPE-DECLS [NO-IntegerEnumerated2] >>> ***/
......
...@@ -2476,7 +2476,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { ...@@ -2476,7 +2476,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = {
typedef enum CN_IntegerEnumerated1 { typedef enum CN_IntegerEnumerated1 {
CN_IntegerEnumerated1_a = 1, CN_IntegerEnumerated1_a = 1,
CN_IntegerEnumerated1_b = 2 CN_IntegerEnumerated1_b = 2
} CN_IntegerEnumerated1_e; } e_CN_IntegerEnumerated1;
/*** <<< TYPE-DECLS [CN-IntegerEnumerated1] >>> ***/ /*** <<< TYPE-DECLS [CN-IntegerEnumerated1] >>> ***/
...@@ -2614,7 +2614,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { ...@@ -2614,7 +2614,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = {
typedef enum NO_IntegerEnumerated2 { typedef enum NO_IntegerEnumerated2 {
NO_IntegerEnumerated2_a = 1, NO_IntegerEnumerated2_a = 1,
NO_IntegerEnumerated2_b = 3000000000 NO_IntegerEnumerated2_b = 3000000000
} NO_IntegerEnumerated2_e; } e_NO_IntegerEnumerated2;
/*** <<< TYPE-DECLS [NO-IntegerEnumerated2] >>> ***/ /*** <<< TYPE-DECLS [NO-IntegerEnumerated2] >>> ***/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment