Changeset 6923


Ignore:
Timestamp:
Jul 21, 2007, 10:19:41 PM (13 years ago)
Author:
gb
Message:

Enter the 1990s (eval-when ..).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ccl/lib/pprint.lisp

    r5396 r6923  
    130130;default (bad) definitions for the non-portable functions
    131131
    132 (eval-when (eval load compile)
     132(eval-when (:execute :load-toplevel :compile-toplevel)
    133133(defun structure-type-p (x) (structurep x))
    134134(defun output-width     (&optional (s *standard-output*))
     
    353353;               ---- XP STRUCTURES, AND THE INTERNAL ALGORITHM ----
    354354
    355 (eval-when (eval compile) ;not used at run time.
     355(eval-when (:execute :compile-toplevel) ;not used at run time.
    356356  (defvar block-stack-entry-size 1)
    357357  (defvar prefix-stack-entry-size 5)
     
    361361  (defvar suffix-entry-size 1))
    362362
    363 (eval-when (eval load compile) ;used at run time
     363(eval-when (:execute :load-toplevel :compile-toplevel) ;used at run time
    364364  (defvar block-stack-min-size #.(* 35. block-stack-entry-size))
    365365  (defvar prefix-stack-min-size #.(* 30. prefix-stack-entry-size))
     
    497497
    498498 
    499 (eval-when (compile eval)
     499(eval-when (:compile-toplevel :execute)
    500500(defmacro LP<-BP (xp &optional (ptr nil))
    501501  (if (null ptr) (setq ptr `(xp-buffer-ptr ,xp)))
     
    592592                   #.block-stack-min-size #.block-stack-entry-size)))
    593593
    594 (eval-when (compile eval)
     594(eval-when (:compile-toplevel :execute)
    595595(defmacro prefix-ptr (xp)
    596596  `(svref (xp-prefix-stack ,xp) (xp-prefix-stack-ptr ,xp)))
     
    637637
    638638
    639 (eval-when (compile eval)
     639(eval-when (:compile-toplevel :execute)
    640640(defmacro Qtype   (xp index) `(svref (xp-queue ,xp) ,index))
    641641(defmacro Qkind   (xp index) `(svref (xp-queue ,xp) (1+ ,index)))
     
    946946;a place where it cannot make a decision yet.
    947947
    948 (eval-when (compile eval)
     948(eval-when (:compile-toplevel :execute)
    949949(defmacro maybe-too-large (xp Qentry queue linel)
    950950  `(let ((.limit. ,linel)
     
    11361136
    11371137(defun maybe-initiate-xp-printing (fn stream &rest args)
    1138   ;(print (list 'mip (type-of stream)))
    11391138  (if (xp-structure-p stream) (apply fn stream args)
    1140       (if (typep stream 'xp-stream)
    1141           (apply fn (slot-value stream 'xp-structure) args)
    1142           (let ((*locating-circularities* (if *print-circle* 0 nil))
    1143                 (*circularity-hash-table*
    1144                  (if *print-circle* (get-circularity-hash-table) nil)))
    1145             (prog1 (xp-print fn (decode-stream-arg stream) args)
    1146               (if *circularity-hash-table*
    1147                   (free-circularity-hash-table *circularity-hash-table*)))))))
     1139    (if (typep stream 'xp-stream)
     1140      (apply fn (slot-value stream 'xp-structure) args)
     1141      (let ((*locating-circularities* (if *print-circle* 0 nil))
     1142            (*circularity-hash-table*
     1143             (if *print-circle* (get-circularity-hash-table) nil)))
     1144        (prog1 (xp-print fn (decode-stream-arg stream) args)
     1145          (if *circularity-hash-table*
     1146            (free-circularity-hash-table *circularity-hash-table*)))))))
    11481147
    11491148(defun xp-print (fn stream args)
     
    14761475
    14771476
    1478 (eval-when (compile load eval)
     1477(eval-when (:compile-toplevel :load-toplevel :execute)
    14791478; called by formatter frobs
    14801479(defun do-sub-format-0 (s control-string args)
Note: See TracChangeset for help on using the changeset viewer.