Bring bleadperl up to version.pm

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

diff --git a/universal.c b/universal.c
index eb4f531..1564b59 100644 (file)
--- a/universal.c
+++ b/universal.c
@@ -174,6 +174,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 +219,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);
@@ -254,7 +256,6 @@ XS(XS_UNIVERSAL_isa)
     dXSARGS;
     SV *sv;
     const char *name;
-    STRLEN n_a;
 
     if (items != 2)
        Perl_croak(aTHX_ "Usage: UNIVERSAL::isa(reference, kind)");
@@ -268,7 +269,7 @@ XS(XS_UNIVERSAL_isa)
                || (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv))))
        XSRETURN_UNDEF;
 
-    name = SvPV_const(ST(1),n_a);
+    name = SvPV_nolen_const(ST(1));
 
     ST(0) = boolSV(sv_derived_from(sv, name));
     XSRETURN(1);
@@ -281,7 +282,6 @@ XS(XS_UNIVERSAL_can)
     const char *name;
     SV   *rv;
     HV   *pkg = NULL;
-    STRLEN n_a;
 
     if (items != 2)
        Perl_croak(aTHX_ "Usage: UNIVERSAL::can(object-ref, method)");
@@ -295,7 +295,7 @@ XS(XS_UNIVERSAL_can)
                || (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv))))
        XSRETURN_UNDEF;
 
-    name = SvPV_const(ST(1),n_a);
+    name = SvPV_nolen_const(ST(1));
     rv = &PL_sv_undef;
 
     if (SvROK(sv)) {
@@ -361,10 +361,9 @@ XS(XS_UNIVERSAL_VERSION)
                           "%s does not define $%s::VERSION--version check failed",
                           name, name);
            } else {
-               STRLEN n_a;
                Perl_croak(aTHX_
                             "%s defines neither package nor VERSION--version check failed",
-                            SvPVx(ST(0),n_a) );
+                            SvPVx_nolen_const(ST(0)) );
             }
        }
 
@@ -398,13 +397,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_setpv(vs,"");
+           }
+       }
+       else if ( items == 3 ) {
+           vs = sv_newmortal();
+           Perl_sv_setpvf(aTHX_ vs,"v%s",SvPV_nolen_const(ST(2)));
        }
 
        rv = new_version(vs);
@@ -427,8 +446,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");
@@ -450,8 +468,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");
@@ -463,6 +480,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;
@@ -473,8 +512,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");
@@ -518,9 +556,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");
@@ -559,17 +595,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;