Changeset 5863

Timestamp:

Feb 2, 2007, 1:27:51 AM (18 years ago)

Author:

Gary Byers

Message:

Try to fix another case involving "auxiliary types".

I think that the concept of auxiliary types might make sense in a context
like:

(def-foreign-type nil

(:struct :foo

(:a :int)
(:b (:struct :bar (:x :int) (:y :int)))))

In that case, :struct :bar is local to the definition. In the similar
case:

(def-foreign-type nil

(:struct :foo

(:a :int)
(:b (:struct :bar))))

:BAR is presumably defined (globally) elsewhere.

File:

• trunk/ccl/lib/foreign-types.lisp (modified) (1 diff)

trunk/ccl/lib/foreign-types.lisp

@@ -984 +984 @@
 (defun parse-foreign-record-type (kind name fields)
   (if fields
-      (let* ((old (and name (auxiliary-foreign-type kind name)))
-             (result (if (or (null old)
-                             (foreign-record-type-fields old))
-                         (make-foreign-record-type :name name :kind kind)
-                         old)))
-        (when (and name (not (eq old result)))
-          (setf (auxiliary-foreign-type kind name) result))
-        (parse-foreign-record-fields result fields)
-        result)
-      (if name
-          (or (auxiliary-foreign-type kind name)
-              (setf (auxiliary-foreign-type kind name)
-                    (make-foreign-record-type :name name :kind kind)))
-          (make-foreign-record-type :kind kind))))
+    (let* ((old (and name (auxiliary-foreign-type kind name)))
+           (result (or old
+                       (make-foreign-record-type :name name :kind kind))))
+      (when (and name (not (eq old result)))
+        (setf (auxiliary-foreign-type kind name) result))
+      (parse-foreign-record-fields result fields)
+      result)
+    (if name
+      (or (auxiliary-foreign-type kind name)
+          (setf (auxiliary-foreign-type kind name)
+                (make-foreign-record-type :name name :kind kind)))
+      (make-foreign-record-type :kind kind))))
 
 ;;; PARSE-FOREIGN-RECORD-FIELDS -- internal