Integrate changes #9493,9494,9495,9496 from maintperl

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

diff --git a/xsutils.c b/xsutils.c
index ea717d9..187d9f7 100644 (file)
--- a/xsutils.c
+++ b/xsutils.c
@@ -23,7 +23,7 @@ void XS_attributes_bootstrap(pTHXo_ CV *cv);
  *
  * The various bootstrap definitions can take care of doing
  * package-specific newXS() calls.  Since the layout of the
- * bundled lib/*.pm files is in a version-specific directory,
+ * bundled *.pm files is in a version-specific directory,
  * version checks in these bootstrap calls are optional.
  */
 
@@ -35,10 +35,6 @@ Perl_boot_core_xsutils(pTHX)
     newXS("attributes::bootstrap",     XS_attributes_bootstrap,        file);
 }
 
-#ifdef PERL_OBJECT
-#define NO_XSLOCKS
-#endif  /* PERL_OBJECT */
-
 #include "XSUB.h"
 
 static int
@@ -52,7 +48,7 @@ modify_SV_attributes(pTHXo_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 
     for (nret = 0 ; numattrs && (attr = *attrlist++); numattrs--) {
        name = SvPV(attr, len);
-       if (negated = (*name == '-')) {
+       if ((negated = (*name == '-'))) {
            name++;
            len--;
        }
@@ -88,12 +84,30 @@ modify_SV_attributes(pTHXo_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
                        continue;
                    }
                    break;
+               case 's':
+                   if (strEQ(name, "shared")) {
+                       if (negated)
+                           GvSHARED_off(CvGV((CV*)sv));
+                       else
+                           GvSHARED_on(CvGV((CV*)sv));
+                       continue;
+                   }
+                   break;
                }
                break;
            }
            break;
        default:
-           /* nothing, yet */
+           switch ((int)len) {
+              case 6:
+               switch (*name) {
+                  case 's':
+                   if (strEQ(name, "shared")) {
+                        /* toke.c has already marked as GvSHARED */
+                        continue;
+                    }
+                }
+            }
            break;
        }
        /* anything recognized had a 'continue' above */
@@ -172,6 +186,8 @@ usage:
 #endif
        if (cvflags & CVf_METHOD)
            XPUSHs(sv_2mortal(newSVpvn("method", 6)));
+        if (GvSHARED(CvGV((CV*)sv)))
+           XPUSHs(sv_2mortal(newSVpvn("shared", 6)));
        break;
     default:
        break;
@@ -257,11 +273,9 @@ usage:
 
     rv = ST(0);
     ST(0) = TARG;
-    if (!SvOK(rv)) {
-       ST(0) = &PL_sv_no;
-       XSRETURN(1);
-    }
-    if (!SvROK(rv))
+    if (SvGMAGICAL(rv))
+       mg_get(rv);
+    if (!(SvOK(rv) && SvROK(rv)))
        goto usage;
     sv = SvRV(rv);
     sv_setpv(TARG, sv_reftype(sv, 0));
@@ -275,7 +289,6 @@ usage:
 XS(XS_attributes__warn_reserved)
 {
     dXSARGS;
-    SV *rv, *sv;
 #ifdef dXSTARGET
     dXSTARGET;
 #else