[cfe-commits] r147155 - in /cfe/trunk: lib/Parse/ParseExpr.cpp test/SemaCXX/cxx0x-initializer-constructor.cpp

[Sebastian Redl]

Author: cornedbee
Date: Thu Dec 22 12:58:29 2011
New Revision: 147155

URL: http://llvm.org/viewvc/llvm-project?rev=147155&view=rev
Log:
Fix a parser bug that prevented it from correctly parsing explicit construct expressoins of the form T{args}.

Modified:
    cfe/trunk/lib/Parse/ParseExpr.cpp
    cfe/trunk/test/SemaCXX/cxx0x-initializer-constructor.cpp

Modified: cfe/trunk/lib/Parse/ParseExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExpr.cpp?rev=147155&r1=147154&r2=147155&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseExpr.cpp (original)
+++ cfe/trunk/lib/Parse/ParseExpr.cpp Thu Dec 22 12:58:29 2011
@@ -678,7 +678,8 @@
       if (Next.is(tok::coloncolon) ||
           (!ColonIsSacred && Next.is(tok::colon)) ||
           Next.is(tok::less) ||
-          Next.is(tok::l_paren)) {
+          Next.is(tok::l_paren) ||
+          Next.is(tok::l_brace)) {
         // If TryAnnotateTypeOrScopeToken annotates the token, tail recurse.
         if (TryAnnotateTypeOrScopeToken())
           return ExprError();

Modified: cfe/trunk/test/SemaCXX/cxx0x-initializer-constructor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx0x-initializer-constructor.cpp?rev=147155&r1=147154&r2=147155&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/cxx0x-initializer-constructor.cpp (original)
+++ cfe/trunk/test/SemaCXX/cxx0x-initializer-constructor.cpp Thu Dec 22 12:58:29 2011
@@ -52,7 +52,7 @@
   }
 
   void inline_init() {
-    //(void) C{1, 1.0}; FIXME: inline initialization
+    (void) C{1, 1.0};
     (void) new C{1, 1.0};
   }