projects
/
uffi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9431: revert to previous handling arrays on sbcl/cmu
[uffi.git]
/
tests
/
arrays.lisp
diff --git
a/tests/arrays.lisp
b/tests/arrays.lisp
index 1775f52ba3b38c45e0da0c5a111f06c97e8f8263..4d6afb478f002cf0dccd2a8b2652a1a579db2f02 100644
(file)
--- a/
tests/arrays.lisp
+++ b/
tests/arrays.lisp
@@
-7,18
+7,16
@@
;;;; Author: Kevin M. Rosenberg
;;;; Date Started: Mar 2002
;;;;
;;;; Author: Kevin M. Rosenberg
;;;; Date Started: Mar 2002
;;;;
-;;;; $Id
: arrays.lisp,v 1.3 2003/04/30 13:48:34 kevin Exp
$
+;;;; $Id$
;;;;
;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002
-2003
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 :uffi-tests)
+(in-package
#
:uffi-tests)
-(uffi:def-constant +column-length+ 10)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (uffi:def-constant +column-length+ 10))
(uffi:def-constant +row-length+ 10)
(uffi:def-foreign-type long-ptr '(* :long))
(uffi:def-constant +row-length+ 10)
(uffi:def-foreign-type long-ptr '(* :long))
@@
-31,30
+29,29
@@
(dotimes (i +column-length+)
(push (uffi:deref-array a '(:array :long) i) results))
(uffi:free-foreign-object a)
(dotimes (i +column-length+)
(push (uffi:deref-array a '(:array :long) i) results))
(uffi:free-foreign-object a)
-
results
)
+
(nreverse results)
)
(0 1 4 9 16 25 36 49 64 81))
(0 1 4 9 16 25 36 49 64 81))
-
(deftest array.2
(deftest array.2
- (let ((a (uffi:allocate-foreign-object '
long-ptr
+row-length+))
+ (let ((a (uffi:allocate-foreign-object '
(:array :long #.+column-length+)
+row-length+))
(results nil))
(dotimes (r +row-length+)
(declare (fixnum r))
(results nil))
(dotimes (r +row-length+)
(declare (fixnum r))
- (setf (uffi:deref-array a '(:array (
* :long
)) r)
-
(uffi:allocate-foreign-object :long
+column-length+))
- (let ((col (uffi:deref-array a '(:array (
* :long
)) r)))
+ (setf (uffi:deref-array a '(:array (
:array :long #.+column-length+
)) r)
+
(uffi:allocate-foreign-object :long #.
+column-length+))
+ (let ((col (uffi:deref-array a '(:array (
:array :long #.+column-length+
)) r)))
(dotimes (c +column-length+)
(declare (fixnum c))
(dotimes (c +column-length+)
(declare (fixnum c))
- (setf (uffi:deref-array col '(:array :long) c) (+ (* r +column-length+) c)))))
+ (setf (uffi:deref-array col '(:array :long
#.+column-length+
) c) (+ (* r +column-length+) c)))))
(dotimes (r +row-length+)
(declare (fixnum r))
(dotimes (r +row-length+)
(declare (fixnum r))
- (let ((col (uffi:deref-array a '(:array (
* :long
)) r)))
+ (let ((col (uffi:deref-array a '(:array (
:array :long #.+column-length+
)) r)))
(dotimes (c +column-length+)
(declare (fixnum c))
(dotimes (c +column-length+)
(declare (fixnum c))
- (push (uffi:deref-array col '(:array :long) c) results))))
+ (push (uffi:deref-array col '(:array :long
#.+column-length+
) c) results))))
(uffi:free-foreign-object a)
(uffi:free-foreign-object a)
-
results
)
+
(nreverse results)
)
(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99))
(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99))