Index: include/clang/Basic/DiagnosticParseKinds.td =================================================================== --- include/clang/Basic/DiagnosticParseKinds.td +++ include/clang/Basic/DiagnosticParseKinds.td @@ -441,6 +441,8 @@ "cannot use %select{dot|arrow}0 operator on a type">; def err_expected_unqualified_id : Error< "expected %select{identifier|unqualified-id}0">; +def err_brackets_go_after_unqualified_id : Error< + "brackets go after the %select{identifier|unqualified-id}0">; def err_unexpected_unqualified_id : Error<"type-id cannot have a name">; def err_func_def_no_params : Error< "function definition does not declare parameters">; Index: include/clang/Parse/Parser.h =================================================================== --- include/clang/Parse/Parser.h +++ include/clang/Parse/Parser.h @@ -2208,6 +2208,7 @@ SmallVectorImpl &ParamInfo, SourceLocation &EllipsisLoc); void ParseBracketDeclarator(Declarator &D); + void ParseMisplacedBracketDeclarator(Declarator &D); //===--------------------------------------------------------------------===// // C++ 7: Declarations [dcl.dcl] Index: lib/Parse/ParseDecl.cpp =================================================================== --- lib/Parse/ParseDecl.cpp +++ lib/Parse/ParseDecl.cpp @@ -4656,6 +4656,19 @@ } } +// When correcting from misplaced brackets before the identifier, the location +// is saved inside the declarator so that other diagnostic messages can use +// them. This extracts and returns that location, or returns the provided +// location if a stored location does not exist. +static SourceLocation getMissingDeclaratorIdLoc(Declarator &D, + SourceLocation Loc) { + if (D.getName().StartLocation.isInvalid() && + D.getName().EndLocation.isValid()) + return D.getName().EndLocation; + + return Loc; +} + /// ParseDirectDeclarator /// direct-declarator: [C99 6.7.5] /// [C99] identifier @@ -4832,11 +4845,15 @@ } else { if (Tok.getKind() == tok::annot_pragma_parser_crash) LLVM_BUILTIN_TRAP; - if (D.getContext() == Declarator::MemberContext) - Diag(Tok, diag::err_expected_member_name_or_semi) + if (Tok.is(tok::l_square)) { + ParseMisplacedBracketDeclarator(D); + return; + } else if (D.getContext() == Declarator::MemberContext) { + Diag(getMissingDeclaratorIdLoc(D, Tok.getLocation()), + diag::err_expected_member_name_or_semi) << (D.getDeclSpec().isEmpty() ? SourceRange() : D.getDeclSpec().getSourceRange()); - else if (getLangOpts().CPlusPlus) { + } else if (getLangOpts().CPlusPlus) { if (Tok.is(tok::period) || Tok.is(tok::arrow)) Diag(Tok, diag::err_invalid_operator_on_type) << Tok.is(tok::arrow); else { @@ -4845,11 +4862,15 @@ Diag(PP.getLocForEndOfToken(Loc), diag::err_expected_unqualified_id) << getLangOpts().CPlusPlus; else - Diag(Tok, diag::err_expected_unqualified_id) + Diag(getMissingDeclaratorIdLoc(D, Tok.getLocation()), + diag::err_expected_unqualified_id) << getLangOpts().CPlusPlus; } - } else - Diag(Tok, diag::err_expected_either) << tok::identifier << tok::l_paren; + } else { + Diag(getMissingDeclaratorIdLoc(D, Tok.getLocation()), + diag::err_expected_either) + << tok::identifier << tok::l_paren; + } D.SetIdentifier(0, Tok.getLocation()); D.setInvalidType(true); } @@ -5555,6 +5576,114 @@ attrs, T.getCloseLocation()); } +/// Diagnose brackets before an identifier. +void Parser::ParseMisplacedBracketDeclarator(Declarator &D) { + assert(Tok.is(tok::l_square) && "Missing opening bracket"); + + SourceLocation StartBracketLoc = Tok.getLocation(); + Declarator TempDeclarator(D.getDeclSpec(), D.getContext()); + + while (Tok.is(tok::l_square)) { + ParseBracketDeclarator(TempDeclarator); + } + + // Stuff the location of the start of the brackets into the Declarator. + // The diagnostics from ParseDirectDeclarator will make more sense if + // they use this location instead. + D.getName().EndLocation = StartBracketLoc; + + SourceLocation StarLoc; + if (Tok.is(tok::star)) { + // Attempt to fix the token stream by lexing, inserting tokens, then + // backtracking. This will add a right paren after the identifier, push + // the current star token back into the stream, and change the current + // token into a left paren. + StarLoc = Tok.getLocation(); + + // Don't need a special location when correction with a star. + D.getName().EndLocation = SourceLocation(); + + // The star token is needed to be the last token since bad things happen + // if the cached tokens to backtrack is empty. + PP.EnterToken(Tok); + PP.EnableBacktrackAtThisPos(); + PP.Lex(Tok); + + // Token to hold the lexed tokens. + Token PPToken; + + // Accept *identifier, *identifier::identifier, etc. + while (true) { + PP.Lex(PPToken); + if (!PPToken.is(tok::identifier)) + break; + PP.Lex(PPToken); + if (!PPToken.is(tok::coloncolon)) + break; + } + + // Put back the last token. + PP.RevertCachedTokens(1); + + // Create a right paren and push it back to the stream. + PPToken.setLocation(PP.getLastCachedTokenLocation()); + PPToken.setKind(tok::r_paren); + PP.EnterToken(PPToken); + + // Reverts the all the way back to the star token. + PP.Backtrack(); + + // Change the current token to a left paren. + Tok.setKind(tok::l_paren); + } + + // Now that the brackets are removed, try parsing the declarator again. + ParseDirectDeclarator(D); + + // Something went wrong parsing the brackets, in which case, + // ParseBracketDeclarator has emitted an error, and we don't need to emit + // one here. + if (TempDeclarator.getNumTypeObjects() == 0) + return; + + // Adding back the bracket info to the end of the Declarator. + for (unsigned i = 0, e = TempDeclarator.getNumTypeObjects(); i < e; ++i) { + const DeclaratorChunk &Chunk = TempDeclarator.getTypeObject(i); + ParsedAttributes attrs(AttrFactory); + attrs.set(Chunk.Common.AttrList); + D.AddTypeInfo(Chunk, attrs, SourceLocation()); + } + + // The missing identifier would have been diagnosed ini ParseDirectDeclarator. + if (!D.getIdentifier() && !StarLoc.isValid()) + return; + + SourceLocation EndBracketLoc = + TempDeclarator.getTypeObject(TempDeclarator.getNumTypeObjects() - 1) + .EndLoc; + + // Generate the move bracket error message. + SourceRange BracketRange(StartBracketLoc, EndBracketLoc); + SourceLocation EndLoc = PP.getLocForEndOfToken(D.getLocEnd()); + if (StarLoc.isValid()) { + // If the brackets are followed by a star, then extra parens are required + // around the star and identifier. + Diag(EndLoc, diag::err_brackets_go_after_unqualified_id) + << getLangOpts().CPlusPlus + << FixItHint::CreateInsertion(StarLoc, "(") + << FixItHint::CreateInsertion(EndLoc, ")") + << FixItHint::CreateInsertionFromRange( + EndLoc, CharSourceRange(BracketRange, true)) + << FixItHint::CreateRemoval(BracketRange); + } else { + Diag(EndLoc, diag::err_brackets_go_after_unqualified_id) + << getLangOpts().CPlusPlus + << FixItHint::CreateInsertionFromRange( + EndLoc, CharSourceRange(BracketRange, true)) + << FixItHint::CreateRemoval(BracketRange); + } +} + /// [GNU] typeof-specifier: /// typeof ( expressions ) /// typeof ( type-name ) Index: test/Parser/brackets.c =================================================================== --- test/Parser/brackets.c +++ test/Parser/brackets.c @@ -0,0 +1,79 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: cp %s %t +// RUN: not %clang_cc1 -fixit %t -x c -DFIXIT +// RUN: %clang_cc1 -fsyntax-only %t -x c -DFIXIT +// RUN: not %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits %s 2>&1 | FileCheck %s -strict-whitespace + +void test1() { + int a[] = {0,1,1,2,3}; + int []b = {0,1,4,9,16}; + // expected-error@-1{{brackets go after the identifier}} + // CHECK: {{^}} int []b = {0,1,4,9,16}; + // CHECK: {{^}} ~~ ^ + // CHECK: {{^}} [] + // CHECK: fix-it:{{.*}}:{[[@LINE-5]]:7-[[@LINE-5]]:9}:"" + // CHECK: fix-it:{{.*}}:{[[@LINE-6]]:10-[[@LINE-6]]:10}:"[]" + + int c = a[0]; + int d = b[0]; // No undeclared identifer error here. + + int *e = a; + int *f = b; // No undeclared identifer error here. +} + +struct S { + int [1][1]x; + // expected-error@-1{{brackets go after the identifier}} + // CHECK: {{^}} int [1][1]x; + // CHECK: {{^}} ~~~~~~ ^ + // CHECK: {{^}} [1][1] + // CHECK: fix-it:{{.*}}:{[[@LINE-5]]:7-[[@LINE-5]]:13}:"" + // CHECK: fix-it:{{.*}}:{[[@LINE-6]]:14-[[@LINE-6]]:14}:"[1][1]" +} s; + +#ifndef FIXIT +void test2() { + int [][][]; + // expected-error@-1{{expected identifier or '('}} + // CHECK: {{^}} int [][][]; + // CHECK: {{^}} ^ + // CHECK-NOT: fix-it + struct T { + int []; + // expected-error@-1{{expected member name or ';' after declaration specifiers}} + // CHECK: {{^}} int []; + // CHECK: {{^}} ~~~ ^ + // CHECK-NOT: fix-it + }; +} + +void test3() { + int [5] *; + // expected-error@-1{{expected identifier or '('}} + // CHECK: {{^}} int [5] *; + // CHECK: {{^}} ^ + // CHECK-NOT: fix-it + // expected-error@-5{{brackets go after the identifier}} + // CHECK: {{^}} int [5] *; + // CHECK: {{^}} ~~~~ ^ + // CHECK: {{^}} ()[5] + // CHECK: fix-it:{{.*}}:{[[@LINE-9]]:7-[[@LINE-9]]:11}:"" + // CHECK: fix-it:{{.*}}:{[[@LINE-10]]:11-[[@LINE-10]]:11}:"(" + // CHECK: fix-it:{{.*}}:{[[@LINE-11]]:12-[[@LINE-11]]:12}:")[5]" + + int [5] * a; + // expected-error@-1{{brackets go after the identifier}} + // CHECK: {{^}} int [5] * a; + // CHECK: {{^}} ~~~~ ^ + // CHECK: {{^}} ( )[5] + // CHECK: fix-it:{{.*}}:{[[@LINE-5]]:7-[[@LINE-5]]:11}:"" + // CHECK: fix-it:{{.*}}:{[[@LINE-6]]:11-[[@LINE-6]]:11}:"(" + // CHECK: fix-it:{{.*}}:{[[@LINE-7]]:14-[[@LINE-7]]:14}:")[5]" + + int *b[5] = a; // expected-error{{}} a should not be corrected to type b + + int (*c)[5] = a; // a should be the same type as c +} +#endif + +// CHECK: 8 errors generated. Index: test/Parser/brackets.cpp =================================================================== --- test/Parser/brackets.cpp +++ test/Parser/brackets.cpp @@ -0,0 +1,99 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: cp %s %t +// RUN: not %clang_cc1 -fixit %t -x c++ -DFIXIT +// RUN: %clang_cc1 -fsyntax-only %t -x c++ -DFIXIT +// RUN: not %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits %s 2>&1 | FileCheck %s -strict-whitespace + +int a[] = {0,1,1,2,3}; +int []b = {0,1,4,9,16}; +// expected-error@-1{{brackets go after the unqualified-id}} +// CHECK: {{^}}int []b = {0,1,4,9,16}; +// CHECK: {{^}} ~~ ^ +// CHECK: {{^}} [] +// CHECK: fix-it:{{.*}}:{[[@LINE-5]]:5-[[@LINE-5]]:7}:"" +// CHECK: fix-it:{{.*}}:{[[@LINE-6]]:8-[[@LINE-6]]:8}:"[]" + +int c = a[0]; +int d = b[0]; // No undeclared identifer error here. + +int *e = a; +int *f = b; // No undeclared identifer error here. + +struct S { + static int [1][1]x; + // expected-error@-1{{brackets go after the unqualified-id}} + // CHECK: {{^}} static int [1][1]x; + // CHECK: {{^}} ~~~~~~ ^ + // CHECK: {{^}} [1][1] + // CHECK: fix-it:{{.*}}:{[[@LINE-5]]:14-[[@LINE-5]]:20}:"" + // CHECK: fix-it:{{.*}}:{[[@LINE-6]]:21-[[@LINE-6]]:21}:"[1][1]" +}; +int [1][1]S::x = { {42} }; +// expected-error@-1{{brackets go after the unqualified-id}} +// CHECK: {{^}}int [1][1]S::x = { {42} }; +// CHECK: {{^}} ~~~~~~ ^ +// CHECK: {{^}} [1][1] +// CHECK: fix-it:{{.*}}:{[[@LINE-5]]:5-[[@LINE-5]]:11}:"" +// CHECK: fix-it:{{.*}}:{[[@LINE-6]]:15-[[@LINE-6]]:15}:"[1][1]" + +int[1] g[2]; +// expected-error@-1{{brackets go after the unqualified-id}} +// CHECK: {{^}}int[1] g[2]; +// CHECK: {{^}} ~~~ ^ +// CHECK: {{^}} [1] +// CHECK: fix-it:{{.*}}:{[[@LINE-5]]:4-[[@LINE-5]]:7}:"" +// CHECK: fix-it:{{.*}}:{[[@LINE-6]]:12-[[@LINE-6]]:12}:"[1]" + +int [3] (*x) = 0; +// expected-error@-1{{brackets go after the unqualified-id}} +// CHECK: {{^}}int [3] (*x) = 0; +// CHECK: {{^}} ~~~~ ^ +// CHECK: {{^}} [3] +// CHECK: fix-it:{{.*}}:{[[@LINE-5]]:5-[[@LINE-5]]:9}:"" +// CHECK: fix-it:{{.*}}:{[[@LINE-6]]:13-[[@LINE-6]]:13}:"[3]" + +struct A { static int (*B)[5]; }; +int [5] *A::B = 0; +// expected-error@-1{{brackets go after the unqualified-id}} +// CHECK: {{^}}int [5] *A::B = 0; +// CHECK: {{^}} ~~~~ ^ +// CHECK: {{^}} ( )[5] +// CHECK: fix-it:{{.*}}:{[[@LINE-5]]:5-[[@LINE-5]]:9}:"" +// CHECK: fix-it:{{.*}}:{[[@LINE-6]]:9-[[@LINE-6]]:9}:"(" +// CHECK: fix-it:{{.*}}:{[[@LINE-7]]:14-[[@LINE-7]]:14}:")[5]" + +int [3] *t; +// expected-error@-1{{brackets go after the unqualified-id}} +// CHECK: {{^}}int [3] *t; +// CHECK: {{^}} ~~~~ ^ +// CHECK: {{^}} ( )[3] +// CHECK: fix-it:{{.*}}:{[[@LINE-5]]:5-[[@LINE-5]]:9}:"" +// CHECK: fix-it:{{.*}}:{[[@LINE-6]]:9-[[@LINE-6]]:9}:"(" +// CHECK: fix-it:{{.*}}:{[[@LINE-7]]:11-[[@LINE-7]]:11}:")[3]" + +int (*tt)[3] = t; // no error + +#ifndef FIXIT +// Make sure x is corrected to be like type y, instead of like type z. +int (*y)[3] = x; +int (*z[3]) = x; // expected-error{{}} + +int [][][]; +// expected-error@-1{{expected unqualified-id}} +// CHECK: {{^}}int [][][]; +// CHECK: {{^}} ^ + +struct T { + int []; + // expected-error@-1{{expected member name or ';' after declaration specifiers}} + // CHECK: {{^}} int []; + // CHECK: {{^}} ~~~ ^ +}; + +int [] T:: +// expected-error@-1{{expected unqualified-id}} +// CHECK: {{^}}int [] T:: +// CHECK: {{^}} ^ +#endif + +// CHECK: 11 errors generated.