Separate parsing of identifier-list (in K&R-style declarations)
PATCH 2/7 Separate parsing of identifier-list (in K&R-style declarations)
Don't mix it with parameter-type-list, add saner checks.
Signed-off-by Al Viro <[email protected]>
--- parse.c | 28 ++++++++++++++++++++++++++-- validation/identifier_list.c | 18 ++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 validation/identifier_list.c
parse.c +26 -2
@@ -1948,12 +1948,36 @@ static struct token *parameter_type_list(struct token *token, struct symbol *fn,return token; } +if (match_op (token,SPECIAL_ELLIPSIS )) { +warning (token->pos,"variadic functions must have one named argument" ); + fn->variadic =1 ; +return token->next; + } + +if (token_type (token) !=TOKEN_IDENT ) +return token; + +if (!lookup_type (token)) { +/* K&R */ +for (;;) { +struct symbol *sym =alloc_symbol (token->pos,SYM_NODE ); + sym->ident = token->ident; + token = token->next; + sym->endpos = token->pos; +add_symbol (list, sym); +if (!match_op (token,',' ) || +token_type (token->next) !=TOKEN_IDENT || +lookup_type (token->next)) +break ; + token = token->next; + } +return token; + } +for (;;) {struct symbol *sym;if (match_op (token,SPECIAL_ELLIPSIS )) { -if (!*list) -warning (token->pos,"variadic functions must have one named argument" ); fn->variadic =1 ; token = token->next;break ;
validation/identifier_list.c new file +18 -0
@@ -0,0 +1,18 @@ +typedef int T ; +void f (...); +void g(*); +void h (x ,int ); +void i_OK (T ); +void j (x ,T ); +/* +* check-name: identifier-list parsing +* check-error-start +identifier_list.c:2:8: warning: variadic functions must have one named argument +identifier_list.c:3:8: error: Expected ) in function declarator +identifier_list.c:3:8: error: got * +identifier_list.c:4:9: error: Expected ) in function declarator +identifier_list.c:4:9: error: got , +identifier_list.c:6:9: error: Expected ) in function declarator +identifier_list.c:6:9: error: got , +* check-error-end +*/
Signature · 1 line
1.5.6.6