move some constructors out of line and fix indentation in ObjCAtThrowStmt::getSourceR...

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

diff --git a/AST/Stmt.cpp b/AST/Stmt.cpp
index 4d1be5539d4dfd19b61e9ed86ebadb699d9bac3c..fd72481fee842beee5b557f0f1293a74cc399af4 100644 (file)
--- a/AST/Stmt.cpp
+++ b/AST/Stmt.cpp
@@ -111,20 +111,17 @@ bool Stmt::hasImplicitControlFlow() const {
   }
 }
 
-AsmStmt::AsmStmt(SourceLocation asmloc, 
-                 bool isvolatile,
-                 unsigned numoutputs,
-                 unsigned numinputs,
-                 std::string *names,
-                 StringLiteral **constraints,
-                 Expr **exprs,
-                 StringLiteral *asmstr,
-                 unsigned numclobbers,
-                 StringLiteral **clobbers,                 
-                 SourceLocation rparenloc)
+//===----------------------------------------------------------------------===//
+// Constructors
+//===----------------------------------------------------------------------===//
+
+AsmStmt::AsmStmt(SourceLocation asmloc,  bool isvolatile,
+                 unsigned numoutputs, unsigned numinputs,
+                 std::string *names, StringLiteral **constraints,
+                 Expr **exprs, StringLiteral *asmstr, unsigned numclobbers,
+                 StringLiteral **clobbers, SourceLocation rparenloc)
   : Stmt(AsmStmtClass), AsmLoc(asmloc), RParenLoc(rparenloc), AsmStr(asmstr)
