Changeset 12412

Timestamp:

02/01/10 22:14:07 (11 years ago)

Author:

ehuelsmann

Message:

Make format.lisp a lot more memory-efficient by replacing an array

of size CHAR-CODE-LIMIT with a hash table.

File:

• trunk/abcl/src/org/armedbear/lisp/format.lisp (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/format.lisp

@@ -298 +298 @@
 
 (defvar *format-directive-expanders*
-  (make-array char-code-limit :initial-element nil))
+  (make-hash-table :test #'eq))
 (defvar *format-directive-interpreters*
-  (make-array char-code-limit :initial-element nil))
+  (make-hash-table :test #'eq))
 
 (defvar *default-format-error-control-string* nil)
@@ -595 +595 @@
     (format-directive
      (let ((expander
-      (aref *format-directive-expanders*
-      (char-code (format-directive-character directive))))
+      (gethash (format-directive-character directive)
+                     *format-directive-expanders*))
      (*default-format-error-offset*
       (1- (format-directive-end directive))))
@@ -712 +712 @@
 
   (defun %set-format-directive-expander (char fn)
-    (setf (aref *format-directive-expanders* (char-code (char-upcase char))) fn)
+    (setf (gethash (char-upcase char) *format-directive-expanders*) fn)
     char)
 
   (defun %set-format-directive-interpreter (char fn)
-    (setf (aref *format-directive-interpreters*
-                (char-code (char-upcase char)))
-          fn)
+    (setf (gethash (char-upcase char) *format-directive-interpreters*) fn)
     char)
 
@@ -1764 +1762 @@
              (let* ((character (format-directive-character directive))
                     (function
-                     (svref *format-directive-interpreters*
-                            (char-code character)))
+                     (gethash character *format-directive-interpreters*))
                     (*default-format-error-offset*
                      (1- (format-directive-end directive))))