X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xsutils.c;h=382befbc3251bc4f4114d42f92fc515a734f9800;hb=574bacfe464e67c186e160f356e339f5a9faa3e8;hp=7b2157432ffeadbd26d5091cd735f03df0f55537;hpb=4f470f63ec19cae10190b8f3ed622153f261d3b1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/xsutils.c b/xsutils.c
index 7b21574..382befb 100644
--- a/xsutils.c
+++ b/xsutils.c
@@ -48,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 == '-')) || (*name == '+')) {
+	if ((negated = (*name == '-'))) {
 	    name++;
 	    len--;
 	}
@@ -84,41 +84,31 @@ modify_SV_attributes(pTHXo_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 			continue;
 		    }
 		    break;
+		case 's':
+      if (strEQ(name, "unique")) {
+			if (negated)
+			    GvUNIQUE_off(CvGV((CV*)sv));
+			else
+			    GvUNIQUE_on(CvGV((CV*)sv));
+			continue;
+		    }
+		    break;
 		}
 		break;
 	    }
-          case SVt_IV:
-          case SVt_NV:
-          case SVt_PV:
-          case SVt_PVIV:
-          case SVt_PVNV:
-          case SVt_PVAV:
-          case SVt_PVHV:
+	    break;
+	default:
 	    switch ((int)len) {
-              case 8:
+              case 6:
 		switch (*name) {
-                  case 'r':
-                    if (strEQ(name, "readonly")) {
-			if (negated)
-			    SvREADONLY_off(sv);
-			else
-			    SvREADONLY_on(sv);
-                        if (SvTYPE(sv) == SVt_PVAV && SvMAGIC(sv)
-                            && mg_find(sv, 'I')) { /* @ISA */
-                            if (negated)
-                                PL_hints &= ~HINT_CT_MRESOLVE;
-                            else
-                                PL_hints |= HINT_CT_MRESOLVE;
-                        }
-			continue;
+                  case 's':
+      if (strEQ(name, "unique")) {
+                        /* toke.c has already marked as GVf_UNIQUE */
+                        continue;
                     }
-                    break;
                 }
             }
 	    break;
-	default:
-	    /* nothing, yet */
-	    break;
 	}
 	/* anything recognized had a 'continue' above */
 	*retlist++ = attr;
@@ -137,6 +127,9 @@ XS(XS_attributes_bootstrap)
     dXSARGS;
     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, "$");
@@ -196,6 +189,8 @@ usage:
 #endif
 	if (cvflags & CVf_METHOD)
 	    XPUSHs(sv_2mortal(newSVpvn("method", 6)));
+        if (GvUNIQUE(CvGV((CV*)sv)))
+     XPUSHs(sv_2mortal(newSVpvn("unique", 6)));
 	break;
     default:
 	break;
@@ -236,18 +231,17 @@ usage:
 	HV *stash = Nullhv;
 	switch (SvTYPE(sv)) {
 	case SVt_PVCV:
-	    if (CvGV(sv) && isGV(CvGV(sv)) && GvSTASH(CvGV(sv)) &&
-			    HvNAME(GvSTASH(CvGV(sv))))
+	    if (CvGV(sv) && isGV(CvGV(sv)) && GvSTASH(CvGV(sv)))
 		stash = GvSTASH(CvGV(sv));
-	    else if (/* !CvANON(sv) && */ CvSTASH(sv) && HvNAME(CvSTASH(sv)))
+	    else if (/* !CvANON(sv) && */ CvSTASH(sv))
 		stash = CvSTASH(sv);
 	    break;
 	case SVt_PVMG:
-	    if (!(SvFAKE(sv) && SvTIED_mg(sv, '*')))
+	    if (!(SvFAKE(sv) && SvTIED_mg(sv, PERL_MAGIC_glob)))
 		break;
 	    /*FALLTHROUGH*/
 	case SVt_PVGV:
-	    if (GvGP(sv) && GvESTASH((GV*)sv) && HvNAME(GvESTASH((GV*)sv)))
+	    if (GvGP(sv) && GvESTASH((GV*)sv))
 		stash = GvESTASH((GV*)sv);
 	    break;
 	default: