;;; If it is losing, we punt with a COMPILER-ERROR. NAMES-SO-FAR is a
;;; list of names which have previously been bound. If the NAME is in
;;; this list, then we error out.
-(declaim (ftype (sfunction (t list) lambda-var) varify-lambda-arg))
-(defun varify-lambda-arg (name names-so-far)
+(declaim (ftype (sfunction (t list &optional t) lambda-var) varify-lambda-arg))
+(defun varify-lambda-arg (name names-so-far &optional (context "lambda list"))
(declare (inline member))
(unless (symbolp name)
- (compiler-error "The lambda variable ~S is not a symbol." name))
+ (compiler-error "~S is not a symbol, and cannot be used as a variable." name))
(when (member name names-so-far :test #'eq)
- (compiler-error "The variable ~S occurs more than once in the lambda list."
- name))
+ (compiler-error "The variable ~S occurs more than once in the ~A."
+ name
+ context))
(let ((kind (info :variable :kind name)))
- (cond ((or (keywordp name) (eq kind :constant))
- (compiler-error "The name of the lambda variable ~S is already in use to name a constant."
+ (cond ((keywordp name)
+ (compiler-error "~S is a keyword, and cannot be used as a local variable."
+ name))
+ ((eq kind :constant)
+ (compiler-error "~@<~S names a defined constant, and cannot be used as a ~
+ local variable.~:@>"
name))
((eq :global kind)
- (compiler-error "The name of the lambda variable ~S is already in use to name a global variable."
- name)))
- (cond ((eq kind :special)
+ (compiler-error "~@<~S names a global lexical variable, and cannot be used ~
+ as a local variable.~:@>"
+ name))
+ ((eq kind :special)
(let ((specvar (find-free-var name)))
(make-lambda-var :%source-name name
:type (leaf-type specvar)
:maybe-add-debug-catch t
:source-name source-name
:debug-name debug-name))
- ((instance-lambda)
- (deprecation-warning 'instance-lambda 'lambda)
- (ir1-convert-lambda `(lambda ,@(cdr thing))
- :source-name source-name
- :debug-name debug-name))
((named-lambda)
(let ((name (cadr thing))
(lambda-expression `(lambda ,@(cddr thing))))
(if (and name (legal-fun-name-p name))
- (let ((defined-fun-res (get-defined-fun name))
+ (let ((defined-fun-res (get-defined-fun name (second lambda-expression)))
(res (ir1-convert-lambda lambda-expression
:maybe-add-debug-catch t
:source-name name)))
(setf (functional-inline-expanded clambda) t)
clambda)))
+;;; Given a lambda-list, return a FUN-TYPE object representing the signature:
+;;; return type is *, and each individual arguments type is T -- but we get
+;;; the argument counts and keywords.
+(defun ftype-from-lambda-list (lambda-list)
+ (multiple-value-bind (req opt restp rest-name keyp key-list allowp morep)
+ (parse-lambda-list lambda-list)
+ (declare (ignore rest-name))
+ (flet ((t (list)
+ (mapcar (constantly t) list)))
+ (let ((reqs (t req))
+ (opts (when opt (cons '&optional (t opt))))
+ ;; When it comes to building a type, &REST means pretty much the
+ ;; same thing as &MORE.
+ (rest (when (or morep restp) (list '&rest t)))
+ (keys (when keyp
+ (cons '&key (mapcar (lambda (spec)
+ (let ((key/var (if (consp spec)
+ (car spec)
+ spec)))
+ (list (if (consp key/var)
+ (car key/var)
+ (keywordicate key/var))
+ t)))
+ key-list))))
+ (allow (when allowp (list '&allow-other-keys))))
+ (specifier-type `(function (,@reqs ,@opts ,@rest ,@keys ,@allow) *))))))
+
;;; Get a DEFINED-FUN object for a function we are about to define. If
;;; the function has been forward referenced, then substitute for the
;;; previous references.
-(defun get-defined-fun (name)
+(defun get-defined-fun (name &optional (lambda-list nil lp))
(proclaim-as-fun-name name)
(when (boundp '*free-funs*)
(let ((found (find-free-fun name "shouldn't happen! (defined-fun)")))
(res (make-defined-fun
:%source-name name
:where-from (if (eq where-from :declared)
- :declared :defined)
- :type (leaf-type found))))
+ :declared
+ :defined-here)
+ :type (if (eq :declared where-from)
+ (leaf-type found)
+ (if lp
+ (ftype-from-lambda-list lambda-list)
+ (specifier-type 'function))))))
(substitute-leaf res found)
(setf (gethash name *free-funs*) res)))
;; If *FREE-FUNS* has a previously converted definition
;; for this name, then blow it away and try again.
((defined-fun-functionals found)
(remhash name *free-funs*)
- (get-defined-fun name))
+ (get-defined-fun name lambda-list))
(t found)))))
;;; Check a new global function definition for consistency with
(defun %compiler-defun (name lambda-with-lexenv compile-toplevel)
(let ((defined-fun nil)) ; will be set below if we're in the compiler
(when compile-toplevel
- (setf defined-fun (get-defined-fun name))
+ (setf defined-fun (if lambda-with-lexenv
+ (get-defined-fun name (fifth lambda-with-lexenv))
+ (get-defined-fun name)))
(when (boundp '*lexenv*)
(remhash name *free-funs*)
(aver (fasl-output-p *compile-object*))
;; old CMU CL comment:
;; If there is a type from a previous definition, blast it,
;; since it is obsolete.
- (when (and defined-fun
- (eq (leaf-where-from defined-fun) :defined))
+ (when (and defined-fun (neq :declared (leaf-where-from defined-fun)))
(setf (leaf-type defined-fun)
;; FIXME: If this is a block compilation thing, shouldn't
;; we be setting the type to the full derived type for the