From d5ab7f1a3c39795d36fc7a9cf0ef89d0e568aeef Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Mon, 6 Oct 2014 15:06:59 +0100 Subject: [PATCH] remove stray evidence of incremental coding (one #+nil'led out form from a previous iteration). Also remove now-unused sorted-position function. --- src/code/target-char.lisp | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/code/target-char.lisp b/src/code/target-char.lisp index fb11af885..ee994532a 100644 --- a/src/code/target-char.lisp +++ b/src/code/target-char.lisp @@ -26,14 +26,6 @@ (defvar **unicode-1-character-name-database**) (defvar **unicode-character-name-huffman-tree**)) -(defun sorted-position (item list) - (let ((index 0)) - (dolist (i list) - (cond - ((= item i) (return-from sorted-position index)) - ((< item i) (return-from sorted-position nil)) - (t (incf index))))) nil) - (defun pack-3-codepoints (first &optional (second 0) (third 0)) (declare (type (unsigned-byte 21) first second third)) (sb!c::mask-signed-field 63 (logior first (ash second 21) (ash third 42)))) @@ -114,18 +106,9 @@ (setf **character-cases** (let* ((table - (make-array (* 64 (1+ (aref **character-case-pages** - (1- (length **character-case-pages**)))))) #+nil - (make-hash-table ;; 64 characters in each page - :size (* 64 (length **character-case-pages**)) - :hash-function - (lambda (key) - (let ((page (sorted-position - (ash key -6) - **character-case-pages**))) - (if page - (+ (ash page 6) (ldb (byte 6 0) key)) - 0))))) + (make-array + (* 64 (1+ (aref **character-case-pages** + (1- (length **character-case-pages**))))))) (info ,case-data) (index 0) (length (length info))) (labels ((read-codepoint () -- 2.11.4.GIT