Changeset 404

Timestamp:

Jan 25, 2004, 2:15:36 PM (21 years ago)

Author:

Gary Byers

Message:

Start to make RLET assert foreign-type ordinals, then give up on the idea.
(FOREIGN-TYPES would need to work earlier in the cold load than they do.)

File:

• trunk/ccl/lib/macros.lisp (modified) (3 diffs)

trunk/ccl/lib/macros.lisp

@@ -2530 +2530 @@
       (if (typep ftype 'foreign-record-type)
         (setq result (nconc result (%foreign-record-field-forms name ftype record-name inits)))
-        (when inits
-          (if (and ftype (null (cdr inits)))
+        (progn
+          ;(setq result (nconc result `((%assert-macptr-ftype ,name ,ftype))))
+          (when inits
+            (if (and ftype (null (cdr inits)))
               (setq result
                     (nconc result
@@ -2537 +2539 @@
                               ,(car inits)))))
               (error "Unexpected or malformed initialization forms: ~s in field type: ~s"
-                     inits record-name)))))))
+                     inits record-name))))))))
 
 (defun %foreign-record-field-forms (ptr record-type record-name inits)
@@ -2545 +2547 @@
   (let* ((result ()))
     (do* ()
-         ((null inits) (nreverse result))
+         ((null inits)
+          `((progn
+              ;(%assert-macptr-ftype ,ptr ,record-type)
+              ,@(nreverse result))))
       (let* ((accessor (decompose-record-accessor (pop inits)))
              (valform (pop inits)))