Changeset 13363

Timestamp:

Jan 4, 2010, 8:43:41 AM (15 years ago)

Author:

gz

Message:

defstruct fixes from trunk (r13344/r13358)

Location:

branches/working-0711/ccl

Files:

• . (modified) (1 prop)
• lib/defstruct.lisp (modified) (1 diff)
• lib/nfcomp.lisp (modified) (1 diff)

branches/working-0711/ccl/lib/defstruct.lisp

@@ -285 +285 @@
           (when def (set-function-info refname nil)))
         (when (symbolp refname)(fmakunbound refname)))
+      #|
+      ;; The print-function may indeed have become obsolete,
+      ;; but we can't generally remove user-defined code
       (let ((print-fn (sd-print-function sd)))
         (when (symbolp print-fn) (fmakunbound print-fn)))
+      |#
       (let ((constructor (sd-constructor sd)))
         (when (symbolp constructor) (fmakunbound constructor)))

branches/working-0711/ccl/lib/nfcomp.lisp

@@ -905 +905 @@
   (let ((defenv (definition-environment env)))
     (when defenv
-      (when (non-nil-symbolp (sd-name sd))
+      (when (and (non-nil-symbolp (sd-name sd))
+                 (not (sd-type sd)))
         (note-type-info (sd-name sd) 'class env)
         (push (make-instance 'compile-time-class :name (sd-name sd))