Skip to content
Snippets Groups Projects
Commit 7b6c79c4 authored by pmai's avatar pmai
Browse files

Fixed long-standing unmatched close parenthesis in expand-defgeneric that

I introduced in version 1.40.
parent b3ef69ef
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/boot.lisp,v 1.43 2002/11/22 00:39:55 pmai Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/boot.lisp,v 1.44 2002/11/28 16:10:11 pmai Exp $")
(in-package :pcl) (in-package :pcl)
...@@ -246,42 +246,42 @@ work during bootstrapping. ...@@ -246,42 +246,42 @@ work during bootstrapping.
(if new-supplied-p (if new-supplied-p
(setf (getf initargs key) new) (setf (getf initargs key) new)
(getf initargs key)))) (getf initargs key))))
(dolist (option options) (dolist (option options)
(case (car option) (case (car option)
(:argument-precedence-order (:argument-precedence-order
(if (initarg :argument-precedence-order) (if (initarg :argument-precedence-order)
(duplicate-option :argument-precedence-order) (duplicate-option :argument-precedence-order)
(initarg :argument-precedence-order `',(cdr option)))) (initarg :argument-precedence-order `',(cdr option))))
(declare (declare
(check-declaration (cdr option)) (check-declaration (cdr option))
(initarg :declarations (initarg :declarations
(append (cdr option) (initarg :declarations)))) (append (cdr option) (initarg :declarations))))
(:documentation (:documentation
(if (initarg :documentation) (if (initarg :documentation)
(duplicate-option :documentation) (duplicate-option :documentation)
(initarg :documentation `',(cadr option)))) (initarg :documentation `',(cadr option))))
(:method-combination (:method-combination
(if (initarg :method-combination) (if (initarg :method-combination)
(duplicate-option :method-combination) (duplicate-option :method-combination)
(initarg :method-combination `',(cdr option)))) (initarg :method-combination `',(cdr option))))
(:generic-function-class (:generic-function-class
(if (initarg :generic-function-class) (if (initarg :generic-function-class)
(duplicate-option :generic-function-class) (duplicate-option :generic-function-class)
(initarg :generic-function-class `',(cadr option)))) (initarg :generic-function-class `',(cadr option))))
(:method-class (:method-class
(if (initarg :method-class) (if (initarg :method-class)
(duplicate-option :method-class) (duplicate-option :method-class)
(initarg :method-class `',(cadr option)))) (initarg :method-class `',(cadr option))))
(:method (:method
(push `(defmethod ,function-specifier ,@(cdr option)) (push `(defmethod ,function-specifier ,@(cdr option))
methods)) methods))
(t ;unsuported things must get a 'program-error (t ;unsuported things must get a 'program-error
(simple-program-error "Unsupported option ~S." option)))) (simple-program-error "Unsupported option ~S." option))))
(let ((declarations (initarg :declarations))) (let ((declarations (initarg :declarations)))
(when declarations (initarg :declarations `',declarations)))) (when declarations (initarg :declarations `',declarations))))
(tell-compiler-about-gf function-specifier lambda-list) (tell-compiler-about-gf function-specifier lambda-list)
`(progn `(progn
(proclaim-defgeneric ',function-specifier ',lambda-list) (proclaim-defgeneric ',function-specifier ',lambda-list)
...@@ -290,7 +290,7 @@ work during bootstrapping. ...@@ -290,7 +290,7 @@ work during bootstrapping.
*defgeneric-times* *defgeneric-times*
`(load-defgeneric ',function-specifier ',lambda-list ,@initargs)) `(load-defgeneric ',function-specifier ',lambda-list ,@initargs))
,@methods ,@methods
`,(function ,function-specifier))))) `,(function ,function-specifier))))
(defun load-defgeneric (function-specifier lambda-list &rest initargs) (defun load-defgeneric (function-specifier lambda-list &rest initargs)
(apply #'ensure-generic-function (apply #'ensure-generic-function
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment