/[cmucl]/src/code/defstruct.lisp
ViewVC logotype

Diff of /src/code/defstruct.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.62 by pw, Mon Apr 20 11:32:50 1998 UTC revision 1.63 by dtc, Mon May 4 01:27:11 1998 UTC
# Line 1304  Line 1304 
1304                                  #'(lambda (x) (typep x (find-class class))))                                  #'(lambda (x) (typep x (find-class class))))
1305                              (fdefinition constructor)))                              (fdefinition constructor)))
1306      (setf (class-direct-superclasses class)      (setf (class-direct-superclasses class)
1307            (list (layout-class (svref inherits (1- (length inherits))))))            (if (eq (dd-name info) 'lisp-stream)
1308                  ;; Hack to add stream as a superclass mixin to lisp-streams.
1309                  (list (layout-class (svref inherits (1- (length inherits))))
1310                        (layout-class (svref inherits (- (length inherits) 2))))
1311                  (list (layout-class (svref inherits (1- (length inherits)))))))
1312      (let ((new-layout (make-layout :class class      (let ((new-layout (make-layout :class class
1313                                     :inherits inherits                                     :inherits inherits
1314                                     :inheritance-depth (length inherits)                                     :inheritance-depth (length inherits)
# Line 1475  Line 1479 
1479                (compiler-layout-or-lose (first include))                (compiler-layout-or-lose (first include))
1480                (class-layout (find-class (or (first superclass-opt)                (class-layout (find-class (or (first superclass-opt)
1481                                              'structure-object))))))                                              'structure-object))))))
1482      (concatenate 'simple-vector (layout-inherits super) (vector super))))      (if (eq (dd-name info) 'lisp-stream)
1483            ;; Hack to added the stream class as a mixin for lisp-streams.
1484            (concatenate 'simple-vector (layout-inherits super)
1485                         (vector super (class-layout (find-class 'stream))))
1486            (concatenate 'simple-vector (layout-inherits super) (vector super)))))
1487    
1488  ;;; %COMPILER-ONLY-DEFSTRUCT  --  Internal  ;;; %COMPILER-ONLY-DEFSTRUCT  --  Internal
1489  ;;;  ;;;

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.63

  ViewVC Help
Powered by ViewVC 1.1.5