[llvm-commits] CVS: llvm/lib/Bytecode/Analyzer/Parser.cpp Parser.h

[Chris Lattner]

Changes in directory llvm/lib/Bytecode/Analyzer:

Parser.cpp updated: 1.5 -> 1.6
Parser.h updated: 1.4 -> 1.5

---
Log message:

Rename Type::PrimitiveID to TypeId and ::getPrimitiveID() to ::getTypeID()


---
Diffs of the changes:  (+5 -5)

Index: llvm/lib/Bytecode/Analyzer/Parser.cpp
diff -u llvm/lib/Bytecode/Analyzer/Parser.cpp:1.5 llvm/lib/Bytecode/Analyzer/Parser.cpp:1.6
--- llvm/lib/Bytecode/Analyzer/Parser.cpp:1.5	Thu Jun 10 16:59:20 2004
+++ llvm/lib/Bytecode/Analyzer/Parser.cpp	Thu Jun 17 13:17:56 2004
@@ -145,7 +145,7 @@
 //cerr << "Looking up Type ID: " << ID << "\n";
 
 if (ID < Type::FirstDerivedTyID)
-  if (const Type *T = Type::getPrimitiveType((Type::PrimitiveID)ID))
+  if (const Type *T = Type::getPrimitiveType((Type::TypeID)ID))
     return T;   // Asked for a primitive type...
 
 // Otherwise, derived types need offset...
@@ -467,7 +467,7 @@
   unsigned PrimType = read_vbr_uint();
 
   const Type *Val = 0;
-  if ((Val = Type::getPrimitiveType((Type::PrimitiveID)PrimType)))
+  if ((Val = Type::getPrimitiveType((Type::TypeID)PrimType)))
     return Val;
   
   switch (PrimType) {
@@ -615,7 +615,7 @@
   
   // Ok, not an ConstantExpr.  We now know how to read the given type...
   const Type *Ty = getType(TypeID);
-  switch (Ty->getPrimitiveID()) {
+  switch (Ty->getTypeID()) {
   case Type::BoolTyID: {
     unsigned Val = read_vbr_uint();
     if (Val != 0 && Val != 1) 


Index: llvm/lib/Bytecode/Analyzer/Parser.h
diff -u llvm/lib/Bytecode/Analyzer/Parser.h:1.4 llvm/lib/Bytecode/Analyzer/Parser.h:1.5
--- llvm/lib/Bytecode/Analyzer/Parser.h:1.4	Thu Jun 10 16:59:20 2004
+++ llvm/lib/Bytecode/Analyzer/Parser.h	Thu Jun 17 13:17:56 2004
@@ -264,7 +264,7 @@
   /// fancy features are supported.
   const Type *getGlobalTableType(unsigned Slot) {
     if (Slot < Type::FirstDerivedTyID) {
-      const Type *Ty = Type::getPrimitiveType((Type::PrimitiveID)Slot);
+      const Type *Ty = Type::getPrimitiveType((Type::TypeID)Slot);
       assert(Ty && "Not a primitive type ID?");
       return Ty;
     }
@@ -276,7 +276,7 @@
 
   unsigned getGlobalTableTypeSlot(const Type *Ty) {
     if (Ty->isPrimitiveType())
-      return Ty->getPrimitiveID();
+      return Ty->getTypeID();
     TypeListTy::iterator I = find(ModuleTypes.begin(),
                                         ModuleTypes.end(), Ty);
     if (I == ModuleTypes.end())