commit f5fbd7963d8d0798ebddcf9baee551e0dd49b9a9
author Chris Lattner <sabre@nondot.org> Thu Aug 10 23:56:11 2006 +0000
committer Chris Lattner <sabre@nondot.org> Thu Aug 10 23:56:11 2006 +0000
tree 2339a840f7ec814be9c6edbc6159f75d39a4867e
parent 4564bc1123137e1d7e7810104bf9ffd022c947b9

Implement type-name parsing, and simple compound initializer parsing.

llvm-svn: 38865

clang/Parse/ParseExpr.cpp

diff --git a/clang/Parse/ParseExpr.cpp b/clang/Parse/ParseExpr.cpp
index cf8a2f5..5e84832 100644
--- a/clang/Parse/ParseExpr.cpp
+++ b/clang/Parse/ParseExpr.cpp
@@ -19,6 +19,15 @@
 // C99 6.7.8
 void Parser::ParseInitializer() {
   // FIXME: STUB.
+  if (Tok.getKind() == tok::l_brace) {
+    ConsumeBrace();
+    // FIXME: initializer-list
+    // Match the '}'.
+    MatchRHSPunctuation(tok::r_brace, Tok.getLocation(), "{",
+                        diag::err_expected_rbrace);
+    return;
+  }
+  
   ParseAssignmentExpression();
 }
 
@@ -44,10 +53,12 @@
   if (Tok.getKind() != tok::l_paren)
     return ParseUnaryExpression();
   
+#if 0
   // Otherwise this is either a cast, a compound literal, or a parenthesized
   // expression.
   SourceLocation LParenLoc = Tok.getLocation();
   ConsumeParen();
+#endif
   
   assert(0);
 }
@@ -319,11 +330,22 @@
       !getLang().NoExtensions) {
     Diag(Tok, diag::ext_gnu_statement_expr);
     ParseCompoundStatement();
-  } else if (!ParenExprOnly && isTypeSpecifierQualifier()) { 
-    // FIXME: Implement compound literals: C99 6.5.2.5.  Type-name: C99 6.7.6.
-    assert(0 && "IMPLEMENT THIS!");
-  } else {
+  } else if (ParenExprOnly || !isTypeSpecifierQualifier()) {
     ParseExpression();
+  } else {
+    // Otherwise, this is a compound expression.
+    ParseTypeName();
+
+    // Match the ')'.
+    MatchRHSPunctuation(tok::r_paren, OpenLoc, "(", diag::err_expected_rparen);
+
+    if (Tok.getKind() != tok::l_brace) {
+      Diag(Tok, diag::err_expected_lbrace_in_compound_literal);
+      return;
+    }
+    
+    ParseInitializer();
+    return;
   }