From 0394c281af257abb24774bd6f081b7abb9f821e3 Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Sat, 11 Jul 2020 15:38:34 +0200 Subject: add testcase for incorrect empty expressions Signed-off-by: Luc Van Oostenryck --- validation/empty-assign.c | 14 ++++++++++++++ validation/empty-initializer.c | 10 ++++++++++ 2 files changed, 24 insertions(+) create mode 100644 validation/empty-assign.c create mode 100644 validation/empty-initializer.c diff --git a/validation/empty-assign.c b/validation/empty-assign.c new file mode 100644 index 00000000..48ac626d --- /dev/null +++ b/validation/empty-assign.c @@ -0,0 +1,14 @@ +static int foo(int a) +{ + a = ; // KO + return a; +} + +/* + * check-name: empty-assign + * check-known-to-fail + * + * check-error-start +empty-assign.c:3:11: error: expression expected before ';' + * check-error-end + */ diff --git a/validation/empty-initializer.c b/validation/empty-initializer.c new file mode 100644 index 00000000..0ca763f6 --- /dev/null +++ b/validation/empty-initializer.c @@ -0,0 +1,10 @@ +static int i = ; // KO + +/* + * check-name: empty-initializer + * check-known-to-fail + * + * check-error-start +empty-initializer.c:1:16: error: expression expected before ';' + * check-error-end + */ -- cgit 1.2.3-korg From 584bf4cd77d422d7f057c9ed167f824955a3c311 Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Sat, 11 Jul 2020 15:42:57 +0200 Subject: warn on empty assignments Currently sparse accepts an empty assignment like: a = ; Make this an error. Signed-off-by: Luc Van Oostenryck --- expression.c | 6 +++++- validation/bad-assignment.c | 1 + validation/empty-assign.c | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/expression.c b/expression.c index 1160cd9c..ecbdd18e 100644 --- a/expression.c +++ b/expression.c @@ -937,10 +937,14 @@ struct token *assignment_expression(struct token *token, struct expression **tre for (i = 0; i < ARRAY_SIZE(assignments); i++) if (assignments[i] == op) { struct expression * expr = alloc_expression(token->pos, EXPR_ASSIGNMENT); + struct token *next = token->next; expr->left = *tree; expr->op = op; *tree = expr; - return assignment_expression(token->next, &expr->right); + token = assignment_expression(next, &expr->right); + if (token == next) + expression_error(expr, "expression expected before '%s'", show_token(token)); + return token; } } return token; diff --git a/validation/bad-assignment.c b/validation/bad-assignment.c index 71938db7..959712be 100644 --- a/validation/bad-assignment.c +++ b/validation/bad-assignment.c @@ -8,6 +8,7 @@ static int foo(int a) * check-name: bad assignment * * check-error-start +bad-assignment.c:3:11: error: expression expected before '\' bad-assignment.c:3:13: error: Expected ; at end of statement bad-assignment.c:3:13: error: got \ * check-error-end diff --git a/validation/empty-assign.c b/validation/empty-assign.c index 48ac626d..d1c3884f 100644 --- a/validation/empty-assign.c +++ b/validation/empty-assign.c @@ -6,7 +6,6 @@ static int foo(int a) /* * check-name: empty-assign - * check-known-to-fail * * check-error-start empty-assign.c:3:11: error: expression expected before ';' -- cgit 1.2.3-korg From 14b55d27ee7d577be66c60a457f0e80a28ef274d Mon Sep 17 00:00:00 2001 From: Luc Van Oostenryck Date: Sat, 11 Jul 2020 15:45:15 +0200 Subject: warn on empty initializations Currently sparse accepts an empty initialization like: int a = ; Make this an error. Signed-off-by: Luc Van Oostenryck --- parse.c | 5 ++++- validation/empty-initializer.c | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/parse.c b/parse.c index a9222e7c..d0a41b14 100644 --- a/parse.c +++ b/parse.c @@ -3117,7 +3117,10 @@ struct token *external_declaration(struct token *token, struct symbol_list **lis for (;;) { if (!is_typedef && match_op(token, '=')) { - token = initializer(&decl->initializer, token->next); + struct token *next = token->next; + token = initializer(&decl->initializer, next); + if (token == next) + sparse_error(token->pos, "expression expected before '%s'", show_token(token)); } if (!is_typedef) { if (validate_decl) diff --git a/validation/empty-initializer.c b/validation/empty-initializer.c index 0ca763f6..95067999 100644 --- a/validation/empty-initializer.c +++ b/validation/empty-initializer.c @@ -2,7 +2,6 @@ static int i = ; // KO /* * check-name: empty-initializer - * check-known-to-fail * * check-error-start empty-initializer.c:1:16: error: expression expected before ';' -- cgit 1.2.3-korg