my 'number' regular expression is now captured only when needed

This commit is contained in:
Dima Kogan 2011-01-06 15:39:57 -08:00
parent da87a716c1
commit 030676037d

View File

@ -413,8 +413,8 @@ sub mainThread
} }
} }
# regexp for a possibly floating point, possibly scientific notation number, fully captured # regexp for a possibly floating point, possibly scientific notation number
my $numRE = qr/([-]?[\d\.]+(?:e[-+]?\d+)?)/io; my $numRE = '[-]?[\d\.]+(?:e[-+]?\d+)?';
my @domain; my @domain;
my $haveNewData; my $haveNewData;
@ -437,11 +437,11 @@ sub mainThread
if($options{domain}) if($options{domain})
{ {
/$numRE/go or next; /($numRE)/go or next;
$domain[0] = $1; $domain[0] = $1;
if($options{'3d'} || $options{colormap}) if($options{'3d'} || $options{colormap})
{ {
/$numRE/go or next; /($numRE)/go or next;
$domain[1] = $1; $domain[1] = $1;
} }
} }
@ -462,7 +462,7 @@ sub mainThread
if($options{dataid}) if($options{dataid})
{ {
while(/(\w+)\s+$numRE/go) while(/(\w+)\s+($numRE)/go)
{ {
my $point = $2; my $point = $2;