* Minor cleanups

[oota-llvm.git] / include / llvm / Function.h

diff --git a/include/llvm/Function.h b/include/llvm/Function.h
index d7c35b3c040b625f2b4fc9f95b9a42cd5ea54865..93b9dc6d7abfe5f6e09e0b8c0e5409a3abb598d1 100644 (file)
--- a/include/llvm/Function.h
+++ b/include/llvm/Function.h
@@ -29,26 +29,24 @@ public:
   // BasicBlock iterators...
   typedef BasicBlocksType::iterator iterator;
   typedef BasicBlocksType::const_iterator const_iterator;
-  typedef reverse_iterator<const_iterator> const_reverse_iterator;
-  typedef reverse_iterator<iterator>             reverse_iterator;
+  typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+  typedef std::reverse_iterator<iterator>             reverse_iterator;
 
 private:
 
   // Important things that make up a method!
-  BasicBlocksType  BasicBlocks;    // The basic blocks
-  ArgumentListType ArgumentList;   // The formal arguments
-
-  Module *Parent;                  // The module that contains this method
-
+  BasicBlocksType  BasicBlocks;         // The basic blocks
+  ArgumentListType ArgumentList;        // The formal arguments
+  
   friend class ValueHolder<Method, Module, Module>;
   void setParent(Module *parent);
 
 public:
-  Method(const MethodType *Ty, const string &Name = "");
+  Method(const MethodType *Ty, bool isInternal, const std::string &Name = "");
   ~Method();
 
   // Specialize setName to handle symbol table majik...
-  virtual void setName(const string &name, SymbolTable *ST = 0);
+  virtual void setName(const std::string &name, SymbolTable *ST = 0);
 
   const Type *getReturnType() const;        // Return the return type of method
   const MethodType *getMethodType() const;  // Return the MethodType for me
@@ -57,19 +55,18 @@ public:
   // this is true for external methods, defined as forward "declare"ations
   bool isExternal() const { return BasicBlocks.empty(); }
 
-
-  // Get the class structure that this method is contained inside of...
-  inline Module *getParent() { return Parent; }
-  inline const Module *getParent() const { return Parent; }
-
-  // Get the underlying elements of the Method...
+  // Get the underlying elements of the Method... both the argument list and
+  // basic block list are empty for external methods.
+  //
   inline const ArgumentListType &getArgumentList() const{ return ArgumentList; }
   inline       ArgumentListType &getArgumentList()      { return ArgumentList; }
 
   inline const BasicBlocksType  &getBasicBlocks() const { return BasicBlocks; }
   inline       BasicBlocksType  &getBasicBlocks()       { return BasicBlocks; }
 
-
+  inline const BasicBlock       *getEntryNode() const   { return front(); }
+  inline       BasicBlock       *getEntryNode()         { return front(); }
+  
   //===--------------------------------------------------------------------===//
   // BasicBlock iterator forwarding functions
   //
@@ -117,10 +114,10 @@ public:
                       BasicBlock::iterator, Instruction*> inst_iterator;
   typedef InstIterator<const BasicBlocksType, const_iterator, 
                       BasicBlock::const_iterator,
-                      const Instruction*> inst_const_iterator;
+                      const Instruction*> const_inst_iterator;
 
   // This inner class is used to implement inst_begin() & inst_end() for
-  // inst_iterator and inst_const_iterator's.
+  // inst_iterator and const_inst_iterator's.
   //
   template <class _BB_t, class _BB_i_t, class _BI_t, class _II_t>
   class InstIterator {
@@ -132,8 +129,12 @@ public:
     _BB_i_t BB;       // BasicBlocksType::iterator
     _BI_t   BI;       // BasicBlock::iterator
   public:
-    typedef bidirectional_iterator_tag iterator_category;
-
+    typedef std::bidirectional_iterator_tag iterator_category;
+    typedef IIty                            value_type;
+    typedef unsigned                        difference_type;
+    typedef BIty                            pointer;
+    typedef IIty                            reference;
+    
     template<class M> InstIterator(M &m) 
       : BBs(m.getBasicBlocks()), BB(BBs.begin()) {    // begin ctor
       if (BB != BBs.end()) {
@@ -154,7 +155,7 @@ public:
     inline IIty operator->() const { return operator*(); }
 
     inline bool operator==(const InstIterator &y) const { 
-      return BB == y.BB && (BI == y.BI || BB == BBs.end());
+      return BB == y.BB && (BB == BBs.end() || BI == y.BI);
     }
     inline bool operator!=(const InstIterator& y) const { 
       return !operator==(y);
@@ -200,8 +201,8 @@ public:
 
   inline inst_iterator inst_begin() { return inst_iterator(*this); }
   inline inst_iterator inst_end()   { return inst_iterator(*this, true); }
-  inline inst_const_iterator inst_begin() const { return inst_const_iterator(*this); }
-  inline inst_const_iterator inst_end()   const { return inst_const_iterator(*this, true); }
+  inline const_inst_iterator inst_begin() const { return const_inst_iterator(*this); }
+  inline const_inst_iterator inst_end()   const { return const_inst_iterator(*this, true); }
 };
 
 // Provide specializations of GraphTraits to be able to treat a method as a