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

Fixed some error reporting and declaration specifiers

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

49
src/parser.c
View File

@ -112,11 +112,12 @@ static int _designator(C99 * c99);
/* parse_check */ /* parse_check */
static int _parse_check(C99 * c99, TokenCode code) static int _parse_check(C99 * c99, TokenCode code)
{ {
int ret; int ret = 0;
if(!_parse_is_code(c99, code)) if(!_parse_is_code(c99, code))
_parse_error(c99, "Expected \"%s\"", code_get_string(code)); ret = _parse_error(c99, "Expected \"%s\"",
c99_scan(c99); code_get_string(code));
ret |= c99_scan(c99);
return ret; return ret;
} }
@ -279,7 +280,7 @@ static int _declaration_specifiers(C99 * c99)
/* storage-class-specifier */ /* storage-class-specifier */
static int _storage_class_specifier(C99 * c99) static int _storage_class_specifier(C99 * c99)
/* typedef | extern | static | auto | register */ /* "typedef" | "extern" | "static" | "auto" | "register" */
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s() \"%s\"\n", __func__, fprintf(stderr, "DEBUG: %s() \"%s\"\n", __func__,
@ -597,12 +598,11 @@ static int _direct_declarator(C99 * c99)
/* FIXME still recursive /* FIXME still recursive
* identifier * identifier
* "(" declarator ")" * "(" declarator ")"
* direct-declarator [ assignment-expression ] * direct-declarator "[" (assignment-expression | "*") "]"
* direct-declarator [ * ]
* direct-declarator "(" parameter-type-list ")" * direct-declarator "(" parameter-type-list ")"
* direct-declarator "(" identifier-list ")" */ * direct-declarator "(" [ identifier-list ] ")" */
{ {
int ret = 0; int ret;
int code; int code;
#ifdef DEBUG #ifdef DEBUG
@ -616,21 +616,28 @@ static int _direct_declarator(C99 * c99)
} }
else else
ret = _identifier(c99); ret = _identifier(c99);
if(c99->token == NULL) while(_parse_is_code(c99, C99_CODE_OPERATOR_LPAREN)
return ret; || _parse_is_code(c99, C99_CODE_OPERATOR_LBRACKET))
if((code = token_get_code(c99->token)) == C99_CODE_OPERATOR_LPAREN)
{ {
c99_scan(c99); code = token_get_code(c99->token);
if(token_in_set(c99->token, c99set_parameter_type_list)) ret |= c99_scan(c99);
ret |= _parameter_type_list(c99); if(code == C99_CODE_OPERATOR_LBRACKET)
else if(token_in_set(c99->token, c99set_identifier_list)) {
ret |= _identifier_list(c99); if(_parse_is_code(c99, C99_CODE_OPERATOR_TIMES))
ret |= _parse_check(c99, C99_CODE_OPERATOR_RPAREN); ret |= c99_scan(c99);
else
ret |= _assignment_expr(c99);
ret |= _parse_check(c99, C99_CODE_OPERATOR_RBRACKET);
}
else /* C99_CODE_OPERATOR_LPAREN */
{
if(token_in_set(c99->token, c99set_parameter_type_list))
ret |= _parameter_type_list(c99);
else if(token_in_set(c99->token, c99set_identifier_list))
ret |= _identifier_list(c99);
ret |= _parse_check(c99, C99_CODE_OPERATOR_RPAREN);
}
} }
else if(code == C99_CODE_OPERATOR_TIMES)
c99_scan(c99);
else if(token_in_set(c99->token, c99set_assignment_expr))
ret |= _assignment_expr(c99);
return ret; return ret;
} }