cvsuser 04/02/25 15:50:09
Modified: ops object.ops
src objects.c
t/pmc objects.t
Log:
Ding, dong, the last object bug is dead\!
Revision Changes Path
1.31 +1 -1 parrot/ops/object.ops
Index: object.ops
===================================================================
RCS file: /cvs/public/parrot/ops/object.ops,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -r1.30 -r1.31
--- object.ops 25 Feb 2004 21:55:18 -0000 1.30
+++ object.ops 25 Feb 2004 23:49:55 -0000 1.31
@@ -241,7 +241,7 @@
PMC* classname_pmc;
classname_pmc = VTABLE_get_pmc_keyed_int(interpreter,
- (PMC *)PMC_data($2), POD_CLASS_NAME);
+ (PMC *)PMC_data($2), PCD_CLASS_NAME);
if (classname_pmc) {
$1 = VTABLE_get_string(interpreter, classname_pmc);
}
1.43 +8 -5 parrot/src/objects.c
Index: objects.c
===================================================================
RCS file: /cvs/public/parrot/src/objects.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -w -r1.42 -r1.43
--- objects.c 25 Feb 2004 23:34:17 -0000 1.42
+++ objects.c 25 Feb 2004 23:49:58 -0000 1.43
@@ -1,6 +1,6 @@
/*
Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-$Id: objects.c,v 1.42 2004/02/25 23:34:17 dan Exp $
+$Id: objects.c,v 1.43 2004/02/25 23:49:58 dan Exp $
=head1 NAME
@@ -847,11 +847,14 @@
INTVAL
Parrot_class_offset(Parrot_Interp interpreter, PMC *object, STRING *class) {
PMC *offset_hash;
- PMC *internal_array;
+ PMC *class_pmc;
INTVAL offset;
- internal_array = PMC_data(object);
+
+ class_pmc = VTABLE_get_pmc_keyed_int(interpreter,
+ (PMC *)PMC_data(object),
+ POD_CLASS);
offset_hash = VTABLE_get_pmc_keyed_int(interpreter,
- internal_array,
+ (PMC *)PMC_data(class_pmc),
PCD_ATTRIB_OFFS);
if (VTABLE_exists_keyed_str(interpreter, offset_hash, class)) {
offset = VTABLE_get_integer_keyed_str(interpreter, offset_hash, class);
1.21 +2 -2 parrot/t/pmc/objects.t
Index: objects.t
===================================================================
RCS file: /cvs/public/parrot/t/pmc/objects.t,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- objects.t 25 Feb 2004 23:34:19 -0000 1.20
+++ objects.t 25 Feb 2004 23:50:09 -0000 1.21
@@ -1,6 +1,6 @@
#! perl -w
# Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-# $Id: objects.t,v 1.20 2004/02/25 23:34:19 dan Exp $
+# $Id: objects.t,v 1.21 2004/02/25 23:50:09 dan Exp $
=head1 NAME
@@ -521,5 +521,5 @@
print "\n"
end
CODE
-0
+2
OUTPUT
