[llvm-commits] CVS: llvm-java/lib/ClassFile/ClassFile.cpp

[Alkis Evlogimenos]

Changes in directory llvm-java/lib/ClassFile:

ClassFile.cpp updated: 1.28 -> 1.29
---
Log message:

Provide real pointer to parent instead of a pointer to its description
(pointer to the ClassFile itself instead of a pointer a
ConstantClass).


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

Index: llvm-java/lib/ClassFile/ClassFile.cpp
diff -u llvm-java/lib/ClassFile/ClassFile.cpp:1.28 llvm-java/lib/ClassFile/ClassFile.cpp:1.29
--- llvm-java/lib/ClassFile/ClassFile.cpp:1.28	Wed Sep 15 15:26:32 2004
+++ llvm-java/lib/ClassFile/ClassFile.cpp	Wed Sep 29 17:31:59 2004
@@ -111,7 +111,7 @@
   }
 
   void readFields(Fields& f,
-                  ConstantClass* parent,
+                  ClassFile* parent,
                   const ConstantPool& cp,
                   std::istream& is)
   {
@@ -123,7 +123,7 @@
   }
 
   void readMethods(Methods& m,
-                   ConstantClass* parent,
+                   ClassFile* parent,
                    const ConstantPool& cp,
                    std::istream& is)
   {
@@ -241,8 +241,8 @@
     throw ClassFileSemanticError(
       "Representation of super class is not of type ConstantClass");
   readClasses(interfaces_, cPool_, is);
-  readFields(fields_, thisClass_, cPool_, is);
-  readMethods(methods_, thisClass_, cPool_, is);
+  readFields(fields_, this, cPool_, is);
+  readMethods(methods_, this, cPool_, is);
   readAttributes(attributes_, cPool_, is);
   for (Methods::const_iterator
          i = methods_.begin(), e = methods_.end(); i != e; ++i)
@@ -516,7 +516,7 @@
 
 //===----------------------------------------------------------------------===//
 // Field implementation
-Field::Field(ConstantClass* parent, const ConstantPool& cp, std::istream& is)
+Field::Field(ClassFile* parent, const ConstantPool& cp, std::istream& is)
   : parent_(parent)
 {
   accessFlags_ = readU2(is);
@@ -564,7 +564,7 @@
 
 //===----------------------------------------------------------------------===//
 // Method implementation
-Method::Method(ConstantClass* parent, const ConstantPool& cp, std::istream& is)
+Method::Method(ClassFile* parent, const ConstantPool& cp, std::istream& is)
   : parent_(parent)
 {
   accessFlags_ = readU2(is);