osmocom
/
asn1c
mirror of https://gerrit.osmocom.org/asn1c
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

member -> Member 

git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@647 59561ff5-6e30-0410-9f3c-9617f08c8826
This commit is contained in:
vlm 2005-02-15 03:37:42 +00:00
parent bf3c5114b3
commit 25f5d27940
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libasn1compiler/asn1c_C.c
View File

@ -1431,7 +1431,7 @@ emit_member_table(arg_t *arg, asn1p_expr_t *expr) {
} }
if(C99_MODE) OUT(".type = "); if(C99_MODE) OUT(".type = ");
if(expr->_anonymous_type && (expr->expr_type & ASN_CONSTR_MASK)) { if(expr->_anonymous_type && (expr->expr_type & ASN_CONSTR_MASK)) {
OUT("(void *)&asn_DEF_%s_member,\n", OUT("(void *)&asn_DEF_%s_Member,\n",
MKID_nr(arg->expr->Identifier)); MKID_nr(arg->expr->Identifier));
} else if(expr->expr_type & ASN_CONSTR_MASK) { } else if(expr->expr_type & ASN_CONSTR_MASK) {
OUT("(void *)&asn_DEF_%s,\n", OUT("(void *)&asn_DEF_%s,\n",

12
libasn1compiler/asn1c_constraint.c
View File

@ -76,9 +76,10 @@ asn1c_emit_constraint_checking_code(arg_t *arg) {
produce_st = 1; produce_st = 1;
break; break;
} }
if(produce_st) if(produce_st) {
OUT("const %s_t *st = sptr;\n", char *tname = asn1c_type_name(arg, arg->expr, TNF_SAFE);
asn1c_type_name(arg, arg->expr, TNF_SAFE)); OUT("const %s_t *st = (const %s_t *)sptr;\n", tname, tname);
}
if(r_size || r_value) { if(r_size || r_value) {
if(r_size) { if(r_size) {
@ -360,6 +361,7 @@ static int
emit_alphabet_check_loop(arg_t *arg, asn1cnst_range_t *range) { emit_alphabet_check_loop(arg_t *arg, asn1cnst_range_t *range) {
asn1c_integer_t natural_stop; asn1c_integer_t natural_stop;
asn1p_expr_t *terminal; asn1p_expr_t *terminal;
char *tname;
terminal = asn1f_find_terminal_type_ex(arg->asn, arg->expr); terminal = asn1f_find_terminal_type_ex(arg->asn, arg->expr);
if(terminal) { if(terminal) {
@ -368,8 +370,8 @@ emit_alphabet_check_loop(arg_t *arg, asn1cnst_range_t *range) {
} else { } else {
terminal = arg->expr; terminal = arg->expr;
} }
OUT("const %s_t *st = sptr;\n", tname = asn1c_type_name(arg, terminal, TNF_SAFE);
asn1c_type_name(arg, terminal, TNF_SAFE)); OUT("const %s_t *st = (const %s_t *)sptr;\n", tname, tname);
switch(terminal->expr_type) { switch(terminal->expr_type) {
case ASN_STRING_UTF8String: case ASN_STRING_UTF8String: