commit fbfaafc0a992823b80e8fd35bbb32192a19767a9
author Sebastian Redl <sebastian.redl@getdesigned.at> Fri Jan 16 23:28:06 2009 +0000
committer Sebastian Redl <sebastian.redl@getdesigned.at> Fri Jan 16 23:28:06 2009 +0000
tree 5b12d3424577f1054381c4bfe1625fc4d1bc2111
parent f5359ea9d0064647fd662e9f68758d6491ad400f

Convert some more statement actions to smart pointers.
Fix a type error; parser wanted to pass the third part of a for-statement as a statement; should be expression.

llvm-svn: 62380

clang/lib/Parse/ParseStmt.cpp

diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index 153aeb8..1bc7858 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/clang/lib/Parse/ParseStmt.cpp
@@ -722,7 +722,8 @@
   if (Cond.isInvalid() || Body.isInvalid())
     return StmtError();
 
-  return Owned(Actions.ActOnWhileStmt(WhileLoc, Cond.release(),Body.release()));
+  return Actions.ActOnWhileStmt(WhileLoc, move_convert(Cond),
+                                move_convert(Body));
 }
 
 /// ParseDoStatement
@@ -786,8 +787,8 @@
   if (Cond.isInvalid() || Body.isInvalid())
     return StmtError();
 
-  return Owned(Actions.ActOnDoStmt(DoLoc, Body.release(), WhileLoc,
-                                   Cond.release()));
+  return Actions.ActOnDoStmt(DoLoc, move_convert(Body), WhileLoc,
+                             move_convert(Cond));
 }
 
 /// ParseForStatement
@@ -843,8 +844,8 @@
   OwningExprResult Value(Actions);
 
   bool ForEach = false;
-  OwningStmtResult FirstPart(Actions), ThirdPart(Actions);
-  OwningExprResult SecondPart(Actions);
+  OwningStmtResult FirstPart(Actions);
+  OwningExprResult SecondPart(Actions), ThirdPart(Actions);
 
   // Parse the first part of the for specifier.
   if (Tok.is(tok::semi)) {  // for (;
@@ -903,11 +904,7 @@
     if (Tok.is(tok::r_paren)) {  // for (...;...;)
       // no third part.
     } else {
-      Value = ParseExpression();
-      if (!Value.isInvalid()) {
-        // Turn the expression into a stmt.
-        ThirdPart = Actions.ActOnExprStmt(move_convert(Value));
-      }
+      ThirdPart = ParseExpression();
     }
   }
   // Match the ')'.
@@ -940,14 +937,14 @@
     return StmtError();
 
   if (!ForEach)
-    return Owned(Actions.ActOnForStmt(ForLoc, LParenLoc, FirstPart.release(),
-                                      SecondPart.release(), ThirdPart.release(),
-                                      RParenLoc, Body.release()));
+    return Actions.ActOnForStmt(ForLoc, LParenLoc, move_convert(FirstPart),
+                              move_convert(SecondPart), move_convert(ThirdPart),
+                              RParenLoc, move_convert(Body));
   else
-    return Owned(Actions.ActOnObjCForCollectionStmt(ForLoc, LParenLoc,
-                                                    FirstPart.release(),
-                                                    SecondPart.release(),
-                                                    RParenLoc, Body.release()));
+    return Actions.ActOnObjCForCollectionStmt(ForLoc, LParenLoc,
+                                              move_convert(FirstPart),
+                                              move_convert(SecondPart),
+                                              RParenLoc, move_convert(Body));
 }
 
 /// ParseGotoStatement