From: Rafael Garcia-Suarez Date: Wed, 22 Nov 2006 09:12:16 +0000 (+0000) Subject: Sync Text::Balanced with the CPAN version (1.99.1) X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=dd6316a97e0f719a4e6c5ff0736fa8b08b1b2337;p=p5sagit%2Fp5-mst-13.2.git Sync Text::Balanced with the CPAN version (1.99.1) p4raw-id: //depot/perl@29344 --- diff --git a/lib/Text/Balanced.pm b/lib/Text/Balanced.pm index 9688de7..a50fb4f 100644 --- a/lib/Text/Balanced.pm +++ b/lib/Text/Balanced.pm @@ -7,9 +7,10 @@ use strict; package Text::Balanced; use Exporter; +use SelfLoader; use vars qw { $VERSION @ISA %EXPORT_TAGS }; -$VERSION = '1.98_01'; +use version; $VERSION = qv('1.99.1'); @ISA = qw ( Exporter ); %EXPORT_TAGS = ( ALL => [ qw( @@ -36,14 +37,6 @@ sub _match_variable($$); sub _match_codeblock($$$$$$$); sub _match_quotelike($$$$); -sub carp { - require Carp; goto &Carp::carp; -} - -sub croak { - require Carp; goto &Carp::croak; -} - # HANDLE RETURN VALUES IN VARIOUS CONTEXTS sub _failmsg { @@ -64,8 +57,7 @@ sub _succeed $@ = undef; my ($wantarray,$textref) = splice @_, 0, 2; my ($extrapos, $extralen) = @_>18 ? splice(@_, -2, 2) : (0,0); - my ($startlen) = $_[5]; - my $oppos = $_[6]; + my ($startlen, $oppos) = @_[5,6]; my $remainderpos = $_[2]; if ($wantarray) { @@ -336,7 +328,7 @@ sub _match_tagged # ($$$$$$$) if (!defined $rdel) { - $rdelspec = $&; + $rdelspec = substr($$textref, $-[0], $+[0] - $-[0]); unless ($rdelspec =~ s/\A([[(<{]+)($XMLNAME).*/ quotemeta "$1\/$2". _revbracket($1) /oes) { _failmsg "Unable to construct closing tag to match: $rdel", @@ -351,7 +343,8 @@ sub _match_tagged # ($$$$$$$) for (qw,~ ! ^ & * ) _ + - = } ] : " ; ' > . ? / | ',) { next if $rdel =~ /\Q$_/; $del = $_; last } unless ($del) { - croak ("Can't interpolate right delimiter $rdel") + use Carp; + croak "Can't interpolate right delimiter $rdel" } eval "qq$del$rdel$del"; }; @@ -590,15 +583,12 @@ sub _match_codeblock($$$$$$$) # NEED TO COVER MANY MORE CASES HERE!!! - # NB 'case' is included here, because in Switch.pm, - # it's followed by a term, not an op - if ($$textref =~ m#\G\s*(?!$ldel_inner) ( [-+*x/%^&|.]=? | [!=]~ | =(?!>) | (\*\*|&&|\|\||<<|>>)=? - | case|split|grep|map|return + | split|grep|map|return | [([] )#gcx) { @@ -729,7 +719,8 @@ sub _match_quotelike($$$$) # ($textref, $prepat, $allow_raw_match) ); } - unless ($$textref =~ m{\G(\b(?:m|s|qq|qx|qw|q|qr|tr|y)\b(?=\s*\S)|<<)}gc) + unless ($$textref =~ + m{\G(\b(?:m|s|qq|qx|qw|q|qr|tr|y)\b(?=\s*\S)|<<(?=\s*["'A-Za-z_]))}gc) { _failmsg q{No quotelike operator found after prefix at "} . substr($$textref, pos($$textref), 20) . @@ -768,7 +759,7 @@ sub _match_quotelike($$$$) # ($textref, $prepat, $allow_raw_match) return; } $rd1pos = pos($$textref); - $$textref =~ m{\Q$label\E\n}gc; + $$textref =~ m{\Q$label\E\n}gc; $ld2pos = pos($$textref); return ( $startpos, $oppos-$startpos, # PREFIX @@ -894,7 +885,8 @@ sub extract_multiple (;$$$$) # ($text, $functions_ref, $max_fields, $ignoreunkno unless (wantarray) { - carp ("extract_multiple reset maximal count to 1 in scalar context") + use Carp; + carp "extract_multiple reset maximal count to 1 in scalar context" if $^W && defined($_[2]) && $max > 1; $max = 1 } @@ -932,7 +924,10 @@ sub extract_multiple (;$$$$) # ($text, $functions_ref, $max_fields, $ignoreunkno elsif (ref($func) eq 'Text::Balanced::Extractor') { @bits = $field = $func->extract($$textref) } elsif( $$textref =~ m/\G$func/gc ) - { @bits = $field = defined($1) ? $1 : $& } + { @bits = $field = defined($1) + ? $1 + : substr($$textref, $-[0], $+[0] - $-[0]) + } $pref ||= ""; if (defined($field) && length($field)) { @@ -1133,9 +1128,9 @@ The substring to be extracted must appear at the current C location of the string's variable (or at index zero, if no C position is defined). In other words, the C subroutines I -extract the first occurrence of a substring anywhere +extract the first occurance of a substring anywhere in a string (like an unanchored regex would). Rather, -they extract an occurrence of the substring appearing +they extract an occurance of the substring appearing immediately at the current matching position in the string (like a C<\G>-anchored regex would). @@ -1401,7 +1396,7 @@ See also: C<"extract_quotelike"> and C<"extract_codeblock">. C extracts any valid Perl variable or variable-involved expression, including scalars, arrays, hashes, array -accesses, hash look-ups, method calls through objects, subroutine calls +accesses, hash look-ups, method calls through objects, subroutine calles through subroutine references, etc. The subroutine takes up to two optional arguments: @@ -2060,7 +2055,7 @@ If none of the extractor subroutines succeeds, then one character is extracted from the start of the text and the extraction subroutines reapplied. Characters which are thus removed are accumulated and eventually become the next field (unless the fourth argument is true, in which -case they are discarded). +case they are disgarded). For example, the following extracts substrings that are valid Perl variables: diff --git a/lib/Text/Balanced/Changes b/lib/Text/Balanced/Changes index dfdae9a..159c8c3 100644 --- a/lib/Text/Balanced/Changes +++ b/lib/Text/Balanced/Changes @@ -319,3 +319,15 @@ Revision history for Perl extension Text::Balanced. 1.98 Fri May 5 14:58:49 2006 - Reinstated full test suite (thanks Steve!) + + + +1.99.0 Thu Nov 16 07:32:06 2006 + + - Removed reliance on expensive $& variable (thanks John) + + - Made Makefile.PL play nice with core versions (thanks Schwern!) + + +1.99.1 Thu Nov 16 09:29:14 2006 + diff --git a/lib/Text/Balanced/README b/lib/Text/Balanced/README index 032bb23..4f19258 100755 --- a/lib/Text/Balanced/README +++ b/lib/Text/Balanced/README @@ -1,14 +1,8 @@ -============================================================================== - Release of version 1.95 of Text::Balanced -============================================================================== - - -NAME +Text::Balanced version 1.99.1 Text::Balanced - Extract delimited text sequences from strings. - -SUMMARY (see Balanced.pod for full details) +SUMMARY Text::Balanced::extract_delimited @@ -42,42 +36,36 @@ SUMMARY (see Balanced.pod for full details) `extract_tagged' attempts to recognize and extract a substring between two arbitrary "tag" patterns (a start tag - and an end tag). - - -INSTALLATION - - It's all pure Perl, so just put the .pm file in its appropriate - local Perl subdirectory. - + and an end tag). -AUTHOR - - Damian Conway (damian@cs.monash.edu.au) +INSTALLATION -COPYRIGHT +To install this module, run the following commands: - Copyright (c) 1997-2001, Damian Conway. All Rights Reserved. - This module is free software. It may be used, redistributed - and/or modified under the same terms as Perl itself. + perl Makefile.PL + make + make test + make install +Alternatively, to install with Module::Build, you can use the following commands: -============================================================================== + perl Build.PL + ./Build + ./Build test + ./Build install -CHANGES IN VERSION 1.95 - - Constrainted _match_quote to only match at word boundaries - (so "exemplum(hic)" doesn't match "m(hic)") - (thanks Craig) +DEPENDENCIES +None. -============================================================================== -AVAILABILITY +COPYRIGHT AND LICENCE -Text::Balanced has been uploaded to the CPAN +Copyright (C) 2006, Damian Conway -============================================================================== +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. diff --git a/lib/Text/Balanced/t/extmul.t b/lib/Text/Balanced/t/extmul.t index 98b6272..34207df 100644 --- a/lib/Text/Balanced/t/extmul.t +++ b/lib/Text/Balanced/t/extmul.t @@ -13,7 +13,7 @@ BEGIN { # Change 1..1 below to 1..last_test_to_print . # (It may become useful if the test is moved to ./t subdirectory.) -BEGIN { $| = 1; print "1..86\n"; } +BEGIN { $| = 1; print "1..85\n"; } END {print "not ok 1\n" unless $loaded;} use Text::Balanced qw ( :ALL ); $loaded = 1; @@ -316,11 +316,3 @@ expect [ scalar extract_multiple(undef, [ q/([a-z]),?/ ]) ], expect [ pos ], [ 0 ]; expect [ $_ ], [ substr($stdtext3,2) ]; - - -# TEST 86 - -# Fails in Text-Balanced-1.95 with result ['1 ', '""', '1234'] -$_ = q{ ""1234}; -expect [ extract_multiple(undef, [\&extract_quotelike]) ], - [ ' ', '""', '1234' ]; diff --git a/lib/Text/Balanced/t/extqlk.t b/lib/Text/Balanced/t/extqlk.t index 0129cd0..1371a4e 100644 --- a/lib/Text/Balanced/t/extqlk.t +++ b/lib/Text/Balanced/t/extqlk.t @@ -14,16 +14,15 @@ BEGIN { # Change 1..1 below to 1..last_test_to_print . # (It may become useful if the test is moved to ./t subdirectory.) -BEGIN { $| = 1; print "1..95\n"; } +BEGIN { $| = 1; print "1..85\n"; } END {print "not ok 1\n" unless $loaded;} use Text::Balanced qw ( extract_quotelike ); $loaded = 1; print "ok 1\n"; $count=2; use vars qw( $DEBUG ); -#$DEBUG=1; -sub debug { print "\t>>>",@_ if $ENV{DEBUG} } -sub esc { my $x = shift; $x =~ s/\n/\\n/gs; $x } +# $DEBUG=1; +sub debug { print "\t>>>",@_ if $DEBUG } ######################### End of black magic. @@ -33,52 +32,36 @@ $neg = 0; while (defined($str = )) { chomp $str; - if ($str =~ s/\A# USING://) { $neg = 0; $cmd = $str; next; } + if ($str =~ s/\A# USING://) { $neg = 0; $cmd = $str; next; } elsif ($str =~ /\A# TH[EI]SE? SHOULD FAIL/) { $neg = 1; next; } - elsif (!$str || $str =~ /\A#/) { $neg = 0; next } - my $setup_cmd = ($str =~ s/\A\{(.*)\}//) ? $1 : ''; - my $tests = 'sl'; + elsif (!$str || $str =~ /\A#/) { $neg = 0; next } + debug "\tUsing: $cmd\n"; + debug "\t on: [$str]\n"; $str =~ s/\\n/\n/g; my $orig = $str; - eval $setup_cmd if $setup_cmd ne ''; - if($tests =~ /l/) { - debug "\tUsing: $cmd\n"; - debug "\t on: [" . esc($setup_cmd) . "][" . esc($str) . "]\n"; - my @res; - eval qq{\@res = $cmd; }; - debug "\t got:\n" . join "", map { "\t\t\t$_: [" . esc($res[$_]) . "]\n"} (0..$#res); - debug "\t left: [" . esc($str) . "]\n"; - debug "\t pos: [" . esc(substr($str,pos($str))) . "...]\n"; - print "not " if (substr($str,pos($str),1) eq ';')==$neg; - print "ok ", $count++; - print "\n"; - } - - eval $setup_cmd if $setup_cmd ne ''; - if($tests =~ /s/) { - $str = $orig; - debug "\tUsing: scalar $cmd\n"; - debug "\t on: [" . esc($str) . "]\n"; - $var = eval $cmd; - print " ($@)" if $@ && $DEBUG; - $var = "" unless defined $var; - debug "\t scalar got: [" . esc($var) . "]\n"; - debug "\t scalar left: [" . esc($str) . "]\n"; - print "not " if ($str =~ '\A;')==$neg; - print "ok ", $count++; - print "\n"; - } + my @res; + eval qq{\@res = $cmd; }; + debug "\t got:\n" . join "", map { ($res[$_]||="")=~s/\n/\\n/g; "\t\t\t$_: [$res[$_]]\n"} (0..$#res); + debug "\t left: " . (map { s/\n/\\n/g; "[$_]\n" } my $cpy1 = $str)[0]; + debug "\t pos: " . (map { s/\n/\\n/g; "[$_]\n" } my $cpy2 = substr($str,pos($str)))[0] . "...]\n"; + print "not " if (substr($str,pos($str),1) eq ';')==$neg; + print "ok ", $count++; + print "\n"; + + $str = $orig; + debug "\tUsing: scalar $cmd\n"; + debug "\t on: [$str]\n"; + $var = eval $cmd; + print " ($@)" if $@ && $DEBUG; + $var = "" unless defined $var; + debug "\t scalar got: " . (map { s/\n/\\n/g; "[$_]\n" } $var)[0]; + debug "\t scalar left: " . (map { s/\n/\\n/g; "[$_]\n" } $str)[0]; + print "not " if ($str =~ '\A;')==$neg; + print "ok ", $count++; + print "\n"; } -# fails in Text::Balanced 1.95 -$_ = qq(s{}{}); -my @z = extract_quotelike(); -print "not " if $z[0] eq ''; -print "ok ", $count++; -print "\n"; - - __DATA__ # USING: extract_quotelike($str); @@ -92,16 +75,11 @@ __DATA__ <{pat}>{$self->{sub}}; # CAN'T HANDLE '>' in '->' s-$self->{pap}-$self->{sub}-; # CAN'T HANDLE '-' in '->'