[llvm-commits] CVS: llvm-java/lib/Compiler/Resolver.cpp Class.h Class.cpp

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/Compiler:

Resolver.cpp updated: 1.1 -> 1.2
Class.h updated: 1.3 -> 1.4
Class.cpp updated: 1.3 -> 1.4
---
Log message:

Function renaming and debug output change. No functional changes.


---
Diffs of the changes:  (+15 -12)

 Class.cpp    |    4 ++--
 Class.h      |   15 +++++++++------
 Resolver.cpp |    8 ++++----
 3 files changed, 15 insertions(+), 12 deletions(-)


Index: llvm-java/lib/Compiler/Resolver.cpp
diff -u llvm-java/lib/Compiler/Resolver.cpp:1.1 llvm-java/lib/Compiler/Resolver.cpp:1.2
--- llvm-java/lib/Compiler/Resolver.cpp:1.1	Wed Mar 23 22:47:47 2005
+++ llvm-java/lib/Compiler/Resolver.cpp	Fri Mar 25 20:50:56 2005
@@ -92,7 +92,7 @@
 {
   ClassMap::iterator it = classMap_.lower_bound(descriptor);
   if (it == classMap_.end() || it->first != descriptor) {
-    DEBUG(std::cerr << "Building Class for: " << descriptor << '\n');
+    DEBUG(std::cerr << "Loading class: " << descriptor << '\n');
     // Insert dummy class to the map.
     it = classMap_.insert(it, std::make_pair(descriptor, Class(*this)));
     switch (descriptor[0]) {
@@ -110,12 +110,12 @@
     case 'L': {
       unsigned pos = descriptor.find(';', 1);
       const std::string& className = descriptor.substr(1, pos - 1);
-      it->second.buildClass(className);
+      it->second.loadClass(className);
       break;
     }
     case '[': {
       const std::string& componentDescriptor = descriptor.substr(1);
-      it->second.buildArrayClass(getClassForDesc(componentDescriptor));
+      it->second.loadArrayClass(getClassForDesc(componentDescriptor));
       break;
     }
     default:
@@ -123,7 +123,7 @@
       abort();
     }
     module_.addTypeName(descriptor, it->second.getStructType());
-    DEBUG(std::cerr << "Built Class for: " << descriptor << '\n');
+    DEBUG(std::cerr << "Loaded class: " << descriptor << '\n');
   }
 
   return it->second;


Index: llvm-java/lib/Compiler/Class.h
diff -u llvm-java/lib/Compiler/Class.h:1.3 llvm-java/lib/Compiler/Class.h:1.4
--- llvm-java/lib/Compiler/Class.h:1.3	Thu Mar 24 16:35:36 2005
+++ llvm-java/lib/Compiler/Class.h	Fri Mar 25 20:50:56 2005
@@ -43,18 +43,21 @@
     void addField(const std::string& name, const Type* type);
     void resolveType();
 
-    // Creates a dummy class.
-    explicit Class(Resolver& resolver);
-
     // Creates primitive class for type.
     Class(Resolver& resolver, const Type* type);
 
+    friend class Resolver;
+
+    // Resolver interface.
+
+    // Creates a dummy class.
+    explicit Class(Resolver& resolver);
+
     // Builds the class object for the named class.
-    void buildClass(const std::string& className);
+    void loadClass(const std::string& className);
     // Builds the array class object of component type componentClass.
-    void buildArrayClass(const Class& componentClass);
+    void loadArrayClass(const Class& componentClass);
 
-    friend class Resolver;
     
   public:
     const Type* getStructType() const { return structType_; }


Index: llvm-java/lib/Compiler/Class.cpp
diff -u llvm-java/lib/Compiler/Class.cpp:1.3 llvm-java/lib/Compiler/Class.cpp:1.4
--- llvm-java/lib/Compiler/Class.cpp:1.3	Thu Mar 24 16:35:36 2005
+++ llvm-java/lib/Compiler/Class.cpp	Fri Mar 25 20:50:56 2005
@@ -68,7 +68,7 @@
   type_ = PointerType::get(structType_);
 }
 
-void Class::buildClass(const std::string& className)
+void Class::loadClass(const std::string& className)
 {
   classFile_ = ClassFile::get(className);
 
@@ -107,7 +107,7 @@
   assert(!isa<OpaqueType>(getStructType()) &&"Class not initialized properly!");
 }
 
-void Class::buildArrayClass(const Class& componentClass)
+void Class::loadArrayClass(const Class& componentClass)
 {
   superClass_ = &resolver_->getClass("java/lang/Object");
   componentClass_ = &componentClass;