X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fctype.lisp;h=a67b43ff7c1894d146c91e35a166ace43ce6c941;hb=a4c3562138e342465826de31fb8c324ae8a4b594;hp=babda466e4cb8667615491a708687da49ff66bb9;hpb=bfa4310e41dcd011ca9d139f29be1c5757b41378;p=sbcl.git diff --git a/src/compiler/ctype.lisp b/src/compiler/ctype.lisp index babda46..a67b43f 100644 --- a/src/compiler/ctype.lisp +++ b/src/compiler/ctype.lisp @@ -212,7 +212,7 @@ (multiple-value-bind (res win) (ctypep val type) (cond ((not win) (note-unwinnage "can't tell whether the ~:R argument is a ~ - constant ~S:~% ~S" + constant ~S:~% ~S" n (type-specifier type) val) nil) ((not res) @@ -253,7 +253,7 @@ ((not (check-arg-type k (specifier-type 'symbol) n))) ((not (constant-lvar-p k)) (note-unwinnage "The ~:R argument (in keyword position) is not a ~ - constant." + constant." n)) (t (let* ((name (lvar-value k)) @@ -554,7 +554,7 @@ ((eq int *empty-type*) (note-lossage "Definition's declared type for variable ~A:~% ~S~@ - conflicts with this type from ~A:~% ~S" + conflicts with this type from ~A:~% ~S" (leaf-debug-name var) (type-specifier vtype) where (type-specifier type)) (return-from try-type-intersections (values nil nil))) @@ -606,7 +606,7 @@ (unless (eq x y) (note-lossage "The definition ~:[doesn't have~;has~] ~A, but ~ - ~A ~:[doesn't~;does~]." + ~A ~:[doesn't~;does~]." x what where y)))) (frob (optional-dispatch-keyp od) (fun-type-keyp type) "&KEY arguments") @@ -739,7 +739,7 @@ type-returns))) (note-lossage "The result type from ~A:~% ~S~@ - conflicts with the definition's result type:~% ~S" + conflicts with the definition's result type:~% ~S" where (type-specifier type-returns) (type-specifier dtype)) nil) (*lossage-detected* nil) @@ -755,8 +755,8 @@ (not (csubtypep (leaf-type var) type))) (funcall unwinnage-fun "Assignment to argument: ~S~% ~ - prevents use of assertion from function ~ - type ~A:~% ~S~%" + prevents use of assertion from function ~ + type ~A:~% ~S~%" (leaf-debug-name var) where (type-specifier type))))