Symbian bleadperl@25725 update

[p5sagit/p5-mst-13.2.git] / universal.c

diff --git a/universal.c b/universal.c
index 8f706cb..0c29d93 100644 (file)
--- a/universal.c
+++ b/universal.c
@@ -144,8 +144,7 @@ Perl_sv_derived_from(pTHX_ SV *sv, const char *name)
     HV *stash = Nullhv;
     HV *name_stash;
 
-    if (SvGMAGICAL(sv))
-        mg_get(sv) ;
+    SvGETMAGIC(sv);
 
     if (SvROK(sv)) {
         sv = SvRV(sv);
@@ -174,6 +173,7 @@ PERL_XS_EXPORT_C void XS_UNIVERSAL_VERSION(pTHX_ CV *cv);
 XS(XS_version_new);
 XS(XS_version_stringify);
 XS(XS_version_numify);
+XS(XS_version_normal);
 XS(XS_version_vcmp);
 XS(XS_version_boolean);
 #ifdef HASATTRIBUTE_NORETURN
@@ -218,6 +218,7 @@ Perl_boot_core_UNIVERSAL(pTHX)
        newXS("version::stringify", XS_version_stringify, file);
        newXS("version::(0+", XS_version_numify, file);
        newXS("version::numify", XS_version_numify, file);
+       newXS("version::normal", XS_version_normal, file);
        newXS("version::(cmp", XS_version_vcmp, file);
        newXS("version::(<=>", XS_version_vcmp, file);
        newXS("version::vcmp", XS_version_vcmp, file);
@@ -260,8 +261,7 @@ XS(XS_UNIVERSAL_isa)
 
     sv = ST(0);
 
-    if (SvGMAGICAL(sv))
-       mg_get(sv);
+    SvGETMAGIC(sv);
 
     if (!SvOK(sv) || !(SvROK(sv) || (SvPOK(sv) && SvCUR(sv))
                || (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv))))
@@ -286,8 +286,7 @@ XS(XS_UNIVERSAL_can)
 
     sv = ST(0);
 
-    if (SvGMAGICAL(sv))
-       mg_get(sv);
+    SvGETMAGIC(sv);
 
     if (!SvOK(sv) || !(SvROK(sv) || (SvPOK(sv) && SvCUR(sv))
                || (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv))))
@@ -336,7 +335,7 @@ XS(XS_UNIVERSAL_VERSION)
 
     gvp = pkg ? (GV**)hv_fetch(pkg,"VERSION",7,FALSE) : Null(GV**);
 
