git.shiar.nl
/
barcat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare regex to match values
[barcat.git]
/
barcat
diff --git
a/barcat
b/barcat
index 89b110fe2ca04ecbf8fb4421190346020687a02d..05502ea068c5a67dd24976e5eb34d3654c4f5d5f 100755
(executable)
--- a/
barcat
+++ b/
barcat
@@
-68,10
+68,11
@@
my (@lines, @values);
my $anchor = !defined $opt{field} ? qr/\A/ :
$opt{field} =~ /^[0-9]+$/ ? qr/(?:\S*\h+){$opt{field}}\K/ :
$opt{field};
my $anchor = !defined $opt{field} ? qr/\A/ :
$opt{field} =~ /^[0-9]+$/ ? qr/(?:\S*\h+){$opt{field}}\K/ :
$opt{field};
+my $valmatch = qr/$anchor ( \h* -? [0-9]* \.? [0-9]+ |)/x;
while (readline) {
s/\r?\n\z//;
s/^\h*// unless $opt{unmodified};
while (readline) {
s/\r?\n\z//;
s/^\h*// unless $opt{unmodified};
- push @values, s/$
anchor ( \h* -? [0-9]* \.? [0-9]+ |)/\n/x
&& $1;
+ push @values, s/$
valmatch/\n/
&& $1;
if (defined $opt{trim}) {
my $trimpos = abs $opt{trim};
if ($trimpos <= 1) {
if (defined $opt{trim}) {
my $trimpos = abs $opt{trim};
if ($trimpos <= 1) {