[Openmcl-cvs-notifications] r10321 - in /trunk/source: compiler/nx1.lisp level-0/l0-pred.lisp library/lispequ.lisp xdump/faslenv.lisp

[gb at clozure.com]

Author: gb
Date: Mon Aug  4 07:18:27 2008
New Revision: 10321

Log:
Remove training wheels, start bumping fasl version.





Modified:
    trunk/source/compiler/nx1.lisp
    trunk/source/level-0/l0-pred.lisp
    trunk/source/library/lispequ.lisp
    trunk/source/xdump/faslenv.lisp

Modified: trunk/source/compiler/nx1.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/compiler/nx1.lisp (original)
+++ trunk/source/compiler/nx1.lisp Mon Aug  4 07:18:27 2008
@@ -63,14 +63,11 @@
      (nx1-form newval))))
 =

 (defnx1 nx1-istruct-typep ((istruct-typep)) (&whole whole thing type &envi=
ronment env)
-   #-bootstrap-istruct (declare (ignore thing type))
-   #-bootstrap-istruct (nx1-treat-as-call whole)
-   #+bootstrap-istruct
   (if (and (quoted-form-p type) (symbolp (cadr type)))
     (make-acode (%nx1-operator istruct-typep)
                 (nx1-immediate :eq)
                 (nx1-form thing)
-                (nx1-form `(register-istruct-cell type)))
+                (nx1-form `(register-istruct-cell ,type)))
     (nx1-treat-as-call whole)))
 =

 (defnx1 nx1-make-list make-list (&whole whole size &rest keys &environment=
 env)

Modified: trunk/source/level-0/l0-pred.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/level-0/l0-pred.lisp (original)
+++ trunk/source/level-0/l0-pred.lisp Mon Aug  4 07:18:27 2008
@@ -1009,11 +1009,7 @@
 =

 (defun istruct-typep (thing type)
   (if (=3D (the fixnum (typecode thing)) target::subtag-istruct)
-    (let* ((cell (%svref thing 0)))
-      (eq (if (atom cell) cell (car cell))
-          (if (atom type) type (car type))))
-    #+istruct-bootstrap
-    (eq (%svref thing 0) type)))
+    (eq (istruct-cell-name (%svref thing 0)) type)))
 =

 (defun istruct-type-name (thing)
   (if (=3D (the fixnum (typecode thing)) target::subtag-istruct)

Modified: trunk/source/library/lispequ.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/library/lispequ.lisp (original)
+++ trunk/source/library/lispequ.lisp Mon Aug  4 07:18:27 2008
@@ -1579,23 +1579,9 @@
 =

 =

 (defmacro istruct-cell-name (cell)
-  #-later
-  (let* ((temp (gensym)))
-    `(let* ((,temp ,cell))
-      (if (atom ,temp)
-        ,temp
-        (car ,temp))))
-  #+later
   `(car ,cell))
 =

 (defmacro istruct-cell-info (cell)
-  #-later
-  (let* ((temp (gensym)))
-    `(let* ((,temp ,cell))
-      (if (consp ,temp)
-        (cdr ,temp)
-        (%class.own-wrapper (find-class ,temp)))))
-  #+later
   `(cdr ,cell))
 =

 (provide "LISPEQU")

Modified: trunk/source/xdump/faslenv.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/xdump/faslenv.lisp (original)
+++ trunk/source/xdump/faslenv.lisp Mon Aug  4 07:18:27 2008
@@ -42,7 +42,7 @@
 (defconstant $fasl-epush-bit 7)
 (defconstant $fasl-file-id #xff00)
 (defconstant $fasl-file-id1 #xff01)
-(defconstant $fasl-vers #x52)
+(defconstant $fasl-vers #x53)
 (defconstant $fasl-min-vers #x52)
 (defconstant $faslend #xff)
 (defconstant $fasl-buf-len 2048)