X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=universal.c;h=6ba5a13785b83d734da6139900272d70795e02af;hb=416c06154f3f0f1dd4b8770baf1fd68ba67c6991;hp=cecf17b64b202ded5f5e4d9765c943a6d67d4f09;hpb=5fef3b4a7f0c97d32160df4fc2eebedccc3910c2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/universal.c b/universal.c
index cecf17b..6ba5a13 100644
--- a/universal.c
+++ b/universal.c
@@ -1,6 +1,7 @@
 /*    universal.c
  *
- *    Copyright (c) 1997-2003, Larry Wall
+ *    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+ *    by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -44,6 +45,9 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
     if (strEQ(HvNAME(stash), name))
 	return &PL_sv_yes;
 
+    if (strEQ(name, "UNIVERSAL"))
+	return &PL_sv_yes;
+
     if (level > 100)
 	Perl_croak(aTHX_ "Recursive inheritance detected in package '%s'",
 		   HvNAME(stash));
@@ -111,8 +115,7 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
 	    (void)hv_store(hv,name,len,&PL_sv_no,0);
 	}
     }
-
-    return boolSV(strEQ(name, "UNIVERSAL"));
+    return &PL_sv_no;
 }
 
 /*
@@ -170,6 +173,8 @@ XS(XS_version_numify);
 XS(XS_version_vcmp);
 XS(XS_version_boolean);
 XS(XS_version_noop);
+XS(XS_version_is_alpha);
+XS(XS_utf8_is_utf8);
 XS(XS_utf8_valid);
 XS(XS_utf8_encode);
 XS(XS_utf8_decode);
@@ -181,6 +186,7 @@ XS(XS_Internals_SvREADONLY);
 XS(XS_Internals_SvREFCNT);
 XS(XS_Internals_hv_clear_placehold);
 XS(XS_PerlIO_get_layers);
+XS(XS_Regexp_DESTROY);
 
 void
 Perl_boot_core_UNIVERSAL(pTHX)
@@ -207,7 +213,9 @@ Perl_boot_core_UNIVERSAL(pTHX)
 	newXS("version::boolean", XS_version_boolean, file);
 	newXS("version::(nomethod", XS_version_noop, file);
 	newXS("version::noop", XS_version_noop, file);
+	newXS("version::is_alpha", XS_version_is_alpha, file);
     }
+    newXS("utf8::is_utf8", XS_utf8_is_utf8, file);
     newXS("utf8::valid", XS_utf8_valid, file);
     newXS("utf8::encode", XS_utf8_encode, file);
     newXS("utf8::decode", XS_utf8_decode, file);
@@ -219,7 +227,9 @@ Perl_boot_core_UNIVERSAL(pTHX)
     newXSproto("Internals::SvREFCNT",XS_Internals_SvREFCNT, file, "\\[$%@];$");
     newXSproto("Internals::hv_clear_placeholders",
                XS_Internals_hv_clear_placehold, file, "\\%");
-    newXS("PerlIO::get_layers", XS_PerlIO_get_layers, file);
+    newXSproto("PerlIO::get_layers",
+               XS_PerlIO_get_layers, file, "*;@");
+    newXS("Regexp::DESTROY", XS_Regexp_DESTROY, file);
 }
 
 
@@ -379,107 +389,157 @@ XS(XS_version_new)
 
 XS(XS_version_stringify)
 {
-    dXSARGS;
-    if (items < 1)
-	Perl_croak(aTHX_ "Usage: version::stringify(lobj, ...)");
-    SP -= items;
-    {
-	SV *	lobj;
-
-        if (sv_derived_from(ST(0), "version")) {
-                SV *tmp = SvRV(ST(0));
-        	lobj = tmp;
-        }
-        else
-                Perl_croak(aTHX_ "lobj is not of type version");
-
-{
-    PUSHs(vstringify(lobj));
-}
-
-	PUTBACK;
-	return;
-    }
+     dXSARGS;
+     if (items < 1)
+	  Perl_croak(aTHX_ "Usage: version::stringify(lobj, ...)");
+     SP -= items;
+     {
+	  SV *	lobj;
+
+	  if (sv_derived_from(ST(0), "version")) {
+	       SV *tmp = SvRV(ST(0));
+	       lobj = tmp;
+	  }
+	  else
+	       Perl_croak(aTHX_ "lobj is not of type version");
+
+	  {
+	       PUSHs(vstringify(lobj));
+	  }
+
+	  PUTBACK;
+	  return;
+     }
 }
 
 XS(XS_version_numify)
 {
-    dXSARGS;
-    if (items < 1)
-	Perl_croak(aTHX_ "Usage: version::numify(lobj, ...)");
-    SP -= items;
-    {
-	SV *	lobj;
-
-        if (sv_derived_from(ST(0), "version")) {
-                SV *tmp = SvRV(ST(0));
-        	lobj = tmp;
-        }
-        else
-                Perl_croak(aTHX_ "lobj is not of type version");
-
-{
-    PUSHs(vnumify(lobj));
-}
-
-	PUTBACK;
-	return;
-    }
+     dXSARGS;
+     if (items < 1)
+	  Perl_croak(aTHX_ "Usage: version::numify(lobj, ...)");
+     SP -= items;
+     {
+	  SV *	lobj;
+
+	  if (sv_derived_from(ST(0), "version")) {
+	       SV *tmp = SvRV(ST(0));
+	       lobj = tmp;
+	  }
+	  else
+	       Perl_croak(aTHX_ "lobj is not of type version");
+
+	  {
+	       PUSHs(vnumify(lobj));
+	  }
+
+	  PUTBACK;
+	  return;
+     }
 }
 
 XS(XS_version_vcmp)
 {
-    dXSARGS;
-    if (items < 1)
-	Perl_croak(aTHX_ "Usage: version::vcmp(lobj, ...)");
-    SP -= items;
-    {
-	SV *	lobj;
-
-        if (sv_derived_from(ST(0), "version")) {
-                SV *tmp = SvRV(ST(0));
-        	lobj = tmp;
-        }
-        else
-                Perl_croak(aTHX_ "lobj is not of type version");
+     dXSARGS;
+     if (items < 1)
+	  Perl_croak(aTHX_ "Usage: version::vcmp(lobj, ...)");
+     SP -= items;
+     {
+	  SV *	lobj;
+
+	  if (sv_derived_from(ST(0), "version")) {
+	       SV *tmp = SvRV(ST(0));
+	       lobj = tmp;
+	  }
+	  else
+	       Perl_croak(aTHX_ "lobj is not of type version");
+
+	  {
+	       SV	*rs;
+	       SV	*rvs;
+	       SV * robj = ST(1);
+	       IV	 swap = (IV)SvIV(ST(2));
+
+	       if ( ! sv_derived_from(robj, "version") )
+	       {
+		    robj = new_version(robj);
+	       }
+	       rvs = SvRV(robj);
+
+	       if ( swap )
+	       {
+		    rs = newSViv(vcmp(rvs,lobj));
+	       }
+	       else
+	       {
+		    rs = newSViv(vcmp(lobj,rvs));
+	       }
+
+	       PUSHs(rs);
+	  }
+
+	  PUTBACK;
+	  return;
+     }
+}
 
+XS(XS_version_boolean)
 {
-    SV	*rs;
-    SV	*rvs;
-    SV * robj = ST(1);
-    IV	 swap = (IV)SvIV(ST(2));
-
-    if ( ! sv_derived_from(robj, "version") )
-    {
-	robj = new_version(robj);
-    }
-    rvs = SvRV(robj);
-
-    if ( swap )
-    {
-        rs = newSViv(vcmp(rvs,lobj));
-    }
-    else
-    {
-        rs = newSViv(vcmp(lobj,rvs));
-    }
-
-    PUSHs(rs);
+     dXSARGS;
+     if (items < 1)
+	  Perl_croak(aTHX_ "Usage: version::boolean(lobj, ...)");
+     SP -= items;
+     {
+	  SV *	lobj;
+
+	  if (sv_derived_from(ST(0), "version")) {
+	       SV *tmp = SvRV(ST(0));
+	       lobj = tmp;
+	  }
+	  else
+	       Perl_croak(aTHX_ "lobj is not of type version");
+
+	  {
+	       SV	*rs;
+	       rs = newSViv( vcmp(lobj,new_version(newSVpvn("0",1))) );
+	       PUSHs(rs);
+	  }
+
+	  PUTBACK;
+	  return;
+     }
 }
 
-	PUTBACK;
-	return;
-    }
+XS(XS_version_noop)
+{
+     dXSARGS;
+     if (items < 1)
+	  Perl_croak(aTHX_ "Usage: version::noop(lobj, ...)");
+     {
+	  SV *	lobj;
+
+	  if (sv_derived_from(ST(0), "version")) {
+	       SV *tmp = SvRV(ST(0));
+	       lobj = tmp;
+	  }
+	  else
+	       Perl_croak(aTHX_ "lobj is not of type version");
+
+	  {
+	       Perl_croak(aTHX_ "operation not supported with version object");
+	  }
+
+     }
+     XSRETURN_EMPTY;
 }
 
-XS(XS_version_boolean)
+XS(XS_version_is_alpha)
 {
     dXSARGS;
-    if (items < 1)
-	Perl_croak(aTHX_ "Usage: version::boolean(lobj, ...)");
+    if (items != 1)
+	Perl_croak(aTHX_ "Usage: version::is_alpha(lobj)");
     SP -= items;
     {
-	SV *	lobj;
+	SV *lobj;
 
         if (sv_derived_from(ST(0), "version")) {
                 SV *tmp = SvRV(ST(0));
@@ -487,58 +547,53 @@ XS(XS_version_boolean)
         }
         else
                 Perl_croak(aTHX_ "lobj is not of type version");
-
 {
-    SV	*rs;
-    rs = newSViv( vcmp(lobj,new_version(newSVpvn("0",1))) );
-    PUSHs(rs);
+    I32 len = av_len((AV *)lobj);
+    I32 digit = SvIVX(*av_fetch((AV *)lobj, len, 0));
+    if ( digit < 0 )
+	XSRETURN_YES;
+    else
+	XSRETURN_NO;
 }
-
 	PUTBACK;
 	return;
     }
 }
 
-XS(XS_version_noop)
+XS(XS_utf8_is_utf8)
 {
-    dXSARGS;
-    if (items < 1)
-	Perl_croak(aTHX_ "Usage: version::noop(lobj, ...)");
-    {
-	SV *	lobj;
-
-        if (sv_derived_from(ST(0), "version")) {
-                SV *tmp = SvRV(ST(0));
-        	lobj = tmp;
-        }
-        else
-                Perl_croak(aTHX_ "lobj is not of type version");
-
-{
-    Perl_croak(aTHX_ "operation not supported with version object");
-}
-
-    }
-    XSRETURN_EMPTY;
+     dXSARGS;
+     if (items != 1)
+	  Perl_croak(aTHX_ "Usage: utf8::is_utf8(sv)");
+     {
+	  SV *	sv = ST(0);
+	  {
+	       if (SvUTF8(sv))
+		    XSRETURN_YES;
+	       else
+		    XSRETURN_NO;
+	  }
+     }
+     XSRETURN_EMPTY;
 }
 
 XS(XS_utf8_valid)
 {
-    dXSARGS;
-    if (items != 1)
-	Perl_croak(aTHX_ "Usage: utf8::valid(sv)");
-    {
-	SV *	sv = ST(0);
- {
-  STRLEN len;
-  char *s = SvPV(sv,len);
-  if (!SvUTF8(sv) || is_utf8_string((U8*)s,len))
-   XSRETURN_YES;
-  else
-   XSRETURN_NO;
- }
-    }
-    XSRETURN_EMPTY;
+     dXSARGS;
+     if (items != 1)
+	  Perl_croak(aTHX_ "Usage: utf8::valid(sv)");
+     {
+	  SV *	sv = ST(0);
+	  {
+	       STRLEN len;
+	       char *s = SvPV(sv,len);
+	       if (!SvUTF8(sv) || is_utf8_string((U8*)s,len))
+		    XSRETURN_YES;
+	       else
+		    XSRETURN_NO;
+	  }
+     }
+     XSRETURN_EMPTY;
 }
 
 XS(XS_utf8_encode)
@@ -700,7 +755,7 @@ XS(XS_Internals_hv_clear_placehold)
             && items) {
             SV *val = hv_iterval(hv, entry);
 
-            if (val == &PL_sv_undef) {
+            if (val == &PL_sv_placeholder) {
 
                 /* It seems that I have to go back in the front of the hash
                    API to delete a hash, even though I have a HE structure
@@ -721,6 +776,11 @@ XS(XS_Internals_hv_clear_placehold)
     XSRETURN(0);
 }
 
+XS(XS_Regexp_DESTROY)
+{
+
+}
+
 XS(XS_PerlIO_get_layers)
 {
     dXSARGS;
@@ -735,7 +795,6 @@ XS(XS_PerlIO_get_layers)
 	bool	details = FALSE;
 
 	if (items > 1) {
-	     SV **popuntil = MARK + 1;
 	     SV **svp;
 	     
 	     for (svp = MARK + 2; svp <= SP; svp += 2) {