'color|c!',
'C' => sub { $opt{color} = 0 },
'field|f=s' => sub {
- $opt{anchor} = /^[0-9]+$/ ? qr/(?:\S*\h+){$_}\K/ : $_ for $_[1];
+ eval {
+ local $_ = $_[1];
+ $opt{anchor} = /^[0-9]+$/ ? qr/(?:\S*\h+){$_}\K/ : qr/$_/;
+ } or die $@ =~ s/(?: at .+)?$/ for option $_[0]/r;
},
'human-readable|H!',
'interval|t:i',
$opt{width} ||= $ENV{COLUMNS} || 80;
$opt{color} //= -t *STDOUT; # enable on tty
$opt{trim} *= $opt{width} / 100 if $opt{trimpct};
-$opt{units} = $opt{'human-readable'} && ['', qw( k M G T P E Z Y y z a f p n μ m )];
+$opt{units} = [split //, ' kMGTPEZYyzafpnμm'] if $opt{'human-readable'};
$opt{anchor} //= qr/\A/;
+$opt{'value-length'} = 6 if $opt{units};
if (defined $opt{interval}) {
$opt{interval} ||= 1;
$SIG{INT} = 'IGNORE'; # continue after assumed eof
my (@lines, @values);
-my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ |)/x;
+my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ (?: e[+-]?[0-9]+ )? |)/x;
while (readline) {
s/\r?\n\z//;
s/^\h*// unless $opt{unmodified};
sub sival {
my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1));
- sprintf "%3.1f%1s", $_[0] / 1000 ** $unit,
- $#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit];
+ my $float = $_[0] !~ /^ (?: 0*\.)? [0-9]{1,3} $/x;
+ sprintf('%*.*f%*s',
+ $float ? 5 : 3, $float, # length and tenths
+ $_[0] / 1000 ** $unit, # number
+ $float ? 0 : 3, # unit size
+ $#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit]
+ );
}
while ($nr <= $#lines) {
Format values using SI unit prefixes,
turning long numbers like I<12356789> into I<12.4M>.
+Also changes an exponent I<1.602176634e-19> to I<160.2z>.
+Short integers are aligned but kept without decimal point.
=item -t, --interval[=<seconds>]