#print "ca($s)\n";
if ($s !~ m/\%(\w+)/) {
my ($name, $props) = $s =~
- /^(\S[^\t]*\S)\t+(\S[^\t]*\S)$/
+ /^(\S[^\t]*\S)(?:\t+(\S[^\t]*\S))?$/
or die "bad commodspec $s";
my $ucname= ucfirst $name;
$commods{$ucname}{Srcs} .= $ss;
my $c= $commods{$ucname};
$c->{Volume}= 1000;
- foreach my $prop (split /\s+/, $props) {
+ foreach my $prop (defined $props ? split /\s+/, $props : ()) {
if ($prop =~ m/^([1-9]\d*)(k?)g$/) {
$c->{Mass}= $1 * ($2 ? 1000 : 1);
} elsif ($prop =~m/^([1-9]\d*)l$/) {
die "unknown property $prop for $ucname";
}
}
- die "no mass for $ucname" unless defined $c->{Mass};
return;
}
die "unknown $&" unless defined $colours{$1};