Vendor import of Perl 5.006

2 files changed, 19 insertions, 11 deletions

diff --git a/contrib/perl5/ext/attrs/attrs.pm b/contrib/perl5/ext/attrs/attrs.pm
index fe2bf35..2070632 100644
--- a/contrib/perl5/ext/attrs/attrs.pm
+++ b/contrib/perl5/ext/attrs/attrs.pm
@@ -1,14 +1,11 @@
 package attrs;
-require DynaLoader;
-use vars '@ISA';
-@ISA = 'DynaLoader';
+use XSLoader ();
 
-use vars qw($VERSION);
 $VERSION = "1.0";
 
 =head1 NAME
 
-attrs - set/get attributes of a subroutine
+attrs - set/get attributes of a subroutine (deprecated)
 
 =head1 SYNOPSIS
 
@@ -21,11 +18,17 @@ attrs - set/get attributes of a subroutine
 
 =head1 DESCRIPTION
 
-This module lets you set and get attributes for subroutines.
+NOTE: Use of this pragma is deprecated.  Use the syntax
+
+    sub foo : locked method { }
+
+to declare attributes instead.  See also L<attributes>.
+
+This pragma lets you set and get attributes for subroutines.
 Setting attributes takes place at compile time; trying to set
 invalid attribute names causes a compile-time error. Calling
-C<attr::get> on a subroutine reference or name returns its list
-of attribute names. Notice that C<attr::get> is not exported.
+C<attrs::get> on a subroutine reference or name returns its list
+of attribute names. Notice that C<attrs::get> is not exported.
 Valid attributes are as follows.
 
 =over
@@ -50,6 +53,6 @@ subroutine is entered.
 
 =cut
 
-bootstrap attrs $VERSION;
+XSLoader::load 'attrs', $VERSION;
 
 1;
diff --git a/contrib/perl5/ext/attrs/attrs.xs b/contrib/perl5/ext/attrs/attrs.xs
index 7f7970d..4c00cd7 100644
--- a/contrib/perl5/ext/attrs/attrs.xs
+++ b/contrib/perl5/ext/attrs/attrs.xs
@@ -1,3 +1,4 @@
+#define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
@@ -26,6 +27,10 @@ char *	Class
     PPCODE:
 	if (!PL_compcv || !(cv = CvOUTSIDE(PL_compcv)))
 	    croak("can't set attributes outside a subroutine scope");
+	if (ckWARN(WARN_DEPRECATED))
+	    Perl_warner(aTHX_ WARN_DEPRECATED,
+			"pragma \"attrs\" is deprecated, "
+			"use \"sub NAME : ATTRS\" instead");
 	for (i = 1; i < items; i++) {
 	    STRLEN n_a;
 	    char *attr = SvPV(ST(i), n_a);
@@ -55,7 +60,7 @@ SV *	sub
 	if (!sub)
 	    croak("invalid subroutine reference or name");
 	if (CvFLAGS(sub) & CVf_METHOD)
-	    XPUSHs(sv_2mortal(newSVpv("method", 0)));
+	    XPUSHs(sv_2mortal(newSVpvn("method", 6)));
 	if (CvFLAGS(sub) & CVf_LOCKED)
-	    XPUSHs(sv_2mortal(newSVpv("locked", 0)));
+	    XPUSHs(sv_2mortal(newSVpvn("locked", 6)));