projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.9.8.28:
[sbcl.git]
/
src
/
pcl
/
ctor.lisp
diff --git
a/src/pcl/ctor.lisp
b/src/pcl/ctor.lisp
index
7a981aa
..
9ae7add
100644
(file)
--- a/
src/pcl/ctor.lisp
+++ b/
src/pcl/ctor.lisp
@@
-109,7
+109,7
@@
(!defstruct-with-alternate-metaclass ctor
:slot-names (function-name class-name class initargs)
:boa-constructor %make-ctor
(!defstruct-with-alternate-metaclass ctor
:slot-names (function-name class-name class initargs)
:boa-constructor %make-ctor
- :superclass-name pcl-funcallable-instance
+ :superclass-name function
:metaclass-name random-pcl-classoid
:metaclass-constructor make-random-pcl-classoid
:dd-type funcallable-structure
:metaclass-name random-pcl-classoid
:metaclass-constructor make-random-pcl-classoid
:dd-type funcallable-structure
@@
-356,7
+356,7
@@
(defun optimizing-generator (ctor ii-methods si-methods)
(multiple-value-bind (locations names body before-method-p)
(fake-initialization-emf ctor ii-methods si-methods)
(defun optimizing-generator (ctor ii-methods si-methods)
(multiple-value-bind (locations names body before-method-p)
(fake-initialization-emf ctor ii-methods si-methods)
- (values
+ (values
`(lambda ,(make-ctor-parameter-list ctor)
(declare #.*optimize-speed*)
,(wrap-in-allocate-forms ctor body before-method-p))
`(lambda ,(make-ctor-parameter-list ctor)
(declare #.*optimize-speed*)
,(wrap-in-allocate-forms ctor body before-method-p))
@@
-596,7
+596,7
@@
,(case type
(constant `',(eval value))
((param var) `,value)
,(case type
(constant `',(eval value))
((param var) `,value)
- (initfn `(funcall ,value))))
+ (initfn `(funcall ,value))))
into class-init-forms
finally (return (values names locations class-init-forms)))
(multiple-value-bind (vars bindings)
into class-init-forms
finally (return (values names locations class-init-forms)))
(multiple-value-bind (vars bindings)
@@
-604,8
+604,8
@@
collect var into vars
collect `(,var (funcall ,initfn)) into bindings
finally (return (values vars bindings)))
collect var into vars
collect `(,var (funcall ,initfn)) into bindings
finally (return (values vars bindings)))
- (values locations names
- bindings vars
+ (values locations names
+ bindings vars
(nreverse defaulting-initargs)
`(,@(delete nil instance-init-forms)
,@class-init-forms))))))))
(nreverse defaulting-initargs)
`(,@(delete nil instance-init-forms)
,@class-init-forms))))))))