Change uses of Method to Function

Change uses of methodArgument to FunctionArgument


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

2 files changed, 5 insertions, 9 deletions

diff --git a/include/llvm/Assembly/CachedWriter.h b/include/llvm/Assembly/CachedWriter.h
index cccf037..20b4c05 100644
--- a/include/llvm/Assembly/CachedWriter.h
+++ b/include/llvm/Assembly/CachedWriter.h
@@ -43,10 +43,10 @@ public:
   inline CachedWriter &operator<<(const GlobalVariable *X) {
     return *this << (const Value*)X;
   }
-  inline CachedWriter &operator<<(const Method *X) {
+  inline CachedWriter &operator<<(const Function *X) {
     return *this << (const Value*)X;
   }
-  inline CachedWriter &operator<<(const MethodArgument *X) {
+  inline CachedWriter &operator<<(const FunctionArgument *X) {
     return *this << (const Value*)X;
   }
   inline CachedWriter &operator<<(const BasicBlock *X) {
diff --git a/include/llvm/Assembly/Writer.h b/include/llvm/Assembly/Writer.h
index 5d5a746..a148c0b 100644
--- a/include/llvm/Assembly/Writer.h
+++ b/include/llvm/Assembly/Writer.h
@@ -19,11 +19,6 @@
 #include <iostream>
 #include "llvm/Type.h"
 
-class Module;
-class GlobalVariable;
-class Function;
-class BasicBlock;
-class Instruction;
 class SlotCalculator;
 
 // The only interface defined by this file... convert the internal 
@@ -100,10 +95,11 @@ inline std::ostream &operator<<(std::ostream &o, const Value *I) {
   switch (I->getValueType()) {
   case Value::TypeVal:       return o << cast<const Type>(I);
   case Value::ConstantVal:   WriteToAssembly(cast<Constant>(I)      , o); break;
-  case Value::MethodArgumentVal: return o << I->getType() << " "<< I->getName();
+  case Value::FunctionArgumentVal:
+    return o << I->getType() << " " << I->getName();
   case Value::InstructionVal:WriteToAssembly(cast<Instruction>(I)   , o); break;
   case Value::BasicBlockVal: WriteToAssembly(cast<BasicBlock>(I)    , o); break;
-  case Value::MethodVal:     WriteToAssembly(cast<Function>(I)      , o); break;
+  case Value::FunctionVal:   WriteToAssembly(cast<Function>(I)      , o); break;
   case Value::GlobalVariableVal:
                              WriteToAssembly(cast<GlobalVariable>(I), o); break;
   case Value::ModuleVal:     WriteToAssembly(cast<Module>(I)        , o); break;