From b56b5e6c5c927cad22b878b53b5d08da0f220821 Mon Sep 17 00:00:00 2001
From: Jonathan Worthington <jnthn@jnthn.net>
Date: Sat, 5 Jun 2010 21:06:49 +0200
Subject: [PATCH] Start to fix up .^attributes somewhat. This at least resolves
 an RT, but we can't pass S12-introspection/attributes.t just yet.

---
 src/metamodel/ClassHOW.pir | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/metamodel/ClassHOW.pir b/src/metamodel/ClassHOW.pir
index e60f41bb810..3a61507df9b 100644
--- a/src/metamodel/ClassHOW.pir
+++ b/src/metamodel/ClassHOW.pir
@@ -193,7 +193,7 @@ Attribute descriptors.
 
     # Get list of parents whose attributes we are interested in, and put
     # this class on the start. With the local flag , that's just us.
-    .local pmc parents, parents_it, cur_class, us
+    .local pmc parents, parents_it, cur_class
     unless null tree goto do_tree
     if null local goto all_parents
     unless local goto all_parents
@@ -214,8 +214,9 @@ Attribute descriptors.
     # If it's us, disregard :tree. Otherwise, if we have :tree, now we call
     # ourself recursively and push an array onto the result.
     if null tree goto tree_handled
-    eq_addr cur_class, us, tree_handled
-    $P0 = self.'attributes'(cur_class, 'tree'=>tree)
+    eq_addr cur_class, obj, tree_handled
+    $P0 = cur_class.'HOW'()
+    $P0 = $P0.'attributes'(cur_class, 'tree'=>tree)
     $P0 = '&circumfix:<[ ]>'($P0)
     push result_list, $P0
     goto parents_it_loop
@@ -224,7 +225,13 @@ Attribute descriptors.
     # Get attributes list and push the attribute descriptors onto
     # the results.
     .local pmc attributes, attr_it
+    eq_addr cur_class, obj, local_attrs
+    $P0 = cur_class.'HOW'()
+    attributes = $P0.'attributes'(cur_class, 'local'=>1)
+    goto have_attrs
+  local_attrs:
     attributes = getattribute self, '$!attributes'
+  have_attrs:
     if null attributes goto attr_it_loop_end
     attr_it = iter attributes
   attr_it_loop: