|
 |
78f1eb |
From 1a1d29aaa2e0c668f9a8c960d52b516415f28983 Mon Sep 17 00:00:00 2001
|
|
|
78f1eb |
From: Vickenty Fesunov <kent@setattr.net>
|
|
|
78f1eb |
Date: Fri, 22 Sep 2017 19:00:46 -0400
|
|
|
78f1eb |
Subject: [PATCH] %{^CAPTURE_ALL} was intended to be an alias for %-; make it
|
|
|
78f1eb |
so.
|
|
|
78f1eb |
MIME-Version: 1.0
|
|
|
78f1eb |
Content-Type: text/plain; charset=UTF-8
|
|
|
78f1eb |
Content-Transfer-Encoding: 8bit
|
|
|
78f1eb |
|
|
|
78f1eb |
For: RT #131867
|
|
|
78f1eb |
|
|
|
78f1eb |
Add Vickenty Fesunov to AUTHORS.
|
|
|
78f1eb |
|
|
|
78f1eb |
Signed-off-by: Ported to 5.30 from 1a1d29aaa2e0c668f9a8c960d52b516415f28983.
|
|
|
78f1eb |
|
|
|
78f1eb |
---
|
|
|
78f1eb |
AUTHORS | 1 +
|
|
|
78f1eb |
ext/Tie-Hash-NamedCapture/NamedCapture.xs | 5 ++++-
|
|
|
78f1eb |
ext/Tie-Hash-NamedCapture/t/tiehash.t | 11 ++++++++---
|
|
|
78f1eb |
|
|
|
78f1eb |
diff --git a/AUTHORS b/AUTHORS
|
|
|
78f1eb |
index 0091100600..c920d52e96 100644
|
|
|
78f1eb |
--- a/AUTHORS
|
|
|
78f1eb |
+++ b/AUTHORS
|
|
|
78f1eb |
@@ -1265,6 +1265,7 @@ Unicode Consortium <unicode.org>
|
|
|
78f1eb |
Vadim Konovalov <vkonovalov@lucent.com>
|
|
|
78f1eb |
Valeriy E. Ushakov <uwe@ptc.spbu.ru>
|
|
|
78f1eb |
Vernon Lyon <vlyon@cpan.org>
|
|
|
78f1eb |
+Vickenty Fesunov <kent@setattr.net>
|
|
|
78f1eb |
Victor Adam <victor@drawall.cc>
|
|
|
78f1eb |
Victor Efimov <victor@vsespb.ru>
|
|
|
78f1eb |
Viktor Turskyi <koorchik@gmail.com>
|
|
|
78f1eb |
diff --git a/ext/Tie-Hash-NamedCapture/NamedCapture.xs b/ext/Tie-Hash-NamedCapture/NamedCapture.xs
|
|
|
78f1eb |
index 7eaae5614d..a607c10090 100644
|
|
|
78f1eb |
--- a/ext/Tie-Hash-NamedCapture/NamedCapture.xs
|
|
|
78f1eb |
+++ b/ext/Tie-Hash-NamedCapture/NamedCapture.xs
|
|
|
78f1eb |
@@ -25,8 +25,11 @@ _tie_it(SV *sv)
|
|
|
78f1eb |
GV * const gv = (GV *)sv;
|
|
|
78f1eb |
HV * const hv = GvHVn(gv);
|
|
|
78f1eb |
SV *rv = newSV_type(SVt_RV);
|
|
|
78f1eb |
+ const char *gv_name = GvNAME(gv);
|
|
|
78f1eb |
CODE:
|
|
|
78f1eb |
- SvRV_set(rv, newSVuv(*GvNAME(gv) == '-' ? RXapif_ALL : RXapif_ONE));
|
|
|
78f1eb |
+ SvRV_set(rv, newSVuv(
|
|
|
78f1eb |
+ strEQ(gv_name, "-") || strEQ(gv_name, "\003APTURE_ALL")
|
|
|
78f1eb |
+ ? RXapif_ALL : RXapif_ONE));
|
|
|
78f1eb |
SvROK_on(rv);
|
|
|
78f1eb |
sv_bless(rv, GvSTASH(CvGV(cv)));
|
|
|
78f1eb |
|
|
|
78f1eb |
diff --git a/ext/Tie-Hash-NamedCapture/t/tiehash.t b/ext/Tie-Hash-NamedCapture/t/tiehash.t
|
|
|
78f1eb |
index 3ebc81ad68..962754085f 100644
|
|
|
78f1eb |
--- a/ext/Tie-Hash-NamedCapture/t/tiehash.t
|
|
|
78f1eb |
+++ b/ext/Tie-Hash-NamedCapture/t/tiehash.t
|
|
|
78f1eb |
@@ -3,7 +3,12 @@ use strict;
|
|
|
78f1eb |
|
|
|
78f1eb |
use Test::More;
|
|
|
78f1eb |
|
|
|
78f1eb |
-my %hashes = ('+' => \%+, '-' => \%-);
|
|
|
78f1eb |
+my %hashes = (
|
|
|
78f1eb |
+ '+' => \%+,
|
|
|
78f1eb |
+ '-' => \%-,
|
|
|
78f1eb |
+ '{^CAPTURE}' => \%{^CAPTURE},
|
|
|
78f1eb |
+ '{^CAPTURE_ALL}' => \%{^CAPTURE_ALL},
|
|
|
78f1eb |
+);
|
|
|
78f1eb |
|
|
|
78f1eb |
foreach (['plus1'],
|
|
|
78f1eb |
['minus1', all => 1],
|
|
|
78f1eb |
@@ -20,12 +25,12 @@ foreach (['plus1'],
|
|
|
78f1eb |
is("abcdef" =~ /(?<foo>[ab])*(?<bar>c)(?<foo>d)(?<bar>[ef]*)/, 1,
|
|
|
78f1eb |
"We matched");
|
|
|
78f1eb |
|
|
|
78f1eb |
-foreach my $name (qw(+ plus1 plus2 plus3)) {
|
|
|
78f1eb |
+foreach my $name (qw(+ {^CAPTURE} plus1 plus2 plus3)) {
|
|
|
78f1eb |
my $hash = $hashes{$name};
|
|
|
78f1eb |
is_deeply($hash, { foo => 'b', bar => 'c' }, "%$name is as expected");
|
|
|
78f1eb |
}
|
|
|
78f1eb |
|
|
|
78f1eb |
-foreach my $name (qw(- minus1 minus2)) {
|
|
|
78f1eb |
+foreach my $name (qw(- {^CAPTURE_ALL} minus1 minus2)) {
|
|
|
78f1eb |
my $hash = $hashes{$name};
|
|
|
78f1eb |
is_deeply($hash, { foo => [qw(b d)], bar => [qw(c ef)] },
|
|
|
78f1eb |
"%$name is as expected");
|
|
|
78f1eb |
--
|
|
|
78f1eb |
2.20.1
|
|
|
78f1eb |
|