1 files changed, 20 insertions, 3 deletions

diff --git a/lout/identity.cc b/lout/identity.cc
index 6fe679b4..61f59ace 100644
--- a/lout/identity.cc
+++ b/lout/identity.cc
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
 #include "identity.hh"
 
 #include <stdio.h>
@@ -41,6 +39,22 @@ IdentifiableObject::Class::Class (IdentifiableObject::Class *parent, int id,
    this->className = className;
 }
 
+void IdentifiableObject::Class::intoStringBuffer(misc::StringBuffer *sb)
+{
+   sb->append ("<class ");
+   sb->append (className);
+   sb->append (" (");
+   sb->appendInt (id);
+   sb->append (")");
+
+   if (parent) {
+      sb->append (", parent: ");
+      parent->intoStringBuffer (sb);
+   }
+
+   sb->append (">");
+}
+
 HashTable <ConstString, IdentifiableObject::Class>
    *IdentifiableObject::classesByName =
       new HashTable<ConstString, IdentifiableObject::Class> (true, true);
@@ -55,7 +69,9 @@ IdentifiableObject::IdentifiableObject ()
 
 void IdentifiableObject::intoStringBuffer(misc::StringBuffer *sb)
 {
-   sb->append("<instance of ");
+   sb->append("<instance ");
+   sb->appendPointer(this);
+   sb->append(" of ");
    sb->append(getClassName());
    sb->append(">");
 }
@@ -78,6 +94,7 @@ void IdentifiableObject::registerName (const char *className, int *classId)
    }
 
    this->classId = klass->id;
+   *classId = klass->id;
    currentlyConstructedClass = klass;
 }