X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=examples%2Farrays.lisp;h=7e5c7bdf18e1e818eac7c64f0e8a24eeca12a1ce;hb=54929de80ac68bb7ef45a28e70945c7243d39c82;hp=ed8046284589a0155aa855e65a4caa53a8d205d6;hpb=ebedde4e67b858b1f65c5eb4dc7bc45978ed1e40;p=uffi.git diff --git a/examples/arrays.lisp b/examples/arrays.lisp index ed80462..7e5c7bd 100644 --- a/examples/arrays.lisp +++ b/examples/arrays.lisp @@ -9,11 +9,8 @@ ;;;; ;;;; $Id$ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg ;;;; -;;;; UFFI users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;; ************************************************************************* (in-package :cl-user) @@ -21,7 +18,7 @@ (uffi:def-constant +column-length+ 10) (uffi:def-constant +row-length+ 10) -(uffi:def-foreign-type long-ptr '(* :long)) +(uffi:def-foreign-type long-ptr (* :long)) (defun test-array-1d () "Tests vector" @@ -39,20 +36,20 @@ (dotimes (r +row-length+) (declare (fixnum r)) (setf (uffi:deref-array a '(:array (* :long)) r) - (uffi:allocate-foreign-object :long +column-length+)) + (uffi:allocate-foreign-object :long +column-length+)) (let ((col (uffi:deref-array a '(:array (* :long)) r))) - (dotimes (c +column-length+) - (declare (fixnum c)) - (setf (uffi:deref-array col '(:array :long) c) (+ (* r +column-length+) c))))) + (dotimes (c +column-length+) + (declare (fixnum c)) + (setf (uffi:deref-array col '(:array :long) c) (+ (* r +column-length+) c))))) (dotimes (r +row-length+) (declare (fixnum r)) (format t "~&Row ~D: " r) (let ((col (uffi:deref-array a '(:array (* :long)) r))) - (dotimes (c +column-length+) - (declare (fixnum c)) - (let ((result (uffi:deref-array col '(:array :long) c))) - (format t "~d " result))))) + (dotimes (c +column-length+) + (declare (fixnum c)) + (let ((result (uffi:deref-array col '(:array :long) c))) + (format t "~d " result))))) (uffi:free-foreign-object a)) (values))