This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
More perldelta entries
[perl5.git] / xsutils.c
index 17b0623..86fb0aa 100644 (file)
--- a/xsutils.c
+++ b/xsutils.c
@@ -1,6 +1,7 @@
 /*    xsutils.c
  *
- *    Copyright (c) 1999-2003, Larry Wall
+ *    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
  *    License or the Artistic License, as specified in the README file.
  */
 
 /* package attributes; */
-void XS_attributes__warn_reserved(pTHX_ CV *cv);
-void XS_attributes_reftype(pTHX_ CV *cv);
-void XS_attributes__modify_attrs(pTHX_ CV *cv);
-void XS_attributes__guess_stash(pTHX_ CV *cv);
-void XS_attributes__fetch_attrs(pTHX_ CV *cv);
-void XS_attributes_bootstrap(pTHX_ CV *cv);
+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);
+PERL_XS_EXPORT_C void XS_attributes__fetch_attrs(pTHX_ CV *cv);
+PERL_XS_EXPORT_C void XS_attributes_bootstrap(pTHX_ CV *cv);
 
 
 /*
@@ -42,11 +43,11 @@ 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)
 {
-    char *file = __FILE__;
-
     newXS("attributes::bootstrap",     XS_attributes_bootstrap,        file);
 }
 
@@ -55,43 +56,48 @@ Perl_boot_core_xsutils(pTHX)
 static int
 modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 {
+    dVAR;
     SV *attr;
-    char *name;
-    STRLEN len;
-    bool negated;
     int nret;
 
     for (nret = 0 ; numattrs && (attr = *attrlist++); numattrs--) {
-       name = SvPV(attr, len);
-       if ((negated = (*name == '-'))) {
+       STRLEN len;
+       const char *name = SvPV_const(attr, len);
+       const bool negated = (*name == '-');
+
+       if (negated) {
            name++;
            len--;
        }
        switch (SvTYPE(sv)) {
        case SVt_PVCV:
            switch ((int)len) {
+#ifdef CVf_ASSERTION
+           case 9:
+               if (memEQ(name, "assertion", 9)) {
+                   if (negated)
+                       CvFLAGS((CV*)sv) &= ~CVf_ASSERTION;
+                   else
+                       CvFLAGS((CV*)sv) |= CVf_ASSERTION;
+                   continue;
+               }
+               break;
+#endif
            case 6:
-               switch (*name) {
-               case 'a':
-                   if (strEQ(name, "assertion")) {
-                       if (negated)
-                           CvFLAGS((CV*)sv) &= ~CVf_ASSERTION;
-                       else
-                           CvFLAGS((CV*)sv) |= CVf_ASSERTION;
-                       continue;
-                   }
-                   break;
+               switch (name[3]) {
                case 'l':
 #ifdef CVf_LVALUE
-                   if (strEQ(name, "lvalue")) {
+                   if (memEQ(name, "lvalue", 6)) {
                        if (negated)
                            CvFLAGS((CV*)sv) &= ~CVf_LVALUE;
                        else
                            CvFLAGS((CV*)sv) |= CVf_LVALUE;
                        continue;
                    }
+                   break;
+               case 'k':
 #endif /* defined CVf_LVALUE */
-                   if (strEQ(name, "locked")) {
+                   if (memEQ(name, "locked", 6)) {
                        if (negated)
                            CvFLAGS((CV*)sv) &= ~CVf_LOCKED;
                        else
@@ -99,8 +105,8 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
                        continue;
                    }
                    break;
-               case 'm':
-                   if (strEQ(name, "method")) {
+               case 'h':
+                   if (memEQ(name, "method", 6)) {
                        if (negated)
                            CvFLAGS((CV*)sv) &= ~CVf_METHOD;
                        else
@@ -108,15 +114,6 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
                        continue;
                    }
                    break;
-               case 'u':
-                   if (strEQ(name, "unique")) {
-                       if (negated)
-                           GvUNIQUE_off(CvGV((CV*)sv));
-                       else
-                           GvUNIQUE_on(CvGV((CV*)sv));
-                       continue;
-                   }
-                   break;
                }
                break;
            }
