From b8411062b8cd6c9f8cce0a26d4cefa6f7537708a Mon Sep 17 00:00:00 2001 From: Nathan Froyd Subject: [PATCH 38/39] clean up #+sbcl/#+cmu/#+ccl bogosity --- src/lisp/structs.lisp | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/lisp/structs.lisp b/src/lisp/structs.lisp index a704596..fa07d34 100755 --- a/src/lisp/structs.lisp +++ b/src/lisp/structs.lisp @@ -132,10 +132,7 @@ (children (trie-children tr)) (ttr (aref children ind))) (declare (type (or (unsigned-byte 8) trie) ttr) - #+sbcl (type trie-children-vector children) - #+ccl (type trie-children-vector children) - #+cmu (type trie-children-vector children) - ) + (type trie-children-vector children)) (if (eql ttr 0) (progn (setf ttr (make-trie :level (+ (trie-level tr) 1))) @@ -179,16 +176,9 @@ (let* ((ind (- letter (char-code #\A))) (children (trie-children tr)) (ttr (aref children ind))) - (declare - (type (unsigned-byte 8) ind) - #+sbcl (type trie-children-vector children) - #+sbcl (type (or (unsigned-byte 8) trie) ttr) - ;; ccl is smart enough to not barf on a 0 pointer - #+ccl (type trie-children-vector children) - #+ccl (type trie ttr) - #+cmu (type trie-children-vector children) - #+cmu (type trie ttr) - ) + (declare (type (unsigned-byte 8) ind) + (type trie-children-vector children) + (type (or (unsigned-byte 8) trie) ttr)) (and (not (eql ttr 0)) (trie-include-prune-p ttr str)))))) -- 1.6.2