X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fglobaldb.lisp;h=b7d8630d68248836a7cf1b3a5a7cc070eda9f6c3;hb=16a6592367eec7c5e9da668ec42fd260e7705b0c;hp=70aefce8fae05d676650cc2c9ae46e7a1762f649;hpb=cfff13b268daf51fd05214b60e67a2b62f340d16;p=sbcl.git

diff --git a/src/compiler/globaldb.lisp b/src/compiler/globaldb.lisp
index 70aefce..b7d8630 100644
--- a/src/compiler/globaldb.lisp
+++ b/src/compiler/globaldb.lisp
@@ -162,9 +162,11 @@
   ;; a number that uniquely identifies this type (and implicitly its class)
   (number (missing-arg) :type type-number)
   ;; a type specifier which info of this type must satisfy
-  (type nil :type t)
+  (type nil :type t)  
   ;; a function called when there is no information of this type
-  (default (lambda () (error "type not defined yet")) :type function))
+  (default (lambda () (error "type not defined yet")) :type function)
+  ;; called by (SETF INFO) before calling SET-INFO-VALUE
+  (validate-function nil :type (or function null)))
 
 ;;; a map from class names to CLASS-INFO structures
 ;;;
@@ -277,6 +279,7 @@
     define-info-type (&key (class (missing-arg))
 			   (type (missing-arg))
 			   (type-spec (missing-arg))
+			   (validate-function)
 			   default)
   (declare (type keyword class type))
   `(progn
@@ -304,6 +307,8 @@
        ;; values differ in the use of SB!XC symbols instead of CL
        ;; symbols.)
        (push `(let ((type-info (type-info-or-lose ,',class ,',type)))
+	        (setf (type-info-validate-function type-info)
+		      ,',validate-function)
 		(setf (type-info-default type-info)
 		       ;; FIXME: This code is sort of nasty. It would
 		       ;; be cleaner if DEFAULT accepted a real
@@ -372,7 +377,7 @@
 		(n-info-types '*info-types*))
       `(dotimes (,n-index (length ,n-table))
 	 (declare (type index ,n-index))
-	 (block ,PUNT
+	 (block ,punt
 	   (let ((,name-var (svref ,n-table ,n-index)))
 	     (unless (eql ,name-var 0)
 	       (do-anonymous ((,n-type (aref ,n-entries-index ,n-index)
@@ -394,7 +399,7 @@
 			     ,@body
 			     (unless (zerop (logand ,n-info
 						    compact-info-entry-last))
-			       (return-from ,PUNT))))))))))))))
+			       (return-from ,punt))))))))))))))
 
 ;;; Return code to iterate over a volatile info environment.
 (defun do-volatile-info (name-var class-var type-var type-number-var value-var
@@ -845,6 +850,8 @@
 		    &optional (env-list nil env-list-p))
   (let* ((info (type-info-or-lose class type))
 	 (tin (type-info-number info)))
+    (when (type-info-validate-function info)
+      (funcall (type-info-validate-function info) name new-value))
     (if env-list-p
 	(set-info-value name
 			tin
@@ -1220,7 +1227,13 @@
   :type :kind
   :type-spec (member :primitive :defined :instance
 		     :forthcoming-defclass-type nil)
-  :default nil)
+  :default nil
+  :validate-function (lambda (name new-value)
+		       (declare (ignore new-value)
+				(notinline info))
+		       (when (info :declaration :recognized name)
+			 (error 'declaration-type-conflict-error
+				:format-arguments (list name)))))
 
 ;;; the expander function for a defined type
 (define-info-type
@@ -1278,12 +1291,23 @@
   :type :info
   :type-spec t
   :default nil)
+(define-info-type
+  :class :typed-structure 
+  :type :documentation
+  :type-spec (or string null)
+  :default nil)
 
 (define-info-class :declaration)
 (define-info-type
   :class :declaration
   :type :recognized
-  :type-spec boolean)
+  :type-spec boolean
+  :validate-function (lambda (name new-value)
+		       (declare (ignore new-value)
+				(notinline info))
+		       (when (info :type :kind name)
+			 (error 'declaration-type-conflict-error
+				:format-arguments (list name)))))
 
 (define-info-class :alien-type)
 (define-info-type