Renamed inst_const_iterator -> const_inst_iterator

Renamed op_const_iterator   -> const_op_iterator
Renamed PointerType::getValueType() -> PointerType::getElementType()


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

6 files changed, 18 insertions, 18 deletions

diff --git a/include/llvm/Analysis/ConstantsScanner.h b/include/llvm/Analysis/ConstantsScanner.h
index ebe85e8..69e97d5 100644
--- a/include/llvm/Analysis/ConstantsScanner.h
+++ b/include/llvm/Analysis/ConstantsScanner.h
@@ -16,7 +16,7 @@ class Constant;
 
 class constant_iterator
   : public std::forward_iterator<const Constant, ptrdiff_t> {
-  Method::inst_const_iterator InstI;        // Method instruction iterator
+  Method::const_inst_iterator InstI;        // Method instruction iterator
   unsigned OpIdx;                           // Operand index
 
   typedef constant_iterator _Self;
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index 7c347a4..d6b8ef7 100644
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -267,7 +267,7 @@ private:
   vector<bool>          implicitIsDef;  // machine instruction (eg, call args)
   
 public:
-  typedef ValOpIterator<const MachineInstr, const Value> val_op_const_iterator;
+  typedef ValOpIterator<const MachineInstr, const Value> val_const_op_iterator;
   typedef ValOpIterator<const MachineInstr,       Value> val_op_iterator;
   
 public:
@@ -307,7 +307,7 @@ public:
   
 public:
   friend ostream& operator<<(ostream& os, const MachineInstr& minstr);
-  friend val_op_const_iterator;
+  friend val_const_op_iterator;
   friend val_op_iterator;
 
 public:
diff --git a/include/llvm/DerivedTypes.h b/include/llvm/DerivedTypes.h
index d98d333..0f7e360 100644
--- a/include/llvm/DerivedTypes.h
+++ b/include/llvm/DerivedTypes.h
@@ -312,7 +312,7 @@ protected:
   PointerType(const Type *ElType);
 public:
 
-  inline const Type *getValueType() const { return ValueType; }
+  inline const Type *getElementType() const { return ValueType; }
 
   virtual const Type *getContainedType(unsigned i) const { 
     return i == 0 ? ValueType.get() : 0;
diff --git a/include/llvm/Function.h b/include/llvm/Function.h
index f2b0b48..6b44ad3 100644
--- a/include/llvm/Function.h
+++ b/include/llvm/Function.h
@@ -114,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 {
@@ -197,8 +197,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 
diff --git a/include/llvm/User.h b/include/llvm/User.h
index 6b1ece4..2ea3a43 100644
--- a/include/llvm/User.h
+++ b/include/llvm/User.h
@@ -40,12 +40,12 @@ public:
   // Operand Iterator interface...
   //
   typedef vector<Use>::iterator       op_iterator;
-  typedef vector<Use>::const_iterator op_const_iterator;
+  typedef vector<Use>::const_iterator const_op_iterator;
 
   inline op_iterator       op_begin()       { return Operands.begin(); }
-  inline op_const_iterator op_begin() const { return Operands.begin(); }
+  inline const_op_iterator op_begin() const { return Operands.begin(); }
   inline op_iterator       op_end()         { return Operands.end(); }
-  inline op_const_iterator op_end()   const { return Operands.end(); }
+  inline const_op_iterator op_end()   const { return Operands.end(); }
 
   // dropAllReferences() - This function is in charge of "letting go" of all
   // objects that this User refers to.  This allows one to
diff --git a/include/llvm/iMemory.h b/include/llvm/iMemory.h
index 8f356bf..13843d2 100644
--- a/include/llvm/iMemory.h
+++ b/include/llvm/iMemory.h
@@ -27,8 +27,8 @@ public:
 
     if (ArraySize) {
       // Make sure they didn't try to specify a size for !(unsized array) type
-      assert(getType()->getValueType()->isArrayType() && 
-             cast<ArrayType>(getType()->getValueType())->isUnsized() && 
+      assert(getType()->getElementType()->isArrayType() && 
+             cast<ArrayType>(getType()->getElementType())->isUnsized() && 
            "Trying to allocate something other than unsized array, with size!");
       assert(ArraySize->getType() == Type::UIntTy &&
              "Malloc/Allocation array size != UIntTy!");
@@ -37,8 +37,8 @@ public:
       Operands.push_back(Use(ArraySize, this));
     } else {
       // Make sure that the pointer is not to an unsized array!
-      assert(!getType()->getValueType()->isArrayType() ||
-	     cast<const ArrayType>(getType()->getValueType())->isSized() && 
+      assert(!getType()->getElementType()->isArrayType() ||
+	     cast<const ArrayType>(getType()->getElementType())->isSized() && 
 	     "Trying to allocate unsized array without size!");
     }
   }
@@ -63,7 +63,7 @@ public:
   // getAllocatedType - Return the type that is being allocated by the
   // instruction.
   inline const Type *getAllocatedType() const {
-    return getType()->getValueType();
+    return getType()->getElementType();
   }
 
   virtual Instruction *clone() const = 0;
@@ -183,11 +183,11 @@ public:
   inline op_iterator       idx_begin()       {
     return op_begin()+getFirstIndexOperandNumber();
   }
-  inline op_const_iterator idx_begin() const {
+  inline const_op_iterator idx_begin() const {
     return op_begin()+getFirstIndexOperandNumber();
   }
   inline op_iterator       idx_end()         { return op_end(); }
-  inline op_const_iterator idx_end()   const { return op_end(); }
+  inline const_op_iterator idx_end()   const { return op_end(); }
 
 
   vector<Value*> copyIndices() const {