(kind (first form))
(args (rest form)))
(case kind
- (special
+ ((special global)
+ (flet ((make-special (name old)
+ (unless (member old '(:special :unknown))
+ (error "Cannot proclaim a ~(~A~) variable special: ~S" old name))
+ (with-single-package-locked-error
+ (:symbol name "globally declaring ~A special")
+ (setf (info :variable :kind name) :special)))
+ (make-global (name old)
+ (unless (member old '(:global :unknown))
+ (error "Cannot proclaim a ~(~A~) variable global: ~S" old name))
+ (with-single-package-locked-error
+ (:symbol name "globally declaring ~A global")
+ (setf (info :variable :kind name) :global))))
+ (let ((fun (if (eq 'special kind) #'make-special #'make-global)))
+ (dolist (name args)
+ (unless (symbolp name)
+ (error "Can't declare a non-symbol as ~S: ~S" kind name))
+ (funcall fun name (info :variable :kind name))))))
+ (always-bound
(dolist (name args)
(unless (symbolp name)
- (error "can't declare a non-symbol as SPECIAL: ~S" name))
+ (error "Can't proclaim a non-symbol as ~S: ~S" kind name))
+ (unless (boundp name)
+ (error "Can't proclaim an unbound symbol as ~S: ~S" kind name))
+ (when (eq :constant (info :variable :kind name))
+ (error "Can't proclaim a constant variable as ~S: ~S" kind name))
(with-single-package-locked-error
- (:symbol name "globally declaring ~A special")
- (about-to-modify-symbol-value name "proclaim ~S as SPECIAL")
- (setf (info :variable :kind name) :special))))
+ (:symbol name "globally declaring ~A always bound")
+ (setf (info :variable :always-bound name) t))))
(type
(if *type-system-initialized*
(let ((type (specifier-type (first args))))
(when (type/= type old-type)
;; FIXME: changing to TYPE-PROCLAMATION-MISMATCH
;; broke late-proclaim.lisp.
- (style-warn "The new TYPE proclamation~% ~S~@
- for ~S does not match the old TYPE~@
- proclamation ~S"
- type name old-type))))
+ (style-warn
+ "~@<new TYPE proclamation for ~S~@:_ ~S~@:_~
+ does not match the old TYPE proclamation:~@:_ ~S~@:>"
+ name (type-specifier type) (type-specifier old-type)))))
(setf (info :variable :type name) type)
(setf (info :variable :where-from name) :declared)))
(push raw-form *queued-proclaims*)))
;; FIXME: changing to FTYPE-PROCLAMATION-MISMATCH
;; broke late-proclaim.lisp.
(style-warn
- "new FTYPE proclamation~@
- ~S~@
- for ~S does not match old FTYPE proclamation~@
- ~S"
- ctype name old-type))))
+ "~@<new FTYPE proclamation for ~S~@:_ ~S~@:_~
+ does not match the old FTYPE proclamation:~@:_ ~S~@:>"
+ name (type-specifier ctype) (type-specifier old-type)))))
;; Now references to this function shouldn't be warned
;; about as undefined, since even if we haven't seen a