Changeset 12215


Ignore:
Timestamp:
Jun 6, 2009, 9:27:52 PM (10 years ago)
Author:
gz
Message:

Merge r11834 r11669 r11833 r11834 into trunk

Location:
trunk/source
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/compiler/optimizers.lisp

    r12045 r12215  
    19761976
    19771977(defun count-known-format-args (string start end)
    1978   (declare (fixnum start end))
     1978  (declare (fixnum end))
    19791979  (loop with count = 0
    19801980        do (setq start (position #\~ string :start start :end end))
  • trunk/source/level-1/l1-clos-boot.lisp

    r12210 r12215  
    13031303
    13041304(defun find-class (name &optional (errorp t) environment)
     1305  (declare (optimize speed))
    13051306  (let* ((cell (find-class-cell name nil)))
    1306     (declare (optimize speed) (type class-cell cell))
     1307    (declare (type class-cell cell))
    13071308    (or (and cell (class-cell-class cell))
    13081309        (let ((defenv (and environment (definition-environment environment))))
  • trunk/source/level-1/l1-dcode.lisp

    r12210 r12215  
    13101310
    13111311(defun nth-or-gf-error (n l gf)
    1312   (declare (fixnum l))
     1312  (declare (fixnum n))
    13131313  (do* ((i 0 (1+ i))
    13141314        (l l (cdr l)))
  • trunk/source/level-1/l1-io.lisp

    r11646 r12215  
    988988        (name (symbol-name symbol))
    989989        (package (symbol-package symbol)))
    990     (declare (type simple-string name) (type package package))
     990    (declare (type simple-string name))
    991991    (when (or *print-readably* *print-escape*)
    992992      (cond ((keywordp symbol)
  • trunk/source/lib/macros.lisp

    r12163 r12215  
    184184         (lstsym (gensym)))
    185185    (multiple-value-bind (forms decls) (parse-body body env nil)
    186      `(block nil
    187        (let* ((,lstsym ,list) ,varsym)
    188         ,@decls
    189           (tagbody
    190             (go ,tstlab)
    191             ,toplab
    192             (setq ,lstsym (cdr (the list ,lstsym)))
    193             ,@forms
    194             ,tstlab
    195             (setq ,varsym (car ,lstsym))
    196             (if ,lstsym (go ,toplab)))
    197           ,@(if ret `((progn  ,ret))))))))
     186      `(block nil
     187         (let* ((,lstsym ,list))
     188           (tagbody
     189              (go ,tstlab)
     190              ,toplab
     191              (let ((,varsym (car ,lstsym)))
     192                ,@decls
     193                (tagbody
     194                   ,@forms)
     195                (setq ,lstsym (cdr (the list ,lstsym))))
     196              ,tstlab
     197              (if ,lstsym (go ,toplab))))
     198         ,@(if ret `((let ((,varsym nil))
     199                       (declare (ignore-if-unused ,varsym))
     200                       ,@decls
     201                       ,ret)))))))
    198202
    199203
     
    978982; This is supposedly ANSI CL.
    979983(defmacro lambda (&whole lambda-expression (&rest paramlist) &body body)
     984  (declare (ignore paramlist body))
    980985  (unless (lambda-expression-p lambda-expression)
    981986    (warn "Invalid lambda expression: ~s" lambda-expression))
    982   `(function (lambda ,paramlist ,@body)))
     987  `(function ,lambda-expression))
    983988
    984989; This isn't
     
    13471352  `(logior (the fixnum ,x) (the fixnum ,y)))
    13481353
    1349 (defmacro %ilogior (body &body args)
     1354(defmacro %ilogior (body &rest args)
    13501355   (while args
    13511356     (setq body (list '%ilogior2 body (pop args))))
     
    14681473        (close ,var)))))
    14691474
    1470 (defmacro with-open-file ((var . args) &body body &aux (stream (gensym))(done (gensym)))
    1471   "Use open to create a file stream to file named by filespec. Filespec is
     1475(defmacro with-open-file ((var filename . args) &body body &aux (stream (gensym))(done (gensym)))
     1476  "Use open to create a file stream to file named by filename. Filename is
    14721477the name of the file to be opened. Options are used as keyword arguments
    14731478to open."
     
    14751480     (unwind-protect
    14761481       (multiple-value-prog1
    1477          (let ((,var (setq ,stream (open ,@args))))
     1482         (let ((,var (setq ,stream (open ,filename ,@args))))
    14781483           ,@body)
    14791484         (setq ,done t))
  • trunk/source/lib/pprint.lisp

    r10942 r12215  
    443443
    444444(defmacro xp-check-size (FORM ptr min-size entry-size
    445                            &optional (type 'simple-vector))
     445                           &optional (type '(simple-array * (*))))
    446446  `(let ((.old. ,form)
    447447         (.ptr. ,ptr))
  • trunk/source/library/loop.lisp

    r11855 r12215  
    19101910(defun loop-for-arithmetic (var val data-type kwd)
    19111911  (loop-sequencer
    1912     var (loop-check-data-type data-type *loop-real-data-type*) t
     1912    var (loop-check-data-type data-type 'number) t
    19131913    nil nil nil nil nil nil
    19141914    (loop-collect-prepositional-phrases
     
    19701970            (setq key-var (and other-p other-var) val-var variable))
    19711971        (push `(with-hash-table-iterator (,next-fn ,ht-var)) *loop-wrappers*)
    1972         (when (consp key-var)
     1972        (when (or (consp key-var) data-type)
    19731973          (setq post-steps `(,key-var ,(setq key-var (loop-gentemp 'loop-hash-key-temp-))
    19741974                             ,@post-steps))
    19751975          (push `(,key-var nil) bindings))
    1976         (when (consp val-var)
     1976        (when (or (consp val-var) data-type)
    19771977          (setq post-steps `(,val-var ,(setq val-var (loop-gentemp 'loop-hash-val-temp-))
    19781978                             ,@post-steps))
Note: See TracChangeset for help on using the changeset viewer.