projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.pre8.105
[sbcl.git]
/
src
/
pcl
/
defclass.lisp
diff --git
a/src/pcl/defclass.lisp
b/src/pcl/defclass.lisp
index
ac41b14
..
2c1dfed
100644
(file)
--- a/
src/pcl/defclass.lisp
+++ b/
src/pcl/defclass.lisp
@@
-72,11
+72,7
@@
(error "The value of the :metaclass option (~S) is not a~%~
legal class name."
(cadr option)))
(error "The value of the :metaclass option (~S) is not a~%~
legal class name."
(cadr option)))
- (setq metaclass
- (case (cadr option)
- (cl:standard-class 'standard-class)
- (cl:structure-class 'structure-class)
- (t (cadr option))))
+ (setq metaclass (cadr option))
(setf options (remove option options))
(return t))))
(setf options (remove option options))
(return t))))
@@
-111,10
+107,10
@@
*writers-for-this-defclass*)
,@(mapcar (lambda (x)
`(declaim (ftype (function (t) t)
*writers-for-this-defclass*)
,@(mapcar (lambda (x)
`(declaim (ftype (function (t) t)
- ,(slot-reader-symbol x)
- ,(slot-boundp-symbol x))
+ ,(slot-reader-name x)
+ ,(slot-boundp-name x))
(ftype (function (t t) t)
(ftype (function (t t) t)
- ,(slot-writer-symbol x))))
+ ,(slot-writer-name x))))
*slot-names-for-this-defclass*)
(let ,(mapcar #'cdr *initfunctions-for-this-defclass*)
(load-defclass ',name
*slot-names-for-this-defclass*)
(let ,(mapcar #'cdr *initfunctions-for-this-defclass*)
(load-defclass ',name
@@
-400,7
+396,7
@@
canonical-options (copy-tree canonical-options))
(let ((ecd
(make-early-class-definition name
canonical-options (copy-tree canonical-options))
(let ((ecd
(make-early-class-definition name
- *load-truename*
+ *load-pathname*
metaclass
supers
canonical-slots
metaclass
supers
canonical-slots