Changeset 10321


Ignore:
Timestamp:
Aug 4, 2008, 11:18:27 AM (11 years ago)
Author:
gb
Message:

Remove training wheels, start bumping fasl version.

Location:
trunk/source
Files:
4 edited

Legend:

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

    r10291 r10321  
    6464
    6565(defnx1 nx1-istruct-typep ((istruct-typep)) (&whole whole thing type &environment env)
    66    #-bootstrap-istruct (declare (ignore thing type))
    67    #-bootstrap-istruct (nx1-treat-as-call whole)
    68    #+bootstrap-istruct
    6966  (if (and (quoted-form-p type) (symbolp (cadr type)))
    7067    (make-acode (%nx1-operator istruct-typep)
    7168                (nx1-immediate :eq)
    7269                (nx1-form thing)
    73                 (nx1-form `(register-istruct-cell type)))
     70                (nx1-form `(register-istruct-cell ,type)))
    7471    (nx1-treat-as-call whole)))
    7572
  • trunk/source/level-0/l0-pred.lisp

    r10309 r10321  
    10101010(defun istruct-typep (thing type)
    10111011  (if (= (the fixnum (typecode thing)) target::subtag-istruct)
    1012     (let* ((cell (%svref thing 0)))
    1013       (eq (if (atom cell) cell (car cell))
    1014           (if (atom type) type (car type))))
    1015     #+istruct-bootstrap
    1016     (eq (%svref thing 0) type)))
     1012    (eq (istruct-cell-name (%svref thing 0)) type)))
    10171013
    10181014(defun istruct-type-name (thing)
  • trunk/source/library/lispequ.lisp

    r10320 r10321  
    15811581
    15821582(defmacro istruct-cell-name (cell)
    1583   #-later
    1584   (let* ((temp (gensym)))
    1585     `(let* ((,temp ,cell))
    1586       (if (atom ,temp)
    1587         ,temp
    1588         (car ,temp))))
    1589   #+later
    15901583  `(car ,cell))
    15911584
    15921585(defmacro istruct-cell-info (cell)
    1593   #-later
    1594   (let* ((temp (gensym)))
    1595     `(let* ((,temp ,cell))
    1596       (if (consp ,temp)
    1597         (cdr ,temp)
    1598         (%class.own-wrapper (find-class ,temp)))))
    1599   #+later
    16001586  `(cdr ,cell))
    16011587
  • trunk/source/xdump/faslenv.lisp

    r10310 r10321  
    4343(defconstant $fasl-file-id #xff00)
    4444(defconstant $fasl-file-id1 #xff01)
    45 (defconstant $fasl-vers #x52)
     45(defconstant $fasl-vers #x53)
    4646(defconstant $fasl-min-vers #x52)
    4747(defconstant $faslend #xff)
Note: See TracChangeset for help on using the changeset viewer.