From 03896da111771e8c359715b088276734a41f6c70 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Wed, 21 Jul 2004 14:34:10 +0000
Subject: [PATCH] print letters as well as tiles when dieing because words out
 of order.

---
 dawg/dict2dawg.pl | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/dawg/dict2dawg.pl b/dawg/dict2dawg.pl
index 9ddc05bd3..1412b9530 100755
--- a/dawg/dict2dawg.pl
+++ b/dawg/dict2dawg.pl
@@ -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 && 
-        @gCurrentWord > 0 && @word > 0
-        && !firstBeforeSecond( \@gCurrentWord, \@word );
+    if ( #$debug && 
+         @gCurrentWord > 0 && @word > 0
+         && !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;