@@ -124,22 +121,23 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
        default:
            switch ((int)len) {
            case 6:
-               switch (*name) {
-               case 's':
-                   if (strEQ(name, "shared")) {
+               switch (name[5]) {
+               case 'd':
+                   if (memEQ(name, "share", 5)) {
                        if (negated)
                            Perl_croak(aTHX_ "A variable may not be unshared");
                        SvSHARE(sv);
                         continue;
                     }
                    break;
-               case 'u':
-                   if (strEQ(name, "unique")) {
+               case 'e':
+                   if (memEQ(name, "uniqu", 5)) {
                        if (SvTYPE(sv) == SVt_PVGV) {
-                           if (negated)
+                           if (negated) {
                                GvUNIQUE_off(sv);
-                           else
+                           } else {
                                GvUNIQUE_on(sv);
+                           }
                        }
                        /* Hope this came from toke.c if not a GV. */
                         continue;
@@ -162,8 +160,8 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 
 XS(XS_attributes_bootstrap)
 {
+    dVAR;
     dXSARGS;
-    char *file = __FILE__;
 
     if( items > 1 )
         Perl_croak(aTHX_ "Usage: attributes::bootstrap $module");
@@ -179,6 +177,7 @@ XS(XS_attributes_bootstrap)
 
 XS(XS_attributes__modify_attrs)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
 
@@ -200,6 +199,7 @@ usage:
 
 XS(XS_attributes__fetch_attrs)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
     cv_flags_t cvflags;
@@ -220,21 +220,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;
@@ -245,13 +245,10 @@ usage:
 
 XS(XS_attributes__guess_stash)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
-#ifdef dXSTARGET
-    dXSTARGET;
-#else
-    SV * TARG = sv_newmortal();
-#endif
+    dXSTARG;
 
     if (items != 1) {
 usage:
@@ -266,13 +263,13 @@ usage:
     sv = SvRV(rv);
 
     if (SvOBJECT(sv))
-       sv_setpv(TARG, HvNAME(SvSTASH(sv)));
+       sv_setpvn(TARG, HvNAME_get(SvSTASH(sv)), HvNAMELEN_get(SvSTASH(sv)));
 #if 0  /* this was probably a bad idea */
     else if (SvPADMY(sv))
        sv_setsv(TARG, &PL_sv_no);      /* unblessed lexical */
 #endif
     else {
-       HV *stash = Nullhv;
+       const HV *stash = NULL;
        switch (SvTYPE(sv)) {
        case SVt_PVCV:
            if (CvGV(sv) && isGV(CvGV(sv)) && GvSTASH(CvGV(sv)))
@@ -280,10 +277,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);
@@ -292,24 +285,19 @@ usage:
            break;
        }
        if (stash)
-           sv_setpv(TARG, HvNAME(stash));
+           sv_setpvn(TARG, HvNAME_get(stash), HvNAMELEN_get(stash));
     }
 
-#ifdef dXSTARGET
     SvSETMAGIC(TARG);
-#endif
     XSRETURN(1);
 }
 
 XS(XS_attributes_reftype)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
-#ifdef dXSTARGET
-    dXSTARGET;
-#else
-    SV * TARG = sv_newmortal();
-#endif
+    dXSTARG;
 
     if (items != 1) {
 usage:
@@ -319,27 +307,20 @@ usage:
 
     rv = ST(0);
     ST(0) = TARG;
-    if (SvGMAGICAL(rv))
-       mg_get(rv);
+    SvGETMAGIC(rv);
     if (!(SvOK(rv) && SvROK(rv)))
        goto usage;
     sv = SvRV(rv);
     sv_setpv(TARG, sv_reftype(sv, 0));
-#ifdef dXSTARGET
     SvSETMAGIC(TARG);
-#endif
 
     XSRETURN(1);
 }
 
 XS(XS_attributes__warn_reserved)
 {
+    dVAR;
     dXSARGS;
-#ifdef dXSTARGET
-    dXSTARGET;
-#else
-    SV * TARG = sv_newmortal();
-#endif
 
     if (items != 0) {
        Perl_croak(aTHX_
@@ -347,12 +328,17 @@ XS(XS_attributes__warn_reserved)
     }
 
     EXTEND(SP,1);
-    ST(0) = TARG;
-    sv_setiv(TARG, ckWARN(WARN_RESERVED) != 0);
-#ifdef dXSTARGET
-    SvSETMAGIC(TARG);
-#endif
+    ST(0) = boolSV(ckWARN(WARN_RESERVED));
 
     XSRETURN(1);
 }
 
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */