Changeset 12098

Timestamp:

08/13/09 13:14:58 (14 years ago)

Author:

ehuelsmann

Message:

Structure access referential integrity checks.

Pointed out by piso.

File:

• trunk/abcl/src/org/armedbear/lisp/defstruct.lisp (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/defstruct.lisp

@@ -345 +345 @@
           (t
            `((declaim (ftype (function * ,type) ,accessor-name))
-             (defun ,accessor-name (instance) (structure-ref instance ,index))
+             (defun ,accessor-name (instance)
+               (structure-ref (the ',*dd-name* instance) ,index))
              (define-source-transform ,accessor-name (instance)
                ,(if (eq type 't)
-                    ``(structure-ref ,instance ,,index)
-                    ``(the ,',type (structure-ref ,instance ,,index)))))))))
+                    ``(structure-ref (the ,',*dd-name* ,instance) ,,index)
+                    ``(the ,',type
+                        (structure-ref (the ,',*dd-name* ,instance) ,,index)))))))))
 
 (defun define-writer (slot)
@@ -369 +371 @@
           (t
            `((defun (setf ,accessor-name) (value instance)
-               (structure-set instance ,index value))
+               (structure-set (the ',*dd-name* instance) ,index value))
              (define-source-transform (setf ,accessor-name) (value instance)
-               `(structure-set ,instance ,,index ,value)))))))
+               `(structure-set (the ,',*dd-name* ,instance)
+                               ,,index ,value)))))))
 
 (defun define-access-functions ()