test.pl should locally increase $Level, rather than setting it to a

[perl5.git] / xsutils.c

diff --git a/xsutils.c b/xsutils.c
index 518e543..900ec3f 100644 (file)
--- a/xsutils.c
+++ b/xsutils.c
@@ -1,6 +1,6 @@
 /*    xsutils.c
  *
- *    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ *    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
  *    by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
@@ -23,7 +23,6 @@
  */
 
 /* package attributes; */
-PERL_XS_EXPORT_C void XS_attributes__warn_reserved(pTHX_ CV *cv);
 PERL_XS_EXPORT_C void XS_attributes_reftype(pTHX_ CV *cv);
 PERL_XS_EXPORT_C void XS_attributes__modify_attrs(pTHX_ CV *cv);
 PERL_XS_EXPORT_C void XS_attributes__guess_stash(pTHX_ CV *cv);
@@ -43,11 +42,11 @@ PERL_XS_EXPORT_C void XS_attributes_bootstrap(pTHX_ CV *cv);
  * version checks in these bootstrap calls are optional.
  */
 
+static const char file[] = __FILE__;
+
 void
 Perl_boot_core_xsutils(pTHX)
 {
-    const char file[] = __FILE__;
-
     newXS("attributes::bootstrap",     XS_attributes_bootstrap,        file);
 }
 
@@ -56,6 +55,7 @@ Perl_boot_core_xsutils(pTHX)
 static int
 modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 {
+    dVAR;
     SV *attr;
     int nret;
 
@@ -84,8 +84,8 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 #endif
            case 6:
                switch (name[3]) {
-               case 'l':
 #ifdef CVf_LVALUE
+               case 'l':
                    if (memEQ(name, "lvalue", 6)) {
                        if (negated)
                            CvFLAGS((CV*)sv) &= ~CVf_LVALUE;
@@ -94,8 +94,8 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
                        continue;
                    }
                    break;
+#endif
                case 'k':
-#endif /* defined CVf_LVALUE */
                    if (memEQ(name, "locked", 6)) {
                        if (negated)
                            CvFLAGS((CV*)sv) &= ~CVf_LOCKED;
@@ -159,13 +159,12 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 
 XS(XS_attributes_bootstrap)
 {
+    dVAR;
     dXSARGS;
-    const char file[] = __FILE__;
 
     if( items > 1 )
         Perl_croak(aTHX_ "Usage: attributes::bootstrap $module");
 
-    newXSproto("attributes::_warn_reserved", XS_attributes__warn_reserved, file, "");
     newXS("attributes::_modify_attrs", XS_attributes__modify_attrs,    file);
     newXSproto("attributes::_guess_stash", XS_attributes__guess_stash, file, "$");
     newXSproto("attributes::_fetch_attrs", XS_attributes__fetch_attrs, file, "$");
@@ -176,6 +175,7 @@ XS(XS_attributes_bootstrap)
 
 XS(XS_attributes__modify_attrs)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
 
@@ -197,6 +197,7 @@ usage:
 
 XS(XS_attributes__fetch_attrs)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
     cv_flags_t cvflags;
@@ -217,21 +218,21 @@ usage:
     case SVt_PVCV:
        cvflags = CvFLAGS((CV*)sv);
        if (cvflags & CVf_LOCKED)
-           XPUSHs(sv_2mortal(newSVpvn("locked", 6)));
+           XPUSHs(sv_2mortal(newSVpvs("locked")));
 #ifdef CVf_LVALUE
        if (cvflags & CVf_LVALUE)
-           XPUSHs(sv_2mortal(newSVpvn("lvalue", 6)));
+           XPUSHs(sv_2mortal(newSVpvs("lvalue")));
 #endif
        if (cvflags & CVf_METHOD)
-           XPUSHs(sv_2mortal(newSVpvn("method", 6)));
+           XPUSHs(sv_2mortal(newSVpvs("method")));
         if (GvUNIQUE(CvGV((CV*)sv)))
-           XPUSHs(sv_2mortal(newSVpvn("unique", 6)));
+           XPUSHs(sv_2mortal(newSVpvs("unique")));
        if (cvflags & CVf_ASSERTION)
-           XPUSHs(sv_2mortal(newSVpvn("assertion", 9)));
+           XPUSHs(sv_2mortal(newSVpvs("assertion")));
        break;
     case SVt_PVGV:
        if (GvUNIQUE(sv))
-           XPUSHs(sv_2mortal(newSVpvn("unique", 6)));
+           XPUSHs(sv_2mortal(newSVpvs("unique")));
        break;
     default:
        break;
@@ -242,6 +243,7 @@ usage:
 
 XS(XS_attributes__guess_stash)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
     dXSTARG;
@@ -273,10 +275,6 @@ usage:
            else if (/* !CvANON(sv) && */ CvSTASH(sv))
                stash = CvSTASH(sv);
            break;
-       case SVt_PVMG:
-           if (!(SvFAKE(sv) && SvTIED_mg(sv, PERL_MAGIC_glob)))
-               break;
-           /*FALLTHROUGH*/
        case SVt_PVGV:
            if (GvGP(sv) && GvESTASH((GV*)sv))
                stash = GvESTASH((GV*)sv);
@@ -294,6 +292,7 @@ usage:
 
 XS(XS_attributes_reftype)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
     dXSTARG;
@@ -316,21 +315,6 @@ usage:
     XSRETURN(1);
 }
 
-XS(XS_attributes__warn_reserved)
-{
-    dXSARGS;
-
-    if (items != 0) {
-       Perl_croak(aTHX_
-                  "Usage: attributes::_warn_reserved ()");
-    }
-
-    EXTEND(SP,1);
-    ST(0) = boolSV(ckWARN(WARN_RESERVED));
-
-    XSRETURN(1);
-}
-
 /*
  * Local variables:
  * c-indentation-style: bsd