- Rename Instruction::First*Op to *OpsBegin, and Num*Ops to *OpsEnd to

    reflect the fact that it's a range being defined.


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

2 files changed, 12 insertions, 12 deletions

diff --git a/include/llvm/InstrTypes.h b/include/llvm/InstrTypes.h
index fc1917b..09c08b8 100644
--- a/include/llvm/InstrTypes.h
+++ b/include/llvm/InstrTypes.h
@@ -47,7 +47,7 @@ public:
   // Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const TerminatorInst *) { return true; }
   static inline bool classof(const Instruction *I) {
-    return I->getOpcode() >= FirstTermOp && I->getOpcode() < NumTermOps; 
+    return I->getOpcode() >= TermOpsBegin && I->getOpcode() < TermOpsEnd;
   }
   static inline bool classof(const Value *V) {
     return isa<Instruction>(V) && classof(cast<Instruction>(V));
@@ -120,7 +120,7 @@ public:
   // Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const BinaryOperator *) { return true; }
   static inline bool classof(const Instruction *I) {
-    return I->getOpcode() >= FirstBinaryOp && I->getOpcode() < NumBinaryOps; 
+    return I->getOpcode() >= BinaryOpsBegin && I->getOpcode() < BinaryOpsEnd; 
   }
   static inline bool classof(const Value *V) {
     return isa<Instruction>(V) && classof(cast<Instruction>(V));
diff --git a/include/llvm/Instruction.h b/include/llvm/Instruction.h
index 0674f0e..89c6409 100644
--- a/include/llvm/Instruction.h
+++ b/include/llvm/Instruction.h
@@ -68,10 +68,10 @@ public:
   static const char* getOpcodeName(unsigned OpCode);
 
   inline bool isTerminator() const {   // Instance of TerminatorInst?
-    return iType >= FirstTermOp && iType < NumTermOps;
+    return iType >= TermOpsBegin && iType < TermOpsEnd;
   }
   inline bool isBinaryOp() const {
-    return iType >= FirstBinaryOp && iType < NumBinaryOps;
+    return iType >= BinaryOpsBegin && iType < BinaryOpsEnd;
   }
 
   virtual void print(std::ostream &OS) const;
@@ -86,30 +86,30 @@ public:
   // Exported enumerations...
   //
   enum TermOps {       // These terminate basic blocks
-#define  FIRST_TERM_INST(N)             FirstTermOp = N,
+#define  FIRST_TERM_INST(N)             TermOpsBegin = N,
 #define HANDLE_TERM_INST(N, OPC, CLASS) OPC = N,
-#define   LAST_TERM_INST(N)             NumTermOps = N+1,
+#define   LAST_TERM_INST(N)             TermOpsEnd = N+1,
 #include "llvm/Instruction.def"
   };
 
   enum BinaryOps {
-#define  FIRST_BINARY_INST(N)             FirstBinaryOp = N,
+#define  FIRST_BINARY_INST(N)             BinaryOpsBegin = N,
 #define HANDLE_BINARY_INST(N, OPC, CLASS) OPC = N,
-#define   LAST_BINARY_INST(N)             NumBinaryOps = N+1,
+#define   LAST_BINARY_INST(N)             BinaryOpsEnd = N+1,
 #include "llvm/Instruction.def"
   };
 
   enum MemoryOps {
-#define  FIRST_MEMORY_INST(N)             FirstMemoryOp = N,
+#define  FIRST_MEMORY_INST(N)             MemoryOpsBegin = N,
 #define HANDLE_MEMORY_INST(N, OPC, CLASS) OPC = N,
-#define   LAST_MEMORY_INST(N)             NumMemoryOps = N+1,
+#define   LAST_MEMORY_INST(N)             MemoryOpsEnd = N+1,
 #include "llvm/Instruction.def"
   };
 
   enum OtherOps {
-#define  FIRST_OTHER_INST(N)             FirstOtherOp = N,
+#define  FIRST_OTHER_INST(N)             OtherOpsBegin = N,
 #define HANDLE_OTHER_INST(N, OPC, CLASS) OPC = N,
-#define   LAST_OTHER_INST(N)             NumOtherOps = N+1,
+#define   LAST_OTHER_INST(N)             OtherOpsEnd = N+1,
 #include "llvm/Instruction.def"
   };
 };