-    if (gvp && isGV(gv = *gvp) && SvOK(sv = GvSV(gv))) {
+    if (gvp && isGV(gv = *gvp) && (sv = GvSV(gv)) && SvOK(sv)) {
         SV *nsv = sv_newmortal();
         sv_setsv(nsv, sv);
         sv = nsv;
@@ -395,13 +394,33 @@ XS(XS_version_new)
        Perl_croak(aTHX_ "Usage: version::new(class, version)");
     SP -= items;
     {
-        const char *classname = SvPV_nolen(ST(0));
         SV *vs = ST(1);
        SV *rv;
-       if (items == 3 )
-       {
-           vs = sv_newmortal(); 
-           Perl_sv_setpvf(aTHX_ vs,"v%s",SvPV_nolen(ST(2)));
+       const char *classname;
+
+       /* get the class if called as an object method */
+       if ( sv_isobject(ST(0)) ) {
+           classname = HvNAME(SvSTASH(SvRV(ST(0))));
+       }
+       else {
+           classname = (char *)SvPV_nolen(ST(0));
+       }
+
+       if ( items == 1 ) {
+           /* no parameter provided */
+           if ( sv_isobject(ST(0)) ) {
+               /* copy existing object */
+               vs = ST(0);
+           }
+           else {
+               /* create empty object */
+               vs = sv_newmortal();
+               sv_setpvn(vs,"",0);
+           }
+       }
+       else if ( items == 3 ) {
+           vs = sv_newmortal();
+           Perl_sv_setpvf(aTHX_ vs,"v%s",SvPV_nolen_const(ST(2)));
        }
 
        rv = new_version(vs);
@@ -424,8 +443,7 @@ XS(XS_version_stringify)
          SV *  lobj = Nullsv;
 
          if (sv_derived_from(ST(0), "version")) {
-              SV *tmp = SvRV(ST(0));
-              lobj = tmp;
+              lobj = SvRV(ST(0));
          }
          else
               Perl_croak(aTHX_ "lobj is not of type version");
@@ -447,8 +465,7 @@ XS(XS_version_numify)
          SV *  lobj = Nullsv;
 
          if (sv_derived_from(ST(0), "version")) {
-              SV *tmp = SvRV(ST(0));
-              lobj = tmp;
+              lobj = SvRV(ST(0));
          }
          else
               Perl_croak(aTHX_ "lobj is not of type version");
@@ -460,6 +477,28 @@ XS(XS_version_numify)
      }
 }
 
+XS(XS_version_normal)
+{
+     dXSARGS;
+     if (items < 1)
+         Perl_croak(aTHX_ "Usage: version::normal(lobj, ...)");
+     SP -= items;
+     {
+         SV *  lobj = Nullsv;
+
+         if (sv_derived_from(ST(0), "version")) {
+              lobj = SvRV(ST(0));
+         }
+         else
+              Perl_croak(aTHX_ "lobj is not of type version");
+
+         PUSHs(sv_2mortal(vnormal(lobj)));
+
+         PUTBACK;
+         return;
+     }
+}
+
 XS(XS_version_vcmp)
 {
      dXSARGS;
@@ -470,8 +509,7 @@ XS(XS_version_vcmp)
          SV *  lobj = Nullsv;
 
          if (sv_derived_from(ST(0), "version")) {
-              SV *tmp = SvRV(ST(0));
-              lobj = tmp;
+              lobj = SvRV(ST(0));
          }
          else
               Perl_croak(aTHX_ "lobj is not of type version");
@@ -515,9 +553,7 @@ XS(XS_version_boolean)
          SV *  lobj = Nullsv;
 
          if (sv_derived_from(ST(0), "version")) {
-               /* XXX If tmp serves a purpose, explain it. */
-              SV *tmp = SvRV(ST(0));
-              lobj = tmp;
+              lobj = SvRV(ST(0));
          }
          else
               Perl_croak(aTHX_ "lobj is not of type version");
@@ -556,17 +592,12 @@ XS(XS_version_is_alpha)
     {
        SV * lobj = Nullsv;
 
-        if (sv_derived_from(ST(0), "version")) {
-                /* XXX If tmp serves a purpose, explain it. */
-                SV *tmp = SvRV(ST(0));
-               lobj = tmp;
-        }
+        if (sv_derived_from(ST(0), "version"))
+               lobj = ST(0);
         else
                 Perl_croak(aTHX_ "lobj is not of type version");
 {
-    const I32 len = av_len((AV *)lobj);
-    const I32 digit = SvIVX(*av_fetch((AV *)lobj, len, 0));
-    if ( digit < 0 )
+    if ( hv_exists((HV*)SvRV(lobj), "alpha", 5 ) )
        XSRETURN_YES;
     else
        XSRETURN_NO;
@@ -785,6 +816,7 @@ XS(XS_Internals_hv_clear_placehold)
 
 XS(XS_Regexp_DESTROY)
 {
+    PERL_UNUSED_ARG(cv);
 }
 
 XS(XS_PerlIO_get_layers)
@@ -872,10 +904,12 @@ XS(XS_PerlIO_get_layers)
                  flgok = flgsvp && *flgsvp && SvIOK(*flgsvp);
 
                  if (details) {
-                      XPUSHs(namok ?
-                            newSVpv(SvPVX_const(*namsvp), 0) : &PL_sv_undef);
-                      XPUSHs(argok ?
-                            newSVpv(SvPVX_const(*argsvp), 0) : &PL_sv_undef);
+                      XPUSHs(namok
+                             ? newSVpvn(SvPVX_const(*namsvp), SvCUR(*namsvp))
+                             : &PL_sv_undef);
+                      XPUSHs(argok
+                             ? newSVpvn(SvPVX_const(*argsvp), SvCUR(*argsvp))
+                             : &PL_sv_undef);
                       if (flgok)
                            XPUSHi(SvIVX(*flgsvp));
                       else
@@ -917,7 +951,8 @@ XS(XS_Internals_hash_seed)
     /* Using dXSARGS would also have dITEM and dSP,
      * which define 2 unused local variables.  */
     dAXMARK;
-    (void)mark;
+    PERL_UNUSED_ARG(cv);
+    PERL_UNUSED_VAR(mark);
     XSRETURN_UV(PERL_HASH_SEED);
 }
 
@@ -926,7 +961,8 @@ XS(XS_Internals_rehash_seed)
     /* Using dXSARGS would also have dITEM and dSP,
      * which define 2 unused local variables.  */
     dAXMARK;
-    (void)mark;
+    PERL_UNUSED_ARG(cv);
+    PERL_UNUSED_VAR(mark);
     XSRETURN_UV(PL_rehash_seed);
 }