Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-11-16 07:48:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

print letters as well as tiles when dieing because words out of order.

Browse source
This commit is contained in:
ehouse 2004-07-21 14:34:10 +00:00
parent 6043e8c544
commit b92e531300
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
xwords4/dawg/dict2dawg.pl
View file

@ -306,6 +306,22 @@ sub registerSubArray {
} # registerSubArray
sub toWord($) {
my ( $tileARef ) = @_;
my $word = "";
foreach my $tile (@$tileARef) {
foreach my $letter (keys (%gTableHash) ) {
if ( $tile == $gTableHash{$letter} ) {
$word .= $letter;
last;
}
}
}
return $word;
}
sub readNextWord() {
my @word;
@ -331,9 +347,13 @@ sub readNextWord() {
}
$gFirstDiff = $numCommonLetters;
die "words ", join(",",@gCurrentWord), " and ", join(",", @word), " out of order" if #$debug &&
if ( #$debug &&
@gCurrentWord > 0 && @word > 0
&& !firstBeforeSecond( \@gCurrentWord, \@word );
&& !firstBeforeSecond( \@gCurrentWord, \@word ) ) {
die "words ", join(",",@gCurrentWord), " (" . toWord(\@gCurrentWord) .
") and " . join(",", @word) . " (" . toWord(\@word) .
") out of order";
}
@gCurrentWord = @word;
} # readNextWord
@ -431,7 +451,9 @@ sub parseAndSort() {
}
if ( $gNeedsSort && ($gWordCount > 0) ) {
print STDERR "starting sort...\n" if $debug;
@wordlist = sort cmpWords @wordlist;
print STDERR "sort finished\n" if $debug;
}
print STDERR "length of list is ", @wordlist + 0, ".\n" if $debug;