-;; Simple first pass. Will later create optimized routines for
-;; various platforms.
-(defmacro with-foreign-object ((var type &rest etc) &rest body)
- (let ((result (gensym)))
- `(let* ((,var (allocate-foreign-object ,type ,@etc))
- (,result (progn ,@body)))
- (free-foreign-object ,var)
- ,result)))
+;; TYPE is evaluated.
+(defmacro with-foreign-object ((var type) &rest body)
+ #-(or cmu lispworks) ; default version
+ `(let ((,var (allocate-foreign-object ,type)))
+ (unwind-protect
+ (progn ,@body)
+ (free-foreign-object ,var)))
+ #+cmu
+ (let ((obj (gensym)))
+ `(alien:with-alien ((,obj ,(convert-from-uffi-type (eval type) :allocate)))
+ (let ((,var (alien:addr ,obj)))
+ ,@body)))
+ #+lispworks
+ `(fli:with-dynamic-foreign-objects ((,var ,(convert-from-uffi-type
+ (eval type) :allocate)))
+ ,@body)
+ )
+