;;; 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)
(arg-vars context-temp count-temp)
(when rest
- (arg-vals `(%listify-rest-args
- ,n-context ,n-count)))
+ (arg-vals `(%listify-rest-args ,n-context ,n-count)))
(when morep
(arg-vals n-context)
(arg-vals n-count))
(n-key (gensym "N-KEY-"))
(n-value-temp (gensym "N-VALUE-TEMP-"))
(n-allowp (gensym "N-ALLOWP-"))
+ (n-lose (gensym "N-LOSE-"))
(n-losep (gensym "N-LOSEP-"))
(allowp (or (optional-dispatch-allowp res)
(policy *lexenv* (zerop safety))))
(tests clause)))
(unless allowp
- (temps n-allowp n-losep)
+ (temps n-allowp n-lose n-losep)
(unless found-allow-p
(tests `((eq ,n-key :allow-other-keys)
(setq ,n-allowp ,n-value-temp))))
(tests `(t
- (setq ,n-losep (list ,n-key)))))
+ (setq ,n-lose ,n-key
+ ,n-losep t))))
(body
`(when (oddp ,n-count)
(unless allowp
(body `(when (and ,n-losep (not ,n-allowp))
- (%unknown-key-arg-error (car ,n-losep))))))))
+ (%unknown-key-arg-error ,n-lose)))))))
(let ((ep (ir1-convert-lambda-body
`((let ,(temps)
(bind-vals))
(when rest
(main-vars rest)
- (main-vals '()))
+ (main-vals '())
+ (unless (lambda-var-ignorep rest)
+ ;; Make up two extra variables, and squirrel them away in
+ ;; ARG-INFO-DEFAULT for transforming (VALUES-LIST REST) into
+ ;; (%MORE-ARG-VALUES CONTEXT 0 COUNT) when possible.
+ (let* ((context-name (gensym "REST-CONTEXT"))
+ (context (make-lambda-var :%source-name context-name
+ :arg-info (make-arg-info :kind :more-context)))
+ (count-name (gensym "REST-COUNT"))
+ (count (make-lambda-var :%source-name count-name
+ :arg-info (make-arg-info :kind :more-count)
+ :type (specifier-type 'index))))
+ (setf (arg-info-default (lambda-var-arg-info rest)) (list context count)
+ (lambda-var-ever-used context) t
+ (lambda-var-ever-used count) t)
+ (setf more-context context
+ more-count count))))
(when more-context
(main-vars more-context)
(main-vals nil)
forms))
(forms (if (eq result-type *wild-type*)
forms
- `((the ,result-type (progn ,@forms)))))
+ `((the ,(type-specifier result-type) (progn ,@forms)))))
(*allow-instrumenting* (and (not system-lambda) *allow-instrumenting*))
(res (cond ((or (find-if #'lambda-var-arg-info vars) keyp)
(ir1-convert-hairy-lambda forms vars keyp
: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))))
:%source-name name
:where-from (if (eq where-from :declared)
:declared
- :defined)
+ :defined-here)
:type (if (eq :declared where-from)
(leaf-type found)
(if lp
(substitute-leaf fun var))
fun))
+(defun %set-inline-expansion (name defined-fun inline-lambda)
+ (cond (inline-lambda
+ (setf (info :function :inline-expansion-designator name)
+ inline-lambda)
+ (when defined-fun
+ (setf (defined-fun-inline-expansion defined-fun)
+ inline-lambda)))
+ (t
+ (clear-info :function :inline-expansion-designator name))))
+
;;; the even-at-compile-time part of DEFUN
;;;
-;;; The INLINE-EXPANSION is a LAMBDA-WITH-LEXENV, or NIL if there is
-;;; no inline expansion.
-(defun %compiler-defun (name lambda-with-lexenv compile-toplevel)
+;;; The INLINE-LAMBDA is a LAMBDA-WITH-LEXENV, or NIL if there is no
+;;; inline expansion.
+(defun %compiler-defun (name inline-lambda compile-toplevel)
(let ((defined-fun nil)) ; will be set below if we're in the compiler
(when compile-toplevel
- (setf defined-fun (if lambda-with-lexenv
- (get-defined-fun name (fifth lambda-with-lexenv))
- (get-defined-fun name)))
+ (with-single-package-locked-error
+ (:symbol name "defining ~S as a function")
+ (setf defined-fun
+ (if inline-lambda
+ (get-defined-fun name (fifth inline-lambda))
+ (get-defined-fun name))))
(when (boundp '*lexenv*)
(remhash name *free-funs*)
(aver (fasl-output-p *compile-object*))
(if (member name *fun-names-in-this-file* :test #'equal)
(warn 'duplicate-definition :name name)
- (push name *fun-names-in-this-file*))))
+ (push name *fun-names-in-this-file*)))
+ (%set-inline-expansion name defined-fun inline-lambda))
(become-defined-fun-name name)
- (cond (lambda-with-lexenv
- (setf (info :function :inline-expansion-designator name)
- lambda-with-lexenv)
- (when defined-fun
- (setf (defined-fun-inline-expansion defined-fun)
- lambda-with-lexenv)))
- (t
- (clear-info :function :inline-expansion-designator name)))
-
;; 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
projects / sbcl.git / blobdiff