From b8bcb944700988138b74d866d1bd138abb310346 Mon Sep 17 00:00:00 2001
From: Petr Písař <ppi...@redhat.com>
Date: Aug 09 2017 11:52:25 +0000
Subject: Fix error message for "our sub foo::bar"
---
diff --git a/perl-5.27.1-perl-131679-Fix-our-sub-foo-bar-message.patch
b/perl-5.27.1-perl-131679-Fix-our-sub-foo-bar-message.patch
new file mode 100644
index 0000000..e9b9bf4
--- /dev/null
+++ b/perl-5.27.1-perl-131679-Fix-our-sub-foo-bar-message.patch
@@ -0,0 +1,51 @@
+From b9a58d500dd75ba783abac92a56e57d41227f62b Mon Sep 17 00:00:00 2001
+From: Father Chrysostomos <spr...@cpan.org>
+Date: Sun, 2 Jul 2017 11:35:20 -0700
+Subject: [PATCH] =?UTF-8?q?[perl=20#131679]=20Fix=20=E2=80=98our=20sub=20f?=
+ =?UTF-8?q?oo::bar=E2=80=99=20message?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It should say subroutine, not variable.
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ t/lib/croak/toke | 6 ++++++
+ toke.c | 3 ++-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/t/lib/croak/toke b/t/lib/croak/toke
+index 7aa15ef..2603224 100644
+--- a/t/lib/croak/toke
++++ b/t/lib/croak/toke
+@@ -133,6 +133,12 @@ state sub;
+ EXPECT
+ Missing name in "state sub" at - line 2.
+ ########
++# NAME our sub pack::foo
++our sub foo::bar;
++EXPECT
++No package name allowed for subroutine &foo::bar in "our" at - line 1, near
"our sub foo::bar"
++Execution of - aborted due to compilation errors.
++########
+ # NAME my sub pack::foo
+ use feature 'lexical_subs', 'state';
+ my sub foo::bar;
+diff --git a/toke.c b/toke.c
+index ace92e3..6aa5f26 100644
+--- a/toke.c
++++ b/toke.c
+@@ -8848,7 +8848,8 @@ S_pending_ident(pTHX)
+ if (PL_in_my == KEY_our) { /* "our" is merely analogous to "my" */
+ if (has_colon)
+ yyerror_pv(Perl_form(aTHX_ "No package name allowed for "
+- "variable %s in \"our\"",
++ "%se %s in \"our\"",
++ *PL_tokenbuf=='&' ?"subroutin":"variabl",
+ PL_tokenbuf), UTF ? SVf_UTF8 : 0);
+ tmp = allocmy(PL_tokenbuf, tokenbuf_len, UTF ? SVf_UTF8 : 0);
+ }
+--
+2.9.4
+
diff --git a/perl.spec b/perl.spec
index ab647d6..e1f6e15 100644
--- a/perl.spec
+++ b/perl.spec
@@ -201,6 +201,9 @@ Patch49:
perl-5.27.1-utf8n_to_uvchr-Don-t-display-too-many-bytes-in-msg.p
# in upstream after 5.27.1
Patch50: perl-5.27.1-perl-131645-Fix-assert-fail-in-pp_sselect.patch
+# Fix error message for "our sub foo::bar", RT#131679, in upstream after 5.27.1
+Patch51: perl-5.27.1-perl-131679-Fix-our-sub-foo-bar-message.patch
+
# Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
Patch200:
perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
@@ -2779,6 +2782,7 @@ Perl extension for Version Objects
%patch48 -p1
%patch49 -p1
%patch50 -p1
+%patch51 -p1
%patch200 -p1
%patch201 -p1
@@ -2814,6 +2818,7 @@ perl -x patchlevel.h \
'Fedora Patch47: Parse caret variables with subscripts as normal variables
inside ${...} escaping (RT#131664)' \
'Fedora Patch49: Do not display too many bytes when reporting malformed
UTF-8 character' \
'Fedora Patch50: Fix select called with a repeated magical variable
(RT#131645)' \
+ 'Fedora Patch51: Fix error message for "our sub foo::bar" (RT#131679)' \
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on
Linux' \
'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
%{nil}
@@ -5105,6 +5110,7 @@ popd
escaping (RT#131664)
- Do not display too many bytes when reporting malformed UTF-8 character
- Fix select called with a repeated magical variable (RT#131645)
+- Fix error message for "our sub foo::bar" (RT#131679)
* Sat Jul 29 2017 Igor Gnatenko <ignatenkobr...@fedoraproject.org> -
4:5.26.0-397
- Enable separate debuginfo back
https://src.fedoraproject.org/rpms/perl/c/b8bcb944700988138b74d866d1bd138abb310346?branch=master
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org
