Change name of OP_SPECIFIC to OP_THREADSV. Fixed perl_get_sv when

[perl5.git] / universal.c

diff --git a/universal.c b/universal.c
index 61a536b..d6689f8 100644 (file)
--- a/universal.c
+++ b/universal.c
@@ -71,40 +71,56 @@ int level;
        }
     }
 
-    return &sv_no;
+    return boolSV(strEQ(name, "UNIVERSAL"));
 }
 
-static
-XS(XS_UNIVERSAL_isa)
+bool
+sv_derived_from(sv, name)
+SV * sv ;
+char * name ;
 {
-    dXSARGS;
-    SV *sv, *rv;
-    char *name, *type;
+    SV *rv;
+    char *type;
     HV *stash;
-
-    if (items != 2)
-       croak("Usage: UNIVERSAL::isa(reference, kind)");
-
+  
     stash = Nullhv;
     type = Nullch;
-    sv = ST(0);
-    name = (char *)SvPV(ST(1),na);
+ 
+    if (SvGMAGICAL(sv))
+        mg_get(sv) ;
 
     if (SvROK(sv)) {
-       sv = SvRV(sv);
-       type = sv_reftype(sv,0);
-       if(SvOBJECT(sv))
-           stash = SvSTASH(sv);
+        sv = SvRV(sv);
+        type = sv_reftype(sv,0);
+        if(SvOBJECT(sv))
+            stash = SvSTASH(sv);
     }
     else {
-       stash = gv_stashsv(sv, FALSE);
+        stash = gv_stashsv(sv, FALSE);
     }
+ 
+    return (type && strEQ(type,name)) ||
+            (stash && isa_lookup(stash, name, strlen(name), 0) == &sv_yes)
+        ? TRUE
+        : FALSE ;
+ 
+}
 
-    ST(0) = (type && strEQ(type,name)) ||
-           (stash && isa_lookup(stash, name, strlen(name), 0) == &sv_yes)
-       ? &sv_yes
-       : &sv_no;
 
+static
+XS(XS_UNIVERSAL_isa)
+{
+    dXSARGS;
+    SV *sv;
+    char *name;
+
+    if (items != 2)
+       croak("Usage: UNIVERSAL::isa(reference, kind)");
+
+    sv = ST(0);
+    name = (char *)SvPV(ST(1),na);
+
+    ST(0) = boolSV(sv_derived_from(sv, name));
     XSRETURN(1);
 }
 
@@ -115,8 +131,7 @@ XS(XS_UNIVERSAL_can)
     SV   *sv;
     char *name;
     SV   *rv;
-    GV   *gv;
-    CV   *cvp;
+    HV   *pkg = NULL;
 
     if (items != 2)
        croak("Usage: UNIVERSAL::can(object-ref, method)");
@@ -125,40 +140,22 @@ XS(XS_UNIVERSAL_can)
     name = (char *)SvPV(ST(1),na);
     rv = &sv_undef;
 
-    if(SvROK(sv) && (sv = (SV*)SvRV(sv)) && SvOBJECT(sv)) {
-        gv = gv_fetchmethod(SvSTASH(sv), name);
-
-        if(gv && GvCV(gv)) {
-            /* If the sub is only a stub then we may have a gv to AUTOLOAD */
-            GV **gvp = (GV**)hv_fetch(GvSTASH(gv), name, strlen(name), TRUE);
-            if(gvp && (cvp = GvCV(*gvp))) {
-                rv = sv_newmortal();
-                sv_setsv(rv, newRV((SV*)cvp));
-            }
-        }
+    if(SvROK(sv)) {
+        sv = (SV*)SvRV(sv);
+        if(SvOBJECT(sv))
+            pkg = SvSTASH(sv);
+    }
+    else {
+        pkg = gv_stashsv(sv, FALSE);
     }
 
-    ST(0) = rv;
-    XSRETURN(1);
-}
-
-static
-XS(XS_UNIVERSAL_is_instance)
-{
-    dXSARGS;
-    ST(0) = SvROK(ST(0)) ? &sv_yes : &sv_no;
-    XSRETURN(1);
-}
-
-static
-XS(XS_UNIVERSAL_class)
-{
-    dXSARGS;
-    if(SvROK(ST(0))) {
-        SV *sv = sv_newmortal();
-        sv_setpv(sv, HvNAME(SvSTASH(ST(0))));
-        ST(0) = sv;
+    if (pkg) {
+        GV *gv = gv_fetchmethod_autoload(pkg, name, FALSE);
+        if (gv && isGV(gv))
+           rv = sv_2mortal(newRV((SV*)GvCV(gv)));
     }
+
+    ST(0) = rv;
     XSRETURN(1);
 }
 
@@ -171,6 +168,7 @@ XS(XS_UNIVERSAL_VERSION)
     GV *gv;
     SV *sv;
     char *undef;
+    double req;
 
     if(SvROK(ST(0))) {
         sv = (SV*)SvRV(ST(0));
@@ -195,9 +193,9 @@ XS(XS_UNIVERSAL_VERSION)
         undef = "(undef)";
     }
 
-    if(items > 1 && (undef || SvNV(ST(1)) > SvNV(sv)))
+    if (items > 1 && (undef || (req = SvNV(ST(1)), req > SvNV(sv))))
        croak("%s version %s required--this is only version %s",
-           HvNAME(pkg),SvPV(ST(1),na),undef ? undef : SvPV(sv,na));
+             HvNAME(pkg), SvPV(ST(1),na), undef ? undef : SvPV(sv,na));
 
     ST(0) = sv;
 
@@ -211,7 +209,5 @@ boot_core_UNIVERSAL()
 
     newXS("UNIVERSAL::isa",             XS_UNIVERSAL_isa,         file);
     newXS("UNIVERSAL::can",             XS_UNIVERSAL_can,         file);
-    newXS("UNIVERSAL::class",           XS_UNIVERSAL_class,       file);
-    newXS("UNIVERSAL::is_instance",     XS_UNIVERSAL_is_instance, file);
     newXS("UNIVERSAL::VERSION",        XS_UNIVERSAL_VERSION,     file);
 }