Restore compatibility with Perl 5.26.0
This commit is contained in:
parent
1b1ceede08
commit
033fa3ec68
69
Parse-Yapp-1.05-Fix-unescaped-curly-bracket-in-regexps.patch
Normal file
69
Parse-Yapp-1.05-Fix-unescaped-curly-bracket-in-regexps.patch
Normal file
@ -0,0 +1,69 @@
|
||||
From d2f95da0bde7130cce98bbd91dc2095df3635bd4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 22 May 2017 11:14:40 +0200
|
||||
Subject: [PATCH] Fix unescaped curly bracket in regexps
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Since 5.22.0 a literal '{' is a warning, since 5.26.0 it's an error:
|
||||
|
||||
Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/\G{ <-- HERE / at YappParse.yp line 288.
|
||||
[...]
|
||||
|
||||
CPAN RT#106685
|
||||
CPAN RT#114776
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
YappParse.yp | 4 ++--
|
||||
lib/Parse/Yapp/Parse.pm | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/YappParse.yp b/YappParse.yp
|
||||
index 9f6c234..8000b34 100644
|
||||
--- a/YappParse.yp
|
||||
+++ b/YappParse.yp
|
||||
@@ -285,7 +285,7 @@ sub _Lexer {
|
||||
return($1, [ $1, $lineno[0] ]);
|
||||
};
|
||||
|
||||
- $$input=~/\G{/gc
|
||||
+ $$input=~/\G\{/gc
|
||||
and do {
|
||||
my($level,$from,$code);
|
||||
|
||||
@@ -312,7 +312,7 @@ sub _Lexer {
|
||||
and return('START',[ undef, $lineno[0] ]);
|
||||
$$input=~/\G%(expect)/gc
|
||||
and return('EXPECT',[ undef, $lineno[0] ]);
|
||||
- $$input=~/\G%{/gc
|
||||
+ $$input=~/\G%\{/gc
|
||||
and do {
|
||||
my($code);
|
||||
|
||||
diff --git a/lib/Parse/Yapp/Parse.pm b/lib/Parse/Yapp/Parse.pm
|
||||
index db561de..9651fa7 100755
|
||||
--- a/lib/Parse/Yapp/Parse.pm
|
||||
+++ b/lib/Parse/Yapp/Parse.pm
|
||||
@@ -880,7 +880,7 @@ sub _Lexer {
|
||||
return($1, [ $1, $lineno[0] ]);
|
||||
};
|
||||
|
||||
- $$input=~/\G{/gc
|
||||
+ $$input=~/\G\{/gc
|
||||
and do {
|
||||
my($level,$from,$code);
|
||||
|
||||
@@ -907,7 +907,7 @@ sub _Lexer {
|
||||
and return('START',[ undef, $lineno[0] ]);
|
||||
$$input=~/\G%(expect)/gc
|
||||
and return('EXPECT',[ undef, $lineno[0] ]);
|
||||
- $$input=~/\G%{/gc
|
||||
+ $$input=~/\G%\{/gc
|
||||
and do {
|
||||
my($code);
|
||||
|
||||
--
|
||||
2.9.4
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: perl-Parse-Yapp
|
||||
Version: 1.05
|
||||
Release: 60%{?dist}
|
||||
Release: 61%{?dist}
|
||||
Summary: Perl extension for generating and using LALR parsers
|
||||
Group: Development/Libraries
|
||||
License: GPL+ or Artistic
|
||||
@ -12,6 +12,8 @@ Patch0: Parse-Yapp-1.05-pod-errors.patch
|
||||
Patch1: Parse-Yapp-1.05-spelling.patch
|
||||
# Fix POD, CPAN RT #11659
|
||||
Patch2: Parse-Yapp-1.05-pod_item.patch
|
||||
# Restore compatibility with Perl 5.26.0, CPAN RT#106685, CPAN RT#114776
|
||||
Patch3: Parse-Yapp-1.05-Fix-unescaped-curly-bracket-in-regexps.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl-generators
|
||||
@ -33,6 +35,7 @@ module and let you easily create a Perl OO parser from an input grammar file.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
chmod 644 README lib/Parse/{*.pm,Yapp/*.pm}
|
||||
|
||||
%build
|
||||
@ -56,6 +59,9 @@ make test
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon May 22 2017 Petr Pisar <ppisar@redhat.com> - 1.05-61
|
||||
- Restore compatibility with Perl 5.26.0 (CPAN RT#106685, CPAN RT#114776)
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.05-60
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user