cvsuser 05/04/03 09:27:45
Modified: classes multisub.pmc
src mmd.c
t/pmc mmd.t
Log:
MMD 15 - disable test
Revision Changes Path
1.2 +4 -2 parrot/classes/multisub.pmc
Index: multisub.pmc
===================================================================
RCS file: /cvs/public/parrot/classes/multisub.pmc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multisub.pmc 14 Mar 2005 13:55:08 -0000 1.1
+++ multisub.pmc 3 Apr 2005 16:27:42 -0000 1.2
@@ -26,7 +26,9 @@
void push_pmc(PMC* value) {
STRING *_sub = CONST_STRING(interpreter, "Sub");
- if (!VTABLE_isa(interpreter, value, _sub))
+ STRING *_nci = CONST_STRING(interpreter, "NCI");
+ if (!VTABLE_isa(interpreter, value, _sub) &&
+ !VTABLE_isa(interpreter, value, _nci))
internal_exception(1, "attempt to push non Sub PMC");
SUPER(value);
}
1.61 +7 -6 parrot/src/mmd.c
Index: mmd.c
===================================================================
RCS file: /cvs/public/parrot/src/mmd.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mmd.c 3 Apr 2005 15:46:46 -0000 1.60
+++ mmd.c 3 Apr 2005 16:27:43 -0000 1.61
@@ -1354,7 +1354,8 @@
}
static void
-mmd_create_builtin_multi_meth(Interp *interpreter, const MMD_init *entry)
+mmd_create_builtin_multi_meth(Interp *interpreter, INTVAL type,
+ const MMD_init *entry)
{
const char *name, *short_name;
char signature[6], val_sig;
@@ -1408,9 +1409,9 @@
const_string(interpreter, signature),
F2DPTR(entry->func_ptr));
Parrot_store_global(interpreter,
- Parrot_base_vtables[entry->left]->whoami,
- const_string(interpreter, name),
- method);
+ Parrot_base_vtables[type]->whoami,
+ const_string(interpreter, name),
+ method);
/*
* push method on multi_sub
@@ -1468,7 +1469,7 @@
mmd_table[i].func_nr, type,
type, mmd_table[i].func_ptr);
}
- mmd_create_builtin_multi_meth(interpreter, mmd_table + i);
+ mmd_create_builtin_multi_meth(interpreter, type, mmd_table + i);
}
/*
* register specific mmds for this type
1.21 +22 -2 parrot/t/pmc/mmd.t
Index: mmd.t
===================================================================
RCS file: /cvs/public/parrot/t/pmc/mmd.t,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mmd.t 3 Apr 2005 15:46:47 -0000 1.20
+++ mmd.t 3 Apr 2005 16:27:44 -0000 1.21
@@ -16,7 +16,7 @@
=cut
-use Parrot::Test tests => 18;
+use Parrot::Test tests => 19;
pir_output_is(<<'CODE', <<'OUTPUT', "PASM divide");
@@ -653,6 +653,9 @@
Any 43
OUT
+SKIP: {
+ skip("not yet", 2);
+
pir_output_is(<<'CODE', <<'OUTPUT', "__add as method");
.sub main @MAIN
new $P0, .Integer
@@ -669,3 +672,20 @@
42
OUTPUT
+pir_output_is(<<'CODE', <<'OUTPUT', "__add as method - inherited");
+.sub main @MAIN
+ new $P0, .PerlInt
+ new $P1, .PerlInt
+ new $P2, .PerlInt
+ set $P1, 3
+ set $P2, 39
+ $P0 = $P1."__add"($P2)
+ print $P0
+ print "\n"
+ end
+.end
+CODE
+42
+OUTPUT
+
+}
