const char *hvname;
I32 entries;
struct mro_meta* selfmeta;
- bool seen_univ = FALSE;
+ bool searching_univ = FALSE;
HV* nmcache;
I32 i;
PPCODE:
assert(curstash);
- if (!seen_univ && SvCUR(linear_sv) == 9
- && strnEQ(SvPV_nolen_const(linear_sv), "UNIVERSAL", 9))
- seen_univ = TRUE;
+ if (searching_univ && curstash == selfstash) break;
gvp = (GV**)hv_fetch(curstash, subname, subname_len, 0);
if (!gvp) continue;
}
}
- if (!seen_univ && (selfstash = gv_stashpvn("UNIVERSAL", 9, 0))) {
- linear_av = S_mro_get_linear_isa_c3(aTHX_ selfstash, 0);
+ if (!searching_univ) {
+ HV * const unistash = gv_stashpvn("UNIVERSAL", 9, 0);
+ if (unistash) {
+ linear_av = S_mro_get_linear_isa_c3(aTHX_ unistash, 0);
linear_svp = AvARRAY(linear_av);
entries = AvFILLp(linear_av) + 1;
- seen_univ = TRUE;
+ searching_univ = TRUE;
goto retry;
+ }
}
(void)hv_store_ent(nmcache, sv, &PL_sv_undef, 0);
BEGIN { chdir 't'; require q(./test.pl); @INC = qw "../lib lib" }
-plan(tests => 14);
+plan(tests => 17);
{
}
-# Test next::method with UNIVERSAL methods
+# Test next::method/can with UNIVERSAL methods
{
package UNIVERSAL;
sub foo { "foo" }
+ sub kan { shift->next::can }
our @ISA = "a";
package a;
sub bar { "bar" }
+ sub baz { shift->next::can }
package M;
sub foo { shift->next::method }
sub bar { shift->next::method }
is eval { M->foo }, "foo", 'next::method with implicit UNIVERSAL';
is eval { M->bar }, "bar", 'n::m w/superclass of implicit UNIVERSAL';
+
+ is baz a, undef,
+ 'univ superclasses next::cannot their own methods';
+ is kan UNIVERSAL, undef,
+ 'UNIVERSAL next::cannot its own methods';
+
+ @a::ISA = 'b';
+ sub b::cnadd { shift->next::can }
+ is baz b, \&a::baz,
+ 'univ supersuperclass noxt::can method in its immediate subclasses';
}