-  , IsVolatile(isvolatile), NumOutputs(numoutputs), NumInputs(numinputs)
-{
+  , IsVolatile(isvolatile), NumOutputs(numoutputs), NumInputs(numinputs) {
   for (unsigned i = 0, e = numinputs + numoutputs; i != e; i++) {
     Names.push_back(names[i]);
     Exprs.push_back(exprs[i]);
@@ -135,6 +132,39 @@ AsmStmt::AsmStmt(SourceLocation asmloc,
     Clobbers.push_back(clobbers[i]);
 }
 
+ObjCForCollectionStmt::ObjCForCollectionStmt(Stmt *Elem, Expr *Collect,
+                                             Stmt *Body,  SourceLocation FCL,
+                                             SourceLocation RPL) 
+: Stmt(ObjCForCollectionStmtClass) {
+  SubExprs[ELEM] = Elem;
+  SubExprs[COLLECTION] = reinterpret_cast<Stmt*>(Collect);
+  SubExprs[BODY] = Body;
+  ForLoc = FCL;
+  RParenLoc = RPL;
+}
+
+
+ObjCAtCatchStmt::ObjCAtCatchStmt(SourceLocation atCatchLoc, 
+                                 SourceLocation rparenloc, 
+                                 Stmt *catchVarStmtDecl, Stmt *atCatchStmt, 
+                                 Stmt *atCatchList)
+: Stmt(ObjCAtCatchStmtClass) {
+  SubExprs[SELECTOR] = catchVarStmtDecl;
+  SubExprs[BODY] = atCatchStmt;
+  if (!atCatchList)
+    NextAtCatchStmt = NULL;
+  else {
+    ObjCAtCatchStmt *AtCatchList = 
+    static_cast<ObjCAtCatchStmt*>(atCatchList);
+    while (AtCatchList->NextAtCatchStmt)
+      AtCatchList = AtCatchList->NextAtCatchStmt;
+    AtCatchList->NextAtCatchStmt = this;
+  }
+  AtCatchLoc = atCatchLoc;
+  RParenLoc = rparenloc;
+}
+
+
 //===----------------------------------------------------------------------===//
 //  Child Iterators for iterating over subexpressions/substatements
 //===----------------------------------------------------------------------===//

diff --git a/CodeGen/CGExprAgg.cpp b/CodeGen/CGExprAgg.cpp
index 3781407f98822ca071532e16c3c7517cec0465af..d52e8b1a0e5f7d08607170876c6398375deba848 100644 (file)
--- a/CodeGen/CGExprAgg.cpp
+++ b/CodeGen/CGExprAgg.cpp
@@ -225,7 +225,7 @@ void AggExprEmitter::VisitInitListExpr(InitListExpr *E) {
   // Copy initializer elements.
   bool AllConstElements = true;
   unsigned i = 0;
-  for (i = 0; i < NumInitElements; ++i) {
+  for (i = 0; i != NumInitElements; ++i) {
     if (llvm::Constant *C = 
         dyn_cast<llvm::Constant>(CGF.EmitScalarExpr(E->getInit(i))))
       ArrayElts.push_back(C);

diff --git a/include/clang/AST/Stmt.h b/include/clang/AST/Stmt.h
index 7f41d0d287d156f5411921a287b3cc9e9082cf69..5990ca20c7f878303170fb583737eaa8cbce6514 100644 (file)
--- a/include/clang/AST/Stmt.h
+++ b/include/clang/AST/Stmt.h
@@ -588,15 +588,8 @@ class ObjCForCollectionStmt : public Stmt {
   SourceLocation RParenLoc;
 public:
   ObjCForCollectionStmt(Stmt *Elem, Expr *Collect, Stmt *Body, 
-                        SourceLocation FCL, SourceLocation RPL) 
-  : Stmt(ObjCForCollectionStmtClass) {
-    SubExprs[ELEM] = Elem;
-    SubExprs[COLLECTION] = reinterpret_cast<Stmt*>(Collect);
-    SubExprs[BODY] = Body;
-    ForLoc = FCL;
-    RParenLoc = RPL;
-  }
-    
+                        SourceLocation FCL, SourceLocation RPL);
+  
   Stmt *getElement() { return SubExprs[ELEM]; }
   Expr *getCollection() { 
     return reinterpret_cast<Expr*>(SubExprs[COLLECTION]); 
@@ -773,17 +766,10 @@ class AsmStmt : public Stmt {
 
   llvm::SmallVector<StringLiteral*, 4> Clobbers;
 public:
-  AsmStmt(SourceLocation asmloc, 
-          bool isvolatile,
-          unsigned numoutputs,
-          unsigned numinputs,
-          std::string *names,
-          StringLiteral **constraints,
-          Expr **exprs,
-          StringLiteral *asmstr,
-          unsigned numclobbers,
-          StringLiteral **clobbers,
-          SourceLocation rparenloc);
+  AsmStmt(SourceLocation asmloc,  bool isvolatile, unsigned numoutputs,
+          unsigned numinputs, std::string *names, StringLiteral **constraints,
+          Expr **exprs, StringLiteral *asmstr, unsigned numclobbers,
+          StringLiteral **clobbers, SourceLocation rparenloc);
 
   bool isVolatile() const { return IsVolatile; }
   
@@ -843,22 +829,7 @@ private:
 
 public:
   ObjCAtCatchStmt(SourceLocation atCatchLoc, SourceLocation rparenloc,
-                  Stmt *catchVarStmtDecl, Stmt *atCatchStmt, Stmt *atCatchList)
-  : Stmt(ObjCAtCatchStmtClass) {
-      SubExprs[SELECTOR] = catchVarStmtDecl;
-      SubExprs[BODY] = atCatchStmt;
-      if (!atCatchList)
-        NextAtCatchStmt = NULL;
-      else {
-        ObjCAtCatchStmt *AtCatchList = 
-          static_cast<ObjCAtCatchStmt*>(atCatchList);
-        while (AtCatchList->NextAtCatchStmt)
-          AtCatchList = AtCatchList->NextAtCatchStmt;
-        AtCatchList->NextAtCatchStmt = this;
-      }
-      AtCatchLoc = atCatchLoc;
-      RParenLoc = rparenloc;
-    }
+                  Stmt *catchVarStmtDecl, Stmt *atCatchStmt, Stmt *atCatchList);
   
   const Stmt *getCatchBody() const { return SubExprs[BODY]; }
   Stmt *getCatchBody() { return SubExprs[BODY]; }
@@ -1020,8 +991,8 @@ public:
   virtual SourceRange getSourceRange() const {
     if (Throw)
       return SourceRange(AtThrowLoc, Throw->getLocEnd()); 
-       else 
-         return SourceRange(AtThrowLoc);
+    else 
+      return SourceRange(AtThrowLoc);
   }
   
   static bool classof(const Stmt *T) {