DeforaOS/C99
DeforaOS/C99
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed parsing structs, unions and a segfault

Browse Source
This commit is contained in:
Pierre Pronchery 2008-03-13 18:12:46 +00:00
parent 573e14f999
commit a969828475
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/parser.c
View File

@ -379,6 +379,7 @@ static int _struct_declaration(C99 * c99)
#endif #endif
ret = _specifier_qualifier_list(c99); ret = _specifier_qualifier_list(c99);
ret |= _struct_declarator_list(c99); ret |= _struct_declarator_list(c99);
ret |= _parse_check(c99, C99_CODE_OPERATOR_SEMICOLON);
return ret; return ret;
} }
@ -405,20 +406,20 @@ static int _struct_declarator_list(C99 * c99)
/* struct-declarator */ /* struct-declarator */
static int _struct_declarator(C99 * c99) static int _struct_declarator(C99 * c99)
/* declarator /* declarator
* [ declarator ] : constant-expr */ * [ declarator ] ":" constant-expr */
{ {
int ret; int ret = 0;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__); fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif #endif
if(!_parse_is_code(c99, C99_CODE_OPERATOR_COLON))
ret |= _declarator(c99);
if(_parse_is_code(c99, C99_CODE_OPERATOR_COLON)) if(_parse_is_code(c99, C99_CODE_OPERATOR_COLON))
{ {
ret |= c99_scan(c99); ret |= c99_scan(c99);
ret |= _constant_expr(c99); ret |= _constant_expr(c99);
} }
else
ret = _declarator(c99);
return ret; return ret;
} }
@ -1280,7 +1281,7 @@ static int _block_item_list(C99 * c99)
fprintf(stderr, "DEBUG: %s()\n", __func__); fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif #endif
ret = _block_item(c99); ret = _block_item(c99);
while(token_in_set(c99->token, c99set_block_item)) while(_parse_in_set(c99, c99set_block_item))
ret |= _block_item(c99); ret |= _block_item(c99);
return ret; return ret;
} }