From 7b3684afffa2d5eda3dd6930f01faaa673686c16 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 14 Jun 2009 00:23:56 +0000 Subject: [PATCH] change ParseStatementOrDeclaration to emit the 'missing ;' with ExpectAndConsume instead of custom diag logic. This gets us an insertion hint and positions the ; at the end of the line instead of on the next token. Before: t.c:5:1: error: expected ';' after return statement } ^ after: t.c:4:11: error: expected ';' after return statement return 4 ^ ; git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@73315 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Parse/ParseStmt.cpp | 6 +++++- test/Parser/statements.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp index 8cdcd517ca..955f00d7a0 100644 --- a/lib/Parse/ParseStmt.cpp +++ b/lib/Parse/ParseStmt.cpp @@ -180,10 +180,14 @@ Parser::ParseStatementOrDeclaration(bool OnlyStatement) { if (Tok.is(tok::semi)) { ConsumeToken(); } else if (!Res.isInvalid()) { - Diag(Tok, diag::err_expected_semi_after_stmt) << SemiError; + // If the result was valid, then we do want to diagnose this. Use + // ExpectAndConsume to emit the diagnostic, even though we know it won't + // succeed. + ExpectAndConsume(tok::semi, diag::err_expected_semi_after_stmt, SemiError); // Skip until we see a } or ;, but don't eat it. SkipUntil(tok::r_brace, true, true); } + return move(Res); } diff --git a/test/Parser/statements.c b/test/Parser/statements.c index c5923bc064..b95c23fb28 100644 --- a/test/Parser/statements.c +++ b/test/Parser/statements.c @@ -54,3 +54,6 @@ void test6(void) { while (0); } +int test7() { + return 4 // expected-error {{expected ';' after return statement}} +} -- 2.50.1