meesbs
/
tinycc
forked from Mirrors/tinycc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support c99 for-loop init decls (2nd attempt)

master
Joe Soroka 2011-03-08 13:36:04 -08:00
parent 7fc2eee55c
commit 5eb82755db
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tccgen.c
View File

@ -76,6 +76,7 @@ static void parse_expr_type(CType *type);
static void decl_initializer(CType *type, Section *sec, unsigned long c, int first, int size_only);
static void block(int *bsym, int *csym, int *case_sym, int *def_sym, int case_reg, int is_expr);
static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r, int has_init, int v, char *asm_label, int scope);
static int decl0(int l, int is_for_loop_init);
static void expr_eq(void);
static void unary_type(CType *type);
static int is_compatible_parameter_types(CType *type1, CType *type2);
@ -4379,8 +4380,12 @@ static void block(int *bsym, int *csym, int *case_sym, int *def_sym,
next();
skip('(');
if (tok != ';') {
gexpr();
vpop();
/* c99 for-loop init decl? */
if (!decl0(VT_LOCAL, 1)) {
/* no, regular for-loop init expr */
gexpr();
vpop();
}
}
skip(';');
d = ind;
@ -5406,7 +5411,7 @@ ST_FUNC void gen_inline_functions(void)
}
/* 'l' is VT_LOCAL or VT_CONST to define default storage type */
ST_FUNC void decl(int l)
static int decl0(int l, int is_for_loop_init)
{
int v, has_init, r;
CType type, btype;
@ -5415,6 +5420,8 @@ ST_FUNC void decl(int l)
while (1) {
if (!parse_btype(&btype, &ad)) {
if (is_for_loop_init)
return 0;
/* skip redundant ';' */
/* XXX: find more elegant solution */
if (tok == ';') {
@ -5629,6 +5636,8 @@ ST_FUNC void decl(int l)
}
}
if (tok != ',') {
if (is_for_loop_init)
return 1;
skip(';');
break;
}
@ -5636,4 +5645,10 @@ ST_FUNC void decl(int l)
}
}
}
return 0;
}
ST_FUNC void decl(int l)
{
decl0(l, 0);
}