commit 16b2f1fec15096d47e04944585518de9da7a651a
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Fri Sep 21 11:00:34 2012 +0200
Allow operator after numeric keyword argument
perl-5.16.1-perl-105924-require-1-2.patch | 116 +++++++++++++++++++++++++++++
perl.spec | 7 ++
2 files changed, 123 insertions(+), 0 deletions(-)
---
diff --git a/perl-5.16.1-perl-105924-require-1-2.patch b/perl-5.16.1-perl-105924-require-1-2.patch
new file mode 100644
index 0000000..76d74f8
--- /dev/null
+++ b/perl-5.16.1-perl-105924-require-1-2.patch
@@ -0,0 +1,116 @@
+From d546938a7c8b111c463b733910db885b24724b42 Mon Sep 17 00:00:00 2001
+From: Father Chrysostomos <sprout@xxxxxxxx>
+Date: Thu, 20 Sep 2012 06:24:25 -0700
+Subject: [PATCH] require 1 << 2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Port to 5.16.1:
+
+commit c31f6d3b869d78bbd101e694fd3b384b47a77f6d
+Author: Father Chrysostomos <sprout@xxxxxxxx>
+Date: Thu Sep 20 06:24:25 2012 -0700
+
+ [perl #105924] require 1 << 2
+
+Setting PL_expect after force_next has no effect, as force_next
+(called by force_version and force_word) picks up the current value of
+PL_expect and arranges for it to be reset thereto after the forced
+token is force-fed to the parser.
+
+The KEY_require case should be setting PL_expect to XTERM (as it
+already does) when there is no forced token (version or bareword),
+because we expect a term after ‘require’, but to XOPERATOR when
+there is a forced token, because we expect an operator after that
+forced token.
+
+Since the PL_expect assignment has no effect after force_next, we can
+set it to XOPERATOR before calling potentially calling force_next, and
+then to XTERM afterwards.
+
+Loop exits had the same bug, so this fixes them all.
+---
+ t/base/lex.t | 10 +++++++++-
+ toke.c | 6 ++++++
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/t/base/lex.t b/t/base/lex.t
+index ce16ef1..c2a6cc3 100644
+--- a/t/base/lex.t
++++ b/t/base/lex.t
+@@ -1,6 +1,6 @@
+ #!./perl
+
+-print "1..57\n";
++print "1..63\n";
+
+ $x = 'x';
+
+@@ -273,3 +273,11 @@ $test++;
+ @a = (1,2,3);
+ print "not " unless($a[~~2] == 3);
+ print "ok 57\n";
++
++$test = 58;
++for(qw< require goto last next redo dump >) {
++ eval "sub { $_ foo << 2 }";
++ print "not " if $@;
++ print "ok ", $test++, " - [perl #105924] $_ WORD << ...\n";
++ print "# $@" if $@;
++}
+diff --git a/toke.c b/toke.c
+index 1d18550..aa2c3b6 100644
+--- a/toke.c
++++ b/toke.c
+@@ -7344,6 +7344,7 @@ Perl_yylex(pTHX)
+ UNI(OP_DBMCLOSE);
+
+ case KEY_dump:
++ PL_expect = XOPERATOR;
+ s = force_word(s,WORD,TRUE,FALSE,FALSE);
+ LOOPX(OP_DUMP);
+
+@@ -7476,6 +7477,7 @@ Perl_yylex(pTHX)
+ LOP(OP_GREPSTART, XREF);
+
+ case KEY_goto:
++ PL_expect = XOPERATOR;
+ s = force_word(s,WORD,TRUE,FALSE,FALSE);
+ LOOPX(OP_GOTO);
+
+@@ -7598,6 +7600,7 @@ Perl_yylex(pTHX)
+ LOP(OP_KILL,XTERM);
+
+ case KEY_last:
++ PL_expect = XOPERATOR;
+ s = force_word(s,WORD,TRUE,FALSE,FALSE);
+ LOOPX(OP_LAST);
+
+@@ -7695,6 +7698,7 @@ Perl_yylex(pTHX)
+ OPERATOR(MY);
+
+ case KEY_next:
++ PL_expect = XOPERATOR;
+ s = force_word(s,WORD,TRUE,FALSE,FALSE);
+ LOOPX(OP_NEXT);
+
+@@ -7880,6 +7884,7 @@ Perl_yylex(pTHX)
+
+ case KEY_require:
+ s = SKIPSPACE1(s);
++ PL_expect = XOPERATOR;
+ if (isDIGIT(*s)) {
+ s = force_version(s, FALSE);
+ }
+@@ -7911,6 +7916,7 @@ Perl_yylex(pTHX)
+ UNI(OP_RESET);
+
+ case KEY_redo:
++ PL_expect = XOPERATOR;
+ s = force_word(s,WORD,TRUE,FALSE,FALSE);
+ LOOPX(OP_REDO);
+
+--
+1.7.11.4
+
diff --git a/perl.spec b/perl.spec
index c901b53..fd0ee3c 100644
--- a/perl.spec
+++ b/perl.spec
@@ -102,6 +102,10 @@ Patch15: perl-5.14.2-Override-the-Pod-Simple-parse_file.patch
# fixed after 5.17.4
Patch16: perl-5.16.1-perl-114764-Stop-my-vars-with-attrs-from-leaking.patch
+# Allow operator after numeric keyword argument, rhbz#859328, RT#105924,
+# fixed after 5.17.4
+Patch17: perl-5.16.1-perl-105924-require-1-2.patch
+
# Update some of the bundled modules
# see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
@@ -1362,6 +1366,7 @@ tarball from perl.org.
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
#copy the example script
cp -a %{SOURCE5} .
@@ -1570,6 +1575,7 @@ pushd %{build_archlib}/CORE/
'Fedora Patch14: Do not truncate syscall() return value to 32 bits (RT#113980)' \
'Fedora Patch15: Override the Pod::Simple::parse_file (CPANRT#77530)' \
'Fedora Patch16: Do not leak with attribute on my variable (RT#114764)' \
+ 'Fedora Patch17: Allow operator after numeric keyword argument (RT#105924)' \
%{nil}
rm patchlevel.bak
@@ -2716,6 +2722,7 @@ sed \
%changelog
* Fri Sep 21 2012 Petr Pisar <ppisar@xxxxxxxxxx> - 4:5.16.1-238
- Do not leak with attribute on my variable (bug #858966)
+- Allow operator after numeric keyword argument (bug #859328)
* Thu Sep 20 2012 Petr Pisar <ppisar@xxxxxxxxxx> - 4:5.16.1-237
- Put perl-podlators into perl-core list (bug #856516)
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
