Fix a problem in digraph handling where "[:" might be treated as "<::" and
erronously trigger the digraph correction fix-it. Include a new test to catch this in the future. llvm-svn: 140175
This commit is contained in:
parent
bef1745c9c
commit
02e25db543
|
@ -75,7 +75,7 @@ static void FixDigraph(Parser &P, Preprocessor &PP, Token &DigraphToken,
|
||||||
void Parser::CheckForTemplateAndDigraph(Token &Next, ParsedType ObjectType,
|
void Parser::CheckForTemplateAndDigraph(Token &Next, ParsedType ObjectType,
|
||||||
bool EnteringContext,
|
bool EnteringContext,
|
||||||
IdentifierInfo &II, CXXScopeSpec &SS) {
|
IdentifierInfo &II, CXXScopeSpec &SS) {
|
||||||
if (!Next.is(tok::l_square) || !Next.getLength() == 2)
|
if (!Next.is(tok::l_square) || Next.getLength() != 2)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Token SecondToken = GetLookAheadToken(2);
|
Token SecondToken = GetLookAheadToken(2);
|
||||||
|
|
|
@ -68,7 +68,8 @@ void test2(char x, struct B * b) {
|
||||||
(void)static_cast LCC c>(&x); // expected-error{{found '<::' after a static_cast which forms the digraph '<:' (aka '[') and a ':', did you mean '< ::'?}}
|
(void)static_cast LCC c>(&x); // expected-error{{found '<::' after a static_cast which forms the digraph '<:' (aka '[') and a ':', did you mean '< ::'?}}
|
||||||
}
|
}
|
||||||
|
|
||||||
template <class T> class D {};
|
// This note comes from "::D[:F> A5;"
|
||||||
|
template <class T> class D {}; // expected-note{{template is declared here}}
|
||||||
template <class T> void E() {};
|
template <class T> void E() {};
|
||||||
class F {};
|
class F {};
|
||||||
|
|
||||||
|
@ -82,4 +83,10 @@ void test3() {
|
||||||
D< ::F> A4;
|
D< ::F> A4;
|
||||||
::E< ::F>();
|
::E< ::F>();
|
||||||
E< ::F>();
|
E< ::F>();
|
||||||
|
|
||||||
|
// Make sure that parser doesn't expand '[:' to '< ::'
|
||||||
|
::D[:F> A5; // expected-error {{cannot refer to class template 'D' without a template argument list}} \
|
||||||
|
// expected-error {{expected expression}} \
|
||||||
|
// expected-error {{expected ']'}} \
|
||||||
|
// expected-note {{to match this '['}}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue