0.8.2.4:

[sbcl.git] / src / compiler / knownfun.lisp

diff --git a/src/compiler/knownfun.lisp b/src/compiler/knownfun.lisp
index e47a03a..8d96138 100644 (file)
--- a/src/compiler/knownfun.lisp
+++ b/src/compiler/knownfun.lisp
@@ -116,6 +116,8 @@
   (predicate-type nil :type (or ctype null)))
 
 (defprinter (fun-info)
+  (attributes :test (not (zerop attributes))
+              :prin1 (decode-ir1-attributes attributes))
   (transforms :test transforms)
   (derive-type :test derive-type)
   (optimizer :test optimizer)
@@ -161,12 +163,14 @@
                              (string-equal (transform-note x) note)
                              (eq (transform-important x) important)))
                       (fun-info-transforms info))))
-    (if old
-       (setf (transform-function old) fun
-             (transform-note old) note)
-       (push (make-transform :type ctype :function fun :note note
-                             :important important)
-             (fun-info-transforms info)))
+    (cond (old
+           (style-warn "Overwriting ~S" old)
+           (setf (transform-function old) fun
+                 (transform-note old) note))
+          (t
+           (push (make-transform :type ctype :function fun :note note
+                                 :important important)
+                 (fun-info-transforms info))))
     name))
 
 ;;; Make a FUN-INFO structure with the specified type, attributes
@@ -258,7 +262,7 @@
                (when (csubtypep type ltype)
                  ltype))))))))
 
-;;; Derive the type to be the type specifier which is the N'th arg.
+;;; Derive the type to be the type specifier which is the Nth arg.
 (defun result-type-specifier-nth-arg (n)
   (lambda (call)
     (declare (type combination call))
@@ -266,4 +270,44 @@
       (when (and cont (constant-continuation-p cont))
        (careful-specifier-type (continuation-value cont))))))
 
+;;; Derive the type to be the type specifier which is the Nth arg,
+;;; with the additional restriptions noted in the CLHS for STRING and
+;;; SIMPLE-STRING, defined to specialize on CHARACTER, and for VECTOR
+;;; (under the page for MAKE-SEQUENCE).
+(defun creation-result-type-specifier-nth-arg (n)
+  (lambda (call)
+    (declare (type combination call))
+    (let ((cont (nth (1- n) (combination-args call))))
+      (when (and cont (constant-continuation-p cont))
+       (let* ((specifier (continuation-value cont))
+              (lspecifier (if (atom specifier) (list specifier) specifier)))
+         (cond
+           ((eq (car lspecifier) 'string)
+            (destructuring-bind (string &rest size)
+                lspecifier
+              (declare (ignore string))
+              (careful-specifier-type
+               `(vector character ,@(when size size)))))
+           ((eq (car lspecifier) 'simple-string)
+            (destructuring-bind (simple-string &rest size)
+                lspecifier
+              (declare (ignore simple-string))
+              (careful-specifier-type
+               `(simple-array character ,@(if size (list size) '((*)))))))
+           (t
+            (let ((ctype (careful-specifier-type specifier)))
+              (if (and (array-type-p ctype)
+                       (eq (array-type-specialized-element-type ctype)
+                           *wild-type*))
+                  ;; I don't think I'm allowed to modify what I get
+                  ;; back from SPECIFIER-TYPE; it is, after all,
+                  ;; cached.  Better copy it, then.
+                  (let ((real-ctype (copy-structure ctype)))
+                    (setf (array-type-element-type real-ctype)
+                          *universal-type*
+                          (array-type-specialized-element-type real-ctype)
+                          *universal-type*)
+                    real-ctype)
+                  ctype)))))))))
+
 (/show0 "knownfun.lisp end of file")