Changeset 16191 for release


Ignore:
Timestamp:
Sep 8, 2014, 3:11:33 PM (4 years ago)
Author:
rme
Message:

Merge from trunk (see ticket:1229)

Location:
release/1.10/source
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release/1.10/source

  • release/1.10/source/level-0/l0-hash.lisp

    r16085 r16191  
    4747  (declaim (inline hash-mod))
    4848  (declaim (inline set-hash-key-conditional set-hash-value-conditional))
    49   (declaim (inline hash-lock-free-p lock-free-gethash)))
     49  (declaim (inline hash-lock-free-p lock-free-gethash))
     50  (declaim (inline invalid-hash-key-p)))
     51
    5052
    5153#+eq-hash-monitor
     
    11281130     hash)))
    11291131
     1132(defun invalid-hash-key-p (key)
     1133  ;; Anything else ?
     1134  (or (eq key free-hash-marker)
     1135      (eq key deleted-hash-key-marker)))
    11301136
    11311137(defun puthash (key hash default &optional (value default))
     
    11331139  (unless (typep hash 'hash-table)
    11341140    (report-bad-arg hash 'hash-table))
    1135   (when (or (eq key free-hash-marker)
    1136             (eq key deleted-hash-key-marker))
     1141  (when (invalid-hash-key-p key)
    11371142    (error "Can't use ~s as a hash-table key" key))
    11381143  (when (hash-lock-free-p hash)
  • release/1.10/source/lib/pprint.lisp

    r15344 r16191  
    12041204
    12051205(defun circularity-process (xp object interior-cdr? &aux (not-pretty (not *print-pretty*)))
     1206  (declare (ftype function invalid-hash-key-p))
    12061207  (unless (or (numberp object)
    12071208              (characterp object)
     1209              (invalid-hash-key-p object)
    12081210              (and (symbolp object)     ;Reader takes care of sharing.
    12091211                   (or (null *print-gensym*) (symbol-package object))))
Note: See TracChangeset for help on using the changeset viewer.