X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xsutils.c;h=3bc1f9349bc5af58002cb4f60fdbec6ab8ed76d2;hb=76467b2a651c6c83b127a7ee5b8170cd17171b66;hp=900ec3fcec73a6a0e8d4c68094b29794429ee918;hpb=20f4e2894de71066f1bcf3cb358fa8516d79a32d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/xsutils.c b/xsutils.c
index 900ec3f..3bc1f93 100644
--- a/xsutils.c
+++ b/xsutils.c
@@ -1,6 +1,6 @@
 /*    xsutils.c
  *
- *    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ *    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
  *    by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
@@ -9,8 +9,10 @@
  */
 
 /*
- * "Perilous to us all are the devices of an art deeper than we possess
- * ourselves." --Gandalf
+ * 'Perilous to us all are the devices of an art deeper than we possess
+ *  ourselves.'                                            --Gandalf
+ *
+ *     [p.597 of _The Lord of the Rings_, III/xi: "The Palantír"]
  */
 
 
@@ -71,26 +73,15 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 	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[3]) {
 #ifdef CVf_LVALUE
 		case 'l':
 		    if (memEQ(name, "lvalue", 6)) {
 			if (negated)
-			    CvFLAGS((CV*)sv) &= ~CVf_LVALUE;
+			    CvFLAGS(MUTABLE_CV(sv)) &= ~CVf_LVALUE;
 			else
-			    CvFLAGS((CV*)sv) |= CVf_LVALUE;
+			    CvFLAGS(MUTABLE_CV(sv)) |= CVf_LVALUE;
 			continue;
 		    }
 		    break;
@@ -98,18 +89,18 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 		case 'k':
 		    if (memEQ(name, "locked", 6)) {
 			if (negated)
-			    CvFLAGS((CV*)sv) &= ~CVf_LOCKED;
+			    CvFLAGS(MUTABLE_CV(sv)) &= ~CVf_LOCKED;
 			else
-			    CvFLAGS((CV*)sv) |= CVf_LOCKED;
+			    CvFLAGS(MUTABLE_CV(sv)) |= CVf_LOCKED;
 			continue;
 		    }
 		    break;
 		case 'h':
 		    if (memEQ(name, "method", 6)) {
 			if (negated)
-			    CvFLAGS((CV*)sv) &= ~CVf_METHOD;
+			    CvFLAGS(MUTABLE_CV(sv)) &= ~CVf_METHOD;
 			else
-			    CvFLAGS((CV*)sv) |= CVf_METHOD;
+			    CvFLAGS(MUTABLE_CV(sv)) |= CVf_METHOD;
 			continue;
 		    }
 		    break;
@@ -131,7 +122,7 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 		    break;
 		case 'e':
 		    if (memEQ(name, "uniqu", 5)) {
-			if (SvTYPE(sv) == SVt_PVGV) {
+			if (isGV_with_GP(sv)) {
 			    if (negated) {
 				GvUNIQUE_off(sv);
 			    } else {
@@ -163,7 +154,7 @@ XS(XS_attributes_bootstrap)
     dXSARGS;
 
     if( items > 1 )
-        Perl_croak(aTHX_ "Usage: attributes::bootstrap $module");
+	croak_xs_usage(cv, "$module");
 
     newXS("attributes::_modify_attrs",	XS_attributes__modify_attrs,	file);
     newXSproto("attributes::_guess_stash", XS_attributes__guess_stash, file, "$");
@@ -181,8 +172,7 @@ XS(XS_attributes__modify_attrs)
 
     if (items < 1) {
 usage:
-	Perl_croak(aTHX_
-		   "Usage: attributes::_modify_attrs $reference, @attributes");
+	croak_xs_usage(cv, "@attributes");
     }
 
     rv = ST(0);
@@ -204,8 +194,7 @@ XS(XS_attributes__fetch_attrs)
 
     if (items != 1) {
 usage:
-	Perl_croak(aTHX_
-		   "Usage: attributes::_fetch_attrs $reference");
+	croak_xs_usage(cv, "$reference");
     }
 
     rv = ST(0);
@@ -216,23 +205,21 @@ usage:
 
     switch (SvTYPE(sv)) {
     case SVt_PVCV:
-	cvflags = CvFLAGS((CV*)sv);
+	cvflags = CvFLAGS((const CV *)sv);
 	if (cvflags & CVf_LOCKED)
-	    XPUSHs(sv_2mortal(newSVpvs("locked")));
+	    XPUSHs(newSVpvs_flags("locked", SVs_TEMP));
 #ifdef CVf_LVALUE
 	if (cvflags & CVf_LVALUE)
-	    XPUSHs(sv_2mortal(newSVpvs("lvalue")));
+	    XPUSHs(newSVpvs_flags("lvalue", SVs_TEMP));
 #endif
 	if (cvflags & CVf_METHOD)
-	    XPUSHs(sv_2mortal(newSVpvs("method")));
-        if (GvUNIQUE(CvGV((CV*)sv)))
-	    XPUSHs(sv_2mortal(newSVpvs("unique")));
-	if (cvflags & CVf_ASSERTION)
-	    XPUSHs(sv_2mortal(newSVpvs("assertion")));
+	    XPUSHs(newSVpvs_flags("method", SVs_TEMP));
+        if (GvUNIQUE(CvGV((const CV *)sv)))
+	    XPUSHs(newSVpvs_flags("unique", SVs_TEMP));
 	break;
     case SVt_PVGV:
-	if (GvUNIQUE(sv))
-	    XPUSHs(sv_2mortal(newSVpvs("unique")));
+	if (isGV_with_GP(sv) && GvUNIQUE(sv))
+	    XPUSHs(newSVpvs_flags("unique", SVs_TEMP));
 	break;
     default:
 	break;
@@ -250,8 +237,7 @@ XS(XS_attributes__guess_stash)
 
     if (items != 1) {
 usage:
-	Perl_croak(aTHX_
-		   "Usage: attributes::_guess_stash $reference");
+	croak_xs_usage(cv, "$reference");
     }
 
     rv = ST(0);
@@ -276,8 +262,8 @@ usage:
 		stash = CvSTASH(sv);
 	    break;
 	case SVt_PVGV:
-	    if (GvGP(sv) && GvESTASH((GV*)sv))
-		stash = GvESTASH((GV*)sv);
+	    if (isGV_with_GP(sv) && GvGP(sv) && GvESTASH(MUTABLE_GV(sv)))
+		stash = GvESTASH(MUTABLE_GV(sv));
 	    break;
 	default:
 	    break;
@@ -299,8 +285,7 @@ XS(XS_attributes_reftype)
 
     if (items != 1) {
 usage:
-	Perl_croak(aTHX_
-		   "Usage: attributes::reftype $reference");
+	croak_xs_usage(cv, "$reference");
     }
 
     rv = ST(0);