From 7d86e9fd41bfb0d495de7c921edb3482175a2c66 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Subject: [PATCH 28/39] convert WORD to a (SIMPLE-ARRAY CHARACTER (*)) --- src/lisp/solver.lisp | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/lisp/solver.lisp b/src/lisp/solver.lisp index aa331dc..9abe0a1 100755 --- a/src/lisp/solver.lisp +++ b/src/lisp/solver.lisp @@ -62,7 +62,7 @@ "Recursively find words by searching dictionary" (declare - (type string word) + (type (simple-array character (*)) word) (type trie tr) (type letter ltr) (type (unsigned-byte 8) fi)) @@ -76,7 +76,6 @@ ;; create a new word according to the search depth (setf (aref word fi) cc) (setq fi (+ fi 1)) - (setf (fill-pointer word) fi) (setf (aref word fi) #\Null) ;; handle Q's @@ -84,7 +83,6 @@ (setq cc #\U) (setf (aref word fi) cc) (setq fi (+ fi 1)) - (setf (fill-pointer word) fi) (setf (aref word fi) #\Null) (setq tr (get-child tr #\Q))) @@ -117,8 +115,7 @@ (board-from-stream *standard-input*))) (word (make-array 20 :initial-element #\Null - :element-type 'character - :fill-pointer 0)) + :element-type 'character)) (board-letters (board-letters the-board))) (declare (type board the-board)) ;; Print out the board config @@ -132,7 +129,6 @@ (declare (type simple-vector row)) (dotimes (j (board-cols the-board)) (let ((letter (aref row j))) - (setf (fill-pointer word) 0) (find-words letter word -- 1.6.2