X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xsutils.c;h=59a249616b59051c29e43ac7e283c85f77950441;hb=97aff369fa5580e7a888d4fa4c86be74ab000409;hp=f8527a283ceb95ad2e15d4b29d54da440c6c1e0a;hpb=d277572a6346d5f51f7cc9aef51be155e4b63a19;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/xsutils.c b/xsutils.c
index f8527a2..59a2496 100644
--- a/xsutils.c
+++ b/xsutils.c
@@ -1,6 +1,6 @@
 /*    xsutils.c
  *
- *    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+ *    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,12 +23,12 @@
  */
 
 /* 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);
 
 
 /*
@@ -46,7 +46,7 @@ void XS_attributes_bootstrap(pTHX_ CV *cv);
 void
 Perl_boot_core_xsutils(pTHX)
 {
-    char *file = __FILE__;
+    const char file[] = __FILE__;
 
     newXS("attributes::bootstrap",	XS_attributes_bootstrap,	file);
 }
@@ -56,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
@@ -100,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
@@ -116,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;
@@ -154,8 +160,9 @@ modify_SV_attributes(pTHX_ SV *sv, SV **retlist, SV **attrlist, int numattrs)
 
 XS(XS_attributes_bootstrap)
 {
+    dVAR;
     dXSARGS;
-    char *file = __FILE__;
+    const char file[] = __FILE__;
 
     if( items > 1 )
         Perl_croak(aTHX_ "Usage: attributes::bootstrap $module");
@@ -171,6 +178,7 @@ XS(XS_attributes_bootstrap)
 
 XS(XS_attributes__modify_attrs)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
 
@@ -192,6 +200,7 @@ usage:
 
 XS(XS_attributes__fetch_attrs)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
     cv_flags_t cvflags;
@@ -212,21 +221,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;
@@ -237,6 +246,7 @@ usage:
 
 XS(XS_attributes__guess_stash)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
     dXSTARG;
@@ -254,13 +264,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,7 +290,7 @@ usage:
 	    break;
 	}
 	if (stash)
-	    sv_setpv(TARG, HvNAME(stash));
+	    sv_setpvn(TARG, HvNAME_get(stash), HvNAMELEN_get(stash));
     }
 
     SvSETMAGIC(TARG);
@@ -289,6 +299,7 @@ usage:
 
 XS(XS_attributes_reftype)
 {
+    dVAR;
     dXSARGS;
     SV *rv, *sv;
     dXSTARG;
@@ -301,8 +312,7 @@ 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);
@@ -314,8 +324,8 @@ usage:
 
 XS(XS_attributes__warn_reserved)
 {
+    dVAR;
     dXSARGS;
-    dXSTARG;
 
     if (items != 0) {
 	Perl_croak(aTHX_
@@ -323,10 +333,17 @@ XS(XS_attributes__warn_reserved)
     }
 
     EXTEND(SP,1);
-    ST(0) = TARG;
-    sv_setiv(TARG, ckWARN(WARN_RESERVED) != 0);
-    SvSETMAGIC(TARG);
+    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:
+ */