X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ffop.lisp;h=37e79cee8aedd0d9d0755f3ca03880b0d4db555a;hb=4281f3b99891120fea5cabbc3a9d091b19f45995;hp=758e8b40223faa5f8ee939968e16bc361c75c22e;hpb=ff92598854bf7cae8d57fe49cef4d9a98e1ab345;p=sbcl.git diff --git a/src/code/fop.lisp b/src/code/fop.lisp index 758e8b4..37e79ce 100644 --- a/src/code/fop.lisp +++ b/src/code/fop.lisp @@ -166,17 +166,6 @@ ;;;; fops for loading symbols -(defvar *load-symbol-buffer* (make-string 100)) -(declaim (simple-string *load-symbol-buffer*)) -(defvar *load-symbol-buffer-size* 100) -(declaim (type index *load-symbol-buffer-size*)) -;;; FIXME: -;;; (1) *LOAD-SYMBOL-BUFFER-SIZE* is redundant, should just be -;;; (LENGTH *LOAD-SYMBOL-BUFFER*). -;;; (2) *LOAD-SYMBOL-BUFFER* should not have a global value, but should -;;; be bound on entry to FASL loading, and it should be renamed to -;;; *FASL-SYMBOL-BUFFER*. - (macrolet (;; FIXME: Should all this code really be duplicated inside ;; each fop? Perhaps it would be better for this shared ;; code to live in FLET FROB1 and FLET FROB4 (for the @@ -189,12 +178,11 @@ (prepare-for-fast-read-byte *fasl-input-stream* (let ((,n-package ,package) (,n-size (fast-read-u-integer ,name-size))) - (when (> ,n-size *load-symbol-buffer-size*) - (setq *load-symbol-buffer* - (make-string (setq *load-symbol-buffer-size* - (* ,n-size 2))))) + (when (> ,n-size (length *fasl-symbol-buffer*)) + (setq *fasl-symbol-buffer* + (make-string (* ,n-size 2)))) (done-with-fast-read-byte) - (let ((,n-buffer *load-symbol-buffer*)) + (let ((,n-buffer *fasl-symbol-buffer*)) (read-string-as-bytes *fasl-input-stream* ,n-buffer ,n-size)