my (@rawcm, @nocm); # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth'
my %colour_ordvals; # $colour_ordvals{'c'}{'green'}= '30';
-my %commodclasses; # $commodclasses{'dye'}= '3';
+our %commodclasses; # $commodclasses{'dye'}= '3';
# IMPORTANT
# when extending the format of source-info in a non-backward
@ctx= (sub { push @nocm, lc $_; });
} elsif (m/^commodclasses$/) {
@ctx= (sub {
- die unless m/^\*([-a-z]+)$/;
+ die unless m/^\*([_a-z]+)$/;
$commodclasses{$1}= scalar keys %commodclasses;
});
} elsif (m/^ocean (\w+)$/) {
$c->{Mass}= $1 * ($2 ? 1000 : 1);
} elsif ($prop =~ m/^([1-9]\d*)l$/) {
$c->{Volume}= $1 * 1000;
- } elsif ($prop =~ m/^\*([-a-z]+)$/) {
+ } elsif ($prop =~ m/^\*([_a-z]+)$/) {
$c->{Class}= $1;
die "$1" unless exists $commodclasses{$1};
$ordclassval= 1e7 + $commodclasses{$1} * 1e7;
die "unknown property $prop for $ucname";
}
}
+ $c->{ClassOrdval}= $ordclassval;
if (defined $ordbase && defined $ordval && defined $ordclassval) {
my $ordvalout= $ordbase + $ordval + $ordclassval;
$c->{Ordval}= $ordvalout;