This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
In struct regexp replace the two arrays of I32s accessed via startp
[perl5.git] / universal.c
index 5c147b6..adfddb5 100644 (file)
@@ -1,7 +1,7 @@
 /*    universal.c
  *
  *    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- *    2005, by Larry Wall and others
+ *    2005, 2006, 2007 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.
  * The main guts of traverse_isa was actually copied from gv_fetchmeth
  */
 
-STATIC SV *
-S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
+STATIC bool
+S_isa_lookup(pTHX_ HV *stash, const char *name, const HV* const name_stash,
              int len, int level)
 {
+    dVAR;
     AV* av;
     GV* gv;
     GV** gvp;
@@ -44,33 +45,36 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
 
     /* A stash/class can go by many names (ie. User == main::User), so 
        we compare the stash itself just in case */
-    if (name_stash && (stash == name_stash))
-        return &PL_sv_yes;
+    if (name_stash && ((const HV *)stash == name_stash))
+        return TRUE;
 
     hvname = HvNAME_get(stash);
 
     if (strEQ(hvname, name))
-       return &PL_sv_yes;
+       return TRUE;
 
     if (strEQ(name, "UNIVERSAL"))
-       return &PL_sv_yes;
+       return TRUE;
 
     if (level > 100)
        Perl_croak(aTHX_ "Recursive inheritance detected in package '%s'",
                   hvname);
 
-    gvp = (GV**)hv_fetch(stash, "::ISA::CACHE::", 14, FALSE);
+    gvp = (GV**)hv_fetchs(stash, "::ISA::CACHE::", FALSE);
 
-    if (gvp && (gv = *gvp) != (GV*)&PL_sv_undef && (subgen = GvSV(gv))
+    if (gvp && (gv = *gvp) && isGV_with_GP(gv) && (subgen = GvSV(gv))
        && (hv = GvHV(gv)))
     {
        if (SvIV(subgen) == (IV)PL_sub_generation) {
-           SV* sv;
            SV** const svp = (SV**)hv_fetch(hv, name, len, FALSE);
-           if (svp && (sv = *svp) != (SV*)&PL_sv_undef) {
-               DEBUG_o( Perl_deb(aTHX_ "Using cached ISA %s for package %s\n",
-                                 name, hvname) );
-               return sv;
+           if (svp) {
+               SV * const sv = *svp;
+#ifdef DEBUGGING
+               if (sv != &PL_sv_undef)
+                   DEBUG_o( Perl_deb(aTHX_ "Using cached ISA %s for package %s\n",
+                                   name, hvname) );
+#endif
+               return (sv == &PL_sv_yes);
            }
        }
        else {
@@ -81,11 +85,11 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
        }
     }
 
-    gvp = (GV**)hv_fetch(stash,"ISA",3,FALSE);
+    gvp = (GV**)hv_fetchs(stash, "ISA", FALSE);
 
-    if (gvp && (gv = *gvp) != (GV*)&PL_sv_undef && (av = GvAV(gv))) {
+    if (gvp && (gv = *gvp) && isGV_with_GP(gv) && (av = GvAV(gv))) {
        if (!hv || !subgen) {
-           gvp = (GV**)hv_fetch(stash, "::ISA::CACHE::", 14, TRUE);
+           gvp = (GV**)hv_fetchs(stash, "::ISA::CACHE::", TRUE);
 
            gv = *gvp;
 
@@ -105,24 +109,23 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
            I32 items = AvFILLp(av) + 1;
            while (items--) {
                SV* const sv = *svp++;
-               HV* const basestash = gv_stashsv(sv, FALSE);
+               HV* const basestash = gv_stashsv(sv, 0);
                if (!basestash) {
                    if (ckWARN(WARN_MISC))
                        Perl_warner(aTHX_ packWARN(WARN_SYNTAX),
                                    "Can't locate package %"SVf" for @%s::ISA",
-                                   sv, hvname);
+                                   SVfARG(sv), hvname);
                    continue;
                }
-               if (&PL_sv_yes == isa_lookup(basestash, name, name_stash, 
-                                             len, level + 1)) {
+               if (isa_lookup(basestash, name, name_stash, len, level + 1)) {
                    (void)hv_store(hv,name,len,&PL_sv_yes,0);
-                   return &PL_sv_yes;
+                   return TRUE;
                }
            }
            (void)hv_store(hv,name,len,&PL_sv_no,0);
        }
     }
-    return &PL_sv_no;
+    return FALSE;
 }
 
 /*
@@ -130,9 +133,9 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
 
 =for apidoc sv_derived_from
 
-Returns a boolean indicating whether the SV is derived from the specified
-class.  This is the function that implements C<UNIVERSAL::isa>.  It works
-for class names as well as for objects.
+Returns a boolean indicating whether the SV is derived from the specified class
+I<at the C level>.  To check derivation at the Perl level, call C<isa()> as a
+normal Perl method.
 
 =cut
 */
@@ -140,6 +143,7 @@ for class names as well as for objects.
 bool
 Perl_sv_derived_from(pTHX_ SV *sv, const char *name)
 {
+    dVAR;
     HV *stash;
 
     SvGETMAGIC(sv);
@@ -153,22 +157,92 @@ Perl_sv_derived_from(pTHX_ SV *sv, const char *name)
        stash = SvOBJECT(sv) ? SvSTASH(sv) : NULL;
     }
     else {
-        stash = gv_stashsv(sv, FALSE);
+        stash = gv_stashsv(sv, 0);
     }
 
     if (stash) {
-       HV * const name_stash = gv_stashpv(name, FALSE);
-       return isa_lookup(stash, name, name_stash, strlen(name), 0) == &PL_sv_yes;
+       HV * const name_stash = gv_stashpv(name, 0);
+       return isa_lookup(stash, name, name_stash, strlen(name), 0);
     }
     else
        return FALSE;
 
 }
 
+/*
+=for apidoc sv_does
+
+Returns a boolean indicating whether the SV performs a specific, named role.
+The SV can be a Perl object or the name of a Perl class.
+
+=cut
+*/
+
 #include "XSUB.h"
 
+bool
+Perl_sv_does(pTHX_ SV *sv, const char *name)
+{
+    const char *classname;
+    bool does_it;
+
+    dSP;
+    ENTER;
+    SAVETMPS;
+
+    SvGETMAGIC(sv);
+
+    if (!SvOK(sv) || !(SvROK(sv) || (SvPOK(sv) && SvCUR(sv))
+               || (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv))))
+       return FALSE;
+
+    if (sv_isobject(sv)) {
+       classname = sv_reftype(SvRV(sv),TRUE);
+    } else {
+       classname = SvPV_nolen(sv);
+    }
+
+    if (strEQ(name,classname))
+       return TRUE;
+
+    PUSHMARK(SP);
+    XPUSHs(sv);
+    XPUSHs(sv_2mortal(newSVpv(name, 0)));
+    PUTBACK;
+
+    call_method("isa", G_SCALAR);
+    SPAGAIN;
+
+    does_it = SvTRUE( TOPs );
+    FREETMPS;
+    LEAVE;
+
+    return does_it;
+}
+
+regexp *
+Perl_get_re_arg( pTHX_ SV *sv, U32 flags, MAGIC **mgp) {
+    MAGIC *mg;
+    if (sv) {
+        if (SvMAGICAL(sv))
+            mg_get(sv);
+        if (SvROK(sv) &&
+            (sv = (SV*)SvRV(sv)) &&     /* assign deliberate */
+            SvTYPE(sv) == SVt_PVMG &&
+            (mg = mg_find(sv, PERL_MAGIC_qr))) /* assign deliberate */
+        {        
+            if (mgp) *mgp = mg;
+            return (regexp *)mg->mg_obj;       
+        }
+    }    
+    if (mgp) *mgp = NULL;
+    return ((flags && PL_curpm) ? PM_GETRE(PL_curpm) : NULL);
+}
+
+
 PERL_XS_EXPORT_C void XS_UNIVERSAL_isa(pTHX_ CV *cv);
 PERL_XS_EXPORT_C void XS_UNIVERSAL_can(pTHX_ CV *cv);
+PERL_XS_EXPORT_C void XS_UNIVERSAL_DOES(pTHX_ CV *cv);
 PERL_XS_EXPORT_C void XS_UNIVERSAL_VERSION(pTHX_ CV *cv);
 XS(XS_version_new);
 XS(XS_version_stringify);
@@ -200,14 +274,22 @@ XS(XS_Internals_hash_seed);
 XS(XS_Internals_rehash_seed);
 XS(XS_Internals_HvREHASH);
 XS(XS_Internals_inc_sub_generation);
+XS(XS_re_is_regexp); 
+XS(XS_re_regname); 
+XS(XS_re_regnames); 
+XS(XS_re_regnames_iterinit);
+XS(XS_re_regnames_iternext);
+XS(XS_re_regnames_count);
 
 void
 Perl_boot_core_UNIVERSAL(pTHX)
 {
-    const char file[] = __FILE__;
+    dVAR;
+    static const char file[] = __FILE__;
 
     newXS("UNIVERSAL::isa",             XS_UNIVERSAL_isa,         file);
     newXS("UNIVERSAL::can",             XS_UNIVERSAL_can,         file);
+    newXS("UNIVERSAL::DOES",            XS_UNIVERSAL_DOES,        file);
     newXS("UNIVERSAL::VERSION",        XS_UNIVERSAL_VERSION,     file);
     {
        /* register the overloading (type 'A') magic */
@@ -250,12 +332,20 @@ Perl_boot_core_UNIVERSAL(pTHX)
     newXSproto("Internals::HvREHASH", XS_Internals_HvREHASH, file, "\\%");
     newXSproto("Internals::inc_sub_generation",XS_Internals_inc_sub_generation,
               file, "");
+    newXSproto("re::is_regexp", XS_re_is_regexp, file, "$");
+    newXSproto("re::regname", XS_re_regname, file, ";$$");
+    newXSproto("re::regnames", XS_re_regnames, file, ";$");
+    newXSproto("re::regnames_iterinit", XS_re_regnames_iterinit, file, "");
+    newXSproto("re::regnames_iternext", XS_re_regnames_iternext, file, ";$");
+    newXSproto("re::regnames_count", XS_re_regnames_count, file, "");
 }
 
 
 XS(XS_UNIVERSAL_isa)
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
 
     if (items != 2)
        Perl_croak(aTHX_ "Usage: UNIVERSAL::isa(reference, kind)");
@@ -278,11 +368,13 @@ XS(XS_UNIVERSAL_isa)
 
 XS(XS_UNIVERSAL_can)
 {
+    dVAR;
     dXSARGS;
     SV   *sv;
     const char *name;
     SV   *rv;
     HV   *pkg = NULL;
+    PERL_UNUSED_ARG(cv);
 
     if (items != 2)
        Perl_croak(aTHX_ "Usage: UNIVERSAL::can(object-ref, method)");
@@ -304,7 +396,7 @@ XS(XS_UNIVERSAL_can)
             pkg = SvSTASH(sv);
     }
     else {
-        pkg = gv_stashsv(sv, FALSE);
+        pkg = gv_stashsv(sv, 0);
     }
 
     if (pkg) {
@@ -317,14 +409,36 @@ XS(XS_UNIVERSAL_can)
     XSRETURN(1);
 }
 
+XS(XS_UNIVERSAL_DOES)
+{
+    dVAR;
+    dXSARGS;
+    PERL_UNUSED_ARG(cv);
+
+    if (items != 2)
+       Perl_croak(aTHX_ "Usage: invocant->does(kind)");
+    else {
+       SV * const sv = ST(0);
+       const char *name;
+
+       name = SvPV_nolen_const(ST(1));
+       if (sv_does( sv, name ))
+           XSRETURN_YES;
+
+       XSRETURN_NO;
+    }
+}
+
 XS(XS_UNIVERSAL_VERSION)
 {
+    dVAR;
     dXSARGS;
     HV *pkg;
     GV **gvp;
     GV *gv;
     SV *sv;
     const char *undef;
+    PERL_UNUSED_ARG(cv);
 
     if (SvROK(ST(0))) {
         sv = (SV*)SvRV(ST(0));
@@ -333,17 +447,17 @@ XS(XS_UNIVERSAL_VERSION)
         pkg = SvSTASH(sv);
     }
     else {
-        pkg = gv_stashsv(ST(0), FALSE);
+        pkg = gv_stashsv(ST(0), 0);
     }
 
-    gvp = pkg ? (GV**)hv_fetch(pkg,"VERSION",7,FALSE) : Null(GV**);
+    gvp = pkg ? (GV**)hv_fetchs(pkg, "VERSION", FALSE) : NULL;
 
     if (gvp && isGV(gv = *gvp) && (sv = GvSV(gv)) && SvOK(sv)) {
         SV * const nsv = sv_newmortal();
         sv_setsv(nsv, sv);
         sv = nsv;
        if ( !sv_derived_from(sv, "version"))
-           upg_version(sv);
+           upg_version(sv, FALSE);
         undef = NULL;
     }
     else {
@@ -369,16 +483,23 @@ XS(XS_UNIVERSAL_VERSION)
 
        if ( !sv_derived_from(req, "version")) {
            /* req may very well be R/O, so create a new object */
-           SV * const nsv = sv_newmortal();
-           sv_setsv(nsv, req);
-           req = nsv;
-           upg_version(req);
+           req = sv_2mortal( new_version(req) );
+       }
+
+       if ( vcmp( req, sv ) > 0 ) {
+           if ( hv_exists((HV*)SvRV(req), "qv", 2 ) ) {
+               Perl_croak(aTHX_ "%s version %"SVf" required--"
+                      "this is only version %"SVf"", HvNAME_get(pkg),
+                      SVfARG(vnormal(req)),
+                      SVfARG(vnormal(sv)));
+           } else {
+               Perl_croak(aTHX_ "%s version %"SVf" required--"
+                      "this is only version %"SVf"", HvNAME_get(pkg),
+                      SVfARG(vnumify(req)),
+                      SVfARG(vnumify(sv)));
+           }
        }
 
-       if ( vcmp( req, sv ) > 0 )
-           Perl_croak(aTHX_ "%s version %"SVf" (%"SVf") required--"
-                   "this is only version %"SVf" (%"SVf")", HvNAME_get(pkg),
-                   vnumify(req),vnormal(req),vnumify(sv),vnormal(sv));
     }
 
     if ( SvOK(sv) && sv_derived_from(sv, "version") ) {
@@ -392,7 +513,9 @@ XS(XS_UNIVERSAL_VERSION)
 
 XS(XS_version_new)
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
     if (items > 3)
        Perl_croak(aTHX_ "Usage: version::new(class, version)");
     SP -= items;
@@ -404,17 +527,10 @@ XS(XS_version_new)
                ? HvNAME(SvSTASH(SvRV(ST(0))))
                : (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);
-           }
+       if ( items == 1 || vs == &PL_sv_undef ) { /* no param or explicit undef */
+           /* create empty object */
+           vs = sv_newmortal();
+           sv_setpvn(vs,"",0);
        }
        else if ( items == 3 ) {
            vs = sv_newmortal();
@@ -423,7 +539,7 @@ XS(XS_version_new)
 
        rv = new_version(vs);
        if ( strcmp(classname,"version") != 0 ) /* inherited new() */
-           sv_bless(rv, gv_stashpv(classname,TRUE));
+           sv_bless(rv, gv_stashpv(classname, GV_ADD));
 
        PUSHs(sv_2mortal(rv));
        PUTBACK;
@@ -433,7 +549,9 @@ XS(XS_version_new)
 
 XS(XS_version_stringify)
 {
+     dVAR;
      dXSARGS;
+     PERL_UNUSED_ARG(cv);
      if (items < 1)
          Perl_croak(aTHX_ "Usage: version::stringify(lobj, ...)");
      SP -= items;
@@ -455,7 +573,9 @@ XS(XS_version_stringify)
 
 XS(XS_version_numify)
 {
+     dVAR;
      dXSARGS;
+     PERL_UNUSED_ARG(cv);
      if (items < 1)
          Perl_croak(aTHX_ "Usage: version::numify(lobj, ...)");
      SP -= items;
@@ -477,7 +597,9 @@ XS(XS_version_numify)
 
 XS(XS_version_normal)
 {
+     dVAR;
      dXSARGS;
+     PERL_UNUSED_ARG(cv);
      if (items < 1)
          Perl_croak(aTHX_ "Usage: version::normal(lobj, ...)");
      SP -= items;
@@ -499,7 +621,9 @@ XS(XS_version_normal)
 
 XS(XS_version_vcmp)
 {
+     dVAR;
      dXSARGS;
+     PERL_UNUSED_ARG(cv);
      if (items < 1)
          Perl_croak(aTHX_ "Usage: version::vcmp(lobj, ...)");
      SP -= items;
@@ -543,13 +667,15 @@ XS(XS_version_vcmp)
 
 XS(XS_version_boolean)
 {
-     dXSARGS;
-     if (items < 1)
-         Perl_croak(aTHX_ "Usage: version::boolean(lobj, ...)");
-     SP -= items;
+    dVAR;
+    dXSARGS;
+    PERL_UNUSED_ARG(cv);
+    if (items < 1)
+       Perl_croak(aTHX_ "Usage: version::boolean(lobj, ...)");
+    SP -= items;
     if (sv_derived_from(ST(0), "version")) {
        SV * const lobj = SvRV(ST(0));
-       SV * const rs = newSViv( vcmp(lobj,new_version(newSVpvn("0",1))) );
+       SV * const rs = newSViv( vcmp(lobj,new_version(newSVpvs("0"))) );
        PUSHs(sv_2mortal(rs));
        PUTBACK;
        return;
@@ -560,7 +686,9 @@ XS(XS_version_boolean)
 
 XS(XS_version_noop)
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
     if (items < 1)
        Perl_croak(aTHX_ "Usage: version::noop(lobj, ...)");
     if (sv_derived_from(ST(0), "version"))
@@ -574,7 +702,9 @@ XS(XS_version_noop)
 
 XS(XS_version_is_alpha)
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
     if (items != 1)
        Perl_croak(aTHX_ "Usage: version::is_alpha(lobj)");
     SP -= items;
@@ -593,29 +723,19 @@ XS(XS_version_is_alpha)
 
 XS(XS_version_qv)
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
     if (items != 1)
        Perl_croak(aTHX_ "Usage: version::qv(ver)");
     SP -= items;
     {
        SV *    ver = ST(0);
        if ( !SvVOK(ver) ) { /* only need to do with if not already v-string */
-           SV * const vs = sv_newmortal();
-           char *version;
-           if ( SvNOK(ver) ) /* may get too much accuracy */
-           {
-               char tbuf[64];
-               const STRLEN len = my_sprintf(tbuf,"%.9"NVgf, SvNVX(ver));
-               version = savepvn(tbuf, len);
-           }
-           else
-           {
-               version = savesvpv(ver);
-           }
-           (void)scan_version(version,vs,TRUE);
-           Safefree(version);
-
-           PUSHs(vs);
+           SV * const rv = sv_newmortal();
+           sv_setsv(rv,ver); /* make a duplicate */
+           upg_version(rv, TRUE);
+           PUSHs(rv);
        }
        else
        {
@@ -629,7 +749,9 @@ XS(XS_version_qv)
 
 XS(XS_utf8_is_utf8)
 {
+     dVAR;
      dXSARGS;
+     PERL_UNUSED_ARG(cv);
      if (items != 1)
          Perl_croak(aTHX_ "Usage: utf8::is_utf8(sv)");
      else {
@@ -644,7 +766,9 @@ XS(XS_utf8_is_utf8)
 
 XS(XS_utf8_valid)
 {
+     dVAR;
      dXSARGS;
+     PERL_UNUSED_ARG(cv);
      if (items != 1)
          Perl_croak(aTHX_ "Usage: utf8::valid(sv)");
     else {
@@ -661,7 +785,9 @@ XS(XS_utf8_valid)
 
 XS(XS_utf8_encode)
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
     if (items != 1)
        Perl_croak(aTHX_ "Usage: utf8::encode(sv)");
     sv_utf8_encode(ST(0));
@@ -670,7 +796,9 @@ XS(XS_utf8_encode)
 
 XS(XS_utf8_decode)
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
     if (items != 1)
        Perl_croak(aTHX_ "Usage: utf8::decode(sv)");
     else {
@@ -684,7 +812,9 @@ XS(XS_utf8_decode)
 
 XS(XS_utf8_upgrade)
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
     if (items != 1)
        Perl_croak(aTHX_ "Usage: utf8::upgrade(sv)");
     else {
@@ -700,7 +830,9 @@ XS(XS_utf8_upgrade)
 
 XS(XS_utf8_downgrade)
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
     if (items < 1 || items > 2)
        Perl_croak(aTHX_ "Usage: utf8::downgrade(sv, failok=0)");
     else {
@@ -716,8 +848,10 @@ XS(XS_utf8_downgrade)
 
 XS(XS_utf8_native_to_unicode)
 {
+ dVAR;
  dXSARGS;
  const UV uv = SvUV(ST(0));
+ PERL_UNUSED_ARG(cv);
 
  if (items > 1)
      Perl_croak(aTHX_ "Usage: utf8::native_to_unicode(sv)");
@@ -728,8 +862,10 @@ XS(XS_utf8_native_to_unicode)
 
 XS(XS_utf8_unicode_to_native)
 {
+ dVAR;
  dXSARGS;
  const UV uv = SvUV(ST(0));
+ PERL_UNUSED_ARG(cv);
 
  if (items > 1)
      Perl_croak(aTHX_ "Usage: utf8::unicode_to_native(sv)");
@@ -740,8 +876,10 @@ XS(XS_utf8_unicode_to_native)
 
 XS(XS_Internals_SvREADONLY)    /* This is dangerous stuff. */
 {
+    dVAR;
     dXSARGS;
     SV * const sv = SvRV(ST(0));
+    PERL_UNUSED_ARG(cv);
 
     if (items == 1) {
         if (SvREADONLY(sv))
@@ -765,8 +903,10 @@ XS(XS_Internals_SvREADONLY)        /* This is dangerous stuff. */
 
 XS(XS_Internals_SvREFCNT)      /* This is dangerous stuff. */
 {
+    dVAR;
     dXSARGS;
     SV * const sv = SvRV(ST(0));
+    PERL_UNUSED_ARG(cv);
 
     if (items == 1)
         XSRETURN_IV(SvREFCNT(sv) - 1); /* Minus the ref created for us. */
@@ -780,7 +920,9 @@ XS(XS_Internals_SvREFCNT)   /* This is dangerous stuff. */
 
 XS(XS_Internals_hv_clear_placehold)
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
 
     if (items != 1)
        Perl_croak(aTHX_ "Usage: UNIVERSAL::hv_clear_placeholders(hv)");
@@ -793,12 +935,15 @@ XS(XS_Internals_hv_clear_placehold)
 
 XS(XS_Regexp_DESTROY)
 {
+    PERL_UNUSED_CONTEXT;
     PERL_UNUSED_ARG(cv);
 }
 
 XS(XS_PerlIO_get_layers)
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
     if (items < 1 || items % 2 == 0)
        Perl_croak(aTHX_ "Usage: PerlIO_get_layers(filehandle[,args])");
 #ifdef USE_PERLIO
@@ -890,9 +1035,11 @@ XS(XS_PerlIO_get_layers)
                  else {
                       if (namok && argok)
                            XPUSHs(Perl_newSVpvf(aTHX_ "%"SVf"(%"SVf")",
-                                              *namsvp, *argsvp));
+                                                SVfARG(*namsvp),
+                                                SVfARG(*argsvp)));
                       else if (namok)
-                           XPUSHs(Perl_newSVpvf(aTHX_ "%"SVf, *namsvp));
+                           XPUSHs(Perl_newSVpvf(aTHX_ "%"SVf,
+                                                SVfARG(*namsvp)));
                       else
                            XPUSHs(&PL_sv_undef);
                       nitem++;
@@ -900,7 +1047,7 @@ XS(XS_PerlIO_get_layers)
                            const IV flags = SvIVX(*flgsvp);
 
                            if (flags & PERLIO_F_UTF8) {
-                                XPUSHs(newSVpvn("utf8", 4));
+                                XPUSHs(newSVpvs("utf8"));
                                 nitem++;
                            }
                       }
@@ -919,6 +1066,7 @@ XS(XS_PerlIO_get_layers)
 
 XS(XS_Internals_hash_seed)
 {
+    dVAR;
     /* Using dXSARGS would also have dITEM and dSP,
      * which define 2 unused local variables.  */
     dAXMARK;
@@ -929,6 +1077,7 @@ XS(XS_Internals_hash_seed)
 
 XS(XS_Internals_rehash_seed)
 {
+    dVAR;
     /* Using dXSARGS would also have dITEM and dSP,
      * which define 2 unused local variables.  */
     dAXMARK;
@@ -939,7 +1088,9 @@ XS(XS_Internals_rehash_seed)
 
 XS(XS_Internals_HvREHASH)      /* Subject to change  */
 {
+    dVAR;
     dXSARGS;
+    PERL_UNUSED_ARG(cv);
     if (SvROK(ST(0))) {
        const HV * const hv = (HV *) SvRV(ST(0));
        if (items == 1 && SvTYPE(hv) == SVt_PVHV) {
@@ -954,6 +1105,7 @@ XS(XS_Internals_HvREHASH)  /* Subject to change  */
 
 XS(XS_Internals_inc_sub_generation)
 {
+    dVAR;
     /* Using dXSARGS would also have dITEM and dSP,
      * which define 2 unused local variables.  */
     dAXMARK;
@@ -963,6 +1115,229 @@ XS(XS_Internals_inc_sub_generation)
     XSRETURN_EMPTY;
 }
 
+XS(XS_re_is_regexp)
+{
+    dVAR; 
+    dXSARGS;
+    if (items != 1)
+       Perl_croak(aTHX_ "Usage: %s(%s)", "re::is_regexp", "sv");
+    PERL_UNUSED_VAR(cv); /* -W */
+    PERL_UNUSED_VAR(ax); /* -Wall */
+    SP -= items;
+    {
+       SV *    sv = ST(0);
+        if ( Perl_get_re_arg( aTHX_ sv, 0, NULL ) ) 
+        {
+            XSRETURN_YES;
+        } else {
+            XSRETURN_NO;
+        }
+        /* NOTREACHED */        
+       PUTBACK;
+       return;
+    }
+}
+
+XS(XS_re_regname)
+{
+
+    dVAR; 
+    dXSARGS;
+    if (items < 1 || items > 2)
+       Perl_croak(aTHX_ "Usage: %s(%s)", "re::regname", "name[, all ]");
+    PERL_UNUSED_VAR(cv); /* -W */
+    PERL_UNUSED_VAR(ax); /* -Wall */
+    SP -= items;
+    {
+       SV *    sv = ST(0);
+       SV *    all;
+        regexp *re = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
+        SV *bufs = NULL;
+
+       if (items < 2)
+           all = NULL;
+       else {
+           all = ST(1);
+       }
+        {
+            if (SvPOK(sv) && re && re->paren_names) {
+                bufs = CALLREG_NAMEDBUF(re,sv,all && SvTRUE(all));
+                if (bufs) {
+                    if (all && SvTRUE(all))
+                        XPUSHs(newRV(bufs));
+                    else
+                        XPUSHs(SvREFCNT_inc(bufs));
+                    XSRETURN(1);
+                }
+            }
+            XSRETURN_UNDEF;
+        }
+       PUTBACK;
+       return;
+    }
+}
+
+XS(XS_re_regnames)
+{
+    dVAR; 
+    dXSARGS;
+    if (items < 0 || items > 1)
+       Perl_croak(aTHX_ "Usage: %s(%s)", "re::regnames", "[all]");
+    PERL_UNUSED_VAR(cv); /* -W */
+    PERL_UNUSED_VAR(ax); /* -Wall */
+    SP -= items;
+    {
+       SV *    all;
+        regexp *re = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
+        IV count = 0;
+
+       if (items < 1)
+           all = NULL;
+       else {
+           all = ST(0);
+       }
+        {
+            if (re && re->paren_names) {
+                HV *hv= re->paren_names;
+                (void)hv_iterinit(hv);
+                while (1) {
+                    HE *temphe = hv_iternext_flags(hv,0);
+                    if (temphe) {
+                        IV i;
+                        IV parno = 0;
+                        SV* sv_dat = HeVAL(temphe);
+                        I32 *nums = (I32*)SvPVX(sv_dat);
+                        for ( i = 0; i < SvIVX(sv_dat); i++ ) {
+                            if ((I32)(re->lastcloseparen) >= nums[i] &&
+                                re->offs[nums[i]].start != -1 &&
+                                re->offs[nums[i]].end != -1)
+                            {
+                                parno = nums[i];
+                                break;
+                            }
+                        }
+                        if (parno || (all && SvTRUE(all))) {
+                            STRLEN len;
+                            char *pv = HePV(temphe, len);
+                            if ( GIMME_V == G_ARRAY ) 
+                                XPUSHs(newSVpvn(pv,len));
+                            count++;
+                        }
+                    } else {
+                        break;
+                    }
+                }
+            }
+            if ( GIMME_V == G_ARRAY ) 
+                XSRETURN(count);
+            else 
+                XSRETURN_UNDEF;
+        }    
+       PUTBACK;
+       return;
+    }
+}
+
+
+XS(XS_re_regnames_iterinit)
+{
+    dVAR; 
+    dXSARGS;
+    if (items != 0)
+       Perl_croak(aTHX_ "Usage: re::regnames_iterinit()");
+    PERL_UNUSED_VAR(cv); /* -W */
+    PERL_UNUSED_VAR(ax); /* -Wall */
+    SP -= items;
+    {
+        regexp *re = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
+        if (re && re->paren_names) {
+            (void)hv_iterinit(re->paren_names);
+            XPUSHs(newSViv(HvTOTALKEYS(re->paren_names)));
+        } else {
+            XSRETURN_UNDEF;
+        }  
+       PUTBACK;
+       return;
+    }
+}
+
+
+XS(XS_re_regnames_iternext)
+{
+    dVAR; 
+    dXSARGS;
+    if (items < 0 || items > 1)
+       Perl_croak(aTHX_ "Usage: %s(%s)", "re::regnames_iternext", "[all]");
+    PERL_UNUSED_VAR(cv); /* -W */
+    PERL_UNUSED_VAR(ax); /* -Wall */
+    SP -= items;
+    {
+       SV *    all;
+        regexp *re = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
+
+       if (items < 1)
+           all = NULL;
+       else {
+           all = ST(0);
+       }
+        if (re && re->paren_names) {
+            HV *hv= re->paren_names;
+            while (1) {
+                HE *temphe = hv_iternext_flags(hv,0);
+                if (temphe) {
+                    IV i;
+                    IV parno = 0;
+                    SV* sv_dat = HeVAL(temphe);
+                    I32 *nums = (I32*)SvPVX(sv_dat);
+                    for ( i = 0; i < SvIVX(sv_dat); i++ ) {
+                        if ((I32)(re->lastcloseparen) >= nums[i] &&
+                            re->offs[nums[i]].start != -1 &&
+                            re->offs[nums[i]].end != -1)
+                        {
+                            parno = nums[i];
+                            break;
+                        }
+                    }
+                    if (parno || (all && SvTRUE(all))) {
+                        STRLEN len;
+                        char *pv = HePV(temphe, len);
+                        XPUSHs(newSVpvn(pv,len));
+                        XSRETURN(1);    
+                    }
+                } else {
+                    break;
+                }
+            }
+        }
+        XSRETURN_UNDEF;
+       PUTBACK;
+       return;
+    }
+}
+
+
+XS(XS_re_regnames_count)
+{
+    regexp *re = PL_curpm ? PM_GETRE(PL_curpm) : NULL;
+    dVAR; 
+    dXSARGS;
+
+    if (items != 0)
+       Perl_croak(aTHX_ "Usage: %s(%s)", "re::regnames_count", "");
+    PERL_UNUSED_VAR(cv); /* -W */
+    PERL_UNUSED_VAR(ax); /* -Wall */
+    SP -= items;
+    
+    if (re && re->paren_names) {
+        XPUSHs(newSViv(HvTOTALKEYS(re->paren_names)));
+    } else {
+        XSRETURN_UNDEF;
+    }  
+    PUTBACK;
+    return;
+}
+
+
 /*
  * Local variables:
  * c-indentation-style: bsd