X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fsymbol.lisp;h=e1143df7eb3f144970e9b81e1412c751cd44105f;hb=4ed3f0d08c3a57a6762018d9622f253ab9d0f2b6;hp=a32c85576813025bd613ca8b4cd1b9b8646e75d0;hpb=b6aa15328871678a3475e82c150b251dffb49ba1;p=sbcl.git diff --git a/src/code/symbol.lisp b/src/code/symbol.lisp index a32c855..e1143df 100644 --- a/src/code/symbol.lisp +++ b/src/code/symbol.lisp @@ -48,12 +48,19 @@ symbol) ;;; Return the built-in hash value for SYMBOL. -#!+(or x86 mips) ;; only backends for which a symbol-hash vop exists + +;;; only backends for which a SYMBOL-HASH vop exists. In the past, +;;; when the MIPS backend supported (or nearly did) a generational +;;; (non-conservative) garbage collector, this read (OR X86 MIPS). +;;; Having excised the vestigial support for GENGC, this now only +;;; applies for the x86 port, but if someone were to rework the GENGC +;;; support, this might change again. -- CSR, 2002-08-26 +#!+x86 (defun symbol-hash (symbol) (symbol-hash symbol)) ;;; Compute the hash value for SYMBOL. -#!-(or x86 mips) +#!-x86 (defun symbol-hash (symbol) (%sxhash-simple-string (symbol-name symbol))) @@ -149,8 +156,11 @@ (do ((plist place (cddr plist))) ((null plist) default) (cond ((atom (cdr plist)) - (error "~S is a malformed property list." - place)) + (error 'simple-type-error + :format-control "malformed property list: ~S." + :format-arguments (list place) + :datum (cdr plist) + :expected-type 'cons)) ((eq (car plist) indicator) (return (cadr plist)))))) @@ -171,8 +181,11 @@ (do ((plist place (cddr plist))) ((null plist) (values nil nil nil)) (cond ((atom (cdr plist)) - (error "~S is a malformed proprty list." - place)) + (error 'simple-type-error + :format-control "malformed property list: ~S." + :format-arguments (list place) + :datum (cdr plist) + :expected-type 'cons)) ((memq (car plist) indicator-list) (return (values (car plist) (cadr plist) plist))))))