diff options
| -rw-r--r-- | lib/Parse/ParseExprCXX.cpp | 2 | ||||
| -rw-r--r-- | test/Parser/cxx-casting.cpp | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp index 89953fd3d8..baec6fdd73 100644 --- a/lib/Parse/ParseExprCXX.cpp +++ b/lib/Parse/ParseExprCXX.cpp @@ -75,7 +75,7 @@ static void FixDigraph(Parser &P, Preprocessor &PP, Token &DigraphToken, void Parser::CheckForTemplateAndDigraph(Token &Next, ParsedType ObjectType, bool EnteringContext, IdentifierInfo &II, CXXScopeSpec &SS) { - if (!Next.is(tok::l_square) || !Next.getLength() == 2) + if (!Next.is(tok::l_square) || Next.getLength() != 2) return; Token SecondToken = GetLookAheadToken(2); diff --git a/test/Parser/cxx-casting.cpp b/test/Parser/cxx-casting.cpp index cb82c8efda..42ad12ee94 100644 --- a/test/Parser/cxx-casting.cpp +++ b/test/Parser/cxx-casting.cpp @@ -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 '< ::'?}} } -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() {}; class F {}; @@ -82,4 +83,10 @@ void test3() { D< ::F> A4; ::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 '['}} } |