commit 2c41d487a6f044bd49a3f4ded9192202d8a8f248
author Chris Lattner <sabre@nondot.org> Sun Mar 29 17:18:04 2009 +0000
committer Chris Lattner <sabre@nondot.org> Sun Mar 29 17:18:04 2009 +0000
tree 86531eaa799afb588283057ad8ddea9d00723e25
parent 06f9792b3f66164e5db08c4ba5bcbf145933c16e

hoist checks for ; and in out of ParseInitDeclaratorListAfterFirstDeclarator
into ParseSimpleDeclaration, and improve a diagnostic.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68009 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Parse/ParseDecl.cpp

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 1f8522f..5de4dd4 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -273,7 +273,30 @@
   Declarator DeclaratorInfo(DS, (Declarator::TheContext)Context);
   ParseDeclarator(DeclaratorInfo);
   
-  return ParseInitDeclaratorListAfterFirstDeclarator(DeclaratorInfo);
+  DeclGroupPtrTy DG =
+    ParseInitDeclaratorListAfterFirstDeclarator(DeclaratorInfo);
+  
+  if (Tok.is(tok::semi)) {
+    ConsumeToken();
+    // for(is key; in keys) is error.
+    if (Context == Declarator::ForContext && isTokIdentifier_in())
+      Diag(Tok, diag::err_parse_error);
+    
+    return DG;
+  }
+  
+  // If this is an ObjC2 for-each loop, this is a successful declarator
+  // parse.  The syntax for these looks like:
+  // 'for' '(' declaration 'in' expr ')' statement
+  if (Context == Declarator::ForContext && isTokIdentifier_in())
+    return DG;
+  
+  Diag(Tok, diag::err_expected_semi_declation);
+  // Skip to end of block or statement
+  SkipUntil(tok::r_brace, true, true);
+  if (Tok.is(tok::semi))
+    ConsumeToken();
+  return DG;
 }
 
 
@@ -315,7 +338,7 @@
       SourceLocation Loc;
       OwningExprResult AsmLabel(ParseSimpleAsm(&Loc));
       if (AsmLabel.isInvalid()) {
-        SkipUntil(tok::semi);
+        SkipUntil(tok::semi, true, true);
         return DeclGroupPtrTy();
       }
 
@@ -343,7 +366,7 @@
       } else {
         OwningExprResult Init(ParseInitializer());
         if (Init.isInvalid()) {
-          SkipUntil(tok::semi);
+          SkipUntil(tok::semi, true, true);
           return DeclGroupPtrTy();
         }
         Actions.AddInitializerToDecl(ThisDecl, move(Init));
@@ -400,31 +423,8 @@
     ParseDeclarator(D);
   }
   
-  if (Tok.is(tok::semi)) {
-    ConsumeToken();
-    // for(is key; in keys) is error.
-    if (D.getContext() == Declarator::ForContext && isTokIdentifier_in()) {
-      Diag(Tok, diag::err_parse_error);
-      return DeclGroupPtrTy();
-    }
-    
-    return Actions.FinalizeDeclaratorGroup(CurScope, &DeclsInGroup[0],
-                                           DeclsInGroup.size());
-  }
-  
-  // If this is an ObjC2 for-each loop, this is a successful declarator
-  // parse.  The syntax for these looks like:
-  // 'for' '(' declaration 'in' expr ')' statement
-  if (D.getContext() == Declarator::ForContext && isTokIdentifier_in())
-    return Actions.FinalizeDeclaratorGroup(CurScope, &DeclsInGroup[0],
-                                           DeclsInGroup.size());
-
-  Diag(Tok, diag::err_parse_error);
-  // Skip to end of block or statement
-  SkipUntil(tok::r_brace, true, true);
-  if (Tok.is(tok::semi))
-    ConsumeToken();
-  return DeclGroupPtrTy();
+  return Actions.FinalizeDeclaratorGroup(CurScope, &DeclsInGroup[0],
+                                         DeclsInGroup.size());
 }
 
 /// ParseSpecifierQualifierList