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

Getting rid of ambiguities between casts and sizeof with expressions

Browse Source
This commit is contained in:
Pierre Pronchery 2008-06-12 05:40:17 +00:00
parent 5689b654bc
commit 1a1d24c6e4
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/parser.c
View File

@ -964,6 +964,7 @@ static int _assignment_expr(C99 * c99)
#if 0 #if 0
ret |= _conditional_expr(c99); ret |= _conditional_expr(c99);
#endif #endif
#if 0
/* FIXME check is this solves the conflict somehow */ /* FIXME check is this solves the conflict somehow */
for(;;) for(;;)
{ {
@ -972,6 +973,15 @@ static int _assignment_expr(C99 * c99)
return ret; return ret;
ret |= _assignment_operator(c99); ret |= _assignment_operator(c99);
} }
#endif
for(;;)
{
ret |= _conditional_expr(c99);
if(!_parse_in_set(c99, c99set_assignment_operator))
return ret;
ret |= _parse_check_set(c99, c99set_assignment_operator,
"assignment operator", _assignment_operator);
}
return ret; return ret;
} }
@ -983,8 +993,8 @@ static int _unary_expr(C99 * c99)
* ++ unary-expr * ++ unary-expr
* -- unary-expr * -- unary-expr
* unary-operator cast-expr * unary-operator cast-expr
* sizeof unary-expr * "sizeof" unary-expr
* sizeof "(" type-name ")" */ * "sizeof" "(" type-name ")" */
{ {
int ret = 0; int ret = 0;
int code; int code;
@ -1012,13 +1022,18 @@ static int _unary_expr(C99 * c99)
if(_parse_is_code(c99, C99_CODE_OPERATOR_LPAREN)) if(_parse_is_code(c99, C99_CODE_OPERATOR_LPAREN))
{ {
ret |= scan(c99); ret |= scan(c99);
ret |= _parse_check_set(c99, c99set_type_name, /* FIXME it may still be an unary-expr */
"type name", _type_name); if(_parse_in_set(c99, c99set_type_name))
ret |= _type_name(c99);
else
ret |= _parse_check_set(c99, c99set_expression,
"type cast or expression",
_expression);
ret |= _parse_check(c99, C99_CODE_OPERATOR_RPAREN); ret |= _parse_check(c99, C99_CODE_OPERATOR_RPAREN);
} }
else else
ret |= _parse_check_set(c99, c99set_unary_expr, ret |= _parse_check_set(c99, c99set_unary_expr,
"unary expression or parenthesis", "type cast or expression",
_unary_expr); _unary_expr);
} }
return ret; return ret;
@ -1205,7 +1220,7 @@ static int _assignment_operator(C99 * c99)
/* conditional-expr */ /* conditional-expr */
static int _conditional_expr(C99 * c99) static int _conditional_expr(C99 * c99)
/* logical-OR-expr [ "?" expression ":" conditional-expr ] */ /* logical-OR-expr { "?" expression ":" logical-OR-expr } */
{ {
int ret; int ret;
@ -1421,9 +1436,19 @@ static int _cast_expr(C99 * c99)
while(_parse_is_code(c99, C99_CODE_OPERATOR_LPAREN)) while(_parse_is_code(c99, C99_CODE_OPERATOR_LPAREN))
{ {
ret |= scan(c99); ret |= scan(c99);
ret |= _parse_check_set(c99, c99set_type_name, "type name", /* in both cases it may already be an unary-expr */
_type_name); if(_parse_in_set(c99, c99set_type_name))
{
ret |= _type_name(c99);
ret |= _parse_check(c99, C99_CODE_OPERATOR_RPAREN);
/* FIXME "{" => postfix-expr with initializer-list */
continue;
}
/* primary-expr */
ret |= _parse_check_set(c99, c99set_expression,
"type cast or expression", _expression);
ret |= _parse_check(c99, C99_CODE_OPERATOR_RPAREN); ret |= _parse_check(c99, C99_CODE_OPERATOR_RPAREN);
return ret;
} }
ret |= _unary_expr(c99); ret |= _unary_expr(c99);
return ret; return ret;