diff --git a/libasn1compiler/asn1c_C.c b/libasn1compiler/asn1c_C.c index 470f38cf3..ba0ba12c8 100644 --- a/libasn1compiler/asn1c_C.c +++ b/libasn1compiler/asn1c_C.c @@ -49,8 +49,10 @@ static int expr_elements_count(arg_t *arg, asn1p_expr_t *expr); static int emit_single_member_OER_constraint_value(arg_t *arg, asn1cnst_range_t *range); static int emit_single_member_OER_constraint_size(arg_t *arg, asn1cnst_range_t *range); static int emit_single_member_PER_constraint(arg_t *arg, asn1cnst_range_t *range, int juscountvalues, const char *type); +static int emit_single_member_JER_constraint_size(arg_t *arg, asn1cnst_range_t *range); static int emit_member_OER_constraints(arg_t *arg, asn1p_expr_t *expr, const char *pfx); static int emit_member_PER_constraints(arg_t *arg, asn1p_expr_t *expr, const char *pfx); +static int emit_member_JER_constraints(arg_t *arg, asn1p_expr_t *expr, const char *pfx); static int emit_member_table(arg_t *arg, asn1p_expr_t *expr, asn1c_ioc_table_and_objset_t *); static int emit_tag2member_map(arg_t *arg, tag2el_t *tag2el, int tag2el_count, const char *opt_modifier); @@ -476,7 +478,7 @@ asn1c_lang_C_type_SEQUENCE_def(arg_t *arg, asn1c_ioc_table_and_objset_t *opt_ioc }); OUT("};\n"); - if((roms_count + aoms_count) && (arg->flags & (A1C_GEN_OER | A1C_GEN_UPER | A1C_GEN_APER))) { + if((roms_count + aoms_count) && (arg->flags & (A1C_GEN_OER | A1C_GEN_UPER | A1C_GEN_APER | A1C_GEN_JER))) { int elm = 0; int comma = 0; comp_mode = 0; @@ -2164,6 +2166,29 @@ emit_single_member_PER_constraint(arg_t *arg, asn1cnst_range_t *range, int alpha return 0; } +static int +emit_single_member_JER_constraint_size(arg_t *arg, asn1cnst_range_t *range) { + if(!range) { + /* jer_support.h: asn_jer_constraint_s */ + OUT("-1"); + return 0; + } + + if(range->incompatible || range->not_JER_visible) { + OUT("-1"); + } else { + if(range->left.type == ARE_VALUE && range->right.type == ARE_VALUE + && range->left.value == range->right.value + && range->left.value >= 0) { + OUT("%s", asn1p_itoa(range->left.value)); + } else { + OUT("-1"); + } + } + + return 0; +} + static int emit_member_OER_constraints(arg_t *arg, asn1p_expr_t *expr, const char *pfx) { int save_target = arg->target->target; @@ -2385,6 +2410,49 @@ emit_member_PER_constraints(arg_t *arg, asn1p_expr_t *expr, const char *pfx) { return 0; } +static int +emit_member_JER_constraints(arg_t *arg, asn1p_expr_t *expr, const char *pfx) { + int save_target = arg->target->target; + asn1cnst_range_t *range; + asn1p_expr_type_e etype; + + etype = expr_get_type(arg, expr); + + if((arg->flags & A1C_GEN_JER) + && (etype == ASN_BASIC_BIT_STRING)) { + /* Fall through */ + } else { + return 0; + } + + REDIR(OT_CTDEFS); + + OUT("#if !defined(ASN_DISABLE_JER_SUPPORT)\n"); + OUT("static asn_jer_constraints_t " + "asn_JER_%s_%s_constr_%d CC_NOTUSED = {\n", + pfx, MKID(expr), expr->_type_unique_index); + + INDENT(+1); + + /* .size */ + range = asn1constraint_compute_JER_range(expr->Identifier, etype, + expr->combined_constraints, + ACT_CT_SIZE, 0, 0, 0); + if(emit_single_member_JER_constraint_size(arg, range)) { + return -1; + } + asn1constraint_range_free(range); + + INDENT(-1); + + OUT("};\n"); + OUT("#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */\n"); + + REDIR(save_target); + + return 0; +} + static int safe_string(const uint8_t *buf, int size) { const uint8_t *end = buf + size; @@ -2988,6 +3056,21 @@ emit_member_table(arg_t *arg, asn1p_expr_t *expr, asn1c_ioc_table_and_objset_t * } OUT(",\n"); OUT_NOINDENT("#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */\n"); + OUT_NOINDENT("#if !defined(ASN_DISABLE_JER_SUPPORT)\n"); + if(C99_MODE) OUT(".jer_constraints = "); + if(arg->flags & A1C_GEN_JER) { + if(expr->constraints && expr->expr_type == ASN_BASIC_BIT_STRING) { + OUT("&asn_JER_memb_%s_constr_%d", + MKID(expr), + expr->_type_unique_index); + } else { + OUT("0"); + } + } else { + OUT("0"); + } + OUT(",\n"); + OUT_NOINDENT("#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */\n"); if(C99_MODE) OUT(".general_constraints = "); if(expr->constraints) { if(arg->flags & A1C_NO_CONSTRAINTS) { @@ -3050,6 +3133,9 @@ emit_member_table(arg_t *arg, asn1p_expr_t *expr, asn1c_ioc_table_and_objset_t * if(emit_member_PER_constraints(arg, expr, "memb")) return -1; + if(emit_member_JER_constraints(arg, expr, "memb")) + return -1; + REDIR(save_target); return 0; @@ -3074,6 +3160,9 @@ emit_type_DEF(arg_t *arg, asn1p_expr_t *expr, enum tvm_compat tv_mode, int tags_ if(emit_member_PER_constraints(arg, expr, "type")) return -1; + if(emit_member_JER_constraints(arg, expr, "type")) + return -1; + if(HIDE_INNER_DEFS) OUT("static /* Use -fall-defs-global to expose */\n"); OUT("asn_TYPE_descriptor_t asn_DEF_%s", p); @@ -3177,6 +3266,19 @@ emit_type_DEF(arg_t *arg, asn1p_expr_t *expr, enum tvm_compat tv_mode, int tags_ } OUT(",\n"); OUT_NOINDENT("#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */\n"); + OUT_NOINDENT("#if !defined(ASN_DISABLE_JER_SUPPORT)\n"); + if(arg->flags & A1C_GEN_JER) { + if(expr->expr_type == ASN_BASIC_BIT_STRING) { + OUT("&asn_JER_type_%s_constr_%d", + expr_id, expr->_type_unique_index); + } else { + OUT("0"); + } + } else { + OUT("0"); + } + OUT(",\n"); + OUT_NOINDENT("#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */\n"); #define FUNCREF(foo) \ do { \ OUT("%s", p); \ diff --git a/libasn1fix/asn1fix_crange.c b/libasn1fix/asn1fix_crange.c index 9a188498d..bae6f553c 100644 --- a/libasn1fix/asn1fix_crange.c +++ b/libasn1fix/asn1fix_crange.c @@ -291,9 +291,12 @@ static int _range_merge_in(asn1cnst_range_t *into, asn1cnst_range_t *cr) { into->not_OER_visible |= cr->not_OER_visible; into->not_PER_visible |= cr->not_PER_visible; + into->not_JER_visible |= cr->not_JER_visible; into->extensible |= cr->extensible; - if(into->extensible) + if(into->extensible) { into->not_OER_visible = 1; + into->not_JER_visible = 1; + } into->narrowing = _softest_narrowing(into, cr); @@ -592,12 +595,15 @@ _range_intersection(asn1cnst_range_t *range, const asn1cnst_range_t *with, int s if(is_oer) { assert(range->extensible == 0); assert(range->not_OER_visible == 0); + assert(range->not_JER_visible == 0); assert(with->extensible == 0); assert(with->not_OER_visible == 0); + assert(with->not_JER_visible == 0); if(range->extensible) { assert(range->not_OER_visible); + assert(range->not_JER_visible); } - if(range->extensible || range->not_OER_visible) { + if(range->extensible || range->not_OER_visible || range->not_JER_visible) { /* X.696 #8.2.4 Completely ignore the extensible constraints */ /* (XXX)(YYY,...) Retain the first one (XXX). */ asn1cnst_range_t *tmp = _range_new(); @@ -609,16 +615,19 @@ _range_intersection(asn1cnst_range_t *range, const asn1cnst_range_t *with, int s if(with->extensible) { assert(with->not_OER_visible); + assert(with->not_JER_visible); } - if(with->extensible || with->not_OER_visible) { + if(with->extensible || with->not_OER_visible || with->not_JER_visible) { /* X.696 #8.2.4 Completely ignore the extensible constraints */ return 0; } } else { /* Propagate errors */ range->extensible |= with->extensible; - if(with->extensible) + if(with->extensible) { range->not_OER_visible = 1; + range->not_JER_visible = 1; + } range->not_PER_visible |= with->not_PER_visible; } range->empty_constraint |= with->empty_constraint; @@ -828,6 +837,11 @@ asn1constraint_compute_PER_range(const char *dbg_name, asn1p_expr_type_e expr_ty return asn1constraint_compute_constraint_range(dbg_name, expr_type, ct, requested_ct_type, minmax, exmet, cpr_flags); } +asn1cnst_range_t * +asn1constraint_compute_JER_range(const char *dbg_name, asn1p_expr_type_e expr_type, const asn1p_constraint_t *ct, enum asn1p_constraint_type_e requested_ct_type, const asn1cnst_range_t *minmax, int *exmet, enum cpr_flags cpr_flags) { + return asn1constraint_compute_constraint_range(dbg_name, expr_type, ct, requested_ct_type, minmax, exmet, cpr_flags | CPR_strict_JER_visibility); +} + static asn1cnst_range_t * asn1f_real_range_from_WCOMPS(const char *dbg_name, const asn1p_constraint_t *ct) { @@ -1044,6 +1058,11 @@ asn1constraint_compute_constraint_range( return range; } + if(!ct + || (range->not_JER_visible && (cpr_flags & CPR_strict_JER_visibility))) { + return range; + } + switch(ct->type) { case ACT_EL_VALUE: vmin = vmax = ct->value; @@ -1059,6 +1078,7 @@ asn1constraint_compute_constraint_range( if(!*exmet) { range->extensible = 1; range->not_OER_visible = 1; + range->not_JER_visible = 1; } else { _range_free(range); errno = ERANGE; @@ -1086,8 +1106,10 @@ asn1constraint_compute_constraint_range( if(errno == ERANGE) { range->empty_constraint = 1; range->extensible = 1; - if(range->extensible) + if(range->extensible) { range->not_OER_visible = 1; + range->not_PER_visible = 1; + } tmp = range; } else { _range_free(range); @@ -1106,8 +1128,10 @@ asn1constraint_compute_constraint_range( if(!tmp) { if(errno == ERANGE) { range->extensible = 1; - if(range->extensible) + if(range->extensible) { range->not_OER_visible = 1; + range->not_JER_visible = 1; + } continue; } else { _range_free(range); @@ -1152,8 +1176,17 @@ asn1constraint_compute_constraint_range( continue; } + if(tmp->not_JER_visible + && (cpr_flags & CPR_strict_JER_visibility)) { + /* + * Ignore not JER-visible + */ + _range_free(tmp); + continue; + } + ret = _range_intersection(range, tmp, - ct->type == ACT_CA_SET, cpr_flags & CPR_strict_OER_visibility); + ct->type == ACT_CA_SET, cpr_flags & (CPR_strict_OER_visibility | CPR_strict_JER_visibility)); _range_free(tmp); if(ret) { _range_free(range); @@ -1180,6 +1213,7 @@ asn1constraint_compute_constraint_range( if(errno == ERANGE) { range->extensible = 1; range->not_OER_visible = 1; + range->not_JER_visible = 1; continue; } else { _range_free(range); @@ -1195,6 +1229,7 @@ asn1constraint_compute_constraint_range( if(tmp) { tmp->extensible |= range->extensible; tmp->not_OER_visible |= range->not_OER_visible; + tmp->not_JER_visible |= range->not_JER_visible; tmp->empty_constraint |= range->empty_constraint; _range_free(range); range = tmp; @@ -1215,6 +1250,7 @@ asn1constraint_compute_constraint_range( if(errno == ERANGE) { range->extensible = 1; range->not_OER_visible = 1; + range->not_JER_visible = 1; continue; } else { _range_free(range); @@ -1235,6 +1271,7 @@ asn1constraint_compute_constraint_range( */ range->extensible |= tmp->extensible; range->not_OER_visible |= tmp->not_OER_visible; + range->not_JER_visible |= tmp->not_JER_visible; _range_free(tmp); continue; } @@ -1247,8 +1284,10 @@ asn1constraint_compute_constraint_range( if(requested_ct_type == ACT_CT_FROM) { /* * X.696 permitted alphabet constraints are not OER-visible. + * X.697 permitted alphabet constraints are not JER-visible. */ range->not_OER_visible = 1; + range->not_JER_visible = 1; if(range->extensible) { /* * X.691, #9.3.10: diff --git a/libasn1fix/asn1fix_crange.h b/libasn1fix/asn1fix_crange.h index 1896392b5..abc4ead0c 100644 --- a/libasn1fix/asn1fix_crange.h +++ b/libasn1fix/asn1fix_crange.h @@ -33,6 +33,7 @@ typedef struct asn1cnst_range_s { int incompatible; /* Constraint incompatible with argument */ int not_OER_visible; /* Contains not OER-visible components */ int not_PER_visible; /* Contains not PER-visible components */ + int not_JER_visible; /* Contains not JER-visible components */ } asn1cnst_range_t; /* @@ -50,7 +51,8 @@ enum cpr_flags { CPR_noflags = 0x00, CPR_strict_OER_visibility = 0x01, CPR_strict_PER_visibility = 0x02, - CPR_simulate_fbless_SIZE = 0x04, + CPR_strict_JER_visibility = 0x04, + CPR_simulate_fbless_SIZE = 0x08, }; asn1cnst_range_t *asn1constraint_compute_OER_range(const char *dbg_name, asn1p_expr_type_e expr_type, @@ -66,6 +68,13 @@ asn1cnst_range_t *asn1constraint_compute_PER_range(const char *dbg_name, const asn1cnst_range_t *minmax, int *expectation_met, enum cpr_flags); +asn1cnst_range_t *asn1constraint_compute_JER_range(const char *dbg_name, + asn1p_expr_type_e expr_type, + const asn1p_constraint_t *ct, + enum asn1p_constraint_type_e required_type, + const asn1cnst_range_t *minmax, + int *expectation_met, + enum cpr_flags); /* Base implementation */ asn1cnst_range_t *asn1constraint_compute_constraint_range(const char *dbg_name, asn1p_expr_type_e expr_type, diff --git a/skeletons/ANY.c b/skeletons/ANY.c index 3cbe1e272..23059c8a0 100644 --- a/skeletons/ANY.c +++ b/skeletons/ANY.c @@ -76,6 +76,9 @@ asn_TYPE_descriptor_t asn_DEF_ANY = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_no_constraint }, /* No constraints */ 0, 0, /* No members */ diff --git a/skeletons/ANY_jer.c b/skeletons/ANY_jer.c index a86db9c73..6382c30d0 100644 --- a/skeletons/ANY_jer.c +++ b/skeletons/ANY_jer.c @@ -7,11 +7,12 @@ #include asn_enc_rval_t -ANY_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, +ANY_encode_jer(const asn_TYPE_descriptor_t *td, const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { ASN__ENCODE_FAILED; /* Dump as binary */ - return OCTET_STRING_encode_jer(td, sptr, ilevel, flags, cb, app_key); + return OCTET_STRING_encode_jer(td, constraints, sptr, ilevel, flags, cb, app_key); } diff --git a/skeletons/BIT_STRING.c b/skeletons/BIT_STRING.c index 208ac14c7..0c799d491 100644 --- a/skeletons/BIT_STRING.c +++ b/skeletons/BIT_STRING.c @@ -40,7 +40,7 @@ asn_TYPE_operation_t asn_OP_BIT_STRING = { 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) - OCTET_STRING_decode_jer_hex, + BIT_STRING_decode_jer, BIT_STRING_encode_jer, #else 0, @@ -91,6 +91,9 @@ asn_TYPE_descriptor_t asn_DEF_BIT_STRING = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ BIT_STRING_constraint }, 0, 0, /* No members */ diff --git a/skeletons/BIT_STRING.h b/skeletons/BIT_STRING.h index 0b71feb7b..aadfc74b9 100644 --- a/skeletons/BIT_STRING.h +++ b/skeletons/BIT_STRING.h @@ -46,7 +46,7 @@ xer_type_encoder_f BIT_STRING_encode_xer; #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) -#define BIT_STRING_decode_jer OCTET_STRING_decode_jer_binary +jer_type_decoder_f BIT_STRING_decode_jer; jer_type_encoder_f BIT_STRING_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/skeletons/BIT_STRING_jer.c b/skeletons/BIT_STRING_jer.c index e530df975..f59d3c683 100644 --- a/skeletons/BIT_STRING_jer.c +++ b/skeletons/BIT_STRING_jer.c @@ -3,24 +3,32 @@ * All rights reserved. * Redistribution and modifications are permitted subject to BSD license. */ +#include #include #include +#include asn_enc_rval_t -BIT_STRING_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +BIT_STRING_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, + enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { asn_enc_rval_t er = {0, 0, 0}; const char * const h2c = "0123456789ABCDEF"; char scratch[16 * 3 + 4]; char *p = scratch; const BIT_STRING_t *st = (const BIT_STRING_t *)sptr; + const asn_jer_constraints_t* cts = constraints ? + constraints : td->encoding_constraints.jer_constraints; uint8_t *buf; uint8_t *end; (void)ilevel; (void)flags; + int jmin = flags & JER_F_MINIFIED; + if(!st || !st->buf) ASN__ENCODE_FAILED; @@ -32,31 +40,256 @@ BIT_STRING_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, /* * Hex dump */ - *p++ = '"'; - for(int i = 0; buf < end; buf++, i++) { - if(!(i % 16) && (i || st->size > 16)) { - ASN__CALLBACK(scratch, p-scratch); - p = scratch; + if(cts->size != -1) { /* Fixed size */ + *p++ = '"'; + for(int i = 0; buf < end; buf++, i++) { + if(!(i % 16) && (i || st->size > 16)) { + ASN__CALLBACK(scratch, p-scratch); + p = scratch; + } + *p++ = h2c[*buf >> 4]; + *p++ = h2c[*buf & 0x0F]; } - *p++ = h2c[*buf >> 4]; - *p++ = h2c[*buf & 0x0F]; - } - ASN__CALLBACK(scratch, p - scratch); - p = scratch; + ASN__CALLBACK(scratch, p - scratch); + p = scratch; + + if(buf == end) { + int ubits = st->bits_unused; + uint8_t v = *buf & (0xff << ubits); + *p++ = h2c[v >> 4]; + *p++ = h2c[v & 0x0F]; + ASN__CALLBACK(scratch, p - scratch); + p = scratch; + } + *p++ = '"'; + ASN__CALLBACK(scratch, p - scratch); + } else { /* Variable size */ + ASN__CALLBACK("{", 1); + if(!jmin) { + ASN__TEXT_INDENT(1, ilevel + 1); + ASN__CALLBACK("\"value\": ", 9); + } else { + ASN__CALLBACK("\"value\":", 8); + } + *p++ = '"'; + for(int i = 0; buf < end; buf++, i++) { + if(!(i % 16) && (i || st->size > 16)) { + ASN__CALLBACK(scratch, p-scratch); + p = scratch; + } + *p++ = h2c[*buf >> 4]; + *p++ = h2c[*buf & 0x0F]; + } - if(buf == end) { - int ubits = st->bits_unused; - uint8_t v = *buf & (0xff << ubits); - *p++ = h2c[v >> 4]; - *p++ = h2c[v & 0x0F]; ASN__CALLBACK(scratch, p - scratch); p = scratch; + + if(buf == end) { + int ubits = st->bits_unused; + uint8_t v = *buf & (0xff << ubits); + *p++ = h2c[v >> 4]; + *p++ = h2c[v & 0x0F]; + ASN__CALLBACK(scratch, p - scratch); + p = scratch; + } + *p++ = '"'; + ASN__CALLBACK(scratch, p - scratch); + + ASN__CALLBACK(",", 1); + if (!jmin) { + ASN__TEXT_INDENT(1, ilevel + 1); + } + + if(!jmin) { + ASN__CALLBACK("\"length\": ", 10); + } else { + ASN__CALLBACK("\"length\":", 9); + } + int wr = snprintf(scratch, sizeof(scratch), "%lu", + st->size * 8 - (st->bits_unused)); + if(wr < 0 || wr >= sizeof(scratch)) { + ASN__ENCODE_FAILED; + } + ASN__CALLBACK(scratch, wr); + if (!jmin) { + ASN__TEXT_INDENT(1, ilevel); + } + ASN__CALLBACK("}", 1); } - *p++ = '"'; - ASN__CALLBACK(scratch, p - scratch); ASN__ENCODED_OK(er); cb_failed: ASN__ENCODE_FAILED; } + +/* + * Return a standardized complex structure. + */ +#undef RETURN +#define RETURN(_code) \ + do { \ + rval.code = _code; \ + rval.consumed = consumed_myself; \ + return rval; \ + } while(0) + +#define SKIPCHAR(_c) \ + do { \ + int found = 0; \ + for (; p < pend; ++p) { \ + if (*p == _c) { \ + found = 1; ++p; \ + break; \ + } \ + } \ + if(!found) RETURN(RC_WMORE); \ + } while(0) + +asn_dec_rval_t +BIT_STRING_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **sptr, + const void *buf_ptr, size_t size) { + BIT_STRING_t *st = (BIT_STRING_t *)*sptr; + const asn_jer_constraints_t *cts = constraints ? + constraints : td->encoding_constraints.jer_constraints; + asn_dec_rval_t rval; /* Return value from the decoder */ + ssize_t consumed_myself = 0; /* Consumed bytes from buf_ptr */ + + /* + * Create the string if does not exist. + */ + if(!st) { + st = (BIT_STRING_t *)(*sptr = CALLOC(1, sizeof(*st))); + if(!st) ASN__DECODE_FAILED; + } + + const char *p = (const char*)buf_ptr; + const char *pend = p + size; + + if(cts->size == -1) { + SKIPCHAR('{'); + SKIPCHAR('"'); + if(pend-p < 5) RETURN(RC_WMORE); + if(0 != memcmp(p, "value", 5)) RETURN(RC_FAIL); + p += 5; + SKIPCHAR('"'); + SKIPCHAR(':'); + } + + /* bitstring value */ + SKIPCHAR('"'); + + /* calculate size */ + const char* p0 = p; + SKIPCHAR('"'); + const char* p1 = p - 1; + p = p0; + + void *nptr = REALLOC(st->buf, (p1-p0 + 1) / 2 + 1); + if(!nptr) RETURN(RC_FAIL); + st->buf = (uint8_t *)nptr; + uint8_t *buf = st->buf; + unsigned int clv = 0; + int half = 0; + + for(; p < p1; p++) { + int ch = *(const unsigned char *)p; + switch(ch) { + case 0x30: case 0x31: case 0x32: case 0x33: case 0x34: /*01234*/ + case 0x35: case 0x36: case 0x37: case 0x38: case 0x39: /*56789*/ + clv = (clv << 4) + (ch - 0x30); + break; + case 0x41: case 0x42: case 0x43: /* ABC */ + case 0x44: case 0x45: case 0x46: /* DEF */ + clv = (clv << 4) + (ch - 0x41 + 10); + break; + case 0x61: case 0x62: case 0x63: /* abc */ + case 0x64: case 0x65: case 0x66: /* def */ + clv = (clv << 4) + (ch - 0x61 + 10); + break; + default: + *buf = 0; /* JIC */ + RETURN(RC_FAIL); + } + if(half++) { + half = 0; + *buf++ = clv; + } + } + + /* + * Check partial decoding. + */ + if(half) { + RETURN(RC_FAIL); + } + + st->size = buf - st->buf; /* Adjust the buffer size */ + st->buf[st->size] = 0; /* Courtesy termination */ + + SKIPCHAR('"'); + + if(cts->size == -1) { + SKIPCHAR(','); + SKIPCHAR('"'); + if(pend-p < 6) RETURN(RC_WMORE); + if(0 != memcmp(p, "length", 6)) RETURN(RC_FAIL); + p += 6; + SKIPCHAR('"'); + SKIPCHAR(':'); + p0 = p; + /* Skip whitespace, numbers, for length calc for INTEGER dec + * Stop on first non-whitespace/non-number */ + int numbered = 0; + for (; p < pend; ++p) { + switch (*p) { + case 0x09: case 0x0a: case 0x0c: case 0x0d: + case 0x20: + if(!numbered) continue; + else break; + /* Ignore whitespace */ + case 0x30: case 0x31: case 0x32: case 0x33: case 0x34: /*01234*/ + case 0x35: case 0x36: case 0x37: case 0x38: case 0x39: /*56789*/ + case 0x2d: /*-*/ + numbered = 1; + continue; + } + if(numbered) break; + } + if(!numbered) RETURN(RC_FAIL); + + unsigned long length; + + INTEGER_t integer = { 0 }; + void *integer_ptr = (void *)&integer; + memset(&integer, 0, sizeof(integer)); + + asn_dec_rval_t dec = + INTEGER_decode_jer(NULL, &asn_DEF_INTEGER, NULL, &integer_ptr, p0, p-p0); + if(dec.code == RC_OK) { + if(asn_INTEGER2ulong(&integer, (unsigned long *)&length)) { + RETURN(RC_FAIL); + } + } else { + RETURN(RC_FAIL); + } + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_INTEGER, &integer); + + if(dec.code != RC_OK) RETURN(RC_FAIL); + st->bits_unused = (st->size * 8) - length; + + SKIPCHAR('}'); + } else { + if(st->size * 8 < cts->size) { + RETURN(RC_FAIL); + } + st->bits_unused = (st->size * 8) - cts->size; + } + + consumed_myself = (const char *)p - (const char *)buf_ptr; + RETURN(RC_OK); +} + diff --git a/skeletons/BMPString.c b/skeletons/BMPString.c index 177d37df4..2705e81ab 100644 --- a/skeletons/BMPString.c +++ b/skeletons/BMPString.c @@ -99,6 +99,9 @@ asn_TYPE_descriptor_t asn_DEF_BMPString = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_DEF_BMPString_per_constraints, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ BMPString_constraint }, 0, 0, /* No members */ diff --git a/skeletons/BMPString_jer.c b/skeletons/BMPString_jer.c index 6231cc862..34711684e 100644 --- a/skeletons/BMPString_jer.c +++ b/skeletons/BMPString_jer.c @@ -9,11 +9,12 @@ asn_dec_rval_t BMPString_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, void **sptr, const void *buf_ptr, size_t size) { asn_dec_rval_t rc; - rc = OCTET_STRING_decode_jer_utf8(opt_codec_ctx, td, sptr, buf_ptr, size); + rc = OCTET_STRING_decode_jer_utf8(opt_codec_ctx, td, constraints, sptr, buf_ptr, size); if(rc.code == RC_OK) { /* * Now we have a whole string in UTF-8 format. @@ -73,8 +74,10 @@ BMPString_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } asn_enc_rval_t -BMPString_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +BMPString_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t* constraints, + const void *sptr, int ilevel, + enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { const BMPString_t *st = (const BMPString_t *)sptr; asn_enc_rval_t er = {0,0,0}; diff --git a/skeletons/BOOLEAN.c b/skeletons/BOOLEAN.c index 7075f095b..c001702c3 100644 --- a/skeletons/BOOLEAN.c +++ b/skeletons/BOOLEAN.c @@ -84,6 +84,9 @@ asn_TYPE_descriptor_t asn_DEF_BOOLEAN = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_no_constraint }, 0, 0, /* No members */ diff --git a/skeletons/BOOLEAN_jer.c b/skeletons/BOOLEAN_jer.c index 46f9ff4d0..9c7dbeb40 100644 --- a/skeletons/BOOLEAN_jer.c +++ b/skeletons/BOOLEAN_jer.c @@ -34,8 +34,9 @@ BOOLEAN__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, asn_dec_rval_t BOOLEAN_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, - const void *buf_ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t* constraints, + void **sptr, const void *buf_ptr, size_t size) { return jer_decode_primitive(opt_codec_ctx, td, sptr, sizeof(BOOLEAN_t), buf_ptr, size, BOOLEAN__jer_body_decode); @@ -43,8 +44,9 @@ BOOLEAN_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, asn_enc_rval_t -BOOLEAN_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +BOOLEAN_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { const BOOLEAN_t *st = (const BOOLEAN_t *)sptr; asn_enc_rval_t er = {0, 0, 0}; diff --git a/skeletons/ENUMERATED.c b/skeletons/ENUMERATED.c index 97bc9b1eb..f10931e41 100644 --- a/skeletons/ENUMERATED.c +++ b/skeletons/ENUMERATED.c @@ -85,6 +85,9 @@ asn_TYPE_descriptor_t asn_DEF_ENUMERATED = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_no_constraint }, 0, 0, /* No members */ diff --git a/skeletons/ENUMERATED_jer.c b/skeletons/ENUMERATED_jer.c index 0a7305ef8..7ef0a15bc 100644 --- a/skeletons/ENUMERATED_jer.c +++ b/skeletons/ENUMERATED_jer.c @@ -81,7 +81,7 @@ ENUMERATED__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, int decoded = 0; for (lp = lstart; lp < lstop; ++lp) { - if (*lp == 0x22 /* '"' */) { + if (*lp == 0x22 /* '"' */) { const asn_INTEGER_enum_map_t *el; el = ENUMERATED_jer_map_enum2value( (const asn_INTEGER_specifics_t *) @@ -117,8 +117,9 @@ ENUMERATED__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, asn_dec_rval_t ENUMERATED_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, - const void *buf_ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **sptr, const void *buf_ptr, size_t size) { return jer_decode_primitive(opt_codec_ctx, td, sptr, sizeof(INTEGER_t), buf_ptr, size, ENUMERATED__jer_body_decode); diff --git a/skeletons/GeneralString.c b/skeletons/GeneralString.c index fe77e64fc..8046a16ad 100644 --- a/skeletons/GeneralString.c +++ b/skeletons/GeneralString.c @@ -87,6 +87,9 @@ asn_TYPE_descriptor_t asn_DEF_GeneralString = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_unknown_constraint }, 0, 0, /* No members */ diff --git a/skeletons/GeneralizedTime.c b/skeletons/GeneralizedTime.c index e4e25626f..14dea79b8 100644 --- a/skeletons/GeneralizedTime.c +++ b/skeletons/GeneralizedTime.c @@ -251,6 +251,9 @@ asn_TYPE_descriptor_t asn_DEF_GeneralizedTime = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_DEF_GeneralizedTime_per_constraints, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ GeneralizedTime_constraint }, 0, 0, /* No members */ diff --git a/skeletons/GeneralizedTime_jer.c b/skeletons/GeneralizedTime_jer.c index ceb6563d3..35f2d9979 100644 --- a/skeletons/GeneralizedTime_jer.c +++ b/skeletons/GeneralizedTime_jer.c @@ -16,8 +16,10 @@ #if !defined(ASN___INTERNAL_TEST_MODE) asn_enc_rval_t -GeneralizedTime_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +GeneralizedTime_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, + enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { GeneralizedTime_t *gt; asn_enc_rval_t rv; @@ -33,7 +35,7 @@ GeneralizedTime_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, gt = asn_time2GT_frac(0, &tm, fv, fd, 1); if(!gt) ASN__ENCODE_FAILED; - rv = OCTET_STRING_encode_jer_utf8(td, sptr, ilevel, flags, + rv = OCTET_STRING_encode_jer_utf8(td, constraints, sptr, ilevel, flags, cb, app_key); ASN_STRUCT_FREE(asn_DEF_GeneralizedTime, gt); return rv; diff --git a/skeletons/GraphicString.c b/skeletons/GraphicString.c index 0f2fc39ba..d1028b859 100644 --- a/skeletons/GraphicString.c +++ b/skeletons/GraphicString.c @@ -87,6 +87,9 @@ asn_TYPE_descriptor_t asn_DEF_GraphicString = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_unknown_constraint }, 0, 0, /* No members */ diff --git a/skeletons/IA5String.c b/skeletons/IA5String.c index 5266f8918..9f9c51159 100644 --- a/skeletons/IA5String.c +++ b/skeletons/IA5String.c @@ -94,6 +94,9 @@ asn_TYPE_descriptor_t asn_DEF_IA5String = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_DEF_IA5String_per_constraints, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IA5String_constraint }, 0, 0, /* No members */ diff --git a/skeletons/INTEGER.c b/skeletons/INTEGER.c index e81cfb280..858b25a7c 100644 --- a/skeletons/INTEGER.c +++ b/skeletons/INTEGER.c @@ -87,6 +87,9 @@ asn_TYPE_descriptor_t asn_DEF_INTEGER = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_no_constraint }, 0, 0, /* No members */ diff --git a/skeletons/INTEGER_jer.c b/skeletons/INTEGER_jer.c index 053d9d68a..e25a76698 100644 --- a/skeletons/INTEGER_jer.c +++ b/skeletons/INTEGER_jer.c @@ -181,8 +181,9 @@ INTEGER__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, asn_dec_rval_t INTEGER_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, - const void *buf_ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **sptr, const void *buf_ptr, size_t size) { return jer_decode_primitive(opt_codec_ctx, td, sptr, sizeof(INTEGER_t), buf_ptr, size, INTEGER__jer_body_decode); @@ -190,8 +191,9 @@ INTEGER_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, asn_enc_rval_t -INTEGER_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +INTEGER_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { const INTEGER_t *st = (const INTEGER_t *)sptr; asn_enc_rval_t er = {0,0,0}; diff --git a/skeletons/ISO646String.c b/skeletons/ISO646String.c index b5eeb78fc..64f149edf 100644 --- a/skeletons/ISO646String.c +++ b/skeletons/ISO646String.c @@ -94,6 +94,9 @@ asn_TYPE_descriptor_t asn_DEF_ISO646String = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_DEF_ISO646String_per_constraints, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ISO646String_constraint }, 0, 0, /* No members */ diff --git a/skeletons/NULL.c b/skeletons/NULL.c index 372929147..ffe4b9fec 100644 --- a/skeletons/NULL.c +++ b/skeletons/NULL.c @@ -84,6 +84,9 @@ asn_TYPE_descriptor_t asn_DEF_NULL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_no_constraint }, 0, 0, /* No members */ diff --git a/skeletons/NULL_jer.c b/skeletons/NULL_jer.c index 0f5f27831..960dba0c9 100644 --- a/skeletons/NULL_jer.c +++ b/skeletons/NULL_jer.c @@ -8,8 +8,10 @@ #include asn_enc_rval_t -NULL_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, - enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, +NULL_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, const void *sptr, + int ilevel, enum jer_encoder_flags_e flags, + asn_app_consume_bytes_f *cb, void *app_key) { asn_enc_rval_t er = {0,0,0}; @@ -27,8 +29,8 @@ NULL_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, static enum jer_pbd_rval -NULL__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, - const void *chunk_buf, size_t chunk_size) { +NULL__jer_body_decode(const asn_TYPE_descriptor_t *td, + void *sptr, const void *chunk_buf, size_t chunk_size) { (void)td; (void)sptr; @@ -44,8 +46,9 @@ NULL__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, asn_dec_rval_t NULL_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, - const void *buf_ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **sptr, const void *buf_ptr, size_t size) { return jer_decode_primitive(opt_codec_ctx, td, sptr, sizeof(NULL_t), buf_ptr, size, NULL__jer_body_decode); diff --git a/skeletons/NativeEnumerated.c b/skeletons/NativeEnumerated.c index 148cb8fb4..cf8fa45c6 100644 --- a/skeletons/NativeEnumerated.c +++ b/skeletons/NativeEnumerated.c @@ -91,6 +91,9 @@ asn_TYPE_descriptor_t asn_DEF_NativeEnumerated = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_no_constraint }, 0, 0, /* No members */ diff --git a/skeletons/NativeEnumerated_jer.c b/skeletons/NativeEnumerated_jer.c index b76b061af..5c469fd82 100644 --- a/skeletons/NativeEnumerated_jer.c +++ b/skeletons/NativeEnumerated_jer.c @@ -11,7 +11,8 @@ */ asn_dec_rval_t NativeEnumerated_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, void **sptr, const void *buf_ptr, size_t size) { const asn_INTEGER_specifics_t *specs = (const asn_INTEGER_specifics_t *)td->specifics; @@ -26,7 +27,7 @@ NativeEnumerated_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } memset(&st, 0, sizeof(st)); - rval = ENUMERATED_decode_jer(opt_codec_ctx, td, &st_ptr, buf_ptr, size); + rval = ENUMERATED_decode_jer(opt_codec_ctx, td, constraints, &st_ptr, buf_ptr, size); if(rval.code == RC_OK) { long l; if((specs&&specs->field_unsigned) @@ -50,8 +51,9 @@ NativeEnumerated_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } asn_enc_rval_t -NativeEnumerated_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +NativeEnumerated_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { const asn_INTEGER_specifics_t *specs = (const asn_INTEGER_specifics_t *)td->specifics; diff --git a/skeletons/NativeInteger.c b/skeletons/NativeInteger.c index 8957b65c3..dcdbaaa08 100644 --- a/skeletons/NativeInteger.c +++ b/skeletons/NativeInteger.c @@ -92,6 +92,9 @@ asn_TYPE_descriptor_t asn_DEF_NativeInteger = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_no_constraint }, 0, 0, /* No members */ diff --git a/skeletons/NativeInteger_jer.c b/skeletons/NativeInteger_jer.c index e7d2f4a35..d384b23ee 100644 --- a/skeletons/NativeInteger_jer.c +++ b/skeletons/NativeInteger_jer.c @@ -11,8 +11,9 @@ */ asn_dec_rval_t NativeInteger_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, - const void *buf_ptr, + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t* constraints, + void **sptr, const void *buf_ptr, size_t size) { const asn_INTEGER_specifics_t *specs = (const asn_INTEGER_specifics_t *)td->specifics; @@ -27,7 +28,7 @@ NativeInteger_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } memset(&st, 0, sizeof(st)); - rval = INTEGER_decode_jer(opt_codec_ctx, td, &st_ptr, buf_ptr, size); + rval = INTEGER_decode_jer(opt_codec_ctx, td, constraints, &st_ptr, buf_ptr, size); if(rval.code == RC_OK) { long l; if((specs&&specs->field_unsigned) @@ -51,8 +52,10 @@ NativeInteger_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } asn_enc_rval_t -NativeInteger_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +NativeInteger_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t* constraints, + const void *sptr, int ilevel, + enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { const asn_INTEGER_specifics_t *specs = (const asn_INTEGER_specifics_t *)td->specifics; diff --git a/skeletons/NativeReal.c b/skeletons/NativeReal.c index f1b245979..f52442156 100644 --- a/skeletons/NativeReal.c +++ b/skeletons/NativeReal.c @@ -111,6 +111,9 @@ asn_TYPE_descriptor_t asn_DEF_NativeReal = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_no_constraint }, 0, 0, /* No members */ diff --git a/skeletons/NativeReal_jer.c b/skeletons/NativeReal_jer.c index 100db75f4..e31dc208e 100644 --- a/skeletons/NativeReal_jer.c +++ b/skeletons/NativeReal_jer.c @@ -12,13 +12,14 @@ */ asn_dec_rval_t NativeReal_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, - const void *buf_ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **sptr, const void *buf_ptr, size_t size) { asn_dec_rval_t rval; REAL_t st = { 0, 0 }; REAL_t *stp = &st; - rval = REAL_decode_jer(opt_codec_ctx, td, (void **)&stp, buf_ptr, size); + rval = REAL_decode_jer(opt_codec_ctx, td, constraints, (void **)&stp, buf_ptr, size); if(rval.code == RC_OK) { double d; if(asn_REAL2double(&st, &d) || NativeReal__set(td, sptr, d) < 0) { @@ -34,11 +35,13 @@ NativeReal_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } asn_enc_rval_t - NativeReal_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, - asn_app_consume_bytes_f *cb, void *app_key) { + NativeReal_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, + enum jer_encoder_flags_e flags, + asn_app_consume_bytes_f *cb, void *app_key) { asn_enc_rval_t er = {0,0,0}; - double native; + double native; REAL_t tmpreal; (void)ilevel; @@ -48,7 +51,7 @@ asn_enc_rval_t if(asn_double2REAL(&tmpreal, native)) ASN__ENCODE_FAILED; - er = REAL_encode_jer(td, &tmpreal, ilevel, flags, cb, app_key); + er = REAL_encode_jer(td, constraints, &tmpreal, ilevel, flags, cb, app_key); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_REAL, &tmpreal); return er; } diff --git a/skeletons/NumericString.c b/skeletons/NumericString.c index a80eaca7a..88dd371e3 100644 --- a/skeletons/NumericString.c +++ b/skeletons/NumericString.c @@ -114,6 +114,9 @@ asn_TYPE_descriptor_t asn_DEF_NumericString = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_DEF_NumericString_per_constraints, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NumericString_constraint }, 0, 0, /* No members */ diff --git a/skeletons/OBJECT_IDENTIFIER.c b/skeletons/OBJECT_IDENTIFIER.c index c5ab38ea3..5ea9ef917 100644 --- a/skeletons/OBJECT_IDENTIFIER.c +++ b/skeletons/OBJECT_IDENTIFIER.c @@ -91,6 +91,9 @@ asn_TYPE_descriptor_t asn_DEF_OBJECT_IDENTIFIER = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OBJECT_IDENTIFIER_constraint }, 0, 0, /* No members */ diff --git a/skeletons/OBJECT_IDENTIFIER_jer.c b/skeletons/OBJECT_IDENTIFIER_jer.c index 1b0cde7c2..302ddbe9e 100644 --- a/skeletons/OBJECT_IDENTIFIER_jer.c +++ b/skeletons/OBJECT_IDENTIFIER_jer.c @@ -31,10 +31,10 @@ OBJECT_IDENTIFIER__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, } --chunk_end; for (; chunk_end >= p; --chunk_end) { - if (*chunk_end == CQUOTE) + if (*chunk_end == CQUOTE) break; } - if (chunk_end - p < 0) + if (chunk_end - p < 0) return JPBD_BROKEN_ENCODING; chunk_size = chunk_end - p; chunk_buf = p; @@ -71,8 +71,9 @@ OBJECT_IDENTIFIER__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, asn_dec_rval_t OBJECT_IDENTIFIER_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, - const void *buf_ptr, + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **sptr, const void *buf_ptr, size_t size) { return jer_decode_primitive(opt_codec_ctx, td, sptr, sizeof(OBJECT_IDENTIFIER_t), @@ -80,8 +81,10 @@ OBJECT_IDENTIFIER_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } asn_enc_rval_t -OBJECT_IDENTIFIER_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +OBJECT_IDENTIFIER_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, + enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { const OBJECT_IDENTIFIER_t *st = (const OBJECT_IDENTIFIER_t *)sptr; asn_enc_rval_t er = {0,0,0}; diff --git a/skeletons/OCTET_STRING.c b/skeletons/OCTET_STRING.c index fc983b4e2..a4630ca76 100644 --- a/skeletons/OCTET_STRING.c +++ b/skeletons/OCTET_STRING.c @@ -93,6 +93,9 @@ asn_TYPE_descriptor_t asn_DEF_OCTET_STRING = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_no_constraint }, 0, 0, /* No members */ @@ -253,7 +256,7 @@ OCTET_STRING_compare(const asn_TYPE_descriptor_t *td, const void *aptr, int OCTET_STRING_copy(const asn_TYPE_descriptor_t *td, void **aptr, const void *bptr) { - const asn_OCTET_STRING_specifics_t *specs = + const asn_OCTET_STRING_specifics_t *specs = td->specifics ? (const asn_OCTET_STRING_specifics_t *)td->specifics : &asn_SPC_OCTET_STRING_specs; OCTET_STRING_t *a = *aptr; diff --git a/skeletons/OCTET_STRING_jer.c b/skeletons/OCTET_STRING_jer.c index 82ba8ff1e..276646d46 100644 --- a/skeletons/OCTET_STRING_jer.c +++ b/skeletons/OCTET_STRING_jer.c @@ -8,8 +8,10 @@ #include /* for .bits_unused member */ asn_enc_rval_t -OCTET_STRING_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +OCTET_STRING_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, + enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { const char * const h2c = "0123456789ABCDEF"; const OCTET_STRING_t *st = (const OCTET_STRING_t *)sptr; @@ -155,8 +157,10 @@ OCTET_STRING__handle_control_chars(void *struct_ptr, const void *chunk_buf, size } asn_enc_rval_t -OCTET_STRING_encode_jer_utf8(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +OCTET_STRING_encode_jer_utf8(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, + enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { const OCTET_STRING_t *st = (const OCTET_STRING_t *)sptr; asn_enc_rval_t er = { 0, 0, 0 }; @@ -227,7 +231,7 @@ static ssize_t OCTET_STRING__convert_hexadecimal(void *sptr, const void *chunk_b } --pend; for (; pend >= p; --pend) { - if (*pend == CQUOTE) + if (*pend == CQUOTE) break; } if (pend - p < 0) return -1; @@ -358,10 +362,10 @@ OCTET_STRING__convert_entrefs(void *sptr, const void *chunk_buf, } --pend; for(; pend >= p; --pend) { - if (*pend == CQUOTE) + if (*pend == CQUOTE) break; } - if(pend - p < 0) + if(pend - p < 0) return -1; /* Reallocate buffer */ @@ -532,7 +536,7 @@ OCTET_STRING__decode_jer( } } } - + /* Restore parsing context */ ctx = (asn_struct_ctx_t *)(((char *)*sptr) + specs->ctx_offset); @@ -554,7 +558,9 @@ OCTET_STRING__decode_jer( */ asn_dec_rval_t OCTET_STRING_decode_jer_hex(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **sptr, const void *buf_ptr, size_t size) { return OCTET_STRING__decode_jer(opt_codec_ctx, td, sptr, buf_ptr, size, 0, @@ -566,8 +572,9 @@ OCTET_STRING_decode_jer_hex(const asn_codec_ctx_t *opt_codec_ctx, */ asn_dec_rval_t OCTET_STRING_decode_jer_utf8(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, - const void *buf_ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **sptr, const void *buf_ptr, size_t size) { return OCTET_STRING__decode_jer(opt_codec_ctx, td, sptr, buf_ptr, size, OCTET_STRING__handle_control_chars, diff --git a/skeletons/OPEN_TYPE_jer.c b/skeletons/OPEN_TYPE_jer.c index 796497623..f70dd10aa 100644 --- a/skeletons/OPEN_TYPE_jer.c +++ b/skeletons/OPEN_TYPE_jer.c @@ -9,8 +9,9 @@ asn_dec_rval_t OPEN_TYPE_jer_get(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void *sptr, - const asn_TYPE_member_t *elm, const void *ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + void *sptr, const asn_TYPE_member_t *elm, const void *ptr, + size_t size) { size_t consumed_myself = 0; asn_type_selector_result_t selected; void *memb_ptr; /* Pointer to the member */ @@ -103,7 +104,8 @@ OPEN_TYPE_jer_get(const asn_codec_ctx_t *opt_codec_ctx, + elm->type->elements[selected.presence_index - 1].memb_offset; rv = selected.type_descriptor->op->jer_decoder( - opt_codec_ctx, selected.type_descriptor, &inner_value, ptr, size); + opt_codec_ctx, selected.type_descriptor, selected.type_descriptor->encoding_constraints.jer_constraints, + &inner_value, ptr, size); ADVANCE(rv.consumed); rv.consumed = 0; switch(rv.code) { diff --git a/skeletons/OPEN_TYPE_oer.c b/skeletons/OPEN_TYPE_oer.c index d21bbade3..357b68edf 100644 --- a/skeletons/OPEN_TYPE_oer.c +++ b/skeletons/OPEN_TYPE_oer.c @@ -94,7 +94,7 @@ asn_enc_rval_t OPEN_TYPE_encode_oer(const asn_TYPE_descriptor_t *td, const asn_oer_constraints_t *constraints, const void *sptr, asn_app_consume_bytes_f *cb, void *app_key) { - asn_TYPE_member_t *elm; + asn_TYPE_member_t *elm; unsigned present; const void *memb_ptr; ssize_t encoded; diff --git a/skeletons/ObjectDescriptor.c b/skeletons/ObjectDescriptor.c index 4b3560af1..97a5733aa 100644 --- a/skeletons/ObjectDescriptor.c +++ b/skeletons/ObjectDescriptor.c @@ -87,6 +87,9 @@ asn_TYPE_descriptor_t asn_DEF_ObjectDescriptor = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_unknown_constraint }, 0, 0, /* No members */ diff --git a/skeletons/PrintableString.c b/skeletons/PrintableString.c index da4dabc72..3fedbcbdf 100644 --- a/skeletons/PrintableString.c +++ b/skeletons/PrintableString.c @@ -124,6 +124,9 @@ asn_TYPE_descriptor_t asn_DEF_PrintableString = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_DEF_PrintableString_per_constraints, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ PrintableString_constraint }, 0, 0, /* No members */ diff --git a/skeletons/REAL.c b/skeletons/REAL.c index 5ff83e44f..1074ee708 100644 --- a/skeletons/REAL.c +++ b/skeletons/REAL.c @@ -127,6 +127,9 @@ asn_TYPE_descriptor_t asn_DEF_REAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_no_constraint }, 0, 0, /* No members */ @@ -377,7 +380,7 @@ REAL_copy(const asn_TYPE_descriptor_t *td, void **aptr, *aptr = 0; } return 0; - } + } if(!a) { a = *aptr = CALLOC(1, sizeof(*a)); @@ -392,7 +395,7 @@ REAL_copy(const asn_TYPE_descriptor_t *td, void **aptr, FREEMEM(a->buf); a->buf = buf; a->size = b->size; - } + } return 0; } diff --git a/skeletons/REAL_jer.c b/skeletons/REAL_jer.c index fbf4c29c0..0d841a792 100644 --- a/skeletons/REAL_jer.c +++ b/skeletons/REAL_jer.c @@ -233,7 +233,9 @@ REAL__jer_dump(double d, int canonical, asn_app_consume_bytes_f *cb, void *app_k } asn_enc_rval_t -REAL_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, +REAL_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { const REAL_t *st = (const REAL_t *)sptr; @@ -255,8 +257,8 @@ REAL_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, * Decode the chunk of JSON text encoding REAL. */ static enum jer_pbd_rval -REAL__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, - const void *chunk_buf, size_t chunk_size) { +REAL__jer_body_decode(const asn_TYPE_descriptor_t *td, + void *sptr, const void *chunk_buf, size_t chunk_size) { REAL_t *st = (REAL_t *)sptr; double value; const char *jerdata = (const char *)chunk_buf; @@ -322,8 +324,9 @@ REAL__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, asn_dec_rval_t REAL_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, - const void *buf_ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **sptr, const void *buf_ptr, size_t size) { return jer_decode_primitive(opt_codec_ctx, td, sptr, sizeof(REAL_t), buf_ptr, size, REAL__jer_body_decode); } diff --git a/skeletons/RELATIVE-OID.c b/skeletons/RELATIVE-OID.c index d9bcbac6d..15d7fec3d 100644 --- a/skeletons/RELATIVE-OID.c +++ b/skeletons/RELATIVE-OID.c @@ -89,6 +89,9 @@ asn_TYPE_descriptor_t asn_DEF_RELATIVE_OID = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_no_constraint }, 0, 0, /* No members */ diff --git a/skeletons/RELATIVE-OID_jer.c b/skeletons/RELATIVE-OID_jer.c index 8abafeb84..c052b2b7d 100644 --- a/skeletons/RELATIVE-OID_jer.c +++ b/skeletons/RELATIVE-OID_jer.c @@ -9,8 +9,9 @@ #define CQUOTE 0x22 static enum jer_pbd_rval -RELATIVE_OID__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, - const void *chunk_buf, size_t chunk_size) { +RELATIVE_OID__jer_body_decode(const asn_TYPE_descriptor_t *td, + void *sptr, const void *chunk_buf, + size_t chunk_size) { RELATIVE_OID_t *st = (RELATIVE_OID_t *)sptr; const char *chunk_end = (const char *)chunk_buf + chunk_size; const char* p = (const char*)chunk_buf; @@ -31,10 +32,10 @@ RELATIVE_OID__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, } --chunk_end; for (; chunk_end >= p; --chunk_end) { - if (*chunk_end == CQUOTE) + if (*chunk_end == CQUOTE) break; } - if (chunk_end - p < 0) + if (chunk_end - p < 0) return JPBD_BROKEN_ENCODING; chunk_size = chunk_end - p; chunk_buf = p; @@ -71,16 +72,19 @@ RELATIVE_OID__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr, asn_dec_rval_t RELATIVE_OID_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, - const void *buf_ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **sptr, const void *buf_ptr, size_t size) { return jer_decode_primitive(opt_codec_ctx, td, sptr, sizeof(RELATIVE_OID_t), buf_ptr, size, RELATIVE_OID__jer_body_decode); } asn_enc_rval_t -RELATIVE_OID_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +RELATIVE_OID_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, + enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { const RELATIVE_OID_t *st = (const RELATIVE_OID_t *)sptr; asn_enc_rval_t er = {0,0,0}; diff --git a/skeletons/T61String.c b/skeletons/T61String.c index a29f0cba6..3f5d0fe1f 100644 --- a/skeletons/T61String.c +++ b/skeletons/T61String.c @@ -87,6 +87,9 @@ asn_TYPE_descriptor_t asn_DEF_T61String = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_unknown_constraint }, 0, 0, /* No members */ diff --git a/skeletons/TeletexString.c b/skeletons/TeletexString.c index 25fa6967f..897d720f3 100644 --- a/skeletons/TeletexString.c +++ b/skeletons/TeletexString.c @@ -87,6 +87,9 @@ asn_TYPE_descriptor_t asn_DEF_TeletexString = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_unknown_constraint }, 0, 0, /* No members */ diff --git a/skeletons/UTCTime.c b/skeletons/UTCTime.c index 0ab547dac..2d77ec842 100644 --- a/skeletons/UTCTime.c +++ b/skeletons/UTCTime.c @@ -105,6 +105,9 @@ asn_TYPE_descriptor_t asn_DEF_UTCTime = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_DEF_UTCTime_constraints, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ UTCTime_constraint }, 0, 0, /* No members */ diff --git a/skeletons/UTCTime_jer.c b/skeletons/UTCTime_jer.c index d0001c10a..e7343ed5f 100644 --- a/skeletons/UTCTime_jer.c +++ b/skeletons/UTCTime_jer.c @@ -16,8 +16,9 @@ #if !defined(ASN___INTERNAL_TEST_MODE) asn_enc_rval_t -UTCTime_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +UTCTime_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { asn_enc_rval_t rv; UTCTime_t *ut; @@ -32,7 +33,7 @@ UTCTime_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, ut = asn_time2UT(0, &tm, 1); if(!ut) ASN__ENCODE_FAILED; - rv = OCTET_STRING_encode_jer_utf8(td, sptr, ilevel, flags, + rv = OCTET_STRING_encode_jer_utf8(td, constraints, sptr, ilevel, flags, cb, app_key); OCTET_STRING_free(&asn_DEF_UTCTime, ut, 0); return rv; diff --git a/skeletons/UTF8String.c b/skeletons/UTF8String.c index bb627d988..f5d17ff6d 100644 --- a/skeletons/UTF8String.c +++ b/skeletons/UTF8String.c @@ -88,6 +88,9 @@ asn_TYPE_descriptor_t asn_DEF_UTF8String = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ UTF8String_constraint }, 0, 0, /* No members */ diff --git a/skeletons/UniversalString.c b/skeletons/UniversalString.c index 4246e1b30..2c694c287 100644 --- a/skeletons/UniversalString.c +++ b/skeletons/UniversalString.c @@ -99,6 +99,9 @@ asn_TYPE_descriptor_t asn_DEF_UniversalString = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_DEF_UniversalString_per_constraints, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ UniversalString_constraint }, 0, 0, /* No members */ diff --git a/skeletons/UniversalString_jer.c b/skeletons/UniversalString_jer.c index c1dcf1885..fe5ad831f 100644 --- a/skeletons/UniversalString_jer.c +++ b/skeletons/UniversalString_jer.c @@ -9,11 +9,12 @@ asn_dec_rval_t UniversalString_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **sptr, - const void *buf_ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **sptr, const void *buf_ptr, size_t size) { asn_dec_rval_t rc; - rc = OCTET_STRING_decode_jer_utf8(opt_codec_ctx, td, sptr, buf_ptr, size); + rc = OCTET_STRING_decode_jer_utf8(opt_codec_ctx, td, constraints, sptr, buf_ptr, size); if(rc.code == RC_OK) { /* * Now we have a whole string in UTF-8 format. @@ -64,8 +65,10 @@ UniversalString_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } asn_enc_rval_t -UniversalString_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +UniversalString_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, + enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { const UniversalString_t *st = (const UniversalString_t *)sptr; asn_enc_rval_t er = {0,0,0}; diff --git a/skeletons/VideotexString.c b/skeletons/VideotexString.c index 0a5a15709..12cb38f19 100644 --- a/skeletons/VideotexString.c +++ b/skeletons/VideotexString.c @@ -87,6 +87,9 @@ asn_TYPE_descriptor_t asn_DEF_VideotexString = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_generic_unknown_constraint }, 0, 0, /* No members */ diff --git a/skeletons/VisibleString.c b/skeletons/VisibleString.c index f583b6203..23842579d 100644 --- a/skeletons/VisibleString.c +++ b/skeletons/VisibleString.c @@ -94,6 +94,9 @@ asn_TYPE_descriptor_t asn_DEF_VisibleString = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_DEF_VisibleString_constraints, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ VisibleString_constraint }, 0, 0, /* No members */ diff --git a/skeletons/constr_CHOICE_jer.c b/skeletons/constr_CHOICE_jer.c index e6efe3249..ef5e8b1eb 100644 --- a/skeletons/constr_CHOICE_jer.c +++ b/skeletons/constr_CHOICE_jer.c @@ -31,8 +31,9 @@ */ asn_dec_rval_t CHOICE_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **struct_ptr, - const void *buf_ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **struct_ptr, const void *buf_ptr, size_t size) { /* * Bring closer parts of structure description. */ @@ -98,7 +99,9 @@ CHOICE_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, /* Start/Continue decoding the inner member */ tmprval = elm->type->op->jer_decoder(opt_codec_ctx, - elm->type, memb_ptr2, + elm->type, + elm->encoding_constraints.jer_constraints, + memb_ptr2, buf_ptr, size); JER_ADVANCE(tmprval.consumed); ASN_DEBUG("JER/CHOICE: itdf: [%s] code=%d", @@ -133,7 +136,7 @@ CHOICE_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, continue; case PJER_DLM: - case PJER_VALUE: + case PJER_VALUE: case PJER_KEY: break; /* Check the rest down there */ } @@ -263,9 +266,9 @@ CHOICE_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } asn_enc_rval_t -CHOICE_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, - enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, - void *app_key) { +CHOICE_encode_jer(const asn_TYPE_descriptor_t *td, const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, enum jer_encoder_flags_e flags, + asn_app_consume_bytes_f *cb, void *app_key) { const asn_CHOICE_specifics_t *specs = (const asn_CHOICE_specifics_t *)td->specifics; asn_enc_rval_t er = {0,0,0}; @@ -307,7 +310,9 @@ CHOICE_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, ASN__CALLBACK3("\"", 1, mname, mlen, "\":", 2); } - tmper = elm->type->op->jer_encoder(elm->type, memb_ptr, + tmper = elm->type->op->jer_encoder(elm->type, + elm->encoding_constraints.jer_constraints, + memb_ptr, ilevel + 1, flags, cb, app_key); if(tmper.encoded == -1) return tmper; er.encoded += tmper.encoded; diff --git a/skeletons/constr_SEQUENCE.c b/skeletons/constr_SEQUENCE.c index a77b68fac..de087a3e2 100644 --- a/skeletons/constr_SEQUENCE.c +++ b/skeletons/constr_SEQUENCE.c @@ -69,7 +69,7 @@ void SEQUENCE_free(const asn_TYPE_descriptor_t *td, void *sptr, enum asn_struct_free_method method) { size_t edx; - const asn_SEQUENCE_specifics_t *specs; + const asn_SEQUENCE_specifics_t *specs; asn_struct_ctx_t *ctx; /* Decoder context */ if(!td || !sptr) @@ -205,7 +205,7 @@ SEQUENCE_copy(const asn_TYPE_descriptor_t *td, void **aptr, const void *bptr) { if(!td) return -1; - const asn_SEQUENCE_specifics_t *specs = + const asn_SEQUENCE_specifics_t *specs = (const asn_SEQUENCE_specifics_t *)td->specifics; size_t edx; void *st = *aptr; /* Target structure */ diff --git a/skeletons/constr_SEQUENCE_OF_jer.c b/skeletons/constr_SEQUENCE_OF_jer.c index b4bfdf426..d65eac769 100644 --- a/skeletons/constr_SEQUENCE_OF_jer.c +++ b/skeletons/constr_SEQUENCE_OF_jer.c @@ -8,8 +8,8 @@ #include asn_enc_rval_t -SEQUENCE_OF_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, - int ilevel, enum jer_encoder_flags_e flags, +SEQUENCE_OF_encode_jer(const asn_TYPE_descriptor_t *td, const asn_jer_constraints_t *constraints, + const void *sptr, int ilevel, enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { asn_enc_rval_t er = {0,0,0}; const asn_SET_OF_specifics_t *specs = (const asn_SET_OF_specifics_t *)td->specifics; @@ -29,7 +29,9 @@ SEQUENCE_OF_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, if(!memb_ptr) continue; if(!jmin) ASN__TEXT_INDENT(1, ilevel + 1); - tmper = elm->type->op->jer_encoder(elm->type, memb_ptr, ilevel + 1, + tmper = elm->type->op->jer_encoder(elm->type, + elm->encoding_constraints.jer_constraints, + memb_ptr, ilevel + 1, flags, cb, app_key); if(tmper.encoded == -1) return tmper; er.encoded += tmper.encoded; diff --git a/skeletons/constr_SEQUENCE_jer.c b/skeletons/constr_SEQUENCE_jer.c index 4d08adacc..9bab29da3 100644 --- a/skeletons/constr_SEQUENCE_jer.c +++ b/skeletons/constr_SEQUENCE_jer.c @@ -39,8 +39,9 @@ */ asn_dec_rval_t SEQUENCE_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **struct_ptr, - const void *ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **struct_ptr, const void *ptr, size_t size) { /* * Bring closer parts of structure description. */ @@ -108,7 +109,9 @@ SEQUENCE_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } else { /* Invoke the inner type decoder, m.b. multiple times */ tmprval = elm->type->op->jer_decoder(opt_codec_ctx, - elm->type, memb_ptr2, + elm->type, + elm->encoding_constraints.jer_constraints, + memb_ptr2, ptr, size); } JER_ADVANCE(tmprval.consumed); @@ -179,7 +182,7 @@ SEQUENCE_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, /* All extensions are optional */ IN_EXTENSION_GROUP(specs, edx)) { JER_ADVANCE(ch_size); - JER_ADVANCE(jer_whitespace_span(ptr, size)); + JER_ADVANCE(jer_whitespace_span(ptr, size)); ctx->phase = 4; /* Phase out */ RETURN(RC_OK); } else { @@ -239,7 +242,7 @@ SEQUENCE_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, switch(ch_type) { case PJER_WMORE: RETURN(RC_WMORE); - case PJER_TEXT: + case PJER_TEXT: JER_ADVANCE(ch_size); break; default: @@ -255,7 +258,7 @@ SEQUENCE_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } break; } - if(n != edx_end) + if(n != edx_end) continue; } else { ASN_DEBUG("Out of defined members: %" ASN_PRI_SIZE "/%u", @@ -294,7 +297,8 @@ SEQUENCE_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } -asn_enc_rval_t SEQUENCE_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, +asn_enc_rval_t SEQUENCE_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t* constraints, const void *sptr, int ilevel, enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { asn_enc_rval_t er = {0,0,0}; @@ -352,8 +356,10 @@ asn_enc_rval_t SEQUENCE_encode_jer(const asn_TYPE_descriptor_t *td, const void * } /* Print the member itself */ - tmper = elm->type->op->jer_encoder(elm->type, memb_ptr, ilevel + 1, - flags, cb, app_key); + tmper = elm->type->op->jer_encoder(elm->type, + elm->encoding_constraints.jer_constraints, + memb_ptr, + ilevel + 1, flags, cb, app_key); if(tmp_def_val) { ASN_STRUCT_FREE(*tmp_def_val_td, tmp_def_val); tmp_def_val = 0; diff --git a/skeletons/constr_SET.c b/skeletons/constr_SET.c index 1d9466ce8..c3476947a 100644 --- a/skeletons/constr_SET.c +++ b/skeletons/constr_SET.c @@ -223,7 +223,7 @@ SET_copy(const asn_TYPE_descriptor_t *td, void **aptr, const void *bptr) { if(!td) return -1; - const asn_SET_specifics_t *specs = + const asn_SET_specifics_t *specs = (const asn_SET_specifics_t *)td->specifics; size_t edx; void *st = *aptr; /* Target structure */ diff --git a/skeletons/constr_SET_OF_jer.c b/skeletons/constr_SET_OF_jer.c index 1245b7018..2f6ec5dd3 100644 --- a/skeletons/constr_SET_OF_jer.c +++ b/skeletons/constr_SET_OF_jer.c @@ -31,8 +31,9 @@ */ asn_dec_rval_t SET_OF_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **struct_ptr, - const void *buf_ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **struct_ptr, const void *buf_ptr, size_t size) { /* * Bring closer parts of structure description. */ @@ -83,6 +84,7 @@ SET_OF_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, (*element->name) ? element->name : element->type->xml_tag); tmprval = element->type->op->jer_decoder(opt_codec_ctx, element->type, + element->encoding_constraints.jer_constraints, &ctx->ptr, buf_ptr, size); if(tmprval.code == RC_OK) { @@ -172,9 +174,10 @@ SET_OF_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, } asn_enc_rval_t -SET_OF_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, - enum jer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, - void *app_key) { +SET_OF_encode_jer(const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t* constraints, const void *sptr, + int ilevel, enum jer_encoder_flags_e flags, + asn_app_consume_bytes_f *cb, void *app_key) { asn_enc_rval_t er = {0,0,0}; const asn_SET_OF_specifics_t *specs = (const asn_SET_OF_specifics_t *)td->specifics; const asn_TYPE_member_t *elm = td->elements; @@ -194,7 +197,9 @@ SET_OF_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr, int ilevel, if(!memb_ptr) continue; if(!jmin) ASN__TEXT_INDENT(1, ilevel + 1); - tmper = elm->type->op->jer_encoder(elm->type, memb_ptr, + tmper = elm->type->op->jer_encoder(elm->type, + elm->encoding_constraints.jer_constraints, + memb_ptr, ilevel + (specs->as_XMLValueList != 2), flags, cb, app_key); if(tmper.encoded == -1) return tmper; diff --git a/skeletons/constr_SET_jer.c b/skeletons/constr_SET_jer.c index 7782b0b3f..aa1edb435 100644 --- a/skeletons/constr_SET_jer.c +++ b/skeletons/constr_SET_jer.c @@ -38,8 +38,9 @@ */ asn_dec_rval_t SET_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, - const asn_TYPE_descriptor_t *td, void **struct_ptr, - const void *ptr, size_t size) { + const asn_TYPE_descriptor_t *td, + const asn_jer_constraints_t *constraints, + void **struct_ptr, const void *ptr, size_t size) { /* * Bring closer parts of structure description. */ @@ -112,7 +113,9 @@ SET_decode_jer(const asn_codec_ctx_t *opt_codec_ctx, /* Invoke the inner type decoder, m.b. multiple times */ tmprval = elm->type->op->jer_decoder(opt_codec_ctx, - elm->type, memb_ptr2, + elm->type, + elm->encoding_constraints.jer_constraints, + memb_ptr2, ptr, size); JER_ADVANCE(tmprval.consumed); if(tmprval.code != RC_OK) diff --git a/skeletons/constr_TYPE.h b/skeletons/constr_TYPE.h index b64d5b5ea..68848df20 100644 --- a/skeletons/constr_TYPE.h +++ b/skeletons/constr_TYPE.h @@ -212,6 +212,9 @@ typedef struct asn_encoding_constraints_s { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) const struct asn_per_constraints_s *per_constraints; #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + const struct asn_jer_constraints_s *jer_constraints; +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ asn_constr_check_f *general_constraints; } asn_encoding_constraints_t; diff --git a/skeletons/file-dependencies b/skeletons/file-dependencies index 450ee31eb..40306746b 100644 --- a/skeletons/file-dependencies +++ b/skeletons/file-dependencies @@ -250,7 +250,7 @@ jer_support.h jer_support.c # JSON parsing jer_decoder.h jer_decoder.c # JER decoding support jer_encoder.h jer_encoder.c # JER encoding support ANY.h ANY_jer.c -BIT_STRING.h BIT_STRING_jer.c +BIT_STRING.h BIT_STRING_jer.c INTEGER.h BMPString.h BMPString_jer.c BOOLEAN.h BOOLEAN_jer.c ENUMERATED.h ENUMERATED_jer.c diff --git a/skeletons/jer_decoder.c b/skeletons/jer_decoder.c index dd8566aae..b00b2384a 100644 --- a/skeletons/jer_decoder.c +++ b/skeletons/jer_decoder.c @@ -35,7 +35,7 @@ jer_decode(const asn_codec_ctx_t *opt_codec_ctx, /* * Invoke type-specific decoder. */ - return td->op->jer_decoder(opt_codec_ctx, td, struct_ptr, buffer, size); + return td->op->jer_decoder(opt_codec_ctx, td, 0, struct_ptr, buffer, size); } diff --git a/skeletons/jer_decoder.h b/skeletons/jer_decoder.h index 550cf64ff..a43592ce3 100644 --- a/skeletons/jer_decoder.h +++ b/skeletons/jer_decoder.h @@ -6,6 +6,7 @@ #define _JER_DECODER_H_ #include +#include #ifdef __cplusplus extern "C" { @@ -30,7 +31,9 @@ asn_dec_rval_t jer_decode( */ typedef asn_dec_rval_t(jer_type_decoder_f)( const asn_codec_ctx_t *opt_codec_ctx, - const struct asn_TYPE_descriptor_s *type_descriptor, void **struct_ptr, + const struct asn_TYPE_descriptor_s *type_descriptor, + const asn_jer_constraints_t *constraints, + void **struct_ptr, const void *buf_ptr, size_t size); /******************************* diff --git a/skeletons/jer_encoder.c b/skeletons/jer_encoder.c index 634ab09d4..8a9bbad81 100644 --- a/skeletons/jer_encoder.c +++ b/skeletons/jer_encoder.c @@ -11,14 +11,14 @@ */ asn_enc_rval_t jer_encode(const asn_TYPE_descriptor_t *td, const void *sptr, - enum jer_encoder_flags_e jer_flags, asn_app_consume_bytes_f *cb, - void *app_key) { + enum jer_encoder_flags_e jer_flags, + asn_app_consume_bytes_f *cb, void *app_key) { asn_enc_rval_t er = {0, 0, 0}; asn_enc_rval_t tmper; if(!td || !sptr) goto cb_failed; - tmper = td->op->jer_encoder(td, sptr, 0, jer_flags, cb, app_key); + tmper = td->op->jer_encoder(td, 0, sptr, 0, jer_flags, cb, app_key); if(tmper.encoded == -1) return tmper; er.encoded += tmper.encoded; diff --git a/skeletons/jer_encoder.h b/skeletons/jer_encoder.h index cf8b9d26c..587c1e177 100644 --- a/skeletons/jer_encoder.h +++ b/skeletons/jer_encoder.h @@ -6,6 +6,7 @@ #define _JER_ENCODER_H_ #include +#include #ifdef __cplusplus extern "C" { @@ -71,6 +72,7 @@ enum jer_equivalence_e jer_equivalent( */ typedef asn_enc_rval_t(jer_type_encoder_f)( const struct asn_TYPE_descriptor_s *type_descriptor, + const asn_jer_constraints_t *constraints, const void *struct_ptr, /* Structure to be encoded */ int ilevel, /* Level of indentation */ enum jer_encoder_flags_e jer_flags, diff --git a/skeletons/jer_support.h b/skeletons/jer_support.h index 556f99e4c..d8d2c5ae5 100644 --- a/skeletons/jer_support.h +++ b/skeletons/jer_support.h @@ -12,6 +12,13 @@ extern "C" { #endif +/* + * Pre-computed JER constraints + */ +typedef struct asn_jer_constraints_s { + ssize_t size; /* -1 (no constraint) or >= 0 */ +} asn_jer_constraints_t; + /* * Types of data transferred to the application. */ diff --git a/tests/tests-asn1c-compiler/03-enum-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/03-enum-OK.asn1.+-P_-fwide-types index ea4d83694..e7490d67f 100644 --- a/tests/tests-asn1c-compiler/03-enum-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/03-enum-OK.asn1.+-P_-fwide-types @@ -29,7 +29,6 @@ ber_type_decoder_f Enum1_decode_ber; der_type_encoder_f Enum1_encode_der; xer_type_decoder_f Enum1_decode_xer; xer_type_encoder_f Enum1_encode_xer; -jer_type_encoder_f Enum1_encode_jer; /*** <<< CODE [Enum1] >>> ***/ @@ -83,6 +82,9 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -123,7 +125,6 @@ ber_type_decoder_f Enum2_decode_ber; der_type_encoder_f Enum2_encode_der; xer_type_decoder_f Enum2_decode_xer; xer_type_encoder_f Enum2_encode_xer; -jer_type_encoder_f Enum2_encode_jer; /*** <<< CODE [Enum2] >>> ***/ @@ -183,6 +184,9 @@ asn_TYPE_descriptor_t asn_DEF_Enum2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -219,7 +223,6 @@ ber_type_decoder_f Enum3_decode_ber; der_type_encoder_f Enum3_encode_der; xer_type_decoder_f Enum3_decode_xer; xer_type_encoder_f Enum3_encode_xer; -jer_type_encoder_f Enum3_encode_jer; /*** <<< CODE [Enum3] >>> ***/ @@ -271,6 +274,9 @@ asn_TYPE_descriptor_t asn_DEF_Enum3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -308,7 +314,6 @@ ber_type_decoder_f Enum4_decode_ber; der_type_encoder_f Enum4_encode_der; xer_type_decoder_f Enum4_decode_xer; xer_type_encoder_f Enum4_encode_xer; -jer_type_encoder_f Enum4_encode_jer; /*** <<< CODE [Enum4] >>> ***/ @@ -362,6 +367,9 @@ asn_TYPE_descriptor_t asn_DEF_Enum4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -398,7 +406,6 @@ ber_type_decoder_f Enum5_decode_ber; der_type_encoder_f Enum5_encode_der; xer_type_decoder_f Enum5_decode_xer; xer_type_encoder_f Enum5_encode_xer; -jer_type_encoder_f Enum5_encode_jer; /*** <<< CODE [Enum5] >>> ***/ @@ -450,6 +457,9 @@ asn_TYPE_descriptor_t asn_DEF_Enum5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -518,6 +528,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -535,6 +548,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -552,6 +568,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -589,6 +608,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -609,6 +631,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -626,6 +651,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -643,6 +671,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -660,6 +691,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -703,6 +737,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/104-param-1-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/104-param-1-OK.asn1.+-P_-fwide-types index 742c7286b..5534bcc42 100644 --- a/tests/tests-asn1c-compiler/104-param-1-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/104-param-1-OK.asn1.+-P_-fwide-types @@ -45,6 +45,9 @@ asn_TYPE_member_t asn_MBR_Collection_16P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -76,6 +79,9 @@ asn_TYPE_descriptor_t asn_DEF_Collection_16P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_Collection_16P0_1, @@ -96,6 +102,9 @@ asn_TYPE_member_t asn_MBR_Collection_16P1_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -127,6 +136,9 @@ asn_TYPE_descriptor_t asn_DEF_Collection_16P1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_Collection_16P1_3, @@ -169,6 +181,9 @@ static asn_TYPE_member_t asn_MBR_Bunch_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -186,6 +201,9 @@ static asn_TYPE_member_t asn_MBR_Bunch_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -224,6 +242,9 @@ asn_TYPE_descriptor_t asn_DEF_Bunch = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Bunch_1, @@ -293,6 +314,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -310,6 +334,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -327,6 +354,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -364,6 +394,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -384,6 +417,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -401,6 +437,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -418,6 +457,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -435,6 +477,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -478,6 +523,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/105-param-2-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/105-param-2-OK.asn1.+-P_-fwide-types index c42e54fe9..73ea529e5 100644 --- a/tests/tests-asn1c-compiler/105-param-2-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/105-param-2-OK.asn1.+-P_-fwide-types @@ -64,6 +64,9 @@ asn_TYPE_member_t asn_MBR_SIGNED_16P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -101,6 +104,9 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_16P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_SIGNED_16P0_1, @@ -121,6 +127,9 @@ static asn_TYPE_member_t asn_MBR_signed_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -166,6 +175,9 @@ asn_TYPE_descriptor_t asn_DEF_signed_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_signed_4, @@ -186,6 +198,9 @@ asn_TYPE_member_t asn_MBR_SIGNED_16P1_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -223,6 +238,9 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_16P1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_SIGNED_16P1_3, @@ -249,7 +267,6 @@ ber_type_decoder_f SignedREAL_decode_ber; der_type_encoder_f SignedREAL_encode_der; xer_type_decoder_f SignedREAL_decode_xer; xer_type_encoder_f SignedREAL_encode_xer; -jer_type_encoder_f SignedREAL_encode_jer; /*** <<< CODE [SignedREAL] >>> ***/ @@ -280,6 +297,9 @@ asn_TYPE_descriptor_t asn_DEF_SignedREAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_SIGNED_16P0_1, @@ -306,7 +326,6 @@ ber_type_decoder_f SignedSET_decode_ber; der_type_encoder_f SignedSET_encode_der; xer_type_decoder_f SignedSET_decode_xer; xer_type_encoder_f SignedSET_encode_xer; -jer_type_encoder_f SignedSET_encode_jer; /*** <<< CODE [SignedSET] >>> ***/ @@ -337,6 +356,9 @@ asn_TYPE_descriptor_t asn_DEF_SignedSET = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_SIGNED_16P1_3, @@ -406,6 +428,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -423,6 +448,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -440,6 +468,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -477,6 +508,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -497,6 +531,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -514,6 +551,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -531,6 +571,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -548,6 +591,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -591,6 +637,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.+-P b/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.+-P index d663a424a..55010022b 100644 --- a/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/106-param-constr-OK.asn1.+-P @@ -136,6 +136,9 @@ asn_TYPE_member_t asn_MBR_Narrow_15P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_narrow1_constraint_1 }, .default_value_cmp = &asn_DFL_2_cmp_3, /* Compare DEFAULT 3 */ @@ -154,6 +157,9 @@ asn_TYPE_member_t asn_MBR_Narrow_15P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_narrow2_constraint_1 }, 0, 0, /* No default value */ @@ -171,6 +177,9 @@ asn_TYPE_member_t asn_MBR_Narrow_15P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_narrow3_constraint_1 }, 0, 0, /* No default value */ @@ -210,6 +219,9 @@ asn_TYPE_descriptor_t asn_DEF_Narrow_15P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Narrow_15P0_1, @@ -236,7 +248,6 @@ ber_type_decoder_f NarrowInteger_decode_ber; der_type_encoder_f NarrowInteger_encode_der; xer_type_decoder_f NarrowInteger_decode_xer; xer_type_encoder_f NarrowInteger_encode_xer; -jer_type_encoder_f NarrowInteger_encode_jer; /*** <<< CODE [NarrowInteger] >>> ***/ @@ -267,6 +278,9 @@ asn_TYPE_descriptor_t asn_DEF_NarrowInteger = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Narrow_15P0_1, @@ -336,6 +350,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -353,6 +370,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -370,6 +390,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -407,6 +430,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -427,6 +453,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -444,6 +473,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -461,6 +493,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -478,6 +513,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -521,6 +559,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/108-param-constr-3-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/108-param-constr-3-OK.asn1.+-P_-fwide-types index c769cfd89..d73b7c679 100644 --- a/tests/tests-asn1c-compiler/108-param-constr-3-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/108-param-constr-3-OK.asn1.+-P_-fwide-types @@ -17,7 +17,6 @@ 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; -jer_type_encoder_f MinMax_16P0_encode_jer; /*** <<< CODE [MinMax] >>> ***/ @@ -79,6 +78,9 @@ asn_TYPE_descriptor_t asn_DEF_MinMax_16P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ MinMax_16P0_constraint }, 0, 0, /* No members */ @@ -104,7 +106,6 @@ 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; -jer_type_encoder_f ThreePlus_encode_jer; /*** <<< CODE [ThreePlus] >>> ***/ @@ -166,6 +167,9 @@ asn_TYPE_descriptor_t asn_DEF_ThreePlus = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ThreePlus_constraint }, 0, 0, /* No members */ @@ -234,6 +238,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -251,6 +258,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -268,6 +278,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -305,6 +318,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -325,6 +341,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -342,6 +361,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -359,6 +381,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -376,6 +401,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -419,6 +447,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/110-param-3-OK.asn1.+-P_-fcompound-names b/tests/tests-asn1c-compiler/110-param-3-OK.asn1.+-P_-fcompound-names index 152ebab8a..a3beccad3 100644 --- a/tests/tests-asn1c-compiler/110-param-3-OK.asn1.+-P_-fcompound-names +++ b/tests/tests-asn1c-compiler/110-param-3-OK.asn1.+-P_-fcompound-names @@ -87,6 +87,9 @@ asn_TYPE_member_t asn_MBR_Flag_15P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, .default_value_cmp = &asn_DFL_2_cmp_5, /* Compare DEFAULT 5 */ @@ -125,6 +128,9 @@ asn_TYPE_descriptor_t asn_DEF_Flag_15P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Flag_15P0_1, @@ -194,6 +200,9 @@ asn_TYPE_descriptor_t asn_DEF_field_7 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeEnumerated_constraint }, 0, 0, /* Defined elsewhere */ @@ -213,6 +222,9 @@ asn_TYPE_member_t asn_MBR_Flag_15P1_6[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, .default_value_cmp = &asn_DFL_7_cmp_5, /* Compare DEFAULT 5 */ @@ -251,6 +263,9 @@ asn_TYPE_descriptor_t asn_DEF_Flag_15P1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Flag_15P1_6, @@ -277,7 +292,6 @@ ber_type_decoder_f IntegerColorFlag_decode_ber; der_type_encoder_f IntegerColorFlag_encode_der; xer_type_decoder_f IntegerColorFlag_decode_xer; xer_type_encoder_f IntegerColorFlag_encode_xer; -jer_type_encoder_f IntegerColorFlag_encode_jer; /*** <<< CODE [IntegerColorFlag] >>> ***/ @@ -308,6 +322,9 @@ asn_TYPE_descriptor_t asn_DEF_IntegerColorFlag = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Flag_15P0_1, @@ -334,7 +351,6 @@ ber_type_decoder_f EnumeratedColorFlag_decode_ber; der_type_encoder_f EnumeratedColorFlag_encode_der; xer_type_decoder_f EnumeratedColorFlag_decode_xer; xer_type_encoder_f EnumeratedColorFlag_encode_xer; -jer_type_encoder_f EnumeratedColorFlag_encode_jer; /*** <<< CODE [EnumeratedColorFlag] >>> ***/ @@ -365,6 +381,9 @@ asn_TYPE_descriptor_t asn_DEF_EnumeratedColorFlag = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Flag_15P1_6, @@ -434,6 +453,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -451,6 +473,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -468,6 +493,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -505,6 +533,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -525,6 +556,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -542,6 +576,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -559,6 +596,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -576,6 +616,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -619,6 +662,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/119-per-strings-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/119-per-strings-OK.asn1.+-P_-gen-UPER_-gen-APER index 6ed0f5193..36563b7ec 100644 --- a/tests/tests-asn1c-compiler/119-per-strings-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/119-per-strings-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -1240,6 +1240,9 @@ static asn_TYPE_member_t asn_MBR_many_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1273,6 +1276,9 @@ asn_TYPE_descriptor_t asn_DEF_many_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_many_2, @@ -1293,6 +1299,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1310,6 +1319,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1327,6 +1339,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_ia5_c_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ia5_c_constraint_1 }, 0, 0, /* No default value */ @@ -1344,6 +1359,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_ia5_ce_constr_6, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ia5_ce_constraint_1 }, 0, 0, /* No default value */ @@ -1361,6 +1379,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_ia5_ir_constr_7, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ia5_ir_constraint_1 }, 0, 0, /* No default value */ @@ -1378,6 +1399,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1395,6 +1419,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_vs_c_constr_9, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_vs_c_constraint_1 }, 0, 0, /* No default value */ @@ -1412,6 +1439,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_vs_ce_constr_10, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_vs_ce_constraint_1 }, 0, 0, /* No default value */ @@ -1429,6 +1459,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_vs_ir_constr_11, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_vs_ir_constraint_1 }, 0, 0, /* No default value */ @@ -1446,6 +1479,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1463,6 +1499,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_pr_c_constr_13, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_pr_c_constraint_1 }, 0, 0, /* No default value */ @@ -1480,6 +1519,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_pr_ir_constr_14, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_pr_ir_constraint_1 }, 0, 0, /* No default value */ @@ -1497,6 +1539,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1514,6 +1559,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_ns_c_constr_16, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ns_c_constraint_1 }, 0, 0, /* No default value */ @@ -1531,6 +1579,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_ns_ce_constr_17, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ns_ce_constraint_1 }, 0, 0, /* No default value */ @@ -1548,6 +1599,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_ns_ir_constr_18, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ns_ir_constraint_1 }, 0, 0, /* No default value */ @@ -1565,6 +1619,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_ut_c_constr_19, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ut_c_constraint_1 }, 0, 0, /* No default value */ @@ -1582,6 +1639,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_ut_ce_constr_20, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ut_ce_constraint_1 }, 0, 0, /* No default value */ @@ -1599,6 +1659,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_ut_ir_constr_21, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ut_ir_constraint_1 }, 0, 0, /* No default value */ @@ -1616,6 +1679,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1633,6 +1699,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_bm_c_constr_23, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_bm_c_constraint_1 }, 0, 0, /* No default value */ @@ -1650,6 +1719,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_bm_cs_constr_24, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_bm_cs_constraint_1 }, 0, 0, /* No default value */ @@ -1667,6 +1739,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_bm_ce_constr_25, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_bm_ce_constraint_1 }, 0, 0, /* No default value */ @@ -1684,6 +1759,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_bm_ir_constr_26, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_bm_ir_constraint_1 }, 0, 0, /* No default value */ @@ -1701,6 +1779,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1718,6 +1799,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_us_c_constr_28, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_us_c_constraint_1 }, 0, 0, /* No default value */ @@ -1735,6 +1819,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_us_cs_constr_29, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_us_cs_constraint_1 }, 0, 0, /* No default value */ @@ -1752,6 +1839,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_us_ce_constr_30, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_us_ce_constraint_1 }, 0, 0, /* No default value */ @@ -1769,6 +1859,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_us_ir_constr_31, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_us_ir_constraint_1 }, 0, 0, /* No default value */ @@ -1786,6 +1879,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1803,6 +1899,9 @@ asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1872,6 +1971,9 @@ asn_TYPE_descriptor_t asn_DEF_PDU = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_PDU_1, @@ -1951,6 +2053,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1968,6 +2073,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1985,6 +2093,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2022,6 +2133,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -2042,6 +2156,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2059,6 +2176,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2076,6 +2196,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2093,6 +2216,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2138,6 +2264,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.+-P b/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.+-P index 8e19c5ee6..032f7f5c7 100644 --- a/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/125-bitstring-constraint-OK.asn1.+-P @@ -25,7 +25,6 @@ ber_type_decoder_f T_decode_ber; der_type_encoder_f T_encode_der; xer_type_decoder_f T_decode_xer; xer_type_encoder_f T_encode_xer; -jer_type_encoder_f T_encode_jer; /*** <<< CODE [T] >>> ***/ @@ -77,6 +76,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ T_constraint }, 0, 0, /* Defined elsewhere */ @@ -145,6 +147,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -162,6 +167,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -179,6 +187,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -216,6 +227,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -236,6 +250,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -253,6 +270,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -270,6 +290,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -287,6 +310,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -330,6 +356,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.+-P_-gen-UPER_-gen-APER index 83fe6f17d..361824edf 100644 --- a/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/126-per-extensions-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -49,6 +49,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -66,6 +69,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -83,6 +89,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -100,6 +109,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -142,6 +154,9 @@ asn_TYPE_descriptor_t asn_DEF_PDU = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_PDU_1, @@ -217,6 +232,9 @@ asn_TYPE_member_t asn_MBR_Singleton_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, .default_value_cmp = &asn_DFL_2_cmp, /* Compare DEFAULT "z" */ @@ -257,6 +275,9 @@ asn_TYPE_descriptor_t asn_DEF_Singleton = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Singleton_1, @@ -330,6 +351,9 @@ asn_TYPE_member_t asn_MBR_PDU_2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -347,6 +371,9 @@ asn_TYPE_member_t asn_MBR_PDU_2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -364,6 +391,9 @@ asn_TYPE_member_t asn_MBR_PDU_2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -403,6 +433,9 @@ asn_TYPE_descriptor_t asn_DEF_PDU_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_PDU_2_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_PDU_2_1, @@ -482,6 +515,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -499,6 +535,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -516,6 +555,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -553,6 +595,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -573,6 +618,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -590,6 +638,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -607,6 +658,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -624,6 +678,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -669,6 +726,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/127-per-long-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/127-per-long-OK.asn1.+-P_-gen-UPER_-gen-APER index d0327a908..79bce4b26 100644 --- a/tests/tests-asn1c-compiler/127-per-long-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/127-per-long-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -239,6 +239,9 @@ asn_TYPE_descriptor_t asn_DEF_unsigned32_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_unsigned32_constr_4, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ unsigned32_4_constraint }, 0, 0, /* No members */ @@ -272,6 +275,9 @@ asn_TYPE_descriptor_t asn_DEF_unsplit32_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_unsplit32_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ unsplit32_5_constraint }, 0, 0, /* No members */ @@ -291,6 +297,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_small32range_constr_2, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_small32range_constraint_1 }, 0, 0, /* No default value */ @@ -308,6 +317,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_full32range_constr_3, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_full32range_constraint_1 }, 0, 0, /* No default value */ @@ -325,6 +337,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_unsigned32_constr_4, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_unsigned32_constraint_1 }, 0, 0, /* No default value */ @@ -342,6 +357,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_unsplit32_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_unsplit32_constraint_1 }, 0, 0, /* No default value */ @@ -382,6 +400,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T_1, @@ -461,6 +482,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -478,6 +502,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -495,6 +522,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -532,6 +562,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -552,6 +585,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -569,6 +605,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -586,6 +625,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -603,6 +645,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -648,6 +693,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/131-per-empty-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/131-per-empty-OK.asn1.+-P_-gen-UPER_-gen-APER index 10ad80092..f0664e655 100644 --- a/tests/tests-asn1c-compiler/131-per-empty-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/131-per-empty-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -45,6 +45,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, 0, 0, /* No members */ @@ -123,6 +126,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -140,6 +146,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -157,6 +166,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -194,6 +206,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -214,6 +229,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -231,6 +249,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -248,6 +269,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -265,6 +289,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -310,6 +337,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/134-per-long-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/134-per-long-OK.asn1.+-P_-gen-UPER_-gen-APER index e299bd540..afa76dd0d 100644 --- a/tests/tests-asn1c-compiler/134-per-long-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/134-per-long-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -193,6 +193,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_unsigned33_constr_2, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_unsigned33_constraint_1 }, 0, 0, /* No default value */ @@ -210,6 +213,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_unsigned42_constr_3, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_unsigned42_constraint_1 }, 0, 0, /* No default value */ @@ -227,6 +233,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_signed33_constr_4, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_signed33_constraint_1 }, 0, 0, /* No default value */ @@ -244,6 +253,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_signed33ext_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_signed33ext_constraint_1 }, 0, 0, /* No default value */ @@ -284,6 +296,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T_1, @@ -363,6 +378,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -380,6 +398,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -397,6 +418,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -434,6 +458,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -454,6 +481,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -471,6 +501,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -488,6 +521,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -505,6 +541,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -550,6 +589,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.+-P_-gen-OER b/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.+-P_-gen-OER index f4eef9bbd..1ff72d8e0 100644 --- a/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.+-P_-gen-OER +++ b/tests/tests-asn1c-compiler/136-oer-long-OK.asn1.+-P_-gen-OER @@ -442,6 +442,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_unsigned8_constraint_1 }, 0, 0, /* No default value */ @@ -459,6 +462,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_unsigned16_constraint_1 }, 0, 0, /* No default value */ @@ -476,6 +482,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_unsigned16stack_constraint_1 }, 0, 0, /* No default value */ @@ -493,6 +502,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_unsigned16stack_ext_constraint_1 }, 0, 0, /* No default value */ @@ -510,6 +522,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_unsigned33_constraint_1 }, 0, 0, /* No default value */ @@ -527,6 +542,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_minmax_constraint_1 }, 0, 0, /* No default value */ @@ -544,6 +562,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_signed8_constraint_1 }, .default_value_cmp = &asn_DFL_9_cmp_3, /* Compare DEFAULT 3 */ @@ -562,6 +583,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_signed16_constraint_1 }, 0, 0, /* No default value */ @@ -579,6 +603,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_signed16stack_constraint_1 }, 0, 0, /* No default value */ @@ -596,6 +623,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_signed16stack_ext_constraint_1 }, 0, 0, /* No default value */ @@ -613,6 +643,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_signed32_constraint_1 }, 0, 0, /* No default value */ @@ -630,6 +663,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_signed33ext_constraint_1 }, 0, 0, /* No default value */ @@ -680,6 +716,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T_1, @@ -757,6 +796,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -774,6 +816,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -791,6 +836,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -828,6 +876,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -848,6 +899,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -865,6 +919,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -882,6 +939,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -899,6 +959,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -944,6 +1007,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/137-oer-string-OK.asn1.+-P_-gen-OER b/tests/tests-asn1c-compiler/137-oer-string-OK.asn1.+-P_-gen-OER index b37c1cfaa..2cfeb85d5 100644 --- a/tests/tests-asn1c-compiler/137-oer-string-OK.asn1.+-P_-gen-OER +++ b/tests/tests-asn1c-compiler/137-oer-string-OK.asn1.+-P_-gen-OER @@ -189,6 +189,9 @@ static asn_TYPE_member_t asn_MBR_unconstrained_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -206,6 +209,9 @@ static asn_TYPE_member_t asn_MBR_unconstrained_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -223,6 +229,9 @@ static asn_TYPE_member_t asn_MBR_unconstrained_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -263,6 +272,9 @@ asn_TYPE_descriptor_t asn_DEF_unconstrained_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_unconstrained_2, @@ -283,6 +295,9 @@ static asn_TYPE_member_t asn_MBR_constrained_6[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_con_ia5_constraint_6 }, 0, 0, /* No default value */ @@ -300,6 +315,9 @@ static asn_TYPE_member_t asn_MBR_constrained_6[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_con_utf8_constraint_6 }, 0, 0, /* No default value */ @@ -317,6 +335,9 @@ static asn_TYPE_member_t asn_MBR_constrained_6[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_con_universal_constraint_6 }, 0, 0, /* No default value */ @@ -357,6 +378,9 @@ asn_TYPE_descriptor_t asn_DEF_constrained_6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_constrained_6, @@ -377,6 +401,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -394,6 +421,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -432,6 +462,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T_1, @@ -509,6 +542,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -526,6 +562,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -543,6 +582,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -580,6 +622,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -600,6 +645,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -617,6 +665,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -634,6 +685,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -651,6 +705,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -696,6 +753,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/138-oer-constraints-OK.asn1.+-P_-gen-OER b/tests/tests-asn1c-compiler/138-oer-constraints-OK.asn1.+-P_-gen-OER index bf12bf089..b31406c12 100644 --- a/tests/tests-asn1c-compiler/138-oer-constraints-OK.asn1.+-P_-gen-OER +++ b/tests/tests-asn1c-compiler/138-oer-constraints-OK.asn1.+-P_-gen-OER @@ -17,7 +17,6 @@ ber_type_decoder_f A_noc_decode_ber; der_type_encoder_f A_noc_encode_der; xer_type_decoder_f A_noc_decode_xer; xer_type_encoder_f A_noc_encode_xer; -jer_type_encoder_f A_noc_encode_jer; oer_type_decoder_f A_noc_decode_oer; oer_type_encoder_f A_noc_encode_oer; @@ -50,6 +49,9 @@ asn_TYPE_descriptor_t asn_DEF_A_noc = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeInteger_constraint }, 0, 0, /* No members */ @@ -75,7 +77,6 @@ ber_type_decoder_f B_0_0_decode_ber; der_type_encoder_f B_0_0_encode_der; xer_type_decoder_f B_0_0_decode_xer; xer_type_encoder_f B_0_0_encode_xer; -jer_type_encoder_f B_0_0_encode_jer; oer_type_decoder_f B_0_0_decode_oer; oer_type_encoder_f B_0_0_encode_oer; @@ -141,6 +142,9 @@ asn_TYPE_descriptor_t asn_DEF_B_0_0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ B_0_0_constraint }, 0, 0, /* No members */ @@ -166,7 +170,6 @@ ber_type_decoder_f C_1_2_decode_ber; der_type_encoder_f C_1_2_encode_der; xer_type_decoder_f C_1_2_decode_xer; xer_type_encoder_f C_1_2_encode_xer; -jer_type_encoder_f C_1_2_encode_jer; oer_type_decoder_f C_1_2_decode_oer; oer_type_encoder_f C_1_2_encode_oer; @@ -232,6 +235,9 @@ asn_TYPE_descriptor_t asn_DEF_C_1_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ C_1_2_constraint }, 0, 0, /* No members */ @@ -257,7 +263,6 @@ ber_type_decoder_f D_inv_decode_ber; der_type_encoder_f D_inv_encode_der; xer_type_decoder_f D_inv_decode_xer; xer_type_encoder_f D_inv_encode_xer; -jer_type_encoder_f D_inv_encode_jer; oer_type_decoder_f D_inv_decode_oer; oer_type_encoder_f D_inv_encode_oer; @@ -323,6 +328,9 @@ asn_TYPE_descriptor_t asn_DEF_D_inv = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ D_inv_constraint }, 0, 0, /* No members */ @@ -348,7 +356,6 @@ ber_type_decoder_f E_2_5_decode_ber; der_type_encoder_f E_2_5_encode_der; xer_type_decoder_f E_2_5_decode_xer; xer_type_encoder_f E_2_5_encode_xer; -jer_type_encoder_f E_2_5_encode_jer; oer_type_decoder_f E_2_5_decode_oer; oer_type_encoder_f E_2_5_encode_oer; @@ -414,6 +421,9 @@ asn_TYPE_descriptor_t asn_DEF_E_2_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ E_2_5_constraint }, 0, 0, /* No members */ @@ -439,7 +449,6 @@ ber_type_decoder_f F_inv_decode_ber; der_type_encoder_f F_inv_encode_der; xer_type_decoder_f F_inv_decode_xer; xer_type_encoder_f F_inv_encode_xer; -jer_type_encoder_f F_inv_encode_jer; oer_type_decoder_f F_inv_decode_oer; oer_type_encoder_f F_inv_encode_oer; @@ -505,6 +514,9 @@ asn_TYPE_descriptor_t asn_DEF_F_inv = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ F_inv_constraint }, 0, 0, /* No members */ @@ -530,7 +542,6 @@ ber_type_decoder_f G_3_3_decode_ber; der_type_encoder_f G_3_3_encode_der; xer_type_decoder_f G_3_3_decode_xer; xer_type_encoder_f G_3_3_encode_xer; -jer_type_encoder_f G_3_3_encode_jer; oer_type_decoder_f G_3_3_decode_oer; oer_type_encoder_f G_3_3_encode_oer; @@ -596,6 +607,9 @@ asn_TYPE_descriptor_t asn_DEF_G_3_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ G_3_3_constraint }, 0, 0, /* No members */ @@ -621,7 +635,6 @@ ber_type_decoder_f H_4_5_decode_ber; der_type_encoder_f H_4_5_encode_der; xer_type_decoder_f H_4_5_decode_xer; xer_type_encoder_f H_4_5_encode_xer; -jer_type_encoder_f H_4_5_encode_jer; oer_type_decoder_f H_4_5_decode_oer; oer_type_encoder_f H_4_5_encode_oer; @@ -687,6 +700,9 @@ asn_TYPE_descriptor_t asn_DEF_H_4_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ H_4_5_constraint }, 0, 0, /* No members */ @@ -712,7 +728,6 @@ ber_type_decoder_f I_1_5_decode_ber; der_type_encoder_f I_1_5_encode_der; xer_type_decoder_f I_1_5_decode_xer; xer_type_encoder_f I_1_5_encode_xer; -jer_type_encoder_f I_1_5_encode_jer; oer_type_decoder_f I_1_5_decode_oer; oer_type_encoder_f I_1_5_encode_oer; @@ -778,6 +793,9 @@ asn_TYPE_descriptor_t asn_DEF_I_1_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ I_1_5_constraint }, 0, 0, /* No members */ @@ -803,7 +821,6 @@ ber_type_decoder_f J_4_5_decode_ber; der_type_encoder_f J_4_5_encode_der; xer_type_decoder_f J_4_5_decode_xer; xer_type_encoder_f J_4_5_encode_xer; -jer_type_encoder_f J_4_5_encode_jer; oer_type_decoder_f J_4_5_decode_oer; oer_type_encoder_f J_4_5_encode_oer; @@ -869,6 +886,9 @@ asn_TYPE_descriptor_t asn_DEF_J_4_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ J_4_5_constraint }, 0, 0, /* No members */ @@ -894,7 +914,6 @@ ber_type_decoder_f K_1_4_decode_ber; der_type_encoder_f K_1_4_encode_der; xer_type_decoder_f K_1_4_decode_xer; xer_type_encoder_f K_1_4_encode_xer; -jer_type_encoder_f K_1_4_encode_jer; oer_type_decoder_f K_1_4_decode_oer; oer_type_encoder_f K_1_4_encode_oer; @@ -960,6 +979,9 @@ asn_TYPE_descriptor_t asn_DEF_K_1_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ K_1_4_constraint }, 0, 0, /* No members */ @@ -985,7 +1007,6 @@ ber_type_decoder_f L_0_5_decode_ber; der_type_encoder_f L_0_5_encode_der; xer_type_decoder_f L_0_5_decode_xer; xer_type_encoder_f L_0_5_encode_xer; -jer_type_encoder_f L_0_5_encode_jer; oer_type_decoder_f L_0_5_decode_oer; oer_type_encoder_f L_0_5_encode_oer; @@ -1051,6 +1072,9 @@ asn_TYPE_descriptor_t asn_DEF_L_0_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ L_0_5_constraint }, 0, 0, /* No members */ @@ -1076,7 +1100,6 @@ ber_type_decoder_f M_inv_decode_ber; der_type_encoder_f M_inv_encode_der; xer_type_decoder_f M_inv_decode_xer; xer_type_encoder_f M_inv_encode_xer; -jer_type_encoder_f M_inv_encode_jer; oer_type_decoder_f M_inv_decode_oer; oer_type_encoder_f M_inv_encode_oer; @@ -1142,6 +1165,9 @@ asn_TYPE_descriptor_t asn_DEF_M_inv = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ M_inv_constraint }, 0, 0, /* No members */ @@ -1167,7 +1193,6 @@ ber_type_decoder_f N_0_5_decode_ber; der_type_encoder_f N_0_5_encode_der; xer_type_decoder_f N_0_5_decode_xer; xer_type_encoder_f N_0_5_encode_xer; -jer_type_encoder_f N_0_5_encode_jer; oer_type_decoder_f N_0_5_decode_oer; oer_type_encoder_f N_0_5_encode_oer; @@ -1233,6 +1258,9 @@ asn_TYPE_descriptor_t asn_DEF_N_0_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ N_0_5_constraint }, 0, 0, /* No members */ @@ -1258,7 +1286,6 @@ ber_type_decoder_f O_inv_decode_ber; der_type_encoder_f O_inv_encode_der; xer_type_decoder_f O_inv_decode_xer; xer_type_encoder_f O_inv_encode_xer; -jer_type_encoder_f O_inv_encode_jer; oer_type_decoder_f O_inv_decode_oer; oer_type_encoder_f O_inv_encode_oer; @@ -1324,6 +1351,9 @@ asn_TYPE_descriptor_t asn_DEF_O_inv = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ O_inv_constraint }, 0, 0, /* No members */ @@ -1349,7 +1379,6 @@ ber_type_decoder_f EConstr_decode_ber; der_type_encoder_f EConstr_encode_der; xer_type_decoder_f EConstr_decode_xer; xer_type_encoder_f EConstr_encode_xer; -jer_type_encoder_f EConstr_encode_jer; oer_type_decoder_f EConstr_decode_oer; oer_type_encoder_f EConstr_encode_oer; @@ -1415,6 +1444,9 @@ asn_TYPE_descriptor_t asn_DEF_EConstr = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ EConstr_constraint }, 0, 0, /* No members */ @@ -1440,7 +1472,6 @@ ber_type_decoder_f FConstr_decode_ber; der_type_encoder_f FConstr_encode_der; xer_type_decoder_f FConstr_decode_xer; xer_type_encoder_f FConstr_encode_xer; -jer_type_encoder_f FConstr_encode_jer; oer_type_decoder_f FConstr_decode_oer; oer_type_encoder_f FConstr_encode_oer; @@ -1506,6 +1537,9 @@ asn_TYPE_descriptor_t asn_DEF_FConstr = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ FConstr_constraint }, 0, 0, /* No members */ @@ -1582,6 +1616,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1599,6 +1636,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1616,6 +1656,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1653,6 +1696,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -1673,6 +1719,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1690,6 +1739,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1707,6 +1759,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1724,6 +1779,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1769,6 +1827,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.+-P b/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.+-P index 86b448f0d..ac625d1a6 100644 --- a/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/139-component-relation-OK.asn1.+-P @@ -142,6 +142,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -159,6 +162,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -195,6 +201,9 @@ asn_TYPE_descriptor_t asn_DEF_value_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OPEN_TYPE_constraint }, asn_MBR_value_3, @@ -215,6 +224,9 @@ static asn_TYPE_member_t asn_MBR_Frame_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ident_constraint_1 }, 0, 0, /* No default value */ @@ -232,6 +244,9 @@ static asn_TYPE_member_t asn_MBR_Frame_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_value_constraint_1 }, 0, 0, /* No default value */ @@ -269,6 +284,9 @@ asn_TYPE_descriptor_t asn_DEF_Frame = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Frame_1, @@ -324,6 +342,9 @@ asn_TYPE_descriptor_t asn_DEF_PrimitiveMessage = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, 0, 0, /* No members */ @@ -378,6 +399,9 @@ asn_TYPE_descriptor_t asn_DEF_ComplexMessage = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, 0, 0, /* No members */ @@ -446,6 +470,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -463,6 +490,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -480,6 +510,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -517,6 +550,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -537,6 +573,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -554,6 +593,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -571,6 +613,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -588,6 +633,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -631,6 +679,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.+-P b/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.+-P index 86b448f0d..ac625d1a6 100644 --- a/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/140-component-relation-OK.asn1.+-P @@ -142,6 +142,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -159,6 +162,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -195,6 +201,9 @@ asn_TYPE_descriptor_t asn_DEF_value_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OPEN_TYPE_constraint }, asn_MBR_value_3, @@ -215,6 +224,9 @@ static asn_TYPE_member_t asn_MBR_Frame_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ident_constraint_1 }, 0, 0, /* No default value */ @@ -232,6 +244,9 @@ static asn_TYPE_member_t asn_MBR_Frame_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_value_constraint_1 }, 0, 0, /* No default value */ @@ -269,6 +284,9 @@ asn_TYPE_descriptor_t asn_DEF_Frame = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Frame_1, @@ -324,6 +342,9 @@ asn_TYPE_descriptor_t asn_DEF_PrimitiveMessage = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, 0, 0, /* No members */ @@ -378,6 +399,9 @@ asn_TYPE_descriptor_t asn_DEF_ComplexMessage = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, 0, 0, /* No members */ @@ -446,6 +470,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -463,6 +490,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -480,6 +510,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -517,6 +550,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -537,6 +573,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -554,6 +593,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -571,6 +613,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -588,6 +633,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -631,6 +679,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.+-P b/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.+-P index b0e353b32..50e1136ce 100644 --- a/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/141-component-relation-OK.asn1.+-P @@ -148,6 +148,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -165,6 +168,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -201,6 +207,9 @@ asn_TYPE_descriptor_t asn_DEF_value_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OPEN_TYPE_constraint }, asn_MBR_value_3, @@ -221,6 +230,9 @@ static asn_TYPE_member_t asn_MBR_Frame_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_ident_constraint_1 }, 0, 0, /* No default value */ @@ -238,6 +250,9 @@ static asn_TYPE_member_t asn_MBR_Frame_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_value_constraint_1 }, 0, 0, /* No default value */ @@ -276,6 +291,9 @@ asn_TYPE_descriptor_t asn_DEF_Frame = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Frame_1, @@ -302,7 +320,6 @@ ber_type_decoder_f ConstrainedInteger_decode_ber; der_type_encoder_f ConstrainedInteger_encode_der; xer_type_decoder_f ConstrainedInteger_decode_xer; xer_type_encoder_f ConstrainedInteger_encode_xer; -jer_type_encoder_f ConstrainedInteger_encode_jer; /*** <<< CODE [ConstrainedInteger] >>> ***/ @@ -358,6 +375,9 @@ asn_TYPE_descriptor_t asn_DEF_ConstrainedInteger = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ConstrainedInteger_constraint }, 0, 0, /* No members */ @@ -412,6 +432,9 @@ asn_TYPE_descriptor_t asn_DEF_PrimitiveMessage = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, 0, 0, /* No members */ @@ -466,6 +489,9 @@ asn_TYPE_descriptor_t asn_DEF_ComplexMessage = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, 0, 0, /* No members */ @@ -534,6 +560,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -551,6 +580,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -568,6 +600,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -605,6 +640,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -625,6 +663,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -642,6 +683,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -659,6 +703,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -676,6 +723,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -719,6 +769,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/142-anonymous-types-deco-OK.asn1.+-P_-fcompound-names b/tests/tests-asn1c-compiler/142-anonymous-types-deco-OK.asn1.+-P_-fcompound-names index a5023500b..2d167aa51 100644 --- a/tests/tests-asn1c-compiler/142-anonymous-types-deco-OK.asn1.+-P_-fcompound-names +++ b/tests/tests-asn1c-compiler/142-anonymous-types-deco-OK.asn1.+-P_-fcompound-names @@ -45,6 +45,9 @@ static asn_TYPE_member_t asn_MBR_CommonType_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -62,6 +65,9 @@ static asn_TYPE_member_t asn_MBR_CommonType_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -97,6 +103,9 @@ asn_TYPE_descriptor_t asn_DEF_CommonType = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_CommonType_1, @@ -212,6 +221,9 @@ static asn_TYPE_member_t asn_MBR_anonType_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_x_constraint_2 }, 0, 0, /* No default value */ @@ -229,6 +241,9 @@ static asn_TYPE_member_t asn_MBR_anonType_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_y_constraint_2 }, 0, 0, /* No default value */ @@ -269,6 +284,9 @@ asn_TYPE_descriptor_t asn_DEF_anonType_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_anonType_2, @@ -289,6 +307,9 @@ asn_TYPE_member_t asn_MBR_Type1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -323,6 +344,9 @@ asn_TYPE_descriptor_t asn_DEF_Type1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Type1_1, @@ -438,6 +462,9 @@ static asn_TYPE_member_t asn_MBR_anonType_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_x_constraint_2 }, 0, 0, /* No default value */ @@ -455,6 +482,9 @@ static asn_TYPE_member_t asn_MBR_anonType_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_y_constraint_2 }, 0, 0, /* No default value */ @@ -495,6 +525,9 @@ asn_TYPE_descriptor_t asn_DEF_anonType_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_anonType_2, @@ -515,6 +548,9 @@ asn_TYPE_member_t asn_MBR_Type2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -549,6 +585,9 @@ asn_TYPE_descriptor_t asn_DEF_Type2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Type2_1, @@ -618,6 +657,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -635,6 +677,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -652,6 +697,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -689,6 +737,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -709,6 +760,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -726,6 +780,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -743,6 +800,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -760,6 +820,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -803,6 +866,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/143-inner-parameterization-OK.asn1.+-P b/tests/tests-asn1c-compiler/143-inner-parameterization-OK.asn1.+-P index 0d0731cf6..6390f9587 100644 --- a/tests/tests-asn1c-compiler/143-inner-parameterization-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/143-inner-parameterization-OK.asn1.+-P @@ -33,6 +33,9 @@ static asn_TYPE_member_t asn_MBR_Message_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -50,6 +53,9 @@ static asn_TYPE_member_t asn_MBR_Message_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -88,6 +94,9 @@ asn_TYPE_descriptor_t asn_DEF_Message = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Message_1, @@ -193,6 +202,9 @@ asn_TYPE_member_t asn_MBR_SpecializedContent_21P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_id_constraint_1 }, 0, 0, /* No default value */ @@ -230,6 +242,9 @@ asn_TYPE_descriptor_t asn_DEF_SpecializedContent_21P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_SpecializedContent_21P0_1, @@ -250,6 +265,9 @@ asn_TYPE_member_t asn_MBR_SpecializedContent_21P1_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_id_constraint_3 }, 0, 0, /* No default value */ @@ -287,6 +305,9 @@ asn_TYPE_descriptor_t asn_DEF_SpecializedContent_21P1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_SpecializedContent_21P1_3, @@ -356,6 +377,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -373,6 +397,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -390,6 +417,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -427,6 +457,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -447,6 +480,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -464,6 +500,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -481,6 +520,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -498,6 +540,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -541,6 +586,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/144-ios-parameterization-OK.asn1.+-P b/tests/tests-asn1c-compiler/144-ios-parameterization-OK.asn1.+-P index 32617bff0..9c47ff691 100644 --- a/tests/tests-asn1c-compiler/144-ios-parameterization-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/144-ios-parameterization-OK.asn1.+-P @@ -32,6 +32,9 @@ static asn_TYPE_member_t asn_MBR_Message_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -69,6 +72,9 @@ asn_TYPE_descriptor_t asn_DEF_Message = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Message_1, @@ -217,6 +223,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -234,6 +243,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -270,6 +282,9 @@ asn_TYPE_descriptor_t asn_DEF_value_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OPEN_TYPE_constraint }, asn_MBR_value_3, @@ -290,6 +305,9 @@ asn_TYPE_member_t asn_MBR_RegionalExtension_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_id_constraint_1 }, 0, 0, /* No default value */ @@ -307,6 +325,9 @@ asn_TYPE_member_t asn_MBR_RegionalExtension_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_value_constraint_1 }, 0, 0, /* No default value */ @@ -344,6 +365,9 @@ asn_TYPE_descriptor_t asn_DEF_RegionalExtension = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_RegionalExtension_1, @@ -413,6 +437,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -430,6 +457,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -447,6 +477,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -484,6 +517,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -504,6 +540,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -521,6 +560,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -538,6 +580,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -555,6 +600,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -598,6 +646,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/146-ios-parameterization-per-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/146-ios-parameterization-per-OK.asn1.+-P_-gen-UPER_-gen-APER index e1957893d..71dd1ee96 100644 --- a/tests/tests-asn1c-compiler/146-ios-parameterization-per-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/146-ios-parameterization-per-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -32,6 +32,9 @@ static asn_TYPE_member_t asn_MBR_Message_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -69,6 +72,9 @@ asn_TYPE_descriptor_t asn_DEF_Message = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Message_1, @@ -234,6 +240,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -251,6 +260,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -290,6 +302,9 @@ asn_TYPE_descriptor_t asn_DEF_value_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OPEN_TYPE_constraint }, asn_MBR_value_3, @@ -310,6 +325,9 @@ asn_TYPE_member_t asn_MBR_RegionalExtension_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_id_constr_2, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_id_constraint_1 }, 0, 0, /* No default value */ @@ -327,6 +345,9 @@ asn_TYPE_member_t asn_MBR_RegionalExtension_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_value_constr_3, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_value_constraint_1 }, 0, 0, /* No default value */ @@ -364,6 +385,9 @@ asn_TYPE_descriptor_t asn_DEF_RegionalExtension = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_RegionalExtension_1, @@ -443,6 +467,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -460,6 +487,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -477,6 +507,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -514,6 +547,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -534,6 +570,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -551,6 +590,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -568,6 +610,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -585,6 +630,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -630,6 +678,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/147-inherit-per-constraints-OK.asn1.+-P_-gen-OER b/tests/tests-asn1c-compiler/147-inherit-per-constraints-OK.asn1.+-P_-gen-OER index f70f62c2e..56c6a32c8 100644 --- a/tests/tests-asn1c-compiler/147-inherit-per-constraints-OK.asn1.+-P_-gen-OER +++ b/tests/tests-asn1c-compiler/147-inherit-per-constraints-OK.asn1.+-P_-gen-OER @@ -17,7 +17,6 @@ ber_type_decoder_f Short_decode_ber; der_type_encoder_f Short_encode_der; xer_type_decoder_f Short_decode_xer; xer_type_encoder_f Short_encode_xer; -jer_type_encoder_f Short_encode_jer; oer_type_decoder_f Short_decode_oer; oer_type_encoder_f Short_encode_oer; @@ -83,6 +82,9 @@ asn_TYPE_descriptor_t asn_DEF_Short = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Short_constraint }, 0, 0, /* No members */ @@ -108,7 +110,6 @@ ber_type_decoder_f Alias_decode_ber; der_type_encoder_f Alias_encode_der; xer_type_decoder_f Alias_decode_xer; xer_type_encoder_f Alias_encode_xer; -jer_type_encoder_f Alias_encode_jer; oer_type_decoder_f Alias_decode_oer; oer_type_encoder_f Alias_encode_oer; @@ -174,6 +175,9 @@ asn_TYPE_descriptor_t asn_DEF_Alias = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Alias_constraint }, 0, 0, /* No members */ @@ -254,6 +258,9 @@ static asn_TYPE_member_t asn_MBR_Soo_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_foo_constraint_1 }, 0, 0, /* No default value */ @@ -271,6 +278,9 @@ static asn_TYPE_member_t asn_MBR_Soo_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -288,6 +298,9 @@ static asn_TYPE_member_t asn_MBR_Soo_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -327,6 +340,9 @@ asn_TYPE_descriptor_t asn_DEF_Soo = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Soo_1, @@ -404,6 +420,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -421,6 +440,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -438,6 +460,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -475,6 +500,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -495,6 +523,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -512,6 +543,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -529,6 +563,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -546,6 +583,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -591,6 +631,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/147-inherit-per-constraints-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/147-inherit-per-constraints-OK.asn1.+-P_-gen-UPER_-gen-APER index b0ac18719..1374d4839 100644 --- a/tests/tests-asn1c-compiler/147-inherit-per-constraints-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/147-inherit-per-constraints-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -18,7 +18,6 @@ ber_type_decoder_f Short_decode_ber; der_type_encoder_f Short_encode_der; xer_type_decoder_f Short_decode_xer; xer_type_encoder_f Short_encode_xer; -jer_type_encoder_f Short_encode_jer; per_type_decoder_f Short_decode_uper; per_type_encoder_f Short_encode_uper; per_type_decoder_f Short_decode_aper; @@ -88,6 +87,9 @@ asn_TYPE_descriptor_t asn_DEF_Short = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Short_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Short_constraint }, 0, 0, /* No members */ @@ -114,7 +116,6 @@ ber_type_decoder_f Alias_decode_ber; der_type_encoder_f Alias_encode_der; xer_type_decoder_f Alias_decode_xer; xer_type_encoder_f Alias_encode_xer; -jer_type_encoder_f Alias_encode_jer; per_type_decoder_f Alias_decode_uper; per_type_encoder_f Alias_encode_uper; per_type_decoder_f Alias_decode_aper; @@ -184,6 +185,9 @@ asn_TYPE_descriptor_t asn_DEF_Alias = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Alias_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Alias_constraint }, 0, 0, /* No members */ @@ -266,6 +270,9 @@ static asn_TYPE_member_t asn_MBR_Soo_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_foo_constr_2, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_foo_constraint_1 }, 0, 0, /* No default value */ @@ -283,6 +290,9 @@ static asn_TYPE_member_t asn_MBR_Soo_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -300,6 +310,9 @@ static asn_TYPE_member_t asn_MBR_Soo_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -339,6 +352,9 @@ asn_TYPE_descriptor_t asn_DEF_Soo = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Soo_1, @@ -418,6 +434,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -435,6 +454,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -452,6 +474,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -489,6 +514,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -509,6 +537,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -526,6 +557,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -543,6 +577,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -560,6 +597,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -605,6 +645,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-fwide-types index e1d15d75e..6d426ad59 100644 --- a/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-fwide-types @@ -17,7 +17,6 @@ ber_type_decoder_f UnconstrainedREAL_decode_ber; der_type_encoder_f UnconstrainedREAL_encode_der; xer_type_decoder_f UnconstrainedREAL_decode_xer; xer_type_encoder_f UnconstrainedREAL_encode_xer; -jer_type_encoder_f UnconstrainedREAL_encode_jer; /*** <<< CODE [UnconstrainedREAL] >>> ***/ @@ -48,6 +47,9 @@ asn_TYPE_descriptor_t asn_DEF_UnconstrainedREAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ REAL_constraint }, 0, 0, /* No members */ @@ -73,7 +75,6 @@ ber_type_decoder_f WeirdlyConstrainedREAL_decode_ber; der_type_encoder_f WeirdlyConstrainedREAL_encode_der; xer_type_decoder_f WeirdlyConstrainedREAL_decode_xer; xer_type_encoder_f WeirdlyConstrainedREAL_encode_xer; -jer_type_encoder_f WeirdlyConstrainedREAL_encode_jer; /*** <<< CODE [WeirdlyConstrainedREAL] >>> ***/ @@ -135,6 +136,9 @@ asn_TYPE_descriptor_t asn_DEF_WeirdlyConstrainedREAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ WeirdlyConstrainedREAL_constraint }, 0, 0, /* No members */ @@ -161,7 +165,6 @@ ber_type_decoder_f Indirect_IEEE_binary32_decode_ber; der_type_encoder_f Indirect_IEEE_binary32_encode_der; xer_type_decoder_f Indirect_IEEE_binary32_decode_xer; xer_type_encoder_f Indirect_IEEE_binary32_encode_xer; -jer_type_encoder_f Indirect_IEEE_binary32_encode_jer; /*** <<< CODE [Indirect-IEEE-binary32] >>> ***/ @@ -214,6 +217,9 @@ asn_TYPE_descriptor_t asn_DEF_Indirect_IEEE_binary32 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Indirect_IEEE_binary32_constraint }, 0, 0, /* No members */ @@ -240,7 +246,6 @@ ber_type_decoder_f IEEE_binary32_w_decode_ber; der_type_encoder_f IEEE_binary32_w_encode_der; xer_type_decoder_f IEEE_binary32_w_decode_xer; xer_type_encoder_f IEEE_binary32_w_encode_xer; -jer_type_encoder_f IEEE_binary32_w_encode_jer; /*** <<< CODE [IEEE-binary32-w] >>> ***/ @@ -293,6 +298,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary32_w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary32_w_constraint }, 0, 0, /* No members */ @@ -319,7 +327,6 @@ ber_type_decoder_f IEEE_binary32_0w_decode_ber; der_type_encoder_f IEEE_binary32_0w_encode_der; xer_type_decoder_f IEEE_binary32_0w_decode_xer; xer_type_encoder_f IEEE_binary32_0w_encode_xer; -jer_type_encoder_f IEEE_binary32_0w_encode_jer; /*** <<< CODE [IEEE-binary32-0w] >>> ***/ @@ -372,6 +379,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary32_0w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary32_0w_constraint }, 0, 0, /* No members */ @@ -398,7 +408,6 @@ ber_type_decoder_f IEEE_binary32_w0_decode_ber; der_type_encoder_f IEEE_binary32_w0_encode_der; xer_type_decoder_f IEEE_binary32_w0_decode_xer; xer_type_encoder_f IEEE_binary32_w0_encode_xer; -jer_type_encoder_f IEEE_binary32_w0_encode_jer; /*** <<< CODE [IEEE-binary32-w0] >>> ***/ @@ -451,6 +460,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary32_w0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary32_w0_constraint }, 0, 0, /* No members */ @@ -476,7 +488,6 @@ ber_type_decoder_f IEEE_binary64_w_decode_ber; der_type_encoder_f IEEE_binary64_w_encode_der; xer_type_decoder_f IEEE_binary64_w_decode_xer; xer_type_encoder_f IEEE_binary64_w_encode_xer; -jer_type_encoder_f IEEE_binary64_w_encode_jer; /*** <<< CODE [IEEE-binary64-w] >>> ***/ @@ -526,6 +537,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary64_w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary64_w_constraint }, 0, 0, /* No members */ @@ -551,7 +565,6 @@ ber_type_decoder_f IEEE_binary64_0w_decode_ber; der_type_encoder_f IEEE_binary64_0w_encode_der; xer_type_decoder_f IEEE_binary64_0w_decode_xer; xer_type_encoder_f IEEE_binary64_0w_encode_xer; -jer_type_encoder_f IEEE_binary64_0w_encode_jer; /*** <<< CODE [IEEE-binary64-0w] >>> ***/ @@ -601,6 +614,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary64_0w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary64_0w_constraint }, 0, 0, /* No members */ @@ -626,7 +642,6 @@ ber_type_decoder_f IEEE_binary64_w0_decode_ber; der_type_encoder_f IEEE_binary64_w0_encode_der; xer_type_decoder_f IEEE_binary64_w0_decode_xer; xer_type_encoder_f IEEE_binary64_w0_encode_xer; -jer_type_encoder_f IEEE_binary64_w0_encode_jer; /*** <<< CODE [IEEE-binary64-w0] >>> ***/ @@ -676,6 +691,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary64_w0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary64_w0_constraint }, 0, 0, /* No members */ @@ -838,6 +856,9 @@ asn_TYPE_descriptor_t asn_DEF_indirect_ieee_binary32_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ indirect_ieee_binary32_2_constraint }, 0, 0, /* No members */ @@ -868,6 +889,9 @@ asn_TYPE_descriptor_t asn_DEF_ieee_binary32_w_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ieee_binary32_w_3_constraint }, 0, 0, /* No members */ @@ -898,6 +922,9 @@ asn_TYPE_descriptor_t asn_DEF_ieee_binary32_0w_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ieee_binary32_0w_4_constraint }, 0, 0, /* No members */ @@ -928,6 +955,9 @@ asn_TYPE_descriptor_t asn_DEF_ieee_binary32_w0_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ieee_binary32_w0_5_constraint }, 0, 0, /* No members */ @@ -947,6 +977,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -964,6 +997,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -981,6 +1017,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -998,6 +1037,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1015,6 +1057,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1032,6 +1077,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1049,6 +1097,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1092,6 +1143,9 @@ asn_TYPE_descriptor_t asn_DEF_Test = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Test_1, @@ -1161,6 +1215,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1178,6 +1235,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1195,6 +1255,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1232,6 +1295,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -1252,6 +1318,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1269,6 +1338,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1286,6 +1358,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1303,6 +1378,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1346,6 +1424,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-gen-OER b/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-gen-OER index d2e78bbb3..4f215a6ab 100644 --- a/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-gen-OER +++ b/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-gen-OER @@ -17,7 +17,6 @@ ber_type_decoder_f UnconstrainedREAL_decode_ber; der_type_encoder_f UnconstrainedREAL_encode_der; xer_type_decoder_f UnconstrainedREAL_decode_xer; xer_type_encoder_f UnconstrainedREAL_encode_xer; -jer_type_encoder_f UnconstrainedREAL_encode_jer; oer_type_decoder_f UnconstrainedREAL_decode_oer; oer_type_encoder_f UnconstrainedREAL_encode_oer; @@ -50,6 +49,9 @@ asn_TYPE_descriptor_t asn_DEF_UnconstrainedREAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeReal_constraint }, 0, 0, /* No members */ @@ -75,7 +77,6 @@ ber_type_decoder_f WeirdlyConstrainedREAL_decode_ber; der_type_encoder_f WeirdlyConstrainedREAL_encode_der; xer_type_decoder_f WeirdlyConstrainedREAL_decode_xer; xer_type_encoder_f WeirdlyConstrainedREAL_encode_xer; -jer_type_encoder_f WeirdlyConstrainedREAL_encode_jer; oer_type_decoder_f WeirdlyConstrainedREAL_decode_oer; oer_type_encoder_f WeirdlyConstrainedREAL_encode_oer; @@ -141,6 +142,9 @@ asn_TYPE_descriptor_t asn_DEF_WeirdlyConstrainedREAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ WeirdlyConstrainedREAL_constraint }, 0, 0, /* No members */ @@ -167,7 +171,6 @@ ber_type_decoder_f Indirect_IEEE_binary32_decode_ber; der_type_encoder_f Indirect_IEEE_binary32_encode_der; xer_type_decoder_f Indirect_IEEE_binary32_decode_xer; xer_type_encoder_f Indirect_IEEE_binary32_encode_xer; -jer_type_encoder_f Indirect_IEEE_binary32_encode_jer; oer_type_decoder_f Indirect_IEEE_binary32_decode_oer; oer_type_encoder_f Indirect_IEEE_binary32_encode_oer; @@ -230,6 +233,9 @@ asn_TYPE_descriptor_t asn_DEF_Indirect_IEEE_binary32 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Indirect_IEEE_binary32_constraint }, 0, 0, /* No members */ @@ -256,7 +262,6 @@ ber_type_decoder_f IEEE_binary32_w_decode_ber; der_type_encoder_f IEEE_binary32_w_encode_der; xer_type_decoder_f IEEE_binary32_w_decode_xer; xer_type_encoder_f IEEE_binary32_w_encode_xer; -jer_type_encoder_f IEEE_binary32_w_encode_jer; oer_type_decoder_f IEEE_binary32_w_decode_oer; oer_type_encoder_f IEEE_binary32_w_encode_oer; @@ -319,6 +324,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary32_w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary32_w_constraint }, 0, 0, /* No members */ @@ -345,7 +353,6 @@ ber_type_decoder_f IEEE_binary32_0w_decode_ber; der_type_encoder_f IEEE_binary32_0w_encode_der; xer_type_decoder_f IEEE_binary32_0w_decode_xer; xer_type_encoder_f IEEE_binary32_0w_encode_xer; -jer_type_encoder_f IEEE_binary32_0w_encode_jer; oer_type_decoder_f IEEE_binary32_0w_decode_oer; oer_type_encoder_f IEEE_binary32_0w_encode_oer; @@ -408,6 +415,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary32_0w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary32_0w_constraint }, 0, 0, /* No members */ @@ -434,7 +444,6 @@ ber_type_decoder_f IEEE_binary32_w0_decode_ber; der_type_encoder_f IEEE_binary32_w0_encode_der; xer_type_decoder_f IEEE_binary32_w0_decode_xer; xer_type_encoder_f IEEE_binary32_w0_encode_xer; -jer_type_encoder_f IEEE_binary32_w0_encode_jer; oer_type_decoder_f IEEE_binary32_w0_decode_oer; oer_type_encoder_f IEEE_binary32_w0_encode_oer; @@ -497,6 +506,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary32_w0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary32_w0_constraint }, 0, 0, /* No members */ @@ -522,7 +534,6 @@ ber_type_decoder_f IEEE_binary64_w_decode_ber; der_type_encoder_f IEEE_binary64_w_encode_der; xer_type_decoder_f IEEE_binary64_w_decode_xer; xer_type_encoder_f IEEE_binary64_w_encode_xer; -jer_type_encoder_f IEEE_binary64_w_encode_jer; oer_type_decoder_f IEEE_binary64_w_decode_oer; oer_type_encoder_f IEEE_binary64_w_encode_oer; @@ -582,6 +593,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary64_w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary64_w_constraint }, 0, 0, /* No members */ @@ -607,7 +621,6 @@ ber_type_decoder_f IEEE_binary64_0w_decode_ber; der_type_encoder_f IEEE_binary64_0w_encode_der; xer_type_decoder_f IEEE_binary64_0w_decode_xer; xer_type_encoder_f IEEE_binary64_0w_encode_xer; -jer_type_encoder_f IEEE_binary64_0w_encode_jer; oer_type_decoder_f IEEE_binary64_0w_decode_oer; oer_type_encoder_f IEEE_binary64_0w_encode_oer; @@ -667,6 +680,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary64_0w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary64_0w_constraint }, 0, 0, /* No members */ @@ -692,7 +708,6 @@ ber_type_decoder_f IEEE_binary64_w0_decode_ber; der_type_encoder_f IEEE_binary64_w0_encode_der; xer_type_decoder_f IEEE_binary64_w0_decode_xer; xer_type_encoder_f IEEE_binary64_w0_encode_xer; -jer_type_encoder_f IEEE_binary64_w0_encode_jer; oer_type_decoder_f IEEE_binary64_w0_decode_oer; oer_type_encoder_f IEEE_binary64_w0_encode_oer; @@ -752,6 +767,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary64_w0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary64_w0_constraint }, 0, 0, /* No members */ @@ -937,6 +955,9 @@ asn_TYPE_descriptor_t asn_DEF_indirect_ieee_binary32_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ indirect_ieee_binary32_2_constraint }, 0, 0, /* No members */ @@ -967,6 +988,9 @@ asn_TYPE_descriptor_t asn_DEF_ieee_binary32_w_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ieee_binary32_w_3_constraint }, 0, 0, /* No members */ @@ -997,6 +1021,9 @@ asn_TYPE_descriptor_t asn_DEF_ieee_binary32_0w_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ieee_binary32_0w_4_constraint }, 0, 0, /* No members */ @@ -1027,6 +1054,9 @@ asn_TYPE_descriptor_t asn_DEF_ieee_binary32_w0_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ieee_binary32_w0_5_constraint }, 0, 0, /* No members */ @@ -1046,6 +1076,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1063,6 +1096,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1080,6 +1116,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1097,6 +1136,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1114,6 +1156,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1131,6 +1176,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1148,6 +1196,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1191,6 +1242,9 @@ asn_TYPE_descriptor_t asn_DEF_Test = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Test_1, @@ -1268,6 +1322,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1285,6 +1342,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1302,6 +1362,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1339,6 +1402,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -1359,6 +1425,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1376,6 +1445,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1393,6 +1465,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1410,6 +1485,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1455,6 +1533,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-gen-UPER_-gen-APER index 4bf523885..a11aac8ad 100644 --- a/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/154-with-REAL-components-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -17,7 +17,6 @@ ber_type_decoder_f UnconstrainedREAL_decode_ber; der_type_encoder_f UnconstrainedREAL_encode_der; xer_type_decoder_f UnconstrainedREAL_decode_xer; xer_type_encoder_f UnconstrainedREAL_encode_xer; -jer_type_encoder_f UnconstrainedREAL_encode_jer; per_type_decoder_f UnconstrainedREAL_decode_uper; per_type_encoder_f UnconstrainedREAL_encode_uper; per_type_decoder_f UnconstrainedREAL_decode_aper; @@ -52,6 +51,9 @@ asn_TYPE_descriptor_t asn_DEF_UnconstrainedREAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeReal_constraint }, 0, 0, /* No members */ @@ -77,7 +79,6 @@ ber_type_decoder_f WeirdlyConstrainedREAL_decode_ber; der_type_encoder_f WeirdlyConstrainedREAL_encode_der; xer_type_decoder_f WeirdlyConstrainedREAL_decode_xer; xer_type_encoder_f WeirdlyConstrainedREAL_encode_xer; -jer_type_encoder_f WeirdlyConstrainedREAL_encode_jer; per_type_decoder_f WeirdlyConstrainedREAL_decode_uper; per_type_encoder_f WeirdlyConstrainedREAL_encode_uper; per_type_decoder_f WeirdlyConstrainedREAL_decode_aper; @@ -147,6 +148,9 @@ asn_TYPE_descriptor_t asn_DEF_WeirdlyConstrainedREAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_WeirdlyConstrainedREAL_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ WeirdlyConstrainedREAL_constraint }, 0, 0, /* No members */ @@ -174,7 +178,6 @@ ber_type_decoder_f Indirect_IEEE_binary32_decode_ber; der_type_encoder_f Indirect_IEEE_binary32_encode_der; xer_type_decoder_f Indirect_IEEE_binary32_decode_xer; xer_type_encoder_f Indirect_IEEE_binary32_encode_xer; -jer_type_encoder_f Indirect_IEEE_binary32_encode_jer; per_type_decoder_f Indirect_IEEE_binary32_decode_uper; per_type_encoder_f Indirect_IEEE_binary32_encode_uper; per_type_decoder_f Indirect_IEEE_binary32_decode_aper; @@ -241,6 +244,9 @@ asn_TYPE_descriptor_t asn_DEF_Indirect_IEEE_binary32 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Indirect_IEEE_binary32_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Indirect_IEEE_binary32_constraint }, 0, 0, /* No members */ @@ -268,7 +274,6 @@ ber_type_decoder_f IEEE_binary32_w_decode_ber; der_type_encoder_f IEEE_binary32_w_encode_der; xer_type_decoder_f IEEE_binary32_w_decode_xer; xer_type_encoder_f IEEE_binary32_w_encode_xer; -jer_type_encoder_f IEEE_binary32_w_encode_jer; per_type_decoder_f IEEE_binary32_w_decode_uper; per_type_encoder_f IEEE_binary32_w_encode_uper; per_type_decoder_f IEEE_binary32_w_decode_aper; @@ -335,6 +340,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary32_w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_IEEE_binary32_w_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary32_w_constraint }, 0, 0, /* No members */ @@ -362,7 +370,6 @@ ber_type_decoder_f IEEE_binary32_0w_decode_ber; der_type_encoder_f IEEE_binary32_0w_encode_der; xer_type_decoder_f IEEE_binary32_0w_decode_xer; xer_type_encoder_f IEEE_binary32_0w_encode_xer; -jer_type_encoder_f IEEE_binary32_0w_encode_jer; per_type_decoder_f IEEE_binary32_0w_decode_uper; per_type_encoder_f IEEE_binary32_0w_encode_uper; per_type_decoder_f IEEE_binary32_0w_decode_aper; @@ -429,6 +436,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary32_0w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_IEEE_binary32_0w_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary32_0w_constraint }, 0, 0, /* No members */ @@ -456,7 +466,6 @@ ber_type_decoder_f IEEE_binary32_w0_decode_ber; der_type_encoder_f IEEE_binary32_w0_encode_der; xer_type_decoder_f IEEE_binary32_w0_decode_xer; xer_type_encoder_f IEEE_binary32_w0_encode_xer; -jer_type_encoder_f IEEE_binary32_w0_encode_jer; per_type_decoder_f IEEE_binary32_w0_decode_uper; per_type_encoder_f IEEE_binary32_w0_encode_uper; per_type_decoder_f IEEE_binary32_w0_decode_aper; @@ -523,6 +532,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary32_w0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_IEEE_binary32_w0_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary32_w0_constraint }, 0, 0, /* No members */ @@ -549,7 +561,6 @@ ber_type_decoder_f IEEE_binary64_w_decode_ber; der_type_encoder_f IEEE_binary64_w_encode_der; xer_type_decoder_f IEEE_binary64_w_decode_xer; xer_type_encoder_f IEEE_binary64_w_encode_xer; -jer_type_encoder_f IEEE_binary64_w_encode_jer; per_type_decoder_f IEEE_binary64_w_decode_uper; per_type_encoder_f IEEE_binary64_w_encode_uper; per_type_decoder_f IEEE_binary64_w_decode_aper; @@ -613,6 +624,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary64_w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_IEEE_binary64_w_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary64_w_constraint }, 0, 0, /* No members */ @@ -639,7 +653,6 @@ ber_type_decoder_f IEEE_binary64_0w_decode_ber; der_type_encoder_f IEEE_binary64_0w_encode_der; xer_type_decoder_f IEEE_binary64_0w_decode_xer; xer_type_encoder_f IEEE_binary64_0w_encode_xer; -jer_type_encoder_f IEEE_binary64_0w_encode_jer; per_type_decoder_f IEEE_binary64_0w_decode_uper; per_type_encoder_f IEEE_binary64_0w_encode_uper; per_type_decoder_f IEEE_binary64_0w_decode_aper; @@ -703,6 +716,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary64_0w = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_IEEE_binary64_0w_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary64_0w_constraint }, 0, 0, /* No members */ @@ -729,7 +745,6 @@ ber_type_decoder_f IEEE_binary64_w0_decode_ber; der_type_encoder_f IEEE_binary64_w0_encode_der; xer_type_decoder_f IEEE_binary64_w0_decode_xer; xer_type_encoder_f IEEE_binary64_w0_encode_xer; -jer_type_encoder_f IEEE_binary64_w0_encode_jer; per_type_decoder_f IEEE_binary64_w0_decode_uper; per_type_encoder_f IEEE_binary64_w0_encode_uper; per_type_decoder_f IEEE_binary64_w0_decode_aper; @@ -793,6 +808,9 @@ asn_TYPE_descriptor_t asn_DEF_IEEE_binary64_w0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_IEEE_binary64_w0_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IEEE_binary64_w0_constraint }, 0, 0, /* No members */ @@ -986,6 +1004,9 @@ asn_TYPE_descriptor_t asn_DEF_indirect_ieee_binary32_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_indirect_ieee_binary32_constr_2, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ indirect_ieee_binary32_2_constraint }, 0, 0, /* No members */ @@ -1016,6 +1037,9 @@ asn_TYPE_descriptor_t asn_DEF_ieee_binary32_w_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_ieee_binary32_w_constr_3, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ieee_binary32_w_3_constraint }, 0, 0, /* No members */ @@ -1046,6 +1070,9 @@ asn_TYPE_descriptor_t asn_DEF_ieee_binary32_0w_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_ieee_binary32_0w_constr_4, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ieee_binary32_0w_4_constraint }, 0, 0, /* No members */ @@ -1076,6 +1103,9 @@ asn_TYPE_descriptor_t asn_DEF_ieee_binary32_w0_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_ieee_binary32_w0_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ieee_binary32_w0_5_constraint }, 0, 0, /* No members */ @@ -1095,6 +1125,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1112,6 +1145,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1129,6 +1165,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1146,6 +1185,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1163,6 +1205,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1180,6 +1225,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1197,6 +1245,9 @@ static asn_TYPE_member_t asn_MBR_Test_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1240,6 +1291,9 @@ asn_TYPE_descriptor_t asn_DEF_Test = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Test_1, @@ -1319,6 +1373,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1336,6 +1393,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1353,6 +1413,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1390,6 +1453,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -1410,6 +1476,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1427,6 +1496,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1444,6 +1516,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1461,6 +1536,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1506,6 +1584,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/155-parameterization-more-than-two-level-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/155-parameterization-more-than-two-level-OK.asn1.+-P_-gen-UPER_-gen-APER index de656f78a..d4a2a3118 100644 --- a/tests/tests-asn1c-compiler/155-parameterization-more-than-two-level-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/155-parameterization-more-than-two-level-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -19,7 +19,6 @@ ber_type_decoder_f PacketId_decode_ber; der_type_encoder_f PacketId_encode_der; xer_type_decoder_f PacketId_decode_xer; xer_type_encoder_f PacketId_encode_xer; -jer_type_encoder_f PacketId_encode_jer; per_type_decoder_f PacketId_decode_uper; per_type_encoder_f PacketId_encode_uper; per_type_decoder_f PacketId_decode_aper; @@ -89,6 +88,9 @@ asn_TYPE_descriptor_t asn_DEF_PacketId = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_PacketId_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ PacketId_constraint }, 0, 0, /* No members */ @@ -124,7 +126,6 @@ ber_type_decoder_f Color_decode_ber; der_type_encoder_f Color_encode_der; xer_type_decoder_f Color_decode_xer; xer_type_encoder_f Color_encode_xer; -jer_type_encoder_f Color_encode_jer; per_type_decoder_f Color_decode_uper; per_type_encoder_f Color_encode_uper; per_type_decoder_f Color_decode_aper; @@ -188,6 +189,9 @@ asn_TYPE_descriptor_t asn_DEF_Color = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Color_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeEnumerated_constraint }, 0, 0, /* Defined elsewhere */ @@ -222,7 +226,6 @@ ber_type_decoder_f Valid_decode_ber; der_type_encoder_f Valid_encode_der; xer_type_decoder_f Valid_decode_xer; xer_type_encoder_f Valid_encode_xer; -jer_type_encoder_f Valid_encode_jer; per_type_decoder_f Valid_decode_uper; per_type_encoder_f Valid_encode_uper; per_type_decoder_f Valid_decode_aper; @@ -284,6 +287,9 @@ asn_TYPE_descriptor_t asn_DEF_Valid = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Valid_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeEnumerated_constraint }, 0, 0, /* Defined elsewhere */ @@ -309,7 +315,6 @@ ber_type_decoder_f Packet_List_decode_ber; der_type_encoder_f Packet_List_encode_der; xer_type_decoder_f Packet_List_decode_xer; xer_type_encoder_f Packet_List_encode_xer; -jer_type_encoder_f Packet_List_encode_jer; per_type_decoder_f Packet_List_decode_uper; per_type_encoder_f Packet_List_encode_uper; per_type_decoder_f Packet_List_decode_aper; @@ -380,6 +385,9 @@ asn_TYPE_descriptor_t asn_DEF_Packet_List = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Packet_List_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Packet_List_constraint }, asn_MBR_LowerLayer_List_45P0_1, @@ -407,7 +415,6 @@ ber_type_decoder_f UpperLayer_List_41P0_decode_ber; der_type_encoder_f UpperLayer_List_41P0_encode_der; xer_type_decoder_f UpperLayer_List_41P0_decode_xer; xer_type_encoder_f UpperLayer_List_41P0_encode_xer; -jer_type_encoder_f UpperLayer_List_41P0_encode_jer; per_type_decoder_f UpperLayer_List_41P0_decode_uper; per_type_encoder_f UpperLayer_List_41P0_encode_uper; per_type_decoder_f UpperLayer_List_41P0_decode_aper; @@ -478,6 +485,9 @@ asn_TYPE_descriptor_t asn_DEF_UpperLayer_List_41P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_UpperLayer_List_41P0_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ UpperLayer_List_41P0_constraint }, asn_MBR_LowerLayer_List_45P0_1, @@ -540,6 +550,9 @@ asn_TYPE_member_t asn_MBR_LowerLayer_List_45P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -571,6 +584,9 @@ asn_TYPE_descriptor_t asn_DEF_LowerLayer_List_45P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_LowerLayer_List_45P0_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_LowerLayer_List_45P0_1, @@ -597,7 +613,6 @@ ber_type_decoder_f SinglePacket_48P0_decode_ber; der_type_encoder_f SinglePacket_48P0_encode_der; xer_type_decoder_f SinglePacket_48P0_decode_xer; xer_type_encoder_f SinglePacket_48P0_encode_xer; -jer_type_encoder_f SinglePacket_48P0_encode_jer; per_type_decoder_f SinglePacket_48P0_decode_uper; per_type_encoder_f SinglePacket_48P0_encode_uper; per_type_decoder_f SinglePacket_48P0_decode_aper; @@ -632,6 +647,9 @@ asn_TYPE_descriptor_t asn_DEF_SinglePacket_48P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_ClassItem_1, @@ -858,6 +876,9 @@ static asn_TYPE_member_t asn_MBR_value_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -893,6 +914,9 @@ asn_TYPE_descriptor_t asn_DEF_value_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OPEN_TYPE_constraint }, asn_MBR_value_4, @@ -913,6 +937,9 @@ asn_TYPE_member_t asn_MBR_ClassItem_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_id_constr_2, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_id_constraint_1 }, 0, 0, /* No default value */ @@ -930,6 +957,9 @@ asn_TYPE_member_t asn_MBR_ClassItem_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_color_constr_3, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_color_constraint_1 }, 0, 0, /* No default value */ @@ -947,6 +977,9 @@ asn_TYPE_member_t asn_MBR_ClassItem_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_value_constr_4, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_value_constraint_1 }, 0, 0, /* No default value */ @@ -985,6 +1018,9 @@ asn_TYPE_descriptor_t asn_DEF_ClassItem = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_ClassItem_1, @@ -1064,6 +1100,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1081,6 +1120,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1098,6 +1140,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1135,6 +1180,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -1155,6 +1203,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1172,6 +1223,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1189,6 +1243,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1206,6 +1263,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1251,6 +1311,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/156-union-ios-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/156-union-ios-OK.asn1.+-P_-gen-UPER_-gen-APER index e9b9fcf98..2c396ecb8 100644 --- a/tests/tests-asn1c-compiler/156-union-ios-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/156-union-ios-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -32,6 +32,9 @@ static asn_TYPE_member_t asn_MBR_Message_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -69,6 +72,9 @@ asn_TYPE_descriptor_t asn_DEF_Message = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Message_1, @@ -255,6 +261,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -272,6 +281,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -289,6 +301,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -306,6 +321,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -323,6 +341,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -340,6 +361,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -383,6 +407,9 @@ asn_TYPE_descriptor_t asn_DEF_value_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OPEN_TYPE_constraint }, asn_MBR_value_3, @@ -403,6 +430,9 @@ asn_TYPE_member_t asn_MBR_TotalRegionExtension_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_id_constr_2, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_id_constraint_1 }, 0, 0, /* No default value */ @@ -420,6 +450,9 @@ asn_TYPE_member_t asn_MBR_TotalRegionExtension_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_value_constr_3, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_value_constraint_1 }, 0, 0, /* No default value */ @@ -457,6 +490,9 @@ asn_TYPE_descriptor_t asn_DEF_TotalRegionExtension = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_TotalRegionExtension_1, @@ -536,6 +572,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -553,6 +592,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -570,6 +612,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -607,6 +652,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -627,6 +675,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -644,6 +695,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -661,6 +715,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -678,6 +735,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -723,6 +783,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/157-per-canonical-order-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/157-per-canonical-order-OK.asn1.+-P_-gen-UPER_-gen-APER index d09aabab9..aa47406fb 100644 --- a/tests/tests-asn1c-compiler/157-per-canonical-order-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/157-per-canonical-order-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -58,6 +58,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -75,6 +78,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -92,6 +98,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -109,6 +118,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -149,6 +161,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_T_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_T_1, @@ -228,6 +243,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -245,6 +263,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -262,6 +283,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -299,6 +323,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -319,6 +346,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -336,6 +366,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -353,6 +386,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -370,6 +406,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -415,6 +454,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/158-sequence-of-sequence-nested-OK.asn1.+-P_-fcompound-names b/tests/tests-asn1c-compiler/158-sequence-of-sequence-nested-OK.asn1.+-P_-fcompound-names index b42a92c05..bbbd724bf 100644 --- a/tests/tests-asn1c-compiler/158-sequence-of-sequence-nested-OK.asn1.+-P_-fcompound-names +++ b/tests/tests-asn1c-compiler/158-sequence-of-sequence-nested-OK.asn1.+-P_-fcompound-names @@ -61,6 +61,9 @@ static asn_TYPE_member_t asn_MBR_Member_7[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -99,6 +102,9 @@ asn_TYPE_descriptor_t asn_DEF_Member_7 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Member_7, @@ -119,6 +125,9 @@ static asn_TYPE_member_t asn_MBR_nested_sos_6[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -152,6 +161,9 @@ asn_TYPE_descriptor_t asn_DEF_nested_sos_6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_nested_sos_6, @@ -172,6 +184,9 @@ static asn_TYPE_member_t asn_MBR_Member_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -189,6 +204,9 @@ static asn_TYPE_member_t asn_MBR_Member_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -228,6 +246,9 @@ asn_TYPE_descriptor_t asn_DEF_Member_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Member_4, @@ -248,6 +269,9 @@ static asn_TYPE_member_t asn_MBR_sos_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -281,6 +305,9 @@ asn_TYPE_descriptor_t asn_DEF_sos_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_sos_3, @@ -301,6 +328,9 @@ static asn_TYPE_member_t asn_MBR_SeqWithNestedSOS_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -318,6 +348,9 @@ static asn_TYPE_member_t asn_MBR_SeqWithNestedSOS_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -356,6 +389,9 @@ asn_TYPE_descriptor_t asn_DEF_SeqWithNestedSOS = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_SeqWithNestedSOS_1, @@ -425,6 +461,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -442,6 +481,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -459,6 +501,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -496,6 +541,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -516,6 +564,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -533,6 +584,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -550,6 +604,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -567,6 +624,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -610,6 +670,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/160-multiple-parameterized-instance-OK.asn1.+-P_-gen-UPER_-gen-APER_-fcompound-names b/tests/tests-asn1c-compiler/160-multiple-parameterized-instance-OK.asn1.+-P_-gen-UPER_-gen-APER_-fcompound-names index 22eacdf4d..f4c56858c 100644 --- a/tests/tests-asn1c-compiler/160-multiple-parameterized-instance-OK.asn1.+-P_-gen-UPER_-gen-APER_-fcompound-names +++ b/tests/tests-asn1c-compiler/160-multiple-parameterized-instance-OK.asn1.+-P_-gen-UPER_-gen-APER_-fcompound-names @@ -32,6 +32,9 @@ static asn_TYPE_member_t asn_MBR_Message1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -69,6 +72,9 @@ asn_TYPE_descriptor_t asn_DEF_Message1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Message1_1, @@ -110,6 +116,9 @@ static asn_TYPE_member_t asn_MBR_Message2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -147,6 +156,9 @@ asn_TYPE_descriptor_t asn_DEF_Message2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Message2_1, @@ -188,6 +200,9 @@ static asn_TYPE_member_t asn_MBR_Message3_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -225,6 +240,9 @@ asn_TYPE_descriptor_t asn_DEF_Message3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Message3_1, @@ -667,6 +685,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -684,6 +705,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -701,6 +725,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -718,6 +745,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -735,6 +765,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -752,6 +785,9 @@ static asn_TYPE_member_t asn_MBR_value_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -795,6 +831,9 @@ asn_TYPE_descriptor_t asn_DEF_value_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OPEN_TYPE_constraint }, asn_MBR_value_3, @@ -815,6 +854,9 @@ asn_TYPE_member_t asn_MBR_TotalRegionExtension_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_id_constr_2, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_id_constraint_1 }, 0, 0, /* No default value */ @@ -832,6 +874,9 @@ asn_TYPE_member_t asn_MBR_TotalRegionExtension_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_value_constr_3, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_value_constraint_1 }, 0, 0, /* No default value */ @@ -869,6 +914,9 @@ asn_TYPE_descriptor_t asn_DEF_TotalRegionExtension = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_TotalRegionExtension_1, @@ -889,6 +937,9 @@ static asn_TYPE_member_t asn_MBR_value_6[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -906,6 +957,9 @@ static asn_TYPE_member_t asn_MBR_value_6[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -942,6 +996,9 @@ asn_TYPE_descriptor_t asn_DEF_value_6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OPEN_TYPE_constraint }, asn_MBR_value_6, @@ -962,6 +1019,9 @@ asn_TYPE_member_t asn_MBR_RegionalExtension3_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_id_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_id_constraint_4 }, 0, 0, /* No default value */ @@ -979,6 +1039,9 @@ asn_TYPE_member_t asn_MBR_RegionalExtension3_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_value_constr_6, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_value_constraint_4 }, 0, 0, /* No default value */ @@ -1016,6 +1079,9 @@ asn_TYPE_descriptor_t asn_DEF_RegionalExtension3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_RegionalExtension3_4, @@ -1036,6 +1102,9 @@ static asn_TYPE_member_t asn_MBR_value_9[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1053,6 +1122,9 @@ static asn_TYPE_member_t asn_MBR_value_9[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_OCTET_STRING_5__constr_10, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_OCTET_STRING_5__constraint_9 }, 0, 0, /* No default value */ @@ -1089,6 +1161,9 @@ asn_TYPE_descriptor_t asn_DEF_value_9 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OPEN_TYPE_constraint }, asn_MBR_value_9, @@ -1109,6 +1184,9 @@ asn_TYPE_member_t asn_MBR_RegionalExtension4_7[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_id_constr_8, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_id_constraint_7 }, 0, 0, /* No default value */ @@ -1126,6 +1204,9 @@ asn_TYPE_member_t asn_MBR_RegionalExtension4_7[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_value_constr_9, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_value_constraint_7 }, 0, 0, /* No default value */ @@ -1163,6 +1244,9 @@ asn_TYPE_descriptor_t asn_DEF_RegionalExtension4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_RegionalExtension4_7, @@ -1242,6 +1326,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1259,6 +1346,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1276,6 +1366,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1313,6 +1406,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -1333,6 +1429,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1350,6 +1449,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1367,6 +1469,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1384,6 +1489,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1429,6 +1537,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/19-param-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/19-param-OK.asn1.+-P_-fwide-types index 304b8af18..58add7776 100644 --- a/tests/tests-asn1c-compiler/19-param-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/19-param-OK.asn1.+-P_-fwide-types @@ -80,6 +80,9 @@ static asn_TYPE_member_t asn_MBR_toBeSigned_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -97,6 +100,9 @@ static asn_TYPE_member_t asn_MBR_toBeSigned_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -114,6 +120,9 @@ static asn_TYPE_member_t asn_MBR_toBeSigned_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -154,6 +163,9 @@ asn_TYPE_descriptor_t asn_DEF_toBeSigned_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_toBeSigned_2, @@ -174,6 +186,9 @@ asn_TYPE_member_t asn_MBR_SIGNED_15P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -191,6 +206,9 @@ asn_TYPE_member_t asn_MBR_SIGNED_15P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -208,6 +226,9 @@ asn_TYPE_member_t asn_MBR_SIGNED_15P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_signature_constraint_1 }, 0, 0, /* No default value */ @@ -247,6 +268,9 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_15P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_SIGNED_15P0_1, @@ -273,7 +297,6 @@ ber_type_decoder_f Certificate_decode_ber; der_type_encoder_f Certificate_encode_der; xer_type_decoder_f Certificate_decode_xer; xer_type_encoder_f Certificate_encode_xer; -jer_type_encoder_f Certificate_encode_jer; /*** <<< CODE [Certificate] >>> ***/ @@ -304,6 +327,9 @@ asn_TYPE_descriptor_t asn_DEF_Certificate = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_SIGNED_15P0_1, @@ -355,6 +381,9 @@ asn_TYPE_member_t asn_MBR_Name_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -386,6 +415,9 @@ asn_TYPE_descriptor_t asn_DEF_Name = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_Name_1, @@ -485,6 +517,9 @@ asn_TYPE_member_t asn_MBR_RelativeDistinguishedName_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_IA5String_constraint_1 }, 0, 0, /* No default value */ @@ -516,6 +551,9 @@ asn_TYPE_descriptor_t asn_DEF_RelativeDistinguishedName = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_RelativeDistinguishedName_1, @@ -585,6 +623,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -602,6 +643,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -619,6 +663,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -656,6 +703,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -676,6 +726,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -693,6 +746,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -710,6 +766,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -727,6 +786,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -770,6 +832,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/22-tags-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/22-tags-OK.asn1.+-P_-fwide-types index 8c2dd6fa9..c7763057c 100644 --- a/tests/tests-asn1c-compiler/22-tags-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/22-tags-OK.asn1.+-P_-fwide-types @@ -54,6 +54,9 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -71,6 +74,9 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -107,6 +113,9 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_b_3, @@ -127,6 +136,9 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -144,6 +156,9 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -161,6 +176,9 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -200,6 +218,9 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T1_1, @@ -269,6 +290,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -286,6 +310,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -303,6 +330,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -340,6 +370,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -360,6 +393,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -377,6 +413,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -394,6 +433,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -411,6 +453,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -454,6 +499,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/30-set-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/30-set-OK.asn1.+-P_-fwide-types index 04b8fffbf..0103b9d12 100644 --- a/tests/tests-asn1c-compiler/30-set-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/30-set-OK.asn1.+-P_-fwide-types @@ -56,6 +56,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -73,6 +76,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -90,6 +96,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -136,6 +145,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_T_1, @@ -205,6 +217,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -222,6 +237,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -239,6 +257,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -276,6 +297,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -296,6 +320,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -313,6 +340,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -330,6 +360,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -347,6 +380,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -390,6 +426,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/31-set-of-OK.asn1.+-P_-fcompound-names b/tests/tests-asn1c-compiler/31-set-of-OK.asn1.+-P_-fcompound-names index 6555b5ece..095777224 100644 --- a/tests/tests-asn1c-compiler/31-set-of-OK.asn1.+-P_-fcompound-names +++ b/tests/tests-asn1c-compiler/31-set-of-OK.asn1.+-P_-fcompound-names @@ -42,6 +42,9 @@ asn_TYPE_member_t asn_MBR_Forest_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -73,6 +76,9 @@ asn_TYPE_descriptor_t asn_DEF_Forest = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_Forest_1, @@ -117,6 +123,9 @@ asn_TYPE_member_t asn_MBR_Tree_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -134,6 +143,9 @@ asn_TYPE_member_t asn_MBR_Tree_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -172,6 +184,9 @@ asn_TYPE_descriptor_t asn_DEF_Tree = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Tree_1, @@ -285,6 +300,9 @@ static asn_TYPE_member_t asn_MBR_trees_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -318,6 +336,9 @@ asn_TYPE_descriptor_t asn_DEF_trees_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_trees_2, @@ -338,6 +359,9 @@ static asn_TYPE_member_t asn_MBR_Member_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -376,6 +400,9 @@ asn_TYPE_descriptor_t asn_DEF_Member_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Member_5, @@ -396,6 +423,9 @@ static asn_TYPE_member_t asn_MBR_anything_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -429,6 +459,9 @@ asn_TYPE_descriptor_t asn_DEF_anything_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_anything_4, @@ -449,6 +482,9 @@ static asn_TYPE_member_t asn_MBR_other_9[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -466,6 +502,9 @@ static asn_TYPE_member_t asn_MBR_other_9[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -502,6 +541,9 @@ asn_TYPE_descriptor_t asn_DEF_other_9 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_other_9, @@ -522,6 +564,9 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -539,6 +584,9 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -556,6 +604,9 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -608,6 +659,9 @@ asn_TYPE_descriptor_t asn_DEF_Stuff = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_Stuff_1, @@ -677,6 +731,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -694,6 +751,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -711,6 +771,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -748,6 +811,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -768,6 +834,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -785,6 +854,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -802,6 +874,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -819,6 +894,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -862,6 +940,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/31-set-of-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/31-set-of-OK.asn1.+-P_-fwide-types index e46ba523f..696f92655 100644 --- a/tests/tests-asn1c-compiler/31-set-of-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/31-set-of-OK.asn1.+-P_-fwide-types @@ -42,6 +42,9 @@ asn_TYPE_member_t asn_MBR_Forest_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -73,6 +76,9 @@ asn_TYPE_descriptor_t asn_DEF_Forest = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_Forest_1, @@ -117,6 +123,9 @@ asn_TYPE_member_t asn_MBR_Tree_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -134,6 +143,9 @@ asn_TYPE_member_t asn_MBR_Tree_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -172,6 +184,9 @@ asn_TYPE_descriptor_t asn_DEF_Tree = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Tree_1, @@ -285,6 +300,9 @@ static asn_TYPE_member_t asn_MBR_trees_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -318,6 +336,9 @@ asn_TYPE_descriptor_t asn_DEF_trees_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_trees_2, @@ -338,6 +359,9 @@ static asn_TYPE_member_t asn_MBR_Member_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -376,6 +400,9 @@ asn_TYPE_descriptor_t asn_DEF_Member_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Member_5, @@ -396,6 +423,9 @@ static asn_TYPE_member_t asn_MBR_anything_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -429,6 +459,9 @@ asn_TYPE_descriptor_t asn_DEF_anything_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_anything_4, @@ -449,6 +482,9 @@ static asn_TYPE_member_t asn_MBR_other_9[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -466,6 +502,9 @@ static asn_TYPE_member_t asn_MBR_other_9[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -502,6 +541,9 @@ asn_TYPE_descriptor_t asn_DEF_other_9 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_other_9, @@ -522,6 +564,9 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -539,6 +584,9 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -556,6 +604,9 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -608,6 +659,9 @@ asn_TYPE_descriptor_t asn_DEF_Stuff = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_Stuff_1, @@ -677,6 +731,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -694,6 +751,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -711,6 +771,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -748,6 +811,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -768,6 +834,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -785,6 +854,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -802,6 +874,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -819,6 +894,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -862,6 +940,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/32-sequence-of-OK.asn1.+-P b/tests/tests-asn1c-compiler/32-sequence-of-OK.asn1.+-P index 9127cc5c1..39a07b01f 100644 --- a/tests/tests-asn1c-compiler/32-sequence-of-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/32-sequence-of-OK.asn1.+-P @@ -40,6 +40,9 @@ static asn_TYPE_member_t asn_MBR_Programming_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -71,6 +74,9 @@ asn_TYPE_descriptor_t asn_DEF_Programming = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_Programming_1, @@ -122,6 +128,9 @@ asn_TYPE_member_t asn_MBR_Fault_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -153,6 +162,9 @@ asn_TYPE_descriptor_t asn_DEF_Fault = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_Fault_1, @@ -212,6 +224,9 @@ asn_TYPE_descriptor_t asn_DEF_Error = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, 0, 0, /* No members */ @@ -268,6 +283,9 @@ static asn_TYPE_member_t asn_MBR_seqOfMan_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -301,6 +319,9 @@ asn_TYPE_descriptor_t asn_DEF_seqOfMan_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_seqOfMan_3, @@ -321,6 +342,9 @@ static asn_TYPE_member_t asn_MBR_SeqWithMandatory_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -338,6 +362,9 @@ static asn_TYPE_member_t asn_MBR_SeqWithMandatory_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -376,6 +403,9 @@ asn_TYPE_descriptor_t asn_DEF_SeqWithMandatory = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_SeqWithMandatory_1, @@ -433,6 +463,9 @@ static asn_TYPE_member_t asn_MBR_seqOfOpt_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -466,6 +499,9 @@ asn_TYPE_descriptor_t asn_DEF_seqOfOpt_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_seqOfOpt_3, @@ -486,6 +522,9 @@ static asn_TYPE_member_t asn_MBR_SeqWithOptional_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -503,6 +542,9 @@ static asn_TYPE_member_t asn_MBR_SeqWithOptional_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -541,6 +583,9 @@ asn_TYPE_descriptor_t asn_DEF_SeqWithOptional = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_SeqWithOptional_1, @@ -610,6 +655,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -627,6 +675,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -644,6 +695,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -681,6 +735,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -701,6 +758,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -718,6 +778,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -735,6 +798,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -752,6 +818,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -795,6 +864,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/37-indirect-choice-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/37-indirect-choice-OK.asn1.+-P_-fwide-types index f6bf9cc7b..3cf12ddc0 100644 --- a/tests/tests-asn1c-compiler/37-indirect-choice-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/37-indirect-choice-OK.asn1.+-P_-fwide-types @@ -51,6 +51,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -68,6 +71,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -85,6 +91,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -102,6 +111,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -139,6 +151,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_T_1, @@ -195,6 +210,9 @@ asn_TYPE_member_t asn_MBR_Choice1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -212,6 +230,9 @@ asn_TYPE_member_t asn_MBR_Choice1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -247,6 +268,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice1_1, @@ -308,6 +332,9 @@ asn_TYPE_member_t asn_MBR_Choice2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -325,6 +352,9 @@ asn_TYPE_member_t asn_MBR_Choice2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -342,6 +372,9 @@ asn_TYPE_member_t asn_MBR_Choice2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -359,6 +392,9 @@ asn_TYPE_member_t asn_MBR_Choice2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -401,6 +437,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice2_1, @@ -427,7 +466,6 @@ ber_type_decoder_f Choice3_decode_ber; der_type_encoder_f Choice3_encode_der; xer_type_decoder_f Choice3_decode_xer; xer_type_encoder_f Choice3_encode_xer; -jer_type_encoder_f Choice3_encode_jer; /*** <<< CODE [Choice3] >>> ***/ @@ -459,6 +497,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice2_1, @@ -485,7 +526,6 @@ ber_type_decoder_f Choice4_decode_ber; der_type_encoder_f Choice4_encode_der; xer_type_decoder_f Choice4_decode_xer; xer_type_encoder_f Choice4_encode_xer; -jer_type_encoder_f Choice4_encode_jer; /*** <<< CODE [Choice4] >>> ***/ @@ -517,6 +557,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice2_1, @@ -543,7 +586,6 @@ ber_type_decoder_f Choice5_decode_ber; der_type_encoder_f Choice5_encode_der; xer_type_decoder_f Choice5_decode_xer; xer_type_encoder_f Choice5_encode_xer; -jer_type_encoder_f Choice5_encode_jer; /*** <<< CODE [Choice5] >>> ***/ @@ -574,6 +616,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice2_1, @@ -600,7 +645,6 @@ ber_type_decoder_f Choice6_decode_ber; der_type_encoder_f Choice6_encode_der; xer_type_decoder_f Choice6_decode_xer; xer_type_encoder_f Choice6_encode_xer; -jer_type_encoder_f Choice6_encode_jer; /*** <<< CODE [Choice6] >>> ***/ @@ -626,6 +670,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice1_1, @@ -695,6 +742,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -712,6 +762,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -729,6 +782,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -766,6 +822,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -786,6 +845,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -803,6 +865,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -820,6 +885,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -837,6 +905,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -880,6 +951,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/39-sequence-of-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/39-sequence-of-OK.asn1.+-P_-fwide-types index dc4d8ba86..250516e08 100644 --- a/tests/tests-asn1c-compiler/39-sequence-of-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/39-sequence-of-OK.asn1.+-P_-fwide-types @@ -48,6 +48,9 @@ static asn_TYPE_member_t asn_MBR_collection_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -80,6 +83,9 @@ asn_TYPE_descriptor_t asn_DEF_collection_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_collection_3, @@ -100,6 +106,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -117,6 +126,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -155,6 +167,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T_1, @@ -200,6 +215,9 @@ asn_TYPE_member_t asn_MBR_T2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -217,6 +235,9 @@ asn_TYPE_member_t asn_MBR_T2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -255,6 +276,9 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T2_1, @@ -324,6 +348,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -341,6 +368,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -358,6 +388,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -395,6 +428,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -415,6 +451,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -432,6 +471,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -449,6 +491,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -466,6 +511,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -509,6 +557,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/42-real-life-OK.asn1.+-P_-R b/tests/tests-asn1c-compiler/42-real-life-OK.asn1.+-P_-R index abace3510..9d602c806 100644 --- a/tests/tests-asn1c-compiler/42-real-life-OK.asn1.+-P_-R +++ b/tests/tests-asn1c-compiler/42-real-life-OK.asn1.+-P_-R @@ -81,6 +81,9 @@ static asn_TYPE_member_t asn_MBR_varsets_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -113,6 +116,9 @@ asn_TYPE_descriptor_t asn_DEF_varsets_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_varsets_3, @@ -133,6 +139,9 @@ static asn_TYPE_member_t asn_MBR_LogLine_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -150,6 +159,9 @@ static asn_TYPE_member_t asn_MBR_LogLine_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_varsets_constraint_1 }, 0, 0, /* No default value */ @@ -188,6 +200,9 @@ asn_TYPE_descriptor_t asn_DEF_LogLine = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_LogLine_1, @@ -273,6 +288,9 @@ static asn_TYPE_member_t asn_MBR_vparts_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -305,6 +323,9 @@ asn_TYPE_descriptor_t asn_DEF_vparts_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_vparts_2, @@ -325,6 +346,9 @@ asn_TYPE_member_t asn_MBR_VariablePartSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_vparts_constraint_1 }, 0, 0, /* No default value */ @@ -342,6 +366,9 @@ asn_TYPE_member_t asn_MBR_VariablePartSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -380,6 +407,9 @@ asn_TYPE_descriptor_t asn_DEF_VariablePartSet = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_VariablePartSet_1, @@ -488,6 +518,9 @@ static asn_TYPE_member_t asn_MBR_vset_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -520,6 +553,9 @@ asn_TYPE_descriptor_t asn_DEF_vset_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_vset_2, @@ -540,6 +576,9 @@ static asn_TYPE_member_t asn_MBR_vrange_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -557,6 +596,9 @@ static asn_TYPE_member_t asn_MBR_vrange_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -596,6 +638,9 @@ asn_TYPE_descriptor_t asn_DEF_vrange_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_vrange_4, @@ -616,6 +661,9 @@ asn_TYPE_member_t asn_MBR_VariablePart_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_vset_constraint_1 }, 0, 0, /* No default value */ @@ -633,6 +681,9 @@ asn_TYPE_member_t asn_MBR_VariablePart_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -668,6 +719,9 @@ asn_TYPE_descriptor_t asn_DEF_VariablePart = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_VariablePart_1, @@ -783,6 +837,9 @@ asn_TYPE_descriptor_t asn_DEF_accept_as_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeEnumerated_constraint }, 0, 0, /* Defined elsewhere */ @@ -802,6 +859,9 @@ static asn_TYPE_member_t asn_MBR_email_9[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -834,6 +894,9 @@ asn_TYPE_descriptor_t asn_DEF_email_9 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_email_9, @@ -854,6 +917,9 @@ static asn_TYPE_member_t asn_MBR_notify_7[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -871,6 +937,9 @@ static asn_TYPE_member_t asn_MBR_notify_7[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -910,6 +979,9 @@ asn_TYPE_descriptor_t asn_DEF_notify_7 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_notify_7, @@ -930,6 +1002,9 @@ asn_TYPE_member_t asn_MBR_ActionItem_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -947,6 +1022,9 @@ asn_TYPE_member_t asn_MBR_ActionItem_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -985,6 +1063,9 @@ asn_TYPE_descriptor_t asn_DEF_ActionItem = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_ActionItem_1, @@ -1054,6 +1135,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1071,6 +1155,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1088,6 +1175,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1125,6 +1215,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -1145,6 +1238,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1162,6 +1258,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1179,6 +1278,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1196,6 +1298,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1239,6 +1344,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/43-recursion-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/43-recursion-OK.asn1.+-P_-fwide-types index fbc287a21..b53570cfe 100644 --- a/tests/tests-asn1c-compiler/43-recursion-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/43-recursion-OK.asn1.+-P_-fwide-types @@ -59,6 +59,9 @@ static asn_TYPE_member_t asn_MBR_t_member1_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -91,6 +94,9 @@ asn_TYPE_descriptor_t asn_DEF_t_member1_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_t_member1_2, @@ -111,6 +117,9 @@ static asn_TYPE_member_t asn_MBR_t_member2_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -143,6 +152,9 @@ asn_TYPE_descriptor_t asn_DEF_t_member2_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_t_member2_4, @@ -163,6 +175,9 @@ asn_TYPE_member_t asn_MBR_Test_structure_1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -180,6 +195,9 @@ asn_TYPE_member_t asn_MBR_Test_structure_1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -197,6 +215,9 @@ asn_TYPE_member_t asn_MBR_Test_structure_1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -214,6 +235,9 @@ asn_TYPE_member_t asn_MBR_Test_structure_1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -254,6 +278,9 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Test_structure_1_1, @@ -328,6 +355,9 @@ static asn_TYPE_member_t asn_MBR_or_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -361,6 +391,9 @@ asn_TYPE_descriptor_t asn_DEF_or_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_or_3, @@ -381,6 +414,9 @@ asn_TYPE_member_t asn_MBR_Choice_1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -398,6 +434,9 @@ asn_TYPE_member_t asn_MBR_Choice_1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -415,6 +454,9 @@ asn_TYPE_member_t asn_MBR_Choice_1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -432,6 +474,9 @@ asn_TYPE_member_t asn_MBR_Choice_1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -469,6 +514,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice_1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice_1_1, @@ -533,6 +581,9 @@ asn_TYPE_member_t asn_MBR_Test_structure_2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -576,6 +627,9 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_Test_structure_2_1, @@ -640,6 +694,9 @@ asn_TYPE_member_t asn_MBR_Test_structure_3_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -683,6 +740,9 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_Test_structure_3_1, @@ -752,6 +812,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -769,6 +832,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -786,6 +852,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -823,6 +892,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -843,6 +915,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -860,6 +935,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -877,6 +955,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -894,6 +975,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -937,6 +1021,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/44-choice-in-sequence-OK.asn1.+-P b/tests/tests-asn1c-compiler/44-choice-in-sequence-OK.asn1.+-P index 975d63045..82a4ba442 100644 --- a/tests/tests-asn1c-compiler/44-choice-in-sequence-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/44-choice-in-sequence-OK.asn1.+-P @@ -83,6 +83,9 @@ static asn_TYPE_member_t asn_MBR_e_6[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -100,6 +103,9 @@ static asn_TYPE_member_t asn_MBR_e_6[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -136,6 +142,9 @@ asn_TYPE_descriptor_t asn_DEF_e_6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_e_6, @@ -156,6 +165,9 @@ static asn_TYPE_member_t asn_MBR_h_9[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -173,6 +185,9 @@ static asn_TYPE_member_t asn_MBR_h_9[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -209,6 +224,9 @@ asn_TYPE_descriptor_t asn_DEF_h_9 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_h_9, @@ -229,6 +247,9 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -246,6 +267,9 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -263,6 +287,9 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -280,6 +307,9 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -319,6 +349,9 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_b_3, @@ -339,6 +372,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -356,6 +392,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -399,6 +438,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T_1, @@ -468,6 +510,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -485,6 +530,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -502,6 +550,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -539,6 +590,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -559,6 +613,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -576,6 +633,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -593,6 +653,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -610,6 +673,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -653,6 +719,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/46-redefine-OK.asn1.+-P_-R b/tests/tests-asn1c-compiler/46-redefine-OK.asn1.+-P_-R index f0b10b970..8dbd94d86 100644 --- a/tests/tests-asn1c-compiler/46-redefine-OK.asn1.+-P_-R +++ b/tests/tests-asn1c-compiler/46-redefine-OK.asn1.+-P_-R @@ -17,7 +17,6 @@ ber_type_decoder_f PrimitiveType_decode_ber; der_type_encoder_f PrimitiveType_encode_der; xer_type_decoder_f PrimitiveType_decode_xer; xer_type_encoder_f PrimitiveType_encode_xer; -jer_type_encoder_f PrimitiveType_encode_jer; /*** <<< CODE [PrimitiveType] >>> ***/ @@ -48,6 +47,9 @@ asn_TYPE_descriptor_t asn_DEF_PrimitiveType = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OCTET_STRING_constraint }, 0, 0, /* No members */ @@ -90,6 +92,9 @@ asn_TYPE_member_t asn_MBR_ConstructedType_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -127,6 +132,9 @@ asn_TYPE_descriptor_t asn_DEF_ConstructedType = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_ConstructedType_1, @@ -153,7 +161,6 @@ ber_type_decoder_f T_decode_ber; der_type_encoder_f T_encode_der; xer_type_decoder_f T_decode_xer; xer_type_encoder_f T_encode_xer; -jer_type_encoder_f T_encode_jer; /*** <<< CODE [T] >>> ***/ @@ -185,6 +192,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_ConstructedType_1, @@ -254,6 +264,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -271,6 +284,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -288,6 +304,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -325,6 +344,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -345,6 +367,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -362,6 +387,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -379,6 +407,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -396,6 +427,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -439,6 +473,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/47-set-ext-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/47-set-ext-OK.asn1.+-P_-fwide-types index cf97c3b96..07ee8689b 100644 --- a/tests/tests-asn1c-compiler/47-set-ext-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/47-set-ext-OK.asn1.+-P_-fwide-types @@ -50,6 +50,9 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -94,6 +97,9 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_T1_1, @@ -153,6 +159,9 @@ static asn_TYPE_member_t asn_MBR_T2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -197,6 +206,9 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_T2_1, @@ -254,6 +266,9 @@ static asn_TYPE_member_t asn_MBR_T3_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -288,6 +303,9 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_T3_1, @@ -345,6 +363,9 @@ static asn_TYPE_member_t asn_MBR_T4_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -379,6 +400,9 @@ asn_TYPE_descriptor_t asn_DEF_T4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_T4_1, @@ -448,6 +472,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -465,6 +492,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -482,6 +512,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -519,6 +552,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -539,6 +575,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -556,6 +595,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -573,6 +615,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -590,6 +635,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -633,6 +681,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.+-P_-fwide-types index 4bb121078..f897131cc 100644 --- a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.+-P_-fwide-types @@ -17,7 +17,6 @@ ber_type_decoder_f Int1_decode_ber; der_type_encoder_f Int1_encode_der; xer_type_decoder_f Int1_decode_xer; xer_type_encoder_f Int1_encode_xer; -jer_type_encoder_f Int1_encode_jer; #define Int1_ten ((Int1_t)10) /*** <<< CODE [Int1] >>> ***/ @@ -49,6 +48,9 @@ asn_TYPE_descriptor_t asn_DEF_Int1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ INTEGER_constraint }, 0, 0, /* No members */ @@ -74,7 +76,6 @@ ber_type_decoder_f Int2_decode_ber; der_type_encoder_f Int2_encode_der; xer_type_decoder_f Int2_decode_xer; xer_type_encoder_f Int2_encode_xer; -jer_type_encoder_f Int2_encode_jer; /*** <<< CODE [Int2] >>> ***/ @@ -132,6 +133,9 @@ asn_TYPE_descriptor_t asn_DEF_Int2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Int2_constraint }, 0, 0, /* No members */ @@ -157,7 +161,6 @@ ber_type_decoder_f Int3_decode_ber; der_type_encoder_f Int3_encode_der; xer_type_decoder_f Int3_decode_xer; xer_type_encoder_f Int3_encode_xer; -jer_type_encoder_f Int3_encode_jer; /*** <<< CODE [Int3] >>> ***/ @@ -219,6 +222,9 @@ asn_TYPE_descriptor_t asn_DEF_Int3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Int3_constraint }, 0, 0, /* No members */ @@ -244,7 +250,6 @@ ber_type_decoder_f Int4_decode_ber; der_type_encoder_f Int4_encode_der; xer_type_decoder_f Int4_decode_xer; xer_type_encoder_f Int4_encode_xer; -jer_type_encoder_f Int4_encode_jer; /*** <<< CODE [Int4] >>> ***/ @@ -306,6 +311,9 @@ asn_TYPE_descriptor_t asn_DEF_Int4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Int4_constraint }, 0, 0, /* No members */ @@ -331,7 +339,6 @@ ber_type_decoder_f Int5_decode_ber; der_type_encoder_f Int5_encode_der; xer_type_decoder_f Int5_decode_xer; xer_type_encoder_f Int5_encode_xer; -jer_type_encoder_f Int5_encode_jer; /*** <<< CODE [Int5] >>> ***/ @@ -393,6 +400,9 @@ asn_TYPE_descriptor_t asn_DEF_Int5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Int5_constraint }, 0, 0, /* No members */ @@ -418,7 +428,6 @@ ber_type_decoder_f ExtensibleExtensions_decode_ber; der_type_encoder_f ExtensibleExtensions_encode_der; xer_type_decoder_f ExtensibleExtensions_decode_xer; xer_type_encoder_f ExtensibleExtensions_encode_xer; -jer_type_encoder_f ExtensibleExtensions_encode_jer; /*** <<< CODE [ExtensibleExtensions] >>> ***/ @@ -480,6 +489,9 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ExtensibleExtensions_constraint }, 0, 0, /* No members */ @@ -505,7 +517,6 @@ ber_type_decoder_f Str1_decode_ber; der_type_encoder_f Str1_encode_der; xer_type_decoder_f Str1_decode_xer; xer_type_encoder_f Str1_encode_xer; -jer_type_encoder_f Str1_encode_jer; /*** <<< CODE [Str1] >>> ***/ @@ -536,6 +547,9 @@ asn_TYPE_descriptor_t asn_DEF_Str1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IA5String_constraint }, 0, 0, /* No members */ @@ -561,7 +575,6 @@ ber_type_decoder_f Str2_decode_ber; der_type_encoder_f Str2_encode_der; xer_type_decoder_f Str2_decode_xer; xer_type_encoder_f Str2_encode_xer; -jer_type_encoder_f Str2_encode_jer; /*** <<< CTABLES [Str2] >>> ***/ @@ -635,6 +648,9 @@ asn_TYPE_descriptor_t asn_DEF_Str2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Str2_constraint }, 0, 0, /* No members */ @@ -660,7 +676,6 @@ ber_type_decoder_f Str3_decode_ber; der_type_encoder_f Str3_encode_der; xer_type_decoder_f Str3_decode_xer; xer_type_encoder_f Str3_encode_xer; -jer_type_encoder_f Str3_encode_jer; /*** <<< CTABLES [Str3] >>> ***/ @@ -745,6 +760,9 @@ asn_TYPE_descriptor_t asn_DEF_Str3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Str3_constraint }, 0, 0, /* No members */ @@ -770,7 +788,6 @@ ber_type_decoder_f Str4_decode_ber; der_type_encoder_f Str4_encode_der; xer_type_decoder_f Str4_decode_xer; xer_type_encoder_f Str4_encode_xer; -jer_type_encoder_f Str4_encode_jer; /*** <<< CTABLES [Str4] >>> ***/ @@ -841,6 +858,9 @@ asn_TYPE_descriptor_t asn_DEF_Str4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Str4_constraint }, 0, 0, /* No members */ @@ -866,7 +886,6 @@ ber_type_decoder_f PER_Visible_decode_ber; der_type_encoder_f PER_Visible_encode_der; xer_type_decoder_f PER_Visible_decode_xer; xer_type_encoder_f PER_Visible_encode_xer; -jer_type_encoder_f PER_Visible_encode_jer; /*** <<< CTABLES [PER-Visible] >>> ***/ @@ -937,6 +956,9 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ PER_Visible_constraint }, 0, 0, /* No members */ @@ -962,7 +984,6 @@ ber_type_decoder_f PER_Visible_2_decode_ber; der_type_encoder_f PER_Visible_2_encode_der; xer_type_decoder_f PER_Visible_2_decode_xer; xer_type_encoder_f PER_Visible_2_encode_xer; -jer_type_encoder_f PER_Visible_2_encode_jer; /*** <<< CTABLES [PER-Visible-2] >>> ***/ @@ -1033,6 +1054,9 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ PER_Visible_2_constraint }, 0, 0, /* No members */ @@ -1058,7 +1082,6 @@ ber_type_decoder_f Not_PER_Visible_1_decode_ber; der_type_encoder_f Not_PER_Visible_1_encode_der; xer_type_decoder_f Not_PER_Visible_1_decode_xer; xer_type_encoder_f Not_PER_Visible_1_encode_xer; -jer_type_encoder_f Not_PER_Visible_1_encode_jer; /*** <<< CTABLES [Not-PER-Visible-1] >>> ***/ @@ -1129,6 +1152,9 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Not_PER_Visible_1_constraint }, 0, 0, /* No members */ @@ -1154,7 +1180,6 @@ ber_type_decoder_f Not_PER_Visible_2_decode_ber; der_type_encoder_f Not_PER_Visible_2_encode_der; xer_type_decoder_f Not_PER_Visible_2_decode_xer; xer_type_encoder_f Not_PER_Visible_2_encode_xer; -jer_type_encoder_f Not_PER_Visible_2_encode_jer; /*** <<< CTABLES [Not-PER-Visible-2] >>> ***/ @@ -1225,6 +1250,9 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Not_PER_Visible_2_constraint }, 0, 0, /* No members */ @@ -1250,7 +1278,6 @@ ber_type_decoder_f Not_PER_Visible_3_decode_ber; der_type_encoder_f Not_PER_Visible_3_encode_der; xer_type_decoder_f Not_PER_Visible_3_decode_xer; xer_type_encoder_f Not_PER_Visible_3_encode_xer; -jer_type_encoder_f Not_PER_Visible_3_encode_jer; /*** <<< CTABLES [Not-PER-Visible-3] >>> ***/ @@ -1321,6 +1348,9 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Not_PER_Visible_3_constraint }, 0, 0, /* No members */ @@ -1346,7 +1376,6 @@ ber_type_decoder_f SIZE_but_not_FROM_decode_ber; der_type_encoder_f SIZE_but_not_FROM_encode_der; xer_type_decoder_f SIZE_but_not_FROM_decode_xer; xer_type_encoder_f SIZE_but_not_FROM_encode_xer; -jer_type_encoder_f SIZE_but_not_FROM_encode_jer; /*** <<< CTABLES [SIZE-but-not-FROM] >>> ***/ @@ -1420,6 +1449,9 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SIZE_but_not_FROM_constraint }, 0, 0, /* No members */ @@ -1445,7 +1477,6 @@ ber_type_decoder_f SIZE_and_FROM_decode_ber; der_type_encoder_f SIZE_and_FROM_encode_der; xer_type_decoder_f SIZE_and_FROM_decode_xer; xer_type_encoder_f SIZE_and_FROM_encode_xer; -jer_type_encoder_f SIZE_and_FROM_encode_jer; /*** <<< CTABLES [SIZE-and-FROM] >>> ***/ @@ -1519,6 +1550,9 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SIZE_and_FROM_constraint }, 0, 0, /* No members */ @@ -1544,7 +1578,6 @@ ber_type_decoder_f Neither_SIZE_nor_FROM_decode_ber; der_type_encoder_f Neither_SIZE_nor_FROM_encode_der; xer_type_decoder_f Neither_SIZE_nor_FROM_decode_xer; xer_type_encoder_f Neither_SIZE_nor_FROM_encode_xer; -jer_type_encoder_f Neither_SIZE_nor_FROM_encode_jer; /*** <<< CTABLES [Neither-SIZE-nor-FROM] >>> ***/ @@ -1615,6 +1648,9 @@ asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Neither_SIZE_nor_FROM_constraint }, 0, 0, /* No members */ @@ -1640,7 +1676,6 @@ ber_type_decoder_f Utf8_4_decode_ber; der_type_encoder_f Utf8_4_encode_der; xer_type_decoder_f Utf8_4_decode_xer; xer_type_encoder_f Utf8_4_encode_xer; -jer_type_encoder_f Utf8_4_encode_jer; /*** <<< CTABLES [Utf8-4] >>> ***/ @@ -1705,6 +1740,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Utf8_4_constraint }, 0, 0, /* No members */ @@ -1730,7 +1768,6 @@ ber_type_decoder_f Utf8_3_decode_ber; der_type_encoder_f Utf8_3_encode_der; xer_type_decoder_f Utf8_3_decode_xer; xer_type_encoder_f Utf8_3_encode_xer; -jer_type_encoder_f Utf8_3_encode_jer; /*** <<< CTABLES [Utf8-3] >>> ***/ @@ -1823,6 +1860,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Utf8_3_constraint }, 0, 0, /* No members */ @@ -1848,7 +1888,6 @@ ber_type_decoder_f Utf8_2_decode_ber; der_type_encoder_f Utf8_2_encode_der; xer_type_decoder_f Utf8_2_decode_xer; xer_type_encoder_f Utf8_2_encode_xer; -jer_type_encoder_f Utf8_2_encode_jer; /*** <<< CODE [Utf8-2] >>> ***/ @@ -1911,6 +1950,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Utf8_2_constraint }, 0, 0, /* No members */ @@ -1936,7 +1978,6 @@ ber_type_decoder_f Utf8_1_decode_ber; der_type_encoder_f Utf8_1_encode_der; xer_type_decoder_f Utf8_1_decode_xer; xer_type_encoder_f Utf8_1_encode_xer; -jer_type_encoder_f Utf8_1_encode_jer; /*** <<< CODE [Utf8-1] >>> ***/ @@ -1967,6 +2008,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ UTF8String_constraint }, 0, 0, /* No members */ @@ -1992,7 +2036,6 @@ ber_type_decoder_f VisibleIdentifier_decode_ber; der_type_encoder_f VisibleIdentifier_encode_der; xer_type_decoder_f VisibleIdentifier_decode_xer; xer_type_encoder_f VisibleIdentifier_encode_xer; -jer_type_encoder_f VisibleIdentifier_encode_jer; /*** <<< CTABLES [VisibleIdentifier] >>> ***/ @@ -2078,6 +2121,9 @@ asn_TYPE_descriptor_t asn_DEF_VisibleIdentifier = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ VisibleIdentifier_constraint }, 0, 0, /* No members */ @@ -2322,6 +2368,9 @@ asn_TYPE_descriptor_t asn_DEF_enum_c_6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -2341,6 +2390,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_int1_c_constraint_1 }, .default_value_cmp = &asn_DFL_2_cmp_3, /* Compare DEFAULT 3 */ @@ -2359,6 +2411,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2376,6 +2431,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_int4_c_constraint_1 }, 0, 0, /* No default value */ @@ -2393,6 +2451,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, .default_value_cmp = &asn_DFL_5_cmp_1, /* Compare DEFAULT 1 */ @@ -2411,6 +2472,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2428,6 +2492,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2445,6 +2512,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_int5_c_constraint_1 }, 0, 0, /* No default value */ @@ -2488,6 +2558,9 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Sequence_1, @@ -2537,6 +2610,9 @@ static asn_TYPE_member_t asn_MBR_SequenceOf_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2568,6 +2644,9 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_SequenceOf_1, @@ -2601,7 +2680,6 @@ ber_type_decoder_f Enum0_decode_ber; der_type_encoder_f Enum0_encode_der; xer_type_decoder_f Enum0_decode_xer; xer_type_encoder_f Enum0_encode_xer; -jer_type_encoder_f Enum0_encode_jer; /*** <<< CODE [Enum0] >>> ***/ @@ -2649,6 +2727,9 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -2681,7 +2762,6 @@ ber_type_decoder_f Enum1_decode_ber; der_type_encoder_f Enum1_encode_der; xer_type_decoder_f Enum1_decode_xer; xer_type_encoder_f Enum1_encode_xer; -jer_type_encoder_f Enum1_encode_jer; /*** <<< CODE [Enum1] >>> ***/ @@ -2754,6 +2834,9 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Enum1_constraint }, 0, 0, /* Defined elsewhere */ @@ -2779,7 +2862,6 @@ ber_type_decoder_f Identifier_decode_ber; der_type_encoder_f Identifier_encode_der; xer_type_decoder_f Identifier_decode_xer; xer_type_encoder_f Identifier_encode_xer; -jer_type_encoder_f Identifier_encode_jer; /*** <<< CTABLES [Identifier] >>> ***/ @@ -2865,6 +2947,9 @@ asn_TYPE_descriptor_t asn_DEF_Identifier = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Identifier_constraint }, 0, 0, /* No members */ @@ -2933,6 +3018,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2950,6 +3038,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2967,6 +3058,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3004,6 +3098,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -3024,6 +3121,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3041,6 +3141,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3058,6 +3161,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3075,6 +3181,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3118,6 +3227,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.+-P_-gen-UPER_-gen-APER index 7df416a3c..118ddba5c 100644 --- a/tests/tests-asn1c-compiler/50-constraint-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/50-constraint-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -17,7 +17,6 @@ ber_type_decoder_f Int1_decode_ber; der_type_encoder_f Int1_encode_der; xer_type_decoder_f Int1_decode_xer; xer_type_encoder_f Int1_encode_xer; -jer_type_encoder_f Int1_encode_jer; per_type_decoder_f Int1_decode_uper; per_type_encoder_f Int1_encode_uper; per_type_decoder_f Int1_decode_aper; @@ -53,6 +52,9 @@ asn_TYPE_descriptor_t asn_DEF_Int1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeInteger_constraint }, 0, 0, /* No members */ @@ -79,7 +81,6 @@ ber_type_decoder_f Int2_decode_ber; der_type_encoder_f Int2_encode_der; xer_type_decoder_f Int2_decode_xer; xer_type_encoder_f Int2_encode_xer; -jer_type_encoder_f Int2_encode_jer; per_type_decoder_f Int2_decode_uper; per_type_encoder_f Int2_encode_uper; per_type_decoder_f Int2_decode_aper; @@ -146,6 +147,9 @@ asn_TYPE_descriptor_t asn_DEF_Int2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Int2_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Int2_constraint }, 0, 0, /* No members */ @@ -172,7 +176,6 @@ ber_type_decoder_f Int3_decode_ber; der_type_encoder_f Int3_encode_der; xer_type_decoder_f Int3_decode_xer; xer_type_encoder_f Int3_encode_xer; -jer_type_encoder_f Int3_encode_jer; per_type_decoder_f Int3_decode_uper; per_type_encoder_f Int3_encode_uper; per_type_decoder_f Int3_decode_aper; @@ -242,6 +245,9 @@ asn_TYPE_descriptor_t asn_DEF_Int3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Int3_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Int3_constraint }, 0, 0, /* No members */ @@ -268,7 +274,6 @@ ber_type_decoder_f Int4_decode_ber; der_type_encoder_f Int4_encode_der; xer_type_decoder_f Int4_decode_xer; xer_type_encoder_f Int4_encode_xer; -jer_type_encoder_f Int4_encode_jer; per_type_decoder_f Int4_decode_uper; per_type_encoder_f Int4_encode_uper; per_type_decoder_f Int4_decode_aper; @@ -338,6 +343,9 @@ asn_TYPE_descriptor_t asn_DEF_Int4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Int4_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Int4_constraint }, 0, 0, /* No members */ @@ -364,7 +372,6 @@ ber_type_decoder_f Int5_decode_ber; der_type_encoder_f Int5_encode_der; xer_type_decoder_f Int5_decode_xer; xer_type_encoder_f Int5_encode_xer; -jer_type_encoder_f Int5_encode_jer; per_type_decoder_f Int5_decode_uper; per_type_encoder_f Int5_encode_uper; per_type_decoder_f Int5_decode_aper; @@ -434,6 +441,9 @@ asn_TYPE_descriptor_t asn_DEF_Int5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Int5_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Int5_constraint }, 0, 0, /* No members */ @@ -459,7 +469,6 @@ ber_type_decoder_f ExtensibleExtensions_decode_ber; der_type_encoder_f ExtensibleExtensions_encode_der; xer_type_decoder_f ExtensibleExtensions_decode_xer; xer_type_encoder_f ExtensibleExtensions_encode_xer; -jer_type_encoder_f ExtensibleExtensions_encode_jer; per_type_decoder_f ExtensibleExtensions_decode_uper; per_type_encoder_f ExtensibleExtensions_encode_uper; per_type_decoder_f ExtensibleExtensions_decode_aper; @@ -529,6 +538,9 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_ExtensibleExtensions_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ExtensibleExtensions_constraint }, 0, 0, /* No members */ @@ -555,7 +567,6 @@ ber_type_decoder_f Str1_decode_ber; der_type_encoder_f Str1_encode_der; xer_type_decoder_f Str1_decode_xer; xer_type_encoder_f Str1_encode_xer; -jer_type_encoder_f Str1_encode_jer; per_type_decoder_f Str1_decode_uper; per_type_encoder_f Str1_encode_uper; per_type_decoder_f Str1_decode_aper; @@ -600,6 +611,9 @@ asn_TYPE_descriptor_t asn_DEF_Str1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Str1_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ IA5String_constraint }, 0, 0, /* No members */ @@ -626,7 +640,6 @@ ber_type_decoder_f Str2_decode_ber; der_type_encoder_f Str2_encode_der; xer_type_decoder_f Str2_decode_xer; xer_type_encoder_f Str2_encode_xer; -jer_type_encoder_f Str2_encode_jer; per_type_decoder_f Str2_decode_uper; per_type_encoder_f Str2_encode_uper; per_type_decoder_f Str2_decode_aper; @@ -714,6 +727,9 @@ asn_TYPE_descriptor_t asn_DEF_Str2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Str2_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Str2_constraint }, 0, 0, /* No members */ @@ -739,7 +755,6 @@ ber_type_decoder_f Str3_decode_ber; der_type_encoder_f Str3_encode_der; xer_type_decoder_f Str3_decode_xer; xer_type_encoder_f Str3_encode_xer; -jer_type_encoder_f Str3_encode_jer; per_type_decoder_f Str3_decode_uper; per_type_encoder_f Str3_encode_uper; per_type_decoder_f Str3_decode_aper; @@ -852,6 +867,9 @@ asn_TYPE_descriptor_t asn_DEF_Str3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Str3_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Str3_constraint }, 0, 0, /* No members */ @@ -877,7 +895,6 @@ ber_type_decoder_f Str4_decode_ber; der_type_encoder_f Str4_encode_der; xer_type_decoder_f Str4_decode_xer; xer_type_encoder_f Str4_encode_xer; -jer_type_encoder_f Str4_encode_jer; per_type_decoder_f Str4_decode_uper; per_type_encoder_f Str4_encode_uper; per_type_decoder_f Str4_decode_aper; @@ -962,6 +979,9 @@ asn_TYPE_descriptor_t asn_DEF_Str4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Str4_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Str4_constraint }, 0, 0, /* No members */ @@ -988,7 +1008,6 @@ ber_type_decoder_f PER_Visible_decode_ber; der_type_encoder_f PER_Visible_encode_der; xer_type_decoder_f PER_Visible_decode_xer; xer_type_encoder_f PER_Visible_encode_xer; -jer_type_encoder_f PER_Visible_encode_jer; per_type_decoder_f PER_Visible_decode_uper; per_type_encoder_f PER_Visible_encode_uper; per_type_decoder_f PER_Visible_decode_aper; @@ -1073,6 +1092,9 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_PER_Visible_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ PER_Visible_constraint }, 0, 0, /* No members */ @@ -1098,7 +1120,6 @@ ber_type_decoder_f PER_Visible_2_decode_ber; der_type_encoder_f PER_Visible_2_encode_der; xer_type_decoder_f PER_Visible_2_decode_xer; xer_type_encoder_f PER_Visible_2_encode_xer; -jer_type_encoder_f PER_Visible_2_encode_jer; per_type_decoder_f PER_Visible_2_decode_uper; per_type_encoder_f PER_Visible_2_encode_uper; per_type_decoder_f PER_Visible_2_decode_aper; @@ -1183,6 +1204,9 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_PER_Visible_2_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ PER_Visible_2_constraint }, 0, 0, /* No members */ @@ -1208,7 +1232,6 @@ ber_type_decoder_f Not_PER_Visible_1_decode_ber; der_type_encoder_f Not_PER_Visible_1_encode_der; xer_type_decoder_f Not_PER_Visible_1_decode_xer; xer_type_encoder_f Not_PER_Visible_1_encode_xer; -jer_type_encoder_f Not_PER_Visible_1_encode_jer; per_type_decoder_f Not_PER_Visible_1_decode_uper; per_type_encoder_f Not_PER_Visible_1_encode_uper; per_type_decoder_f Not_PER_Visible_1_decode_aper; @@ -1293,6 +1316,9 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Not_PER_Visible_1_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Not_PER_Visible_1_constraint }, 0, 0, /* No members */ @@ -1318,7 +1344,6 @@ ber_type_decoder_f Not_PER_Visible_2_decode_ber; der_type_encoder_f Not_PER_Visible_2_encode_der; xer_type_decoder_f Not_PER_Visible_2_decode_xer; xer_type_encoder_f Not_PER_Visible_2_encode_xer; -jer_type_encoder_f Not_PER_Visible_2_encode_jer; per_type_decoder_f Not_PER_Visible_2_decode_uper; per_type_encoder_f Not_PER_Visible_2_encode_uper; per_type_decoder_f Not_PER_Visible_2_decode_aper; @@ -1403,6 +1428,9 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Not_PER_Visible_2_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Not_PER_Visible_2_constraint }, 0, 0, /* No members */ @@ -1428,7 +1456,6 @@ ber_type_decoder_f Not_PER_Visible_3_decode_ber; der_type_encoder_f Not_PER_Visible_3_encode_der; xer_type_decoder_f Not_PER_Visible_3_decode_xer; xer_type_encoder_f Not_PER_Visible_3_encode_xer; -jer_type_encoder_f Not_PER_Visible_3_encode_jer; per_type_decoder_f Not_PER_Visible_3_decode_uper; per_type_encoder_f Not_PER_Visible_3_encode_uper; per_type_decoder_f Not_PER_Visible_3_decode_aper; @@ -1513,6 +1540,9 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Not_PER_Visible_3_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Not_PER_Visible_3_constraint }, 0, 0, /* No members */ @@ -1538,7 +1568,6 @@ ber_type_decoder_f SIZE_but_not_FROM_decode_ber; der_type_encoder_f SIZE_but_not_FROM_encode_der; xer_type_decoder_f SIZE_but_not_FROM_decode_xer; xer_type_encoder_f SIZE_but_not_FROM_encode_xer; -jer_type_encoder_f SIZE_but_not_FROM_encode_jer; per_type_decoder_f SIZE_but_not_FROM_decode_uper; per_type_encoder_f SIZE_but_not_FROM_encode_uper; per_type_decoder_f SIZE_but_not_FROM_decode_aper; @@ -1626,6 +1655,9 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_SIZE_but_not_FROM_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SIZE_but_not_FROM_constraint }, 0, 0, /* No members */ @@ -1651,7 +1683,6 @@ ber_type_decoder_f SIZE_and_FROM_decode_ber; der_type_encoder_f SIZE_and_FROM_encode_der; xer_type_decoder_f SIZE_and_FROM_decode_xer; xer_type_encoder_f SIZE_and_FROM_encode_xer; -jer_type_encoder_f SIZE_and_FROM_encode_jer; per_type_decoder_f SIZE_and_FROM_decode_uper; per_type_encoder_f SIZE_and_FROM_encode_uper; per_type_decoder_f SIZE_and_FROM_decode_aper; @@ -1739,6 +1770,9 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_SIZE_and_FROM_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SIZE_and_FROM_constraint }, 0, 0, /* No members */ @@ -1764,7 +1798,6 @@ ber_type_decoder_f Neither_SIZE_nor_FROM_decode_ber; der_type_encoder_f Neither_SIZE_nor_FROM_encode_der; xer_type_decoder_f Neither_SIZE_nor_FROM_decode_xer; xer_type_encoder_f Neither_SIZE_nor_FROM_encode_xer; -jer_type_encoder_f Neither_SIZE_nor_FROM_encode_jer; per_type_decoder_f Neither_SIZE_nor_FROM_decode_uper; per_type_encoder_f Neither_SIZE_nor_FROM_encode_uper; per_type_decoder_f Neither_SIZE_nor_FROM_decode_aper; @@ -1849,6 +1882,9 @@ asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Neither_SIZE_nor_FROM_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Neither_SIZE_nor_FROM_constraint }, 0, 0, /* No members */ @@ -1874,7 +1910,6 @@ ber_type_decoder_f Utf8_4_decode_ber; der_type_encoder_f Utf8_4_encode_der; xer_type_decoder_f Utf8_4_decode_xer; xer_type_encoder_f Utf8_4_encode_xer; -jer_type_encoder_f Utf8_4_encode_jer; per_type_decoder_f Utf8_4_decode_uper; per_type_encoder_f Utf8_4_encode_uper; per_type_decoder_f Utf8_4_decode_aper; @@ -1953,6 +1988,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Utf8_4_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Utf8_4_constraint }, 0, 0, /* No members */ @@ -1978,7 +2016,6 @@ ber_type_decoder_f Utf8_3_decode_ber; der_type_encoder_f Utf8_3_encode_der; xer_type_decoder_f Utf8_3_decode_xer; xer_type_encoder_f Utf8_3_encode_xer; -jer_type_encoder_f Utf8_3_encode_jer; per_type_decoder_f Utf8_3_decode_uper; per_type_encoder_f Utf8_3_encode_uper; per_type_decoder_f Utf8_3_decode_aper; @@ -2085,6 +2122,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Utf8_3_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Utf8_3_constraint }, 0, 0, /* No members */ @@ -2111,7 +2151,6 @@ ber_type_decoder_f Utf8_2_decode_ber; der_type_encoder_f Utf8_2_encode_der; xer_type_decoder_f Utf8_2_decode_xer; xer_type_encoder_f Utf8_2_encode_xer; -jer_type_encoder_f Utf8_2_encode_jer; per_type_decoder_f Utf8_2_decode_uper; per_type_encoder_f Utf8_2_encode_uper; per_type_decoder_f Utf8_2_decode_aper; @@ -2188,6 +2227,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Utf8_2_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Utf8_2_constraint }, 0, 0, /* No members */ @@ -2213,7 +2255,6 @@ ber_type_decoder_f Utf8_1_decode_ber; der_type_encoder_f Utf8_1_encode_der; xer_type_decoder_f Utf8_1_decode_xer; xer_type_encoder_f Utf8_1_encode_xer; -jer_type_encoder_f Utf8_1_encode_jer; per_type_decoder_f Utf8_1_decode_uper; per_type_encoder_f Utf8_1_encode_uper; per_type_decoder_f Utf8_1_decode_aper; @@ -2248,6 +2289,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ UTF8String_constraint }, 0, 0, /* No members */ @@ -2273,7 +2317,6 @@ ber_type_decoder_f VisibleIdentifier_decode_ber; der_type_encoder_f VisibleIdentifier_encode_der; xer_type_decoder_f VisibleIdentifier_decode_xer; xer_type_encoder_f VisibleIdentifier_encode_xer; -jer_type_encoder_f VisibleIdentifier_encode_jer; per_type_decoder_f VisibleIdentifier_decode_uper; per_type_encoder_f VisibleIdentifier_encode_uper; per_type_decoder_f VisibleIdentifier_decode_aper; @@ -2391,6 +2434,9 @@ asn_TYPE_descriptor_t asn_DEF_VisibleIdentifier = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_VisibleIdentifier_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ VisibleIdentifier_constraint }, 0, 0, /* No members */ @@ -2646,6 +2692,9 @@ asn_TYPE_descriptor_t asn_DEF_enum_c_6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_enum_c_constr_6, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeEnumerated_constraint }, 0, 0, /* Defined elsewhere */ @@ -2665,6 +2714,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_int1_c_constr_2, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_int1_c_constraint_1 }, .default_value_cmp = &asn_DFL_2_cmp_3, /* Compare DEFAULT 3 */ @@ -2683,6 +2735,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2700,6 +2755,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_int4_c_constr_4, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_int4_c_constraint_1 }, 0, 0, /* No default value */ @@ -2717,6 +2775,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, .default_value_cmp = &asn_DFL_5_cmp_1, /* Compare DEFAULT 1 */ @@ -2735,6 +2796,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2752,6 +2816,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2769,6 +2836,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = &asn_PER_memb_int5_c_constr_13, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_int5_c_constraint_1 }, 0, 0, /* No default value */ @@ -2814,6 +2884,9 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Sequence_1, @@ -2873,6 +2946,9 @@ static asn_TYPE_member_t asn_MBR_SequenceOf_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2904,6 +2980,9 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_SequenceOf_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_SequenceOf_1, @@ -2937,7 +3016,6 @@ ber_type_decoder_f Enum0_decode_ber; der_type_encoder_f Enum0_encode_der; xer_type_decoder_f Enum0_decode_xer; xer_type_encoder_f Enum0_encode_xer; -jer_type_encoder_f Enum0_encode_jer; per_type_decoder_f Enum0_decode_uper; per_type_encoder_f Enum0_encode_uper; per_type_decoder_f Enum0_decode_aper; @@ -2999,6 +3077,9 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Enum0_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeEnumerated_constraint }, 0, 0, /* Defined elsewhere */ @@ -3031,7 +3112,6 @@ ber_type_decoder_f Enum1_decode_ber; der_type_encoder_f Enum1_encode_der; xer_type_decoder_f Enum1_decode_xer; xer_type_encoder_f Enum1_encode_xer; -jer_type_encoder_f Enum1_encode_jer; per_type_decoder_f Enum1_decode_uper; per_type_encoder_f Enum1_encode_uper; per_type_decoder_f Enum1_decode_aper; @@ -3118,6 +3198,9 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Enum1_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Enum1_constraint }, 0, 0, /* Defined elsewhere */ @@ -3144,7 +3227,6 @@ ber_type_decoder_f Identifier_decode_ber; der_type_encoder_f Identifier_encode_der; xer_type_decoder_f Identifier_decode_xer; xer_type_encoder_f Identifier_encode_xer; -jer_type_encoder_f Identifier_encode_jer; per_type_decoder_f Identifier_decode_uper; per_type_encoder_f Identifier_encode_uper; per_type_decoder_f Identifier_decode_aper; @@ -3262,6 +3344,9 @@ asn_TYPE_descriptor_t asn_DEF_Identifier = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Identifier_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ Identifier_constraint }, 0, 0, /* No members */ @@ -3340,6 +3425,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3357,6 +3445,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3374,6 +3465,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3411,6 +3505,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -3431,6 +3528,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3448,6 +3548,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3465,6 +3568,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3482,6 +3588,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -3527,6 +3636,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/59-choice-extended-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/59-choice-extended-OK.asn1.+-P_-fwide-types index 93a086ebc..4f4706992 100644 --- a/tests/tests-asn1c-compiler/59-choice-extended-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/59-choice-extended-OK.asn1.+-P_-fwide-types @@ -61,6 +61,9 @@ asn_TYPE_member_t asn_MBR_Choice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -78,6 +81,9 @@ asn_TYPE_member_t asn_MBR_Choice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -95,6 +101,9 @@ asn_TYPE_member_t asn_MBR_Choice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -136,6 +145,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice_1, @@ -205,6 +217,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -222,6 +237,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -239,6 +257,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -276,6 +297,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -296,6 +320,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -313,6 +340,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -330,6 +360,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -347,6 +380,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -390,6 +426,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/60-any-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/60-any-OK.asn1.+-P_-fwide-types index aba6b6ea6..c337cb3c0 100644 --- a/tests/tests-asn1c-compiler/60-any-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/60-any-OK.asn1.+-P_-fwide-types @@ -34,6 +34,9 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -51,6 +54,9 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -88,6 +94,9 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T1_1, @@ -131,6 +140,9 @@ static asn_TYPE_member_t asn_MBR_T2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -148,6 +160,9 @@ static asn_TYPE_member_t asn_MBR_T2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -186,6 +201,9 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T2_1, @@ -228,6 +246,9 @@ static asn_TYPE_member_t asn_MBR_T3_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -245,6 +266,9 @@ static asn_TYPE_member_t asn_MBR_T3_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -279,6 +303,9 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T3_1, @@ -348,6 +375,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -365,6 +395,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -382,6 +415,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -419,6 +455,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -439,6 +478,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -456,6 +498,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -473,6 +518,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -490,6 +538,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -533,6 +584,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.+-P_-fnative-types b/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.+-P_-fnative-types index 421fd75db..9960a9d6c 100644 --- a/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.+-P_-fnative-types +++ b/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.+-P_-fnative-types @@ -17,7 +17,6 @@ ber_type_decoder_f T1_decode_ber; der_type_encoder_f T1_encode_der; xer_type_decoder_f T1_decode_xer; xer_type_encoder_f T1_encode_xer; -jer_type_encoder_f T1_encode_jer; /*** <<< CODE [T1] >>> ***/ @@ -59,6 +58,9 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeReal_constraint }, 0, 0, /* No members */ @@ -84,7 +86,6 @@ ber_type_decoder_f T2_decode_ber; der_type_encoder_f T2_encode_der; xer_type_decoder_f T2_decode_xer; xer_type_encoder_f T2_encode_xer; -jer_type_encoder_f T2_encode_jer; /*** <<< CODE [T2] >>> ***/ @@ -124,6 +125,9 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeReal_constraint }, 0, 0, /* No members */ @@ -149,7 +153,6 @@ ber_type_decoder_f T3_decode_ber; der_type_encoder_f T3_encode_der; xer_type_decoder_f T3_decode_xer; xer_type_encoder_f T3_encode_xer; -jer_type_encoder_f T3_encode_jer; /*** <<< CODE [T3] >>> ***/ @@ -187,6 +190,9 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeReal_constraint }, 0, 0, /* No members */ @@ -212,7 +218,6 @@ ber_type_decoder_f T4_decode_ber; der_type_encoder_f T4_encode_der; xer_type_decoder_f T4_decode_xer; xer_type_encoder_f T4_encode_xer; -jer_type_encoder_f T4_encode_jer; /*** <<< CODE [T4] >>> ***/ @@ -245,6 +250,9 @@ asn_TYPE_descriptor_t asn_DEF_T4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeReal_constraint }, 0, 0, /* No members */ @@ -270,7 +278,6 @@ ber_type_decoder_f T5_decode_ber; der_type_encoder_f T5_encode_der; xer_type_decoder_f T5_decode_xer; xer_type_encoder_f T5_encode_xer; -jer_type_encoder_f T5_encode_jer; /*** <<< CODE [T5] >>> ***/ @@ -302,6 +309,9 @@ asn_TYPE_descriptor_t asn_DEF_T5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeReal_constraint }, 0, 0, /* No members */ @@ -327,7 +337,6 @@ ber_type_decoder_f T6_decode_ber; der_type_encoder_f T6_encode_der; xer_type_decoder_f T6_decode_xer; xer_type_encoder_f T6_encode_xer; -jer_type_encoder_f T6_encode_jer; /*** <<< CODE [T6] >>> ***/ @@ -358,6 +367,9 @@ asn_TYPE_descriptor_t asn_DEF_T6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeReal_constraint }, 0, 0, /* No members */ @@ -383,7 +395,6 @@ ber_type_decoder_f T_decode_ber; der_type_encoder_f T_encode_der; xer_type_decoder_f T_decode_xer; xer_type_encoder_f T_encode_xer; -jer_type_encoder_f T_encode_jer; /*** <<< CODE [T] >>> ***/ @@ -416,6 +427,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Ts_1, @@ -462,6 +476,9 @@ asn_TYPE_member_t asn_MBR_Ts_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -479,6 +496,9 @@ asn_TYPE_member_t asn_MBR_Ts_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -496,6 +516,9 @@ asn_TYPE_member_t asn_MBR_Ts_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -536,6 +559,9 @@ asn_TYPE_descriptor_t asn_DEF_Ts = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Ts_1, @@ -605,6 +631,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -622,6 +651,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -639,6 +671,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -676,6 +711,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -696,6 +734,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -713,6 +754,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -730,6 +774,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -747,6 +794,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -790,6 +840,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.+-P_-fwide-types index aef6c4413..3d9d1cdab 100644 --- a/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/65-multi-tag-OK.asn1.+-P_-fwide-types @@ -17,7 +17,6 @@ ber_type_decoder_f T1_decode_ber; der_type_encoder_f T1_encode_der; xer_type_decoder_f T1_decode_xer; xer_type_encoder_f T1_encode_xer; -jer_type_encoder_f T1_encode_jer; /*** <<< CODE [T1] >>> ***/ @@ -59,6 +58,9 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ REAL_constraint }, 0, 0, /* No members */ @@ -84,7 +86,6 @@ ber_type_decoder_f T2_decode_ber; der_type_encoder_f T2_encode_der; xer_type_decoder_f T2_decode_xer; xer_type_encoder_f T2_encode_xer; -jer_type_encoder_f T2_encode_jer; /*** <<< CODE [T2] >>> ***/ @@ -124,6 +125,9 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ REAL_constraint }, 0, 0, /* No members */ @@ -149,7 +153,6 @@ ber_type_decoder_f T3_decode_ber; der_type_encoder_f T3_encode_der; xer_type_decoder_f T3_decode_xer; xer_type_encoder_f T3_encode_xer; -jer_type_encoder_f T3_encode_jer; /*** <<< CODE [T3] >>> ***/ @@ -187,6 +190,9 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ REAL_constraint }, 0, 0, /* No members */ @@ -212,7 +218,6 @@ ber_type_decoder_f T4_decode_ber; der_type_encoder_f T4_encode_der; xer_type_decoder_f T4_decode_xer; xer_type_encoder_f T4_encode_xer; -jer_type_encoder_f T4_encode_jer; /*** <<< CODE [T4] >>> ***/ @@ -245,6 +250,9 @@ asn_TYPE_descriptor_t asn_DEF_T4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ REAL_constraint }, 0, 0, /* No members */ @@ -270,7 +278,6 @@ ber_type_decoder_f T5_decode_ber; der_type_encoder_f T5_encode_der; xer_type_decoder_f T5_decode_xer; xer_type_encoder_f T5_encode_xer; -jer_type_encoder_f T5_encode_jer; /*** <<< CODE [T5] >>> ***/ @@ -302,6 +309,9 @@ asn_TYPE_descriptor_t asn_DEF_T5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ REAL_constraint }, 0, 0, /* No members */ @@ -327,7 +337,6 @@ ber_type_decoder_f T6_decode_ber; der_type_encoder_f T6_encode_der; xer_type_decoder_f T6_decode_xer; xer_type_encoder_f T6_encode_xer; -jer_type_encoder_f T6_encode_jer; /*** <<< CODE [T6] >>> ***/ @@ -358,6 +367,9 @@ asn_TYPE_descriptor_t asn_DEF_T6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ REAL_constraint }, 0, 0, /* No members */ @@ -383,7 +395,6 @@ ber_type_decoder_f T_decode_ber; der_type_encoder_f T_encode_der; xer_type_decoder_f T_decode_xer; xer_type_encoder_f T_encode_xer; -jer_type_encoder_f T_encode_jer; /*** <<< CODE [T] >>> ***/ @@ -416,6 +427,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Ts_1, @@ -462,6 +476,9 @@ asn_TYPE_member_t asn_MBR_Ts_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -479,6 +496,9 @@ asn_TYPE_member_t asn_MBR_Ts_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -496,6 +516,9 @@ asn_TYPE_member_t asn_MBR_Ts_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -536,6 +559,9 @@ asn_TYPE_descriptor_t asn_DEF_Ts = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Ts_1, @@ -605,6 +631,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -622,6 +651,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -639,6 +671,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -676,6 +711,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -696,6 +734,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -713,6 +754,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -730,6 +774,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -747,6 +794,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -790,6 +840,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/66-ref-simple-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/66-ref-simple-OK.asn1.+-P_-fwide-types index 5718f51e3..23dd64b6a 100644 --- a/tests/tests-asn1c-compiler/66-ref-simple-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/66-ref-simple-OK.asn1.+-P_-fwide-types @@ -33,6 +33,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -64,6 +67,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_T_1, @@ -99,7 +105,6 @@ ber_type_decoder_f SimpleType_decode_ber; der_type_encoder_f SimpleType_encode_der; xer_type_decoder_f SimpleType_decode_xer; xer_type_encoder_f SimpleType_encode_xer; -jer_type_encoder_f SimpleType_encode_jer; /*** <<< CODE [SimpleType] >>> ***/ @@ -149,6 +154,9 @@ asn_TYPE_descriptor_t asn_DEF_SimpleType = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -217,6 +225,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -234,6 +245,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -251,6 +265,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -288,6 +305,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -308,6 +328,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -325,6 +348,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -342,6 +368,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -359,6 +388,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -402,6 +434,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/69-reserved-words-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/69-reserved-words-OK.asn1.+-P_-fwide-types index 1bd842de2..0f6deb721 100644 --- a/tests/tests-asn1c-compiler/69-reserved-words-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/69-reserved-words-OK.asn1.+-P_-fwide-types @@ -111,6 +111,9 @@ asn_TYPE_descriptor_t asn_DEF_class_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, 0, 0, /* No members */ @@ -130,6 +133,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -147,6 +153,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_char_constraint_1 }, 0, 0, /* No default value */ @@ -164,6 +173,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -181,6 +193,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -221,6 +236,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_T_1, @@ -290,6 +308,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -307,6 +328,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -324,6 +348,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -361,6 +388,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -381,6 +411,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -398,6 +431,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -415,6 +451,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -432,6 +471,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -475,6 +517,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/70-xer-test-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/70-xer-test-OK.asn1.+-P_-fwide-types index cbcf711ae..337ca848f 100644 --- a/tests/tests-asn1c-compiler/70-xer-test-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/70-xer-test-OK.asn1.+-P_-fwide-types @@ -90,6 +90,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -107,6 +110,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -124,6 +130,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -141,6 +150,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -158,6 +170,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -175,6 +190,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -192,6 +210,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -209,6 +230,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -226,6 +250,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -243,6 +270,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -260,6 +290,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -277,6 +310,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -294,6 +330,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -311,6 +350,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -328,6 +370,9 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -376,6 +421,9 @@ asn_TYPE_descriptor_t asn_DEF_PDU = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_PDU_1, @@ -432,6 +480,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -449,6 +500,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -466,6 +520,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -483,6 +540,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -523,6 +583,9 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Sequence_1, @@ -583,6 +646,9 @@ asn_TYPE_member_t asn_MBR_Set_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -600,6 +666,9 @@ asn_TYPE_member_t asn_MBR_Set_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -644,6 +713,9 @@ asn_TYPE_descriptor_t asn_DEF_Set = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_Set_1, @@ -746,6 +818,9 @@ asn_TYPE_descriptor_t asn_DEF_enum_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -765,6 +840,9 @@ asn_TYPE_member_t asn_MBR_ExtensibleSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -782,6 +860,9 @@ asn_TYPE_member_t asn_MBR_ExtensibleSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -826,6 +907,9 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSet = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_ExtensibleSet_1, @@ -877,6 +961,9 @@ asn_TYPE_member_t asn_MBR_ExtensibleSequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -894,6 +981,9 @@ asn_TYPE_member_t asn_MBR_ExtensibleSequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -911,6 +1001,9 @@ asn_TYPE_member_t asn_MBR_ExtensibleSequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -950,6 +1043,9 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_ExtensibleSequence_1, @@ -999,6 +1095,9 @@ asn_TYPE_member_t asn_MBR_ExtensibleSequence2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1016,6 +1115,9 @@ asn_TYPE_member_t asn_MBR_ExtensibleSequence2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1054,6 +1156,9 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_ExtensibleSequence2_1, @@ -1098,6 +1203,9 @@ asn_TYPE_member_t asn_MBR_SetOfNULL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1129,6 +1237,9 @@ asn_TYPE_descriptor_t asn_DEF_SetOfNULL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_SetOfNULL_1, @@ -1173,6 +1284,9 @@ asn_TYPE_member_t asn_MBR_SetOfREAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1204,6 +1318,9 @@ asn_TYPE_descriptor_t asn_DEF_SetOfREAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_SetOfREAL_1, @@ -1288,6 +1405,9 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -1307,6 +1427,9 @@ asn_TYPE_member_t asn_MBR_SetOfEnums_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1338,6 +1461,9 @@ asn_TYPE_descriptor_t asn_DEF_SetOfEnums = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_SetOfEnums_1, @@ -1382,6 +1508,9 @@ asn_TYPE_member_t asn_MBR_NamedSetOfNULL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1413,6 +1542,9 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfNULL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_NamedSetOfNULL_1, @@ -1457,6 +1589,9 @@ asn_TYPE_member_t asn_MBR_NamedSetOfREAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1488,6 +1623,9 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfREAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_NamedSetOfREAL_1, @@ -1572,6 +1710,9 @@ asn_TYPE_descriptor_t asn_DEF_name_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -1591,6 +1732,9 @@ asn_TYPE_member_t asn_MBR_NamedSetOfEnums_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1622,6 +1766,9 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfEnums = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_NamedSetOfEnums_1, @@ -1666,6 +1813,9 @@ asn_TYPE_member_t asn_MBR_SequenceOf_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1697,6 +1847,9 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_SequenceOf_1, @@ -1741,6 +1894,9 @@ asn_TYPE_member_t asn_MBR_SeqOfZuka_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1772,6 +1928,9 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfZuka = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_SeqOfZuka_1, @@ -1823,6 +1982,9 @@ asn_TYPE_member_t asn_MBR_SetOfChoice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1854,6 +2016,9 @@ asn_TYPE_descriptor_t asn_DEF_SetOfChoice = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_SetOfChoice_1, @@ -1905,6 +2070,9 @@ asn_TYPE_member_t asn_MBR_NamedSetOfChoice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1936,6 +2104,9 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfChoice = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_NamedSetOfChoice_1, @@ -1992,6 +2163,9 @@ asn_TYPE_member_t asn_MBR_SimpleChoice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2009,6 +2183,9 @@ asn_TYPE_member_t asn_MBR_SimpleChoice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2044,6 +2221,9 @@ asn_TYPE_descriptor_t asn_DEF_SimpleChoice = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_SimpleChoice_1, @@ -2113,6 +2293,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2130,6 +2313,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2147,6 +2333,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2184,6 +2373,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -2204,6 +2396,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2221,6 +2416,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2238,6 +2436,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2255,6 +2456,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2298,6 +2502,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/72-same-names-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/72-same-names-OK.asn1.+-P_-fwide-types index 1a8e0c501..496218789 100644 --- a/tests/tests-asn1c-compiler/72-same-names-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/72-same-names-OK.asn1.+-P_-fwide-types @@ -45,6 +45,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -62,6 +65,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -102,6 +108,9 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Member_2, @@ -122,6 +131,9 @@ static asn_TYPE_member_t asn_MBR_Type_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -153,6 +165,9 @@ asn_TYPE_descriptor_t asn_DEF_Type = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_Type_1, @@ -218,6 +233,9 @@ static asn_TYPE_member_t asn_MBR_another_name_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -235,6 +253,9 @@ static asn_TYPE_member_t asn_MBR_another_name_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -274,6 +295,9 @@ asn_TYPE_descriptor_t asn_DEF_another_name_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_another_name_3, @@ -294,6 +318,9 @@ static asn_TYPE_member_t asn_MBR_one_name_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -329,6 +356,9 @@ asn_TYPE_descriptor_t asn_DEF_one_name_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_one_name_2, @@ -349,6 +379,9 @@ asn_TYPE_member_t asn_MBR_Type1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -386,6 +419,9 @@ asn_TYPE_descriptor_t asn_DEF_Type1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Type1_1, @@ -548,6 +584,9 @@ static asn_TYPE_member_t asn_MBR_another_name_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_a_constraint_3 }, 0, 0, /* No default value */ @@ -565,6 +604,9 @@ static asn_TYPE_member_t asn_MBR_another_name_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -604,6 +646,9 @@ asn_TYPE_descriptor_t asn_DEF_another_name_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_another_name_3, @@ -624,6 +669,9 @@ static asn_TYPE_member_t asn_MBR_one_name_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -662,6 +710,9 @@ asn_TYPE_descriptor_t asn_DEF_one_name_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_one_name_2, @@ -682,6 +733,9 @@ static asn_TYPE_member_t asn_MBR_another_name_8[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_a_constraint_8 }, 0, 0, /* No default value */ @@ -699,6 +753,9 @@ static asn_TYPE_member_t asn_MBR_another_name_8[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -738,6 +795,9 @@ asn_TYPE_descriptor_t asn_DEF_another_name_8 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_another_name_8, @@ -758,6 +818,9 @@ static asn_TYPE_member_t asn_MBR_two_name_7[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -803,6 +866,9 @@ asn_TYPE_descriptor_t asn_DEF_two_name_7 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_two_name_7, @@ -823,6 +889,9 @@ asn_TYPE_member_t asn_MBR_Type2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -840,6 +909,9 @@ asn_TYPE_member_t asn_MBR_Type2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -875,6 +947,9 @@ asn_TYPE_descriptor_t asn_DEF_Type2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Type2_1, @@ -944,6 +1019,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -961,6 +1039,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -978,6 +1059,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1015,6 +1099,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -1035,6 +1122,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1052,6 +1142,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1069,6 +1162,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1086,6 +1182,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1129,6 +1228,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/73-circular-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/73-circular-OK.asn1.+-P_-fwide-types index 3e69d9872..67a3fd94e 100644 --- a/tests/tests-asn1c-compiler/73-circular-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/73-circular-OK.asn1.+-P_-fwide-types @@ -48,6 +48,9 @@ static asn_TYPE_member_t asn_MBR_data_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -80,6 +83,9 @@ asn_TYPE_descriptor_t asn_DEF_data_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_data_2, @@ -100,6 +106,9 @@ asn_TYPE_member_t asn_MBR_Type_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -137,6 +146,9 @@ asn_TYPE_descriptor_t asn_DEF_Type = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Type_1, @@ -163,7 +175,6 @@ ber_type_decoder_f EpytRef_decode_ber; der_type_encoder_f EpytRef_encode_der; xer_type_decoder_f EpytRef_decode_xer; xer_type_encoder_f EpytRef_encode_xer; -jer_type_encoder_f EpytRef_encode_jer; /*** <<< CODE [EpytRef] >>> ***/ @@ -194,6 +205,9 @@ asn_TYPE_descriptor_t asn_DEF_EpytRef = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Epyt_1, @@ -255,6 +269,9 @@ static asn_TYPE_member_t asn_MBR_stype_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -287,6 +304,9 @@ asn_TYPE_descriptor_t asn_DEF_stype_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_stype_2, @@ -307,6 +327,9 @@ asn_TYPE_member_t asn_MBR_Epyt_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -324,6 +347,9 @@ asn_TYPE_member_t asn_MBR_Epyt_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -341,6 +367,9 @@ asn_TYPE_member_t asn_MBR_Epyt_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -380,6 +409,9 @@ asn_TYPE_descriptor_t asn_DEF_Epyt = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Epyt_1, @@ -566,6 +598,9 @@ static asn_TYPE_member_t asn_MBR_senums_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -598,6 +633,9 @@ asn_TYPE_descriptor_t asn_DEF_senums_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_senums_4, @@ -618,6 +656,9 @@ asn_TYPE_member_t asn_MBR_Ypet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -635,6 +676,9 @@ asn_TYPE_member_t asn_MBR_Ypet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, .default_value_cmp = &asn_DFL_3_cmp_7, /* Compare DEFAULT 7 */ @@ -653,6 +697,9 @@ asn_TYPE_member_t asn_MBR_Ypet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -670,6 +717,9 @@ asn_TYPE_member_t asn_MBR_Ypet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_patest1_constraint_1 }, 0, 0, /* No default value */ @@ -687,6 +737,9 @@ asn_TYPE_member_t asn_MBR_Ypet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_patest2_constraint_1 }, 0, 0, /* No default value */ @@ -734,6 +787,9 @@ asn_TYPE_descriptor_t asn_DEF_Ypet = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_Ypet_1, @@ -768,7 +824,6 @@ ber_type_decoder_f EnumType_decode_ber; der_type_encoder_f EnumType_encode_der; xer_type_decoder_f EnumType_decode_xer; xer_type_encoder_f EnumType_encode_xer; -jer_type_encoder_f EnumType_encode_jer; /*** <<< CODE [EnumType] >>> ***/ @@ -816,6 +871,9 @@ asn_TYPE_descriptor_t asn_DEF_EnumType = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ ENUMERATED_constraint }, 0, 0, /* Defined elsewhere */ @@ -884,6 +942,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -901,6 +962,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -918,6 +982,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -955,6 +1022,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -975,6 +1045,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -992,6 +1065,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1009,6 +1085,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1026,6 +1105,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1069,6 +1151,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.+-P_-fwide-types index 8ffa2faf7..6a3cc0d6e 100644 --- a/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/84-param-tags-OK.asn1.+-P_-fwide-types @@ -94,6 +94,9 @@ asn_TYPE_member_t asn_MBR_TestType_16P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_common_constraint_1 }, .default_value_cmp = &asn_DFL_2_cmp_0, /* Compare DEFAULT 0 */ @@ -132,6 +135,9 @@ asn_TYPE_descriptor_t asn_DEF_TestType_16P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_TestType_16P0_1, @@ -174,6 +180,9 @@ asn_TYPE_member_t asn_MBR_TestType_16P1_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, .default_value_cmp = &asn_DFL_4_cmp_0, /* Compare DEFAULT 0 */ @@ -212,6 +221,9 @@ asn_TYPE_descriptor_t asn_DEF_TestType_16P1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_TestType_16P1_3, @@ -265,6 +277,9 @@ static asn_TYPE_member_t asn_MBR_TestChoice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -282,6 +297,9 @@ static asn_TYPE_member_t asn_MBR_TestChoice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -317,6 +335,9 @@ asn_TYPE_descriptor_t asn_DEF_TestChoice = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_TestChoice_1, @@ -423,6 +444,9 @@ asn_TYPE_member_t asn_MBR_AutoType_34P0_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_common_constraint_1 }, 0, 0, /* No default value */ @@ -460,6 +484,9 @@ asn_TYPE_descriptor_t asn_DEF_AutoType_34P0 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_AutoType_34P0_1, @@ -480,6 +507,9 @@ asn_TYPE_member_t asn_MBR_AutoType_34P1_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_common_constraint_3 }, 0, 0, /* No default value */ @@ -517,6 +547,9 @@ asn_TYPE_descriptor_t asn_DEF_AutoType_34P1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_AutoType_34P1_3, @@ -570,6 +603,9 @@ static asn_TYPE_member_t asn_MBR_AutoChoice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -587,6 +623,9 @@ static asn_TYPE_member_t asn_MBR_AutoChoice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -622,6 +661,9 @@ asn_TYPE_descriptor_t asn_DEF_AutoChoice = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_AutoChoice_1, @@ -691,6 +733,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -708,6 +753,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -725,6 +773,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -762,6 +813,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -782,6 +836,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -799,6 +856,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -816,6 +876,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -833,6 +896,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -876,6 +942,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/88-integer-enum-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/88-integer-enum-OK.asn1.+-P_-fwide-types index ee2004e28..205fdbfba 100644 --- a/tests/tests-asn1c-compiler/88-integer-enum-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/88-integer-enum-OK.asn1.+-P_-fwide-types @@ -24,7 +24,6 @@ ber_type_decoder_f T_decode_ber; der_type_encoder_f T_encode_der; xer_type_decoder_f T_decode_xer; xer_type_encoder_f T_encode_xer; -jer_type_encoder_f T_encode_jer; /*** <<< CODE [T] >>> ***/ @@ -55,6 +54,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ INTEGER_constraint }, 0, 0, /* Defined elsewhere */ @@ -123,6 +125,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -140,6 +145,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -157,6 +165,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -194,6 +205,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -214,6 +228,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -231,6 +248,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -248,6 +268,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -265,6 +288,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -308,6 +334,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.+-P_-fcompound-names b/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.+-P_-fcompound-names index 88b4cb2f7..5aeb1f200 100644 --- a/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.+-P_-fcompound-names +++ b/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.+-P_-fcompound-names @@ -46,6 +46,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -80,6 +83,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_T_1, @@ -149,6 +155,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -166,6 +175,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -183,6 +195,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -220,6 +235,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -240,6 +258,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -257,6 +278,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -274,6 +298,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -291,6 +318,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -334,6 +364,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.+-P_-fwide-types index 406218a51..30ca629bb 100644 --- a/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/89-bit-string-enum-OK.asn1.+-P_-fwide-types @@ -46,6 +46,9 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -80,6 +83,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_T_1, @@ -149,6 +155,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -166,6 +175,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -183,6 +195,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -220,6 +235,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -240,6 +258,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -257,6 +278,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -274,6 +298,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -291,6 +318,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -334,6 +364,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P index 0715693f8..2eb0e608d 100644 --- a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P @@ -17,7 +17,6 @@ ber_type_decoder_f CN_IntegerUnlimited_decode_ber; der_type_encoder_f CN_IntegerUnlimited_encode_der; xer_type_decoder_f CN_IntegerUnlimited_decode_xer; xer_type_encoder_f CN_IntegerUnlimited_encode_xer; -jer_type_encoder_f CN_IntegerUnlimited_encode_jer; /*** <<< CODE [CN-IntegerUnlimited] >>> ***/ @@ -48,6 +47,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeInteger_constraint }, 0, 0, /* No members */ @@ -73,7 +75,6 @@ ber_type_decoder_f CN_IntegerMinMax_decode_ber; der_type_encoder_f CN_IntegerMinMax_encode_der; xer_type_decoder_f CN_IntegerMinMax_decode_xer; xer_type_encoder_f CN_IntegerMinMax_encode_xer; -jer_type_encoder_f CN_IntegerMinMax_encode_jer; /*** <<< CODE [CN-IntegerMinMax] >>> ***/ @@ -123,6 +124,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CN_IntegerMinMax_constraint }, 0, 0, /* No members */ @@ -148,7 +152,6 @@ ber_type_decoder_f CN_IntegerMinLow_decode_ber; der_type_encoder_f CN_IntegerMinLow_encode_der; xer_type_decoder_f CN_IntegerMinLow_decode_xer; xer_type_encoder_f CN_IntegerMinLow_encode_xer; -jer_type_encoder_f CN_IntegerMinLow_encode_jer; /*** <<< CODE [CN-IntegerMinLow] >>> ***/ @@ -204,6 +207,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CN_IntegerMinLow_constraint }, 0, 0, /* No members */ @@ -229,7 +235,6 @@ ber_type_decoder_f NO_IntegerMinHigh_decode_ber; der_type_encoder_f NO_IntegerMinHigh_encode_der; xer_type_decoder_f NO_IntegerMinHigh_decode_xer; xer_type_encoder_f NO_IntegerMinHigh_encode_xer; -jer_type_encoder_f NO_IntegerMinHigh_encode_jer; /*** <<< CODE [NO-IntegerMinHigh] >>> ***/ @@ -291,6 +296,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerMinHigh_constraint }, 0, 0, /* No members */ @@ -316,7 +324,6 @@ ber_type_decoder_f NO_IntegerLowHigh_decode_ber; der_type_encoder_f NO_IntegerLowHigh_encode_der; xer_type_decoder_f NO_IntegerLowHigh_decode_xer; xer_type_encoder_f NO_IntegerLowHigh_encode_xer; -jer_type_encoder_f NO_IntegerLowHigh_encode_jer; /*** <<< CODE [NO-IntegerLowHigh] >>> ***/ @@ -377,6 +384,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerLowHigh_constraint }, 0, 0, /* No members */ @@ -402,7 +412,6 @@ ber_type_decoder_f CN_IntegerLowMax_decode_ber; der_type_encoder_f CN_IntegerLowMax_encode_der; xer_type_decoder_f CN_IntegerLowMax_decode_xer; xer_type_encoder_f CN_IntegerLowMax_encode_xer; -jer_type_encoder_f CN_IntegerLowMax_encode_jer; /*** <<< CODE [CN-IntegerLowMax] >>> ***/ @@ -463,6 +472,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CN_IntegerLowMax_constraint }, 0, 0, /* No members */ @@ -488,7 +500,6 @@ ber_type_decoder_f NO_IntegerHighMax_decode_ber; der_type_encoder_f NO_IntegerHighMax_encode_der; xer_type_decoder_f NO_IntegerHighMax_decode_xer; xer_type_encoder_f NO_IntegerHighMax_encode_xer; -jer_type_encoder_f NO_IntegerHighMax_encode_jer; /*** <<< CODE [NO-IntegerHighMax] >>> ***/ @@ -550,6 +561,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerHighMax_constraint }, 0, 0, /* No members */ @@ -575,7 +589,6 @@ ber_type_decoder_f NO_IntegerLowestMax_decode_ber; der_type_encoder_f NO_IntegerLowestMax_encode_der; xer_type_decoder_f NO_IntegerLowestMax_decode_xer; xer_type_encoder_f NO_IntegerLowestMax_encode_xer; -jer_type_encoder_f NO_IntegerLowestMax_encode_jer; /*** <<< CODE [NO-IntegerLowestMax] >>> ***/ @@ -637,6 +650,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerLowestMax_constraint }, 0, 0, /* No members */ @@ -662,7 +678,6 @@ ber_type_decoder_f NO_IntegerOutRange_decode_ber; der_type_encoder_f NO_IntegerOutRange_encode_der; xer_type_decoder_f NO_IntegerOutRange_decode_xer; xer_type_encoder_f NO_IntegerOutRange_encode_xer; -jer_type_encoder_f NO_IntegerOutRange_encode_jer; /*** <<< CODE [NO-IntegerOutRange] >>> ***/ @@ -723,6 +738,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerOutRange_constraint }, 0, 0, /* No members */ @@ -748,7 +766,6 @@ ber_type_decoder_f NO_IntegerOutValue_decode_ber; der_type_encoder_f NO_IntegerOutValue_encode_der; xer_type_decoder_f NO_IntegerOutValue_decode_xer; xer_type_encoder_f NO_IntegerOutValue_encode_xer; -jer_type_encoder_f NO_IntegerOutValue_encode_jer; /*** <<< CODE [NO-IntegerOutValue] >>> ***/ @@ -809,6 +826,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerOutValue_constraint }, 0, 0, /* No members */ @@ -834,7 +854,6 @@ ber_type_decoder_f OK_IntegerInRange1_decode_ber; der_type_encoder_f OK_IntegerInRange1_encode_der; xer_type_decoder_f OK_IntegerInRange1_decode_xer; xer_type_encoder_f OK_IntegerInRange1_encode_xer; -jer_type_encoder_f OK_IntegerInRange1_encode_jer; /*** <<< CODE [OK-IntegerInRange1] >>> ***/ @@ -890,6 +909,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange1_constraint }, 0, 0, /* No members */ @@ -915,7 +937,6 @@ ber_type_decoder_f OK_IntegerInRange2_decode_ber; der_type_encoder_f OK_IntegerInRange2_encode_der; xer_type_decoder_f OK_IntegerInRange2_decode_xer; xer_type_encoder_f OK_IntegerInRange2_encode_xer; -jer_type_encoder_f OK_IntegerInRange2_encode_jer; /*** <<< CODE [OK-IntegerInRange2] >>> ***/ @@ -971,6 +992,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange2_constraint }, 0, 0, /* No members */ @@ -996,7 +1020,6 @@ ber_type_decoder_f OK_IntegerInRange3_decode_ber; der_type_encoder_f OK_IntegerInRange3_encode_der; xer_type_decoder_f OK_IntegerInRange3_decode_xer; xer_type_encoder_f OK_IntegerInRange3_encode_xer; -jer_type_encoder_f OK_IntegerInRange3_encode_jer; /*** <<< CODE [OK-IntegerInRange3] >>> ***/ @@ -1052,6 +1075,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange3_constraint }, 0, 0, /* No members */ @@ -1077,7 +1103,6 @@ ber_type_decoder_f OK_IntegerInRange4_decode_ber; der_type_encoder_f OK_IntegerInRange4_encode_der; xer_type_decoder_f OK_IntegerInRange4_decode_xer; xer_type_encoder_f OK_IntegerInRange4_encode_xer; -jer_type_encoder_f OK_IntegerInRange4_encode_jer; /*** <<< CODE [OK-IntegerInRange4] >>> ***/ @@ -1133,6 +1158,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange4_constraint }, 0, 0, /* No members */ @@ -1158,7 +1186,6 @@ ber_type_decoder_f OK_IntegerInRange5_decode_ber; der_type_encoder_f OK_IntegerInRange5_encode_der; xer_type_decoder_f OK_IntegerInRange5_decode_xer; xer_type_encoder_f OK_IntegerInRange5_encode_xer; -jer_type_encoder_f OK_IntegerInRange5_encode_jer; /*** <<< CODE [OK-IntegerInRange5] >>> ***/ @@ -1214,6 +1241,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange5_constraint }, 0, 0, /* No members */ @@ -1239,7 +1269,6 @@ ber_type_decoder_f NO_IntegerInRange6_decode_ber; der_type_encoder_f NO_IntegerInRange6_encode_der; xer_type_decoder_f NO_IntegerInRange6_decode_xer; xer_type_encoder_f NO_IntegerInRange6_encode_xer; -jer_type_encoder_f NO_IntegerInRange6_encode_jer; /*** <<< CODE [NO-IntegerInRange6] >>> ***/ @@ -1291,6 +1320,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerInRange6_constraint }, 0, 0, /* No members */ @@ -1323,7 +1355,6 @@ ber_type_decoder_f CN_IntegerEnumerated1_decode_ber; der_type_encoder_f CN_IntegerEnumerated1_encode_der; xer_type_decoder_f CN_IntegerEnumerated1_decode_xer; xer_type_encoder_f CN_IntegerEnumerated1_encode_xer; -jer_type_encoder_f CN_IntegerEnumerated1_encode_jer; /*** <<< CODE [CN-IntegerEnumerated1] >>> ***/ @@ -1354,6 +1385,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeInteger_constraint }, 0, 0, /* Defined elsewhere */ @@ -1386,7 +1420,6 @@ ber_type_decoder_f NO_IntegerEnumerated2_decode_ber; der_type_encoder_f NO_IntegerEnumerated2_encode_der; xer_type_decoder_f NO_IntegerEnumerated2_decode_xer; xer_type_encoder_f NO_IntegerEnumerated2_encode_xer; -jer_type_encoder_f NO_IntegerEnumerated2_encode_jer; /*** <<< CODE [NO-IntegerEnumerated2] >>> ***/ @@ -1417,6 +1450,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ INTEGER_constraint }, 0, 0, /* Defined elsewhere */ @@ -1485,6 +1521,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1502,6 +1541,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1519,6 +1561,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1556,6 +1601,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -1576,6 +1624,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1593,6 +1644,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1610,6 +1664,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1627,6 +1684,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1670,6 +1730,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P_-fwide-types index 96ef46df2..08bffdb95 100644 --- a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P_-fwide-types @@ -17,7 +17,6 @@ ber_type_decoder_f CN_IntegerUnlimited_decode_ber; der_type_encoder_f CN_IntegerUnlimited_encode_der; xer_type_decoder_f CN_IntegerUnlimited_decode_xer; xer_type_encoder_f CN_IntegerUnlimited_encode_xer; -jer_type_encoder_f CN_IntegerUnlimited_encode_jer; /*** <<< CODE [CN-IntegerUnlimited] >>> ***/ @@ -48,6 +47,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ INTEGER_constraint }, 0, 0, /* No members */ @@ -73,7 +75,6 @@ ber_type_decoder_f CN_IntegerMinMax_decode_ber; der_type_encoder_f CN_IntegerMinMax_encode_der; xer_type_decoder_f CN_IntegerMinMax_decode_xer; xer_type_encoder_f CN_IntegerMinMax_encode_xer; -jer_type_encoder_f CN_IntegerMinMax_encode_jer; /*** <<< CODE [CN-IntegerMinMax] >>> ***/ @@ -125,6 +126,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CN_IntegerMinMax_constraint }, 0, 0, /* No members */ @@ -150,7 +154,6 @@ ber_type_decoder_f CN_IntegerMinLow_decode_ber; der_type_encoder_f CN_IntegerMinLow_encode_der; xer_type_decoder_f CN_IntegerMinLow_decode_xer; xer_type_encoder_f CN_IntegerMinLow_encode_xer; -jer_type_encoder_f CN_IntegerMinLow_encode_jer; /*** <<< CODE [CN-IntegerMinLow] >>> ***/ @@ -212,6 +215,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CN_IntegerMinLow_constraint }, 0, 0, /* No members */ @@ -237,7 +243,6 @@ ber_type_decoder_f NO_IntegerMinHigh_decode_ber; der_type_encoder_f NO_IntegerMinHigh_encode_der; xer_type_decoder_f NO_IntegerMinHigh_decode_xer; xer_type_encoder_f NO_IntegerMinHigh_encode_xer; -jer_type_encoder_f NO_IntegerMinHigh_encode_jer; /*** <<< CODE [NO-IntegerMinHigh] >>> ***/ @@ -299,6 +304,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerMinHigh_constraint }, 0, 0, /* No members */ @@ -324,7 +332,6 @@ ber_type_decoder_f NO_IntegerLowHigh_decode_ber; der_type_encoder_f NO_IntegerLowHigh_encode_der; xer_type_decoder_f NO_IntegerLowHigh_decode_xer; xer_type_encoder_f NO_IntegerLowHigh_encode_xer; -jer_type_encoder_f NO_IntegerLowHigh_encode_jer; /*** <<< CODE [NO-IntegerLowHigh] >>> ***/ @@ -385,6 +392,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerLowHigh_constraint }, 0, 0, /* No members */ @@ -410,7 +420,6 @@ ber_type_decoder_f CN_IntegerLowMax_decode_ber; der_type_encoder_f CN_IntegerLowMax_encode_der; xer_type_decoder_f CN_IntegerLowMax_decode_xer; xer_type_encoder_f CN_IntegerLowMax_encode_xer; -jer_type_encoder_f CN_IntegerLowMax_encode_jer; /*** <<< CODE [CN-IntegerLowMax] >>> ***/ @@ -472,6 +481,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CN_IntegerLowMax_constraint }, 0, 0, /* No members */ @@ -497,7 +509,6 @@ ber_type_decoder_f NO_IntegerHighMax_decode_ber; der_type_encoder_f NO_IntegerHighMax_encode_der; xer_type_decoder_f NO_IntegerHighMax_decode_xer; xer_type_encoder_f NO_IntegerHighMax_encode_xer; -jer_type_encoder_f NO_IntegerHighMax_encode_jer; /*** <<< CODE [NO-IntegerHighMax] >>> ***/ @@ -559,6 +570,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerHighMax_constraint }, 0, 0, /* No members */ @@ -584,7 +598,6 @@ ber_type_decoder_f NO_IntegerLowestMax_decode_ber; der_type_encoder_f NO_IntegerLowestMax_encode_der; xer_type_decoder_f NO_IntegerLowestMax_decode_xer; xer_type_encoder_f NO_IntegerLowestMax_encode_xer; -jer_type_encoder_f NO_IntegerLowestMax_encode_jer; /*** <<< CODE [NO-IntegerLowestMax] >>> ***/ @@ -646,6 +659,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerLowestMax_constraint }, 0, 0, /* No members */ @@ -671,7 +687,6 @@ ber_type_decoder_f NO_IntegerOutRange_decode_ber; der_type_encoder_f NO_IntegerOutRange_encode_der; xer_type_decoder_f NO_IntegerOutRange_decode_xer; xer_type_encoder_f NO_IntegerOutRange_encode_xer; -jer_type_encoder_f NO_IntegerOutRange_encode_jer; /*** <<< CODE [NO-IntegerOutRange] >>> ***/ @@ -732,6 +747,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerOutRange_constraint }, 0, 0, /* No members */ @@ -757,7 +775,6 @@ ber_type_decoder_f NO_IntegerOutValue_decode_ber; der_type_encoder_f NO_IntegerOutValue_encode_der; xer_type_decoder_f NO_IntegerOutValue_decode_xer; xer_type_encoder_f NO_IntegerOutValue_encode_xer; -jer_type_encoder_f NO_IntegerOutValue_encode_jer; /*** <<< CODE [NO-IntegerOutValue] >>> ***/ @@ -818,6 +835,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerOutValue_constraint }, 0, 0, /* No members */ @@ -843,7 +863,6 @@ ber_type_decoder_f OK_IntegerInRange1_decode_ber; der_type_encoder_f OK_IntegerInRange1_encode_der; xer_type_decoder_f OK_IntegerInRange1_decode_xer; xer_type_encoder_f OK_IntegerInRange1_encode_xer; -jer_type_encoder_f OK_IntegerInRange1_encode_jer; /*** <<< CODE [OK-IntegerInRange1] >>> ***/ @@ -899,6 +918,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange1_constraint }, 0, 0, /* No members */ @@ -924,7 +946,6 @@ ber_type_decoder_f OK_IntegerInRange2_decode_ber; der_type_encoder_f OK_IntegerInRange2_encode_der; xer_type_decoder_f OK_IntegerInRange2_decode_xer; xer_type_encoder_f OK_IntegerInRange2_encode_xer; -jer_type_encoder_f OK_IntegerInRange2_encode_jer; /*** <<< CODE [OK-IntegerInRange2] >>> ***/ @@ -980,6 +1001,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange2_constraint }, 0, 0, /* No members */ @@ -1005,7 +1029,6 @@ ber_type_decoder_f OK_IntegerInRange3_decode_ber; der_type_encoder_f OK_IntegerInRange3_encode_der; xer_type_decoder_f OK_IntegerInRange3_decode_xer; xer_type_encoder_f OK_IntegerInRange3_encode_xer; -jer_type_encoder_f OK_IntegerInRange3_encode_jer; /*** <<< CODE [OK-IntegerInRange3] >>> ***/ @@ -1061,6 +1084,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange3_constraint }, 0, 0, /* No members */ @@ -1086,7 +1112,6 @@ ber_type_decoder_f OK_IntegerInRange4_decode_ber; der_type_encoder_f OK_IntegerInRange4_encode_der; xer_type_decoder_f OK_IntegerInRange4_decode_xer; xer_type_encoder_f OK_IntegerInRange4_encode_xer; -jer_type_encoder_f OK_IntegerInRange4_encode_jer; /*** <<< CODE [OK-IntegerInRange4] >>> ***/ @@ -1142,6 +1167,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange4_constraint }, 0, 0, /* No members */ @@ -1167,7 +1195,6 @@ ber_type_decoder_f OK_IntegerInRange5_decode_ber; der_type_encoder_f OK_IntegerInRange5_encode_der; xer_type_decoder_f OK_IntegerInRange5_decode_xer; xer_type_encoder_f OK_IntegerInRange5_encode_xer; -jer_type_encoder_f OK_IntegerInRange5_encode_jer; /*** <<< CODE [OK-IntegerInRange5] >>> ***/ @@ -1229,6 +1256,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange5_constraint }, 0, 0, /* No members */ @@ -1254,7 +1284,6 @@ ber_type_decoder_f NO_IntegerInRange6_decode_ber; der_type_encoder_f NO_IntegerInRange6_encode_der; xer_type_decoder_f NO_IntegerInRange6_decode_xer; xer_type_encoder_f NO_IntegerInRange6_encode_xer; -jer_type_encoder_f NO_IntegerInRange6_encode_jer; /*** <<< CODE [NO-IntegerInRange6] >>> ***/ @@ -1306,6 +1335,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerInRange6_constraint }, 0, 0, /* No members */ @@ -1338,7 +1370,6 @@ ber_type_decoder_f CN_IntegerEnumerated1_decode_ber; der_type_encoder_f CN_IntegerEnumerated1_encode_der; xer_type_decoder_f CN_IntegerEnumerated1_decode_xer; xer_type_encoder_f CN_IntegerEnumerated1_encode_xer; -jer_type_encoder_f CN_IntegerEnumerated1_encode_jer; /*** <<< CODE [CN-IntegerEnumerated1] >>> ***/ @@ -1369,6 +1400,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ INTEGER_constraint }, 0, 0, /* Defined elsewhere */ @@ -1401,7 +1435,6 @@ ber_type_decoder_f NO_IntegerEnumerated2_decode_ber; der_type_encoder_f NO_IntegerEnumerated2_encode_der; xer_type_decoder_f NO_IntegerEnumerated2_decode_xer; xer_type_encoder_f NO_IntegerEnumerated2_encode_xer; -jer_type_encoder_f NO_IntegerEnumerated2_encode_jer; /*** <<< CODE [NO-IntegerEnumerated2] >>> ***/ @@ -1432,6 +1465,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ INTEGER_constraint }, 0, 0, /* Defined elsewhere */ @@ -1500,6 +1536,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1517,6 +1556,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1534,6 +1576,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1571,6 +1616,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -1591,6 +1639,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1608,6 +1659,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1625,6 +1679,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1642,6 +1699,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1685,6 +1745,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P_-gen-UPER_-gen-APER index c2e2cf956..fcee0bd85 100644 --- a/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/90-cond-int-type-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -17,7 +17,6 @@ ber_type_decoder_f CN_IntegerUnlimited_decode_ber; der_type_encoder_f CN_IntegerUnlimited_encode_der; xer_type_decoder_f CN_IntegerUnlimited_decode_xer; xer_type_encoder_f CN_IntegerUnlimited_encode_xer; -jer_type_encoder_f CN_IntegerUnlimited_encode_jer; per_type_decoder_f CN_IntegerUnlimited_decode_uper; per_type_encoder_f CN_IntegerUnlimited_encode_uper; per_type_decoder_f CN_IntegerUnlimited_decode_aper; @@ -52,6 +51,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeInteger_constraint }, 0, 0, /* No members */ @@ -77,7 +79,6 @@ ber_type_decoder_f CN_IntegerMinMax_decode_ber; der_type_encoder_f CN_IntegerMinMax_encode_der; xer_type_decoder_f CN_IntegerMinMax_decode_xer; xer_type_encoder_f CN_IntegerMinMax_encode_xer; -jer_type_encoder_f CN_IntegerMinMax_encode_jer; per_type_decoder_f CN_IntegerMinMax_decode_uper; per_type_encoder_f CN_IntegerMinMax_encode_uper; per_type_decoder_f CN_IntegerMinMax_decode_aper; @@ -141,6 +142,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_CN_IntegerMinMax_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CN_IntegerMinMax_constraint }, 0, 0, /* No members */ @@ -166,7 +170,6 @@ ber_type_decoder_f CN_IntegerMinLow_decode_ber; der_type_encoder_f CN_IntegerMinLow_encode_der; xer_type_decoder_f CN_IntegerMinLow_decode_xer; xer_type_encoder_f CN_IntegerMinLow_encode_xer; -jer_type_encoder_f CN_IntegerMinLow_encode_jer; per_type_decoder_f CN_IntegerMinLow_decode_uper; per_type_encoder_f CN_IntegerMinLow_encode_uper; per_type_decoder_f CN_IntegerMinLow_decode_aper; @@ -236,6 +239,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_CN_IntegerMinLow_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CN_IntegerMinLow_constraint }, 0, 0, /* No members */ @@ -261,7 +267,6 @@ ber_type_decoder_f NO_IntegerMinHigh_decode_ber; der_type_encoder_f NO_IntegerMinHigh_encode_der; xer_type_decoder_f NO_IntegerMinHigh_decode_xer; xer_type_encoder_f NO_IntegerMinHigh_encode_xer; -jer_type_encoder_f NO_IntegerMinHigh_encode_jer; per_type_decoder_f NO_IntegerMinHigh_decode_uper; per_type_encoder_f NO_IntegerMinHigh_encode_uper; per_type_decoder_f NO_IntegerMinHigh_decode_aper; @@ -337,6 +342,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_NO_IntegerMinHigh_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerMinHigh_constraint }, 0, 0, /* No members */ @@ -362,7 +370,6 @@ ber_type_decoder_f NO_IntegerLowHigh_decode_ber; der_type_encoder_f NO_IntegerLowHigh_encode_der; xer_type_decoder_f NO_IntegerLowHigh_decode_xer; xer_type_encoder_f NO_IntegerLowHigh_encode_xer; -jer_type_encoder_f NO_IntegerLowHigh_encode_jer; per_type_decoder_f NO_IntegerLowHigh_decode_uper; per_type_encoder_f NO_IntegerLowHigh_encode_uper; per_type_decoder_f NO_IntegerLowHigh_decode_aper; @@ -437,6 +444,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_NO_IntegerLowHigh_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerLowHigh_constraint }, 0, 0, /* No members */ @@ -462,7 +472,6 @@ ber_type_decoder_f CN_IntegerLowMax_decode_ber; der_type_encoder_f CN_IntegerLowMax_encode_der; xer_type_decoder_f CN_IntegerLowMax_decode_xer; xer_type_encoder_f CN_IntegerLowMax_encode_xer; -jer_type_encoder_f CN_IntegerLowMax_encode_jer; per_type_decoder_f CN_IntegerLowMax_decode_uper; per_type_encoder_f CN_IntegerLowMax_encode_uper; per_type_decoder_f CN_IntegerLowMax_decode_aper; @@ -537,6 +546,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_CN_IntegerLowMax_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CN_IntegerLowMax_constraint }, 0, 0, /* No members */ @@ -562,7 +574,6 @@ ber_type_decoder_f NO_IntegerHighMax_decode_ber; der_type_encoder_f NO_IntegerHighMax_encode_der; xer_type_decoder_f NO_IntegerHighMax_decode_xer; xer_type_encoder_f NO_IntegerHighMax_encode_xer; -jer_type_encoder_f NO_IntegerHighMax_encode_jer; per_type_decoder_f NO_IntegerHighMax_decode_uper; per_type_encoder_f NO_IntegerHighMax_encode_uper; per_type_decoder_f NO_IntegerHighMax_decode_aper; @@ -638,6 +649,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_NO_IntegerHighMax_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerHighMax_constraint }, 0, 0, /* No members */ @@ -663,7 +677,6 @@ ber_type_decoder_f NO_IntegerLowestMax_decode_ber; der_type_encoder_f NO_IntegerLowestMax_encode_der; xer_type_decoder_f NO_IntegerLowestMax_decode_xer; xer_type_encoder_f NO_IntegerLowestMax_encode_xer; -jer_type_encoder_f NO_IntegerLowestMax_encode_jer; per_type_decoder_f NO_IntegerLowestMax_decode_uper; per_type_encoder_f NO_IntegerLowestMax_encode_uper; per_type_decoder_f NO_IntegerLowestMax_decode_aper; @@ -739,6 +752,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_NO_IntegerLowestMax_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerLowestMax_constraint }, 0, 0, /* No members */ @@ -764,7 +780,6 @@ ber_type_decoder_f NO_IntegerOutRange_decode_ber; der_type_encoder_f NO_IntegerOutRange_encode_der; xer_type_decoder_f NO_IntegerOutRange_decode_xer; xer_type_encoder_f NO_IntegerOutRange_encode_xer; -jer_type_encoder_f NO_IntegerOutRange_encode_jer; per_type_decoder_f NO_IntegerOutRange_decode_uper; per_type_encoder_f NO_IntegerOutRange_encode_uper; per_type_decoder_f NO_IntegerOutRange_decode_aper; @@ -839,6 +854,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_NO_IntegerOutRange_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerOutRange_constraint }, 0, 0, /* No members */ @@ -864,7 +882,6 @@ ber_type_decoder_f NO_IntegerOutValue_decode_ber; der_type_encoder_f NO_IntegerOutValue_encode_der; xer_type_decoder_f NO_IntegerOutValue_decode_xer; xer_type_encoder_f NO_IntegerOutValue_encode_xer; -jer_type_encoder_f NO_IntegerOutValue_encode_jer; per_type_decoder_f NO_IntegerOutValue_decode_uper; per_type_encoder_f NO_IntegerOutValue_encode_uper; per_type_decoder_f NO_IntegerOutValue_decode_aper; @@ -939,6 +956,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_NO_IntegerOutValue_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerOutValue_constraint }, 0, 0, /* No members */ @@ -964,7 +984,6 @@ ber_type_decoder_f OK_IntegerInRange1_decode_ber; der_type_encoder_f OK_IntegerInRange1_encode_der; xer_type_decoder_f OK_IntegerInRange1_decode_xer; xer_type_encoder_f OK_IntegerInRange1_encode_xer; -jer_type_encoder_f OK_IntegerInRange1_encode_jer; per_type_decoder_f OK_IntegerInRange1_decode_uper; per_type_encoder_f OK_IntegerInRange1_encode_uper; per_type_decoder_f OK_IntegerInRange1_decode_aper; @@ -1034,6 +1053,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_OK_IntegerInRange1_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange1_constraint }, 0, 0, /* No members */ @@ -1059,7 +1081,6 @@ ber_type_decoder_f OK_IntegerInRange2_decode_ber; der_type_encoder_f OK_IntegerInRange2_encode_der; xer_type_decoder_f OK_IntegerInRange2_decode_xer; xer_type_encoder_f OK_IntegerInRange2_encode_xer; -jer_type_encoder_f OK_IntegerInRange2_encode_jer; per_type_decoder_f OK_IntegerInRange2_decode_uper; per_type_encoder_f OK_IntegerInRange2_encode_uper; per_type_decoder_f OK_IntegerInRange2_decode_aper; @@ -1129,6 +1150,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_OK_IntegerInRange2_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange2_constraint }, 0, 0, /* No members */ @@ -1154,7 +1178,6 @@ ber_type_decoder_f OK_IntegerInRange3_decode_ber; der_type_encoder_f OK_IntegerInRange3_encode_der; xer_type_decoder_f OK_IntegerInRange3_decode_xer; xer_type_encoder_f OK_IntegerInRange3_encode_xer; -jer_type_encoder_f OK_IntegerInRange3_encode_jer; per_type_decoder_f OK_IntegerInRange3_decode_uper; per_type_encoder_f OK_IntegerInRange3_encode_uper; per_type_decoder_f OK_IntegerInRange3_decode_aper; @@ -1224,6 +1247,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_OK_IntegerInRange3_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange3_constraint }, 0, 0, /* No members */ @@ -1249,7 +1275,6 @@ ber_type_decoder_f OK_IntegerInRange4_decode_ber; der_type_encoder_f OK_IntegerInRange4_encode_der; xer_type_decoder_f OK_IntegerInRange4_decode_xer; xer_type_encoder_f OK_IntegerInRange4_encode_xer; -jer_type_encoder_f OK_IntegerInRange4_encode_jer; per_type_decoder_f OK_IntegerInRange4_decode_uper; per_type_encoder_f OK_IntegerInRange4_encode_uper; per_type_decoder_f OK_IntegerInRange4_decode_aper; @@ -1319,6 +1344,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_OK_IntegerInRange4_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange4_constraint }, 0, 0, /* No members */ @@ -1344,7 +1372,6 @@ ber_type_decoder_f OK_IntegerInRange5_decode_ber; der_type_encoder_f OK_IntegerInRange5_encode_der; xer_type_decoder_f OK_IntegerInRange5_decode_xer; xer_type_encoder_f OK_IntegerInRange5_encode_xer; -jer_type_encoder_f OK_IntegerInRange5_encode_jer; per_type_decoder_f OK_IntegerInRange5_decode_uper; per_type_encoder_f OK_IntegerInRange5_encode_uper; per_type_decoder_f OK_IntegerInRange5_decode_aper; @@ -1414,6 +1441,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_OK_IntegerInRange5_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_IntegerInRange5_constraint }, 0, 0, /* No members */ @@ -1439,7 +1469,6 @@ ber_type_decoder_f NO_IntegerInRange6_decode_ber; der_type_encoder_f NO_IntegerInRange6_encode_der; xer_type_decoder_f NO_IntegerInRange6_decode_xer; xer_type_encoder_f NO_IntegerInRange6_encode_xer; -jer_type_encoder_f NO_IntegerInRange6_encode_jer; per_type_decoder_f NO_IntegerInRange6_decode_uper; per_type_encoder_f NO_IntegerInRange6_encode_uper; per_type_decoder_f NO_IntegerInRange6_decode_aper; @@ -1505,6 +1534,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_NO_IntegerInRange6_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_IntegerInRange6_constraint }, 0, 0, /* No members */ @@ -1537,7 +1569,6 @@ ber_type_decoder_f CN_IntegerEnumerated1_decode_ber; der_type_encoder_f CN_IntegerEnumerated1_encode_der; xer_type_decoder_f CN_IntegerEnumerated1_decode_xer; xer_type_encoder_f CN_IntegerEnumerated1_encode_xer; -jer_type_encoder_f CN_IntegerEnumerated1_encode_jer; per_type_decoder_f CN_IntegerEnumerated1_decode_uper; per_type_encoder_f CN_IntegerEnumerated1_encode_uper; per_type_decoder_f CN_IntegerEnumerated1_decode_aper; @@ -1572,6 +1603,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NativeInteger_constraint }, 0, 0, /* Defined elsewhere */ @@ -1604,7 +1638,6 @@ ber_type_decoder_f NO_IntegerEnumerated2_decode_ber; der_type_encoder_f NO_IntegerEnumerated2_encode_der; xer_type_decoder_f NO_IntegerEnumerated2_decode_xer; xer_type_encoder_f NO_IntegerEnumerated2_encode_xer; -jer_type_encoder_f NO_IntegerEnumerated2_encode_jer; per_type_decoder_f NO_IntegerEnumerated2_decode_uper; per_type_encoder_f NO_IntegerEnumerated2_encode_uper; per_type_decoder_f NO_IntegerEnumerated2_decode_aper; @@ -1639,6 +1672,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ INTEGER_constraint }, 0, 0, /* Defined elsewhere */ @@ -1717,6 +1753,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1734,6 +1773,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1751,6 +1793,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1788,6 +1833,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -1808,6 +1856,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1825,6 +1876,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1842,6 +1896,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1859,6 +1916,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1904,6 +1964,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.+-P_-fbless-SIZE b/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.+-P_-fbless-SIZE index 5dbb3452a..4886aefdf 100644 --- a/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.+-P_-fbless-SIZE +++ b/tests/tests-asn1c-compiler/91-cond-int-blessSize-OK.asn1.+-P_-fbless-SIZE @@ -17,7 +17,6 @@ ber_type_decoder_f OK_Integer1_decode_ber; der_type_encoder_f OK_Integer1_encode_der; xer_type_decoder_f OK_Integer1_decode_xer; xer_type_encoder_f OK_Integer1_encode_xer; -jer_type_encoder_f OK_Integer1_encode_jer; /*** <<< CODE [OK-Integer1] >>> ***/ @@ -67,6 +66,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_Integer1_constraint }, 0, 0, /* No members */ @@ -92,7 +94,6 @@ ber_type_decoder_f OK_Integer2_decode_ber; der_type_encoder_f OK_Integer2_encode_der; xer_type_decoder_f OK_Integer2_decode_xer; xer_type_encoder_f OK_Integer2_encode_xer; -jer_type_encoder_f OK_Integer2_encode_jer; /*** <<< CODE [OK-Integer2] >>> ***/ @@ -142,6 +143,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_Integer2_constraint }, 0, 0, /* No members */ @@ -167,7 +171,6 @@ ber_type_decoder_f OK_Integer3_decode_ber; der_type_encoder_f OK_Integer3_encode_der; xer_type_decoder_f OK_Integer3_decode_xer; xer_type_encoder_f OK_Integer3_encode_xer; -jer_type_encoder_f OK_Integer3_encode_jer; /*** <<< CODE [OK-Integer3] >>> ***/ @@ -217,6 +220,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_Integer3_constraint }, 0, 0, /* No members */ @@ -242,7 +248,6 @@ ber_type_decoder_f OK_Integer4_decode_ber; der_type_encoder_f OK_Integer4_encode_der; xer_type_decoder_f OK_Integer4_decode_xer; xer_type_encoder_f OK_Integer4_encode_xer; -jer_type_encoder_f OK_Integer4_encode_jer; /*** <<< CODE [OK-Integer4] >>> ***/ @@ -292,6 +297,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ OK_Integer4_constraint }, 0, 0, /* No members */ @@ -317,7 +325,6 @@ ber_type_decoder_f NO_Integer5_decode_ber; der_type_encoder_f NO_Integer5_encode_der; xer_type_decoder_f NO_Integer5_decode_xer; xer_type_encoder_f NO_Integer5_encode_xer; -jer_type_encoder_f NO_Integer5_encode_jer; /*** <<< CODE [NO-Integer5] >>> ***/ @@ -367,6 +374,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_Integer5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ NO_Integer5_constraint }, 0, 0, /* No members */ @@ -435,6 +445,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -452,6 +465,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -469,6 +485,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -506,6 +525,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -526,6 +548,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -543,6 +568,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -560,6 +588,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -577,6 +608,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -620,6 +654,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.+-P_-findirect-choice b/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.+-P_-findirect-choice index fca43e9ad..4700650ed 100644 --- a/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.+-P_-findirect-choice +++ b/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.+-P_-findirect-choice @@ -61,6 +61,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -78,6 +81,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -95,6 +101,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -112,6 +121,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -129,6 +141,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -146,6 +161,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -163,6 +181,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -180,6 +201,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -197,6 +221,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -214,6 +241,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -260,6 +290,9 @@ asn_TYPE_descriptor_t asn_DEF_Everything = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Everything_1, @@ -327,6 +360,9 @@ asn_TYPE_member_t asn_MBR_Choice1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -344,6 +380,9 @@ asn_TYPE_member_t asn_MBR_Choice1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -379,6 +418,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice1_1, @@ -448,6 +490,9 @@ asn_TYPE_member_t asn_MBR_Choice2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -465,6 +510,9 @@ asn_TYPE_member_t asn_MBR_Choice2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -500,6 +548,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice2_1, @@ -579,6 +630,9 @@ static asn_TYPE_member_t asn_MBR_a_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -618,6 +672,9 @@ asn_TYPE_descriptor_t asn_DEF_a_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_a_2, @@ -638,6 +695,9 @@ static asn_TYPE_member_t asn_MBR_c_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -671,6 +731,9 @@ asn_TYPE_descriptor_t asn_DEF_c_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_c_5, @@ -691,6 +754,9 @@ asn_TYPE_member_t asn_MBR_Choice3_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -708,6 +774,9 @@ asn_TYPE_member_t asn_MBR_Choice3_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -725,6 +794,9 @@ asn_TYPE_member_t asn_MBR_Choice3_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -761,6 +833,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice3_1, @@ -833,6 +908,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -850,6 +928,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -867,6 +948,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -884,6 +968,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -901,6 +988,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -943,6 +1033,9 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Member_2, @@ -963,6 +1056,9 @@ asn_TYPE_member_t asn_MBR_Set_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -994,6 +1090,9 @@ asn_TYPE_descriptor_t asn_DEF_Set = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_Set_1, @@ -1054,6 +1153,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1071,6 +1173,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1088,6 +1193,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1105,6 +1213,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1145,6 +1256,9 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Sequence_1, @@ -1171,7 +1285,6 @@ ber_type_decoder_f TypeRef_decode_ber; der_type_encoder_f TypeRef_encode_der; xer_type_decoder_f TypeRef_decode_xer; xer_type_encoder_f TypeRef_encode_xer; -jer_type_encoder_f TypeRef_encode_jer; /*** <<< CODE [TypeRef] >>> ***/ @@ -1202,6 +1315,9 @@ asn_TYPE_descriptor_t asn_DEF_TypeRef = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Sequence_1, @@ -1258,6 +1374,9 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1297,6 +1416,9 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_b_3, @@ -1317,6 +1439,9 @@ asn_TYPE_member_t asn_MBR_Alpha_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1334,6 +1459,9 @@ asn_TYPE_member_t asn_MBR_Alpha_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1372,6 +1500,9 @@ asn_TYPE_descriptor_t asn_DEF_Alpha = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Alpha_1, @@ -1425,6 +1556,9 @@ asn_TYPE_member_t asn_MBR_Beta_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1442,6 +1576,9 @@ asn_TYPE_member_t asn_MBR_Beta_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1480,6 +1617,9 @@ asn_TYPE_descriptor_t asn_DEF_Beta = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Beta_1, @@ -1536,6 +1676,9 @@ asn_TYPE_member_t asn_MBR_Gamma_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1553,6 +1696,9 @@ asn_TYPE_member_t asn_MBR_Gamma_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1570,6 +1716,9 @@ asn_TYPE_member_t asn_MBR_Gamma_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1609,6 +1758,9 @@ asn_TYPE_descriptor_t asn_DEF_Gamma = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Gamma_1, @@ -1673,6 +1825,9 @@ asn_TYPE_member_t asn_MBR_OneTwo_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1716,6 +1871,9 @@ asn_TYPE_descriptor_t asn_DEF_OneTwo = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_OneTwo_1, @@ -1780,6 +1938,9 @@ asn_TYPE_member_t asn_MBR_TwoThree_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1823,6 +1984,9 @@ asn_TYPE_descriptor_t asn_DEF_TwoThree = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_TwoThree_1, @@ -1891,6 +2055,9 @@ asn_TYPE_member_t asn_MBR_ThreeOne_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1908,6 +2075,9 @@ asn_TYPE_member_t asn_MBR_ThreeOne_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1952,6 +2122,9 @@ asn_TYPE_descriptor_t asn_DEF_ThreeOne = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_ThreeOne_1, @@ -2021,6 +2194,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2038,6 +2214,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2055,6 +2234,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2092,6 +2274,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -2112,6 +2297,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2129,6 +2317,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2146,6 +2337,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2163,6 +2357,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2206,6 +2403,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.+-P_-fwide-types index 8a8bb4980..90e0fd9fc 100644 --- a/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/92-circular-loops-OK.asn1.+-P_-fwide-types @@ -61,6 +61,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -78,6 +81,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -95,6 +101,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -112,6 +121,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -129,6 +141,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -146,6 +161,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -163,6 +181,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -180,6 +201,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -197,6 +221,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -214,6 +241,9 @@ asn_TYPE_member_t asn_MBR_Everything_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -260,6 +290,9 @@ asn_TYPE_descriptor_t asn_DEF_Everything = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Everything_1, @@ -327,6 +360,9 @@ asn_TYPE_member_t asn_MBR_Choice1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -344,6 +380,9 @@ asn_TYPE_member_t asn_MBR_Choice1_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -379,6 +418,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice1 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice1_1, @@ -447,6 +489,9 @@ asn_TYPE_member_t asn_MBR_Choice2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -464,6 +509,9 @@ asn_TYPE_member_t asn_MBR_Choice2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -499,6 +547,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice2_1, @@ -578,6 +629,9 @@ static asn_TYPE_member_t asn_MBR_a_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -617,6 +671,9 @@ asn_TYPE_descriptor_t asn_DEF_a_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_a_2, @@ -637,6 +694,9 @@ static asn_TYPE_member_t asn_MBR_c_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -670,6 +730,9 @@ asn_TYPE_descriptor_t asn_DEF_c_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_OF_constraint }, asn_MBR_c_5, @@ -690,6 +753,9 @@ asn_TYPE_member_t asn_MBR_Choice3_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -707,6 +773,9 @@ asn_TYPE_member_t asn_MBR_Choice3_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -724,6 +793,9 @@ asn_TYPE_member_t asn_MBR_Choice3_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -760,6 +832,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice3_1, @@ -832,6 +907,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -849,6 +927,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -866,6 +947,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -883,6 +967,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -900,6 +987,9 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -942,6 +1032,9 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Member_2, @@ -962,6 +1055,9 @@ asn_TYPE_member_t asn_MBR_Set_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -993,6 +1089,9 @@ asn_TYPE_descriptor_t asn_DEF_Set = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_Set_1, @@ -1053,6 +1152,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1070,6 +1172,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1087,6 +1192,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1104,6 +1212,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1144,6 +1255,9 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Sequence_1, @@ -1170,7 +1284,6 @@ ber_type_decoder_f TypeRef_decode_ber; der_type_encoder_f TypeRef_encode_der; xer_type_decoder_f TypeRef_decode_xer; xer_type_encoder_f TypeRef_encode_xer; -jer_type_encoder_f TypeRef_encode_jer; /*** <<< CODE [TypeRef] >>> ***/ @@ -1201,6 +1314,9 @@ asn_TYPE_descriptor_t asn_DEF_TypeRef = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Sequence_1, @@ -1257,6 +1373,9 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1296,6 +1415,9 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_b_3, @@ -1316,6 +1438,9 @@ asn_TYPE_member_t asn_MBR_Alpha_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1333,6 +1458,9 @@ asn_TYPE_member_t asn_MBR_Alpha_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1371,6 +1499,9 @@ asn_TYPE_descriptor_t asn_DEF_Alpha = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Alpha_1, @@ -1424,6 +1555,9 @@ asn_TYPE_member_t asn_MBR_Beta_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1441,6 +1575,9 @@ asn_TYPE_member_t asn_MBR_Beta_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1479,6 +1616,9 @@ asn_TYPE_descriptor_t asn_DEF_Beta = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Beta_1, @@ -1535,6 +1675,9 @@ asn_TYPE_member_t asn_MBR_Gamma_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1552,6 +1695,9 @@ asn_TYPE_member_t asn_MBR_Gamma_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1569,6 +1715,9 @@ asn_TYPE_member_t asn_MBR_Gamma_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1608,6 +1757,9 @@ asn_TYPE_descriptor_t asn_DEF_Gamma = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Gamma_1, @@ -1672,6 +1824,9 @@ asn_TYPE_member_t asn_MBR_OneTwo_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1715,6 +1870,9 @@ asn_TYPE_descriptor_t asn_DEF_OneTwo = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_OneTwo_1, @@ -1779,6 +1937,9 @@ asn_TYPE_member_t asn_MBR_TwoThree_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1822,6 +1983,9 @@ asn_TYPE_descriptor_t asn_DEF_TwoThree = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_TwoThree_1, @@ -1890,6 +2054,9 @@ asn_TYPE_member_t asn_MBR_ThreeOne_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1907,6 +2074,9 @@ asn_TYPE_member_t asn_MBR_ThreeOne_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -1951,6 +2121,9 @@ asn_TYPE_descriptor_t asn_DEF_ThreeOne = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_ThreeOne_1, @@ -2020,6 +2193,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2037,6 +2213,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2054,6 +2233,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2091,6 +2273,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -2111,6 +2296,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2128,6 +2316,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2145,6 +2336,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2162,6 +2356,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -2205,6 +2402,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/93-asn1c-controls-OK.asn1.+-P_-fwide-types b/tests/tests-asn1c-compiler/93-asn1c-controls-OK.asn1.+-P_-fwide-types index b6e03c92a..b77a7260f 100644 --- a/tests/tests-asn1c-compiler/93-asn1c-controls-OK.asn1.+-P_-fwide-types +++ b/tests/tests-asn1c-compiler/93-asn1c-controls-OK.asn1.+-P_-fwide-types @@ -35,6 +35,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -52,6 +55,9 @@ asn_TYPE_member_t asn_MBR_Sequence_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -90,6 +96,9 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Sequence_1, @@ -155,6 +164,9 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -172,6 +184,9 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -217,6 +232,9 @@ asn_TYPE_descriptor_t asn_DEF_Set = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_Set_1, @@ -288,6 +306,9 @@ static asn_TYPE_member_t asn_MBR_setof_2[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -321,6 +342,9 @@ asn_TYPE_descriptor_t asn_DEF_setof_2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_OF_constraint }, asn_MBR_setof_2, @@ -341,6 +365,9 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -358,6 +385,9 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -375,6 +405,9 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -411,6 +444,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice_1, @@ -480,6 +516,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -497,6 +536,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -514,6 +556,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -551,6 +596,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -571,6 +619,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -588,6 +639,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -605,6 +659,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -622,6 +679,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -665,6 +725,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/94-set-optionals-OK.asn1.+-P b/tests/tests-asn1c-compiler/94-set-optionals-OK.asn1.+-P index dbe870d5a..c7ce25bc3 100644 --- a/tests/tests-asn1c-compiler/94-set-optionals-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/94-set-optionals-OK.asn1.+-P @@ -68,6 +68,9 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -85,6 +88,9 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -102,6 +108,9 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -119,6 +128,9 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -136,6 +148,9 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -153,6 +168,9 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -170,6 +188,9 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -187,6 +208,9 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -204,6 +228,9 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -221,6 +248,9 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -275,6 +305,9 @@ asn_TYPE_descriptor_t asn_DEF_TestSet = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SET_constraint }, asn_MBR_TestSet_1, @@ -344,6 +377,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -361,6 +397,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -378,6 +417,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -415,6 +457,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -435,6 +480,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -452,6 +500,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -469,6 +520,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -486,6 +540,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -529,6 +586,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.+-P_-gen-UPER_-gen-APER b/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.+-P_-gen-UPER_-gen-APER index 9a3e25161..bedab066a 100644 --- a/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.+-P_-gen-UPER_-gen-APER +++ b/tests/tests-asn1c-compiler/95-choice-per-order-OK.asn1.+-P_-gen-UPER_-gen-APER @@ -88,6 +88,9 @@ static asn_TYPE_member_t asn_MBR_ch_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -105,6 +108,9 @@ static asn_TYPE_member_t asn_MBR_ch_4[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -144,6 +150,9 @@ asn_TYPE_descriptor_t asn_DEF_ch_4 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_ch_constr_4, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_ch_4, @@ -164,6 +173,9 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -181,6 +193,9 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -198,6 +213,9 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -215,6 +233,9 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -256,6 +277,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Choice_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice_1, @@ -320,6 +344,9 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -337,6 +364,9 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -372,6 +402,9 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_Choice2_constr_1, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_Choice2_1, @@ -451,6 +484,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -468,6 +504,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -485,6 +524,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -522,6 +564,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) &asn_PER_type_encoding_constr_5, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -542,6 +587,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -559,6 +607,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -576,6 +627,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -593,6 +647,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -638,6 +695,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/98-attribute-class-OK.asn1.+-P b/tests/tests-asn1c-compiler/98-attribute-class-OK.asn1.+-P index c97084162..f12403c5e 100644 --- a/tests/tests-asn1c-compiler/98-attribute-class-OK.asn1.+-P +++ b/tests/tests-asn1c-compiler/98-attribute-class-OK.asn1.+-P @@ -69,6 +69,9 @@ static asn_TYPE_member_t asn_MBR_Attribute_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = memb_identifier_constraint_1 }, 0, 0, /* No default value */ @@ -86,6 +89,9 @@ static asn_TYPE_member_t asn_MBR_Attribute_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -124,6 +130,9 @@ asn_TYPE_descriptor_t asn_DEF_Attribute = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_Attribute_1, @@ -193,6 +202,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -210,6 +222,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -227,6 +242,9 @@ static asn_TYPE_member_t asn_MBR_encoding_5[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -264,6 +282,9 @@ asn_TYPE_descriptor_t asn_DEF_encoding_5 = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ CHOICE_constraint }, asn_MBR_encoding_5, @@ -284,6 +305,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -301,6 +325,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -318,6 +345,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -335,6 +365,9 @@ static asn_TYPE_member_t asn_MBR_EXTERNAL_1[] = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) .per_constraints = 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + .jer_constraints = 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ .general_constraints = 0 }, 0, 0, /* No default value */ @@ -378,6 +411,9 @@ asn_TYPE_descriptor_t asn_DEF_EXTERNAL = { #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) 0, #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ SEQUENCE_constraint }, asn_MBR_EXTERNAL_1, diff --git a/tests/tests-asn1c-compiler/check-parsing.sh b/tests/tests-asn1c-compiler/check-parsing.sh index 92432d39a..131c12b93 100755 --- a/tests/tests-asn1c-compiler/check-parsing.sh +++ b/tests/tests-asn1c-compiler/check-parsing.sh @@ -35,7 +35,7 @@ for ref in ${top_srcdir}/tests/tests-asn1c-compiler/*.asn1.+*; do PROCESSING="$ref (from $src)" LC_ALL=C sed -e 's/^found in .*/found in .../' < "$ref" > "$oldversion" ec=0 - (${top_builddir}/asn1c/asn1c -S ${top_srcdir}/skeletons -no-gen-OER -no-gen-UPER -no-gen-APER $flags "$src" | LC_ALL=C sed -e 's/^found in .*/found in .../' > "$newversion") || ec=$? + (${top_builddir}/asn1c/asn1c -S ${top_srcdir}/skeletons -no-gen-OER -no-gen-UPER -no-gen-APER -no-gen-JER $flags "$src" | LC_ALL=C sed -e 's/^found in .*/found in .../' > "$newversion") || ec=$? if [ $? = 0 ]; then diff $diffArgs "$oldversion" "$newversion" || ec=$? fi @@ -45,7 +45,7 @@ for ref in ${top_srcdir}/tests/tests-asn1c-compiler/*.asn1.+*; do fi rm -f $oldversion $newversion if [ "$1" = "regenerate" ]; then - ${top_builddir}/asn1c/asn1c -S ${top_srcdir}/skeletons -no-gen-OER -no-gen-UPER -no-gen-APER $flags "$src" > "$ref" + ${top_builddir}/asn1c/asn1c -S ${top_srcdir}/skeletons -no-gen-OER -no-gen-UPER -no-gen-APER -no-gen-JER $flags "$src" > "$ref" fi done