X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FRegexp%2FWildcards.pm;h=15b42c79fccf5f0b8122a5db5938bc2d846e1eb0;hb=0acfe1e394d884c4ff93c844467c446873681c24;hp=1fad00698e7bc511382b759e03403f464d2cab87;hpb=4b05cdd06ebeb55b8ced935e9fd99d42d40719ee;p=perl%2Fmodules%2FRegexp-Wildcards.git diff --git a/lib/Regexp/Wildcards.pm b/lib/Regexp/Wildcards.pm index 1fad006..15b42c7 100644 --- a/lib/Regexp/Wildcards.pm +++ b/lib/Regexp/Wildcards.pm @@ -3,8 +3,9 @@ package Regexp::Wildcards; use strict; use warnings; -use Carp qw/croak/; -use Text::Balanced qw/extract_bracketed/; +use Carp qw; +use Scalar::Util qw; +use Text::Balanced qw; =head1 NAME @@ -12,13 +13,13 @@ Regexp::Wildcards - Converts wildcard expressions to Perl regular expressions. =head1 VERSION -Version 1.02 +Version 1.03 =cut -use vars qw/$VERSION/; +use vars qw<$VERSION>; BEGIN { - $VERSION = '1.02'; + $VERSION = '1.03'; } =head1 SYNOPSIS @@ -34,12 +35,12 @@ BEGIN { $re = $rw->convert('%a_c%', 'sql'); # Turn SQL wildcards into regexps. $rw = Regexp::Wildcards->new( - do => [ qw/jokers brackets/ ], # Do jokers and brackets. - capture => [ qw/any greedy/ ], # Capture *'s greedily. + do => [ qw ], # Do jokers and brackets. + capture => [ qw ], # Capture *'s greedily. ); $rw->do(add => 'groups'); # Don't escape groups. - $rw->capture(rem => [ qw/greedy/ ]); # Actually we want non-greedy matches. + $rw->capture(rem => [ qw ]); # Actually we want non-greedy matches. $re = $rw->convert('*a{,(b)?}?c*'); # '(.*?)a(?:|(b).).c(.*?)' $rw->capture(); # No more captures. @@ -61,24 +62,24 @@ Typesets that mimic the behaviour of Windows and Unix shells are also provided. sub _check_self { croak 'First argument isn\'t a valid ' . __PACKAGE__ . ' object' - unless ref $_[0] and $_[0]->isa(__PACKAGE__); + unless blessed $_[0] and $_[0]->isa(__PACKAGE__); } my %types = ( - jokers => [ qw/jokers/ ], - sql => [ qw/sql/ ], - commas => [ qw/commas/ ], - brackets => [ qw/brackets/ ], - unix => [ qw/jokers brackets/ ], - win32 => [ qw/jokers commas/ ], + jokers => [ qw ], + sql => [ qw ], + commas => [ qw ], + brackets => [ qw ], + unix => [ qw ], + win32 => [ qw ], ); -$types{$_} = $types{win32} for qw/dos os2 MSWin32 cygwin/; -$types{$_} = $types{unix} for qw/linux +$types{$_} = $types{win32} for qw; +$types{$_} = $types{unix} for qw; my %escapes = ( jokers => '?*', @@ -115,7 +116,7 @@ sub _validate { } my %checked; - for (qw/set add rem/) { + for (qw) { my $opt = $opts{$_}; next unless defined $opt; my $cb = { @@ -310,7 +311,7 @@ No argument means C<< set => [ ] >>. $rw->do(set => 'jokers'); # Only translate jokers. $rw->do('jokers'); # Same. - $rw->do(add => [ qw/sql commas/ ]); # Translate also SQL and commas. + $rw->do(add => [ qw ]); # Translate also SQL and commas. $rw->do(rem => 'jokers'); # Specifying both 'sql' and 'jokers' is useless. $rw->do(); # Translate nothing. @@ -415,7 +416,7 @@ Capture matching C<{ ... , ... }> alternations. $rw->capture(set => 'single'); # Only capture "exactly one" metacharacters. $rw->capture('single'); # Same. - $rw->capture(add => [ qw/any greedy/ ]); # Also greedily capture "any" metacharacters. + $rw->capture(add => [ qw ]); # Also greedily capture "any" metacharacters. $rw->capture(rem => 'greedy'); # No more greed please. $rw->capture(); # Capture nothing. @@ -468,7 +469,7 @@ An object module shouldn't export any function, and so does this one. =head1 DEPENDENCIES -L (core module since perl 5), L (since 5.7.3). +L (core module since perl 5), L, L (since 5.7.3). =head1 CAVEATS