[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-199-gfb7dd
|
From: |
Andy Wingo |
|
Subject: |
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-199-gfb7dd00 |
|
Date: |
Sat, 08 Feb 2014 13:28:45 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=fb7dd00169304a5922838e4d2f25253640a35def
The branch, stable-2.0 has been updated
via fb7dd00169304a5922838e4d2f25253640a35def (commit)
via dc65b88d839c326889618112c4870ad3a64e9446 (commit)
via b9b88351ea2c4b43a6f90938554dc5693b17e328 (commit)
from 0ce224594ae5a673f6a397c284db5f5a61935334 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fb7dd00169304a5922838e4d2f25253640a35def
Author: Andy Wingo <address@hidden>
Date: Sat Feb 8 14:18:40 2014 +0100
Deprecate general "uniform-vector" interface
* libguile/uniform.h:
* libguile/uniform.c (scm_is_uniform_vector, scm_uniform_vector_p)
(scm_c_uniform_vector_length, scm_uniform_vector_length)
(scm_uniform_vector_element_type, scm_uniform_vector_element_size)
(scm_c_uniform_vector_ref, scm_uniform_vector_ref):
(scm_c_uniform_vector_set_x, scm_uniform_vector_set_x):
(scm_uniform_vector_to_list)
(scm_uniform_vector_elements, scm_uniform_vector_writable_elements):
Deprecate. This interface lacked both generality and specificity.
The general replacement is array-length, array-ref, and friends on the
scheme side, or the array handle interface on the C side. On the
specific side of things, there are the specific bytevector, srfi-4,
and bitvector interfaces.
* test-suite/tests/arrays.test:
* test-suite/tests/bitvectors.test:
* test-suite/tests/ports.test:
* test-suite/tests/srfi-4.test: Update to use array interfaces.
* doc/ref/api-foreign.texi (Void Pointers and Byte Access):
* doc/ref/srfi-modules.texi (SRFI-4): Update.
commit dc65b88d839c326889618112c4870ad3a64e9446
Author: Andy Wingo <address@hidden>
Date: Sat Feb 8 13:52:21 2014 +0100
Simplify srfi-4 C implementation
* libguile/srfi-4.c (DEFINE_SRFI_4_C_FUNCS): In the raw element
accessors (e.g scm_u32vector_writable_elements), only permit
bytevectors, as the constructors will only make bytevectors. This
harmonizes with the Scheme interfaces as well, which expect packed
bytevectors.
(scm_make_srfi_4_vector): Knowing that the new value is a bytevector
with base 0 and inc 1, simplify initialization.
commit b9b88351ea2c4b43a6f90938554dc5693b17e328
Author: Andy Wingo <address@hidden>
Date: Sat Feb 8 14:27:49 2014 +0100
Deprecate htons, htonl, ntohs, ntohl
* libguile/sockets.h:
* libguile/sockets.c:
* libguile/deprecated.h:
* libguile/deprecated.c (scm_htons, scm_htonl, scm_ntohs, scm_ntohl):
Deprecate. Bytevectors adequately subsume their functionality.
* doc/ref/posix.texi:
* test-suite/tests/00-socket.test: Update.
-----------------------------------------------------------------------
Summary of changes:
doc/ref/api-foreign.texi | 12 +++----
doc/ref/posix.texi | 51 +----------------------------
doc/ref/srfi-modules.texi | 60 ---------------------------------
libguile/deprecated.c | 65 +++++++++++++++++++++++++++++++++++-
libguile/deprecated.h | 9 ++++-
libguile/socket.c | 46 +-------------------------
libguile/socket.h | 6 +---
libguile/srfi-4.c | 68 ++++++++++++++------------------------
libguile/uniform.c | 59 ++++++++++++++++++++++++++++++++-
libguile/uniform.h | 54 +++++++++++++++++-------------
test-suite/tests/00-socket.test | 44 +------------------------
test-suite/tests/arrays.test | 19 +++-------
test-suite/tests/bitvectors.test | 19 +++++-----
test-suite/tests/ports.test | 4 +-
test-suite/tests/srfi-4.test | 50 ++++++++++++++--------------
15 files changed, 236 insertions(+), 330 deletions(-)
diff --git a/doc/ref/api-foreign.texi b/doc/ref/api-foreign.texi
index e595668..381c10d 100644
--- a/doc/ref/api-foreign.texi
+++ b/doc/ref/api-foreign.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual.
@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2007, 2008,
address@hidden 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
address@hidden 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation,
Inc.
@c See the file guile.texi for copying conditions.
@node Foreign Function Interface
@@ -613,12 +613,10 @@ Scheme objects such as strings, floating point numbers,
or integers.
Return a bytevector aliasing the @var{len} bytes pointed to by
@var{pointer}.
-The user may specify an alternate default interpretation for
-the memory by passing the @var{uvec_type} argument, to indicate
-that the memory is an array of elements of that type.
address@hidden should be something that
address@hidden would return, like @code{f32}
-or @code{s16}.
+The user may specify an alternate default interpretation for the memory
+by passing the @var{uvec_type} argument, to indicate that the memory is
+an array of elements of that type. @var{uvec_type} should be something
+that @code{array-type} would return, like @code{f32} or @code{s16}.
When @var{offset} is passed, it specifies the offset in bytes relative
to @var{pointer} of the memory region aliased by the returned
diff --git a/doc/ref/posix.texi b/doc/ref/posix.texi
index 56f5c78..7ca2fb0 100644
--- a/doc/ref/posix.texi
+++ b/doc/ref/posix.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual.
@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2006, 2007,
address@hidden 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation,
Inc.
address@hidden 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software
Foundation, Inc.
@c See the file guile.texi for copying conditions.
@node POSIX
@@ -3392,55 +3392,6 @@ file descriptor:
any unflushed buffered port data is ignored.
@end deffn
-The following functions can be used to convert short and long integers
-between ``host'' and ``network'' order. Although the procedures above do
-this automatically for addresses, the conversion will still need to
-be done when sending or receiving encoded integer data from the network.
-
address@hidden {Scheme Procedure} htons value
address@hidden {C Function} scm_htons (value)
-Convert a 16 bit quantity from host to network byte ordering.
address@hidden is packed into 2 bytes, which are then converted
-and returned as a new integer.
address@hidden deffn
-
address@hidden {Scheme Procedure} ntohs value
address@hidden {C Function} scm_ntohs (value)
-Convert a 16 bit quantity from network to host byte ordering.
address@hidden is packed into 2 bytes, which are then converted
-and returned as a new integer.
address@hidden deffn
-
address@hidden {Scheme Procedure} htonl value
address@hidden {C Function} scm_htonl (value)
-Convert a 32 bit quantity from host to network byte ordering.
address@hidden is packed into 4 bytes, which are then converted
-and returned as a new integer.
address@hidden deffn
-
address@hidden {Scheme Procedure} ntohl value
address@hidden {C Function} scm_ntohl (value)
-Convert a 32 bit quantity from network to host byte ordering.
address@hidden is packed into 4 bytes, which are then converted
-and returned as a new integer.
address@hidden deffn
-
-These procedures are inconvenient to use at present, but consider:
-
address@hidden
-(define write-network-long
- (lambda (value port)
- (let ((v (make-uniform-vector 1 1 0)))
- (uniform-vector-set! v 0 (htonl value))
- (uniform-vector-write v port))))
-
-(define read-network-long
- (lambda (port)
- (let ((v (make-uniform-vector 1 1 0)))
- (uniform-vector-read! v port)
- (ntohl (uniform-vector-ref v 0)))))
address@hidden example
-
@node Internet Socket Examples
@subsubsection Network Socket Examples
diff --git a/doc/ref/srfi-modules.texi b/doc/ref/srfi-modules.texi
index 59059c7..98ce104 100644
--- a/doc/ref/srfi-modules.texi
+++ b/doc/ref/srfi-modules.texi
@@ -1345,7 +1345,6 @@ C had modules!)
@menu
* SRFI-4 Overview:: The warp and weft of uniform numeric vectors.
* SRFI-4 API:: Uniform vectors, from Scheme and from C.
-* SRFI-4 Generic Operations:: The general, operating on the specific.
* SRFI-4 and Bytevectors:: SRFI-4 vectors are backed by bytevectors.
* SRFI-4 Extensions:: Guile-specific extensions to the standard.
@end menu
@@ -1730,65 +1729,6 @@ C}), but returns a pointer to the elements of a uniform
numeric vector
of the indicated kind.
@end deftypefn
address@hidden SRFI-4 Generic Operations
address@hidden SRFI-4 - Generic operations
-
-Guile also provides procedures that operate on all types of uniform numeric
-vectors. In what is probably a bug, these procedures are currently available
in
-the default environment as well; however prudent hackers will make sure to
-import @code{(srfi srfi-4 gnu)} before using these.
-
address@hidden {C Function} int scm_is_uniform_vector (SCM uvec)
-Return non-zero when @var{uvec} is a uniform numeric vector, zero
-otherwise.
address@hidden deftypefn
-
address@hidden {C Function} size_t scm_c_uniform_vector_length (SCM uvec)
-Return the number of elements of @var{uvec} as a @code{size_t}.
address@hidden deftypefn
-
address@hidden {Scheme Procedure} uniform-vector? obj
address@hidden {C Function} scm_uniform_vector_p (obj)
-Return @code{#t} if @var{obj} is a homogeneous numeric vector of the
-indicated type.
address@hidden deffn
-
address@hidden {Scheme Procedure} uniform-vector-length vec
address@hidden {C Function} scm_uniform_vector_length (vec)
-Return the number of elements in @var{vec}.
address@hidden deffn
-
address@hidden {Scheme Procedure} uniform-vector-ref vec i
address@hidden {C Function} scm_uniform_vector_ref (vec, i)
-Return the element at index @var{i} in @var{vec}. The first element
-in @var{vec} is index 0.
address@hidden deffn
-
address@hidden {Scheme Procedure} uniform-vector-set! vec i value
address@hidden {C Function} scm_uniform_vector_set_x (vec, i, value)
-Set the element at index @var{i} in @var{vec} to @var{value}. The
-first element in @var{vec} is index 0. The return value is
-unspecified.
address@hidden deffn
-
address@hidden {Scheme Procedure} uniform-vector->list vec
address@hidden {C Function} scm_uniform_vector_to_list (vec)
-Return a newly allocated list holding all elements of @var{vec}.
address@hidden deffn
-
address@hidden {C Function} {const void *} scm_uniform_vector_elements (SCM
vec, scm_t_array_handle *handle, size_t *lenp, ssize_t *incp)
-Like @code{scm_vector_elements} (@pxref{Vector Accessing from C}), but
-returns a pointer to the elements of a uniform numeric vector.
address@hidden deftypefn
-
address@hidden {C Function} {void *} scm_uniform_vector_writable_elements (SCM
vec, scm_t_array_handle *handle, size_t *lenp, ssize_t *incp)
-Like @code{scm_vector_writable_elements} (@pxref{Vector Accessing from
-C}), but returns a pointer to the elements of a uniform numeric vector.
address@hidden deftypefn
-
-Unless you really need to the limited generality of these functions, it
-is best to use the type-specific functions, or the array accessors.
-
@node SRFI-4 and Bytevectors
@subsubsection SRFI-4 - Relation to bytevectors
diff --git a/libguile/deprecated.c b/libguile/deprecated.c
index dee9ac3..7ff7b73 100644
--- a/libguile/deprecated.c
+++ b/libguile/deprecated.c
@@ -2,7 +2,7 @@
deprecate something, move it here when that is feasible.
*/
-/* Copyright (C) 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2012, 2013 Free
Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014
Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -2952,6 +2952,69 @@ SCM_DEFINE (scm_gc_live_object_stats,
"gc-live-object-stats", 0, 0, 0,
+SCM_DEFINE (scm_htons, "htons", 1, 0, 0,
+ (SCM value),
+ "Convert a 16 bit quantity from host to network byte ordering.\n"
+ "@var{value} is packed into 2 bytes, which are then converted\n"
+ "and returned as a new integer.")
+#define FUNC_NAME s_scm_htons
+{
+ scm_c_issue_deprecation_warning
+ ("htons is deprecated. Use bytevector-u16-set! and bytevector-u16-ref "
+ "with big endianness.");
+
+ return scm_from_ushort (htons (scm_to_ushort (value)));
+}
+#undef FUNC_NAME
+
+SCM_DEFINE (scm_ntohs, "ntohs", 1, 0, 0,
+ (SCM value),
+ "Convert a 16 bit quantity from network to host byte ordering.\n"
+ "@var{value} is packed into 2 bytes, which are then converted\n"
+ "and returned as a new integer.")
+#define FUNC_NAME s_scm_ntohs
+{
+ scm_c_issue_deprecation_warning
+ ("ntohs is deprecated. Use bytevector-u16-set! and bytevector-u16-ref "
+ "with big endianness.");
+
+ return scm_from_ushort (ntohs (scm_to_ushort (value)));
+}
+#undef FUNC_NAME
+
+SCM_DEFINE (scm_htonl, "htonl", 1, 0, 0,
+ (SCM value),
+ "Convert a 32 bit quantity from host to network byte ordering.\n"
+ "@var{value} is packed into 4 bytes, which are then converted\n"
+ "and returned as a new integer.")
+#define FUNC_NAME s_scm_htonl
+{
+ scm_c_issue_deprecation_warning
+ ("htonl is deprecated. Use bytevector-u32-set! and bytevector-u32-ref "
+ "with big endianness.");
+
+ return scm_from_ulong (htonl (scm_to_uint32 (value)));
+}
+#undef FUNC_NAME
+
+SCM_DEFINE (scm_ntohl, "ntohl", 1, 0, 0,
+ (SCM value),
+ "Convert a 32 bit quantity from network to host byte ordering.\n"
+ "@var{value} is packed into 4 bytes, which are then converted\n"
+ "and returned as a new integer.")
+#define FUNC_NAME s_scm_ntohl
+{
+ scm_c_issue_deprecation_warning
+ ("ntohl is deprecated. Use bytevector-u32-set! and bytevector-u32-ref "
+ "with big endianness.");
+
+ return scm_from_ulong (ntohl (scm_to_uint32 (value)));
+}
+#undef FUNC_NAME
+
+
+
+
void
scm_i_init_deprecated ()
{
diff --git a/libguile/deprecated.h b/libguile/deprecated.h
index cfbea6b..5f95f27 100644
--- a/libguile/deprecated.h
+++ b/libguile/deprecated.h
@@ -5,7 +5,7 @@
#ifndef SCM_DEPRECATED_H
#define SCM_DEPRECATED_H
-/* Copyright (C) 2003,2004, 2005, 2006, 2007, 2009, 2010, 2011, 2012, 2013
Free Software Foundation, Inc.
+/* Copyright (C) 2003,2004, 2005, 2006, 2007, 2009, 2010, 2011, 2012, 2013,
2014 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -865,6 +865,13 @@ SCM_DEPRECATED SCM scm_gc_live_object_stats (void);
+SCM_DEPRECATED SCM scm_htons (SCM in);
+SCM_DEPRECATED SCM scm_ntohs (SCM in);
+SCM_DEPRECATED SCM scm_htonl (SCM in);
+SCM_DEPRECATED SCM scm_ntohl (SCM in);
+
+
+
void scm_i_init_deprecated (void);
#endif
diff --git a/libguile/socket.c b/libguile/socket.c
index a0fb1a9..09f4831 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -1,5 +1,5 @@
/* Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
- * 2006, 2007, 2009, 2011, 2012, 2013 Free Software Foundation, Inc.
+ * 2006, 2007, 2009, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -92,50 +92,6 @@ typedef union
-SCM_DEFINE (scm_htons, "htons", 1, 0, 0,
- (SCM value),
- "Convert a 16 bit quantity from host to network byte ordering.\n"
- "@var{value} is packed into 2 bytes, which are then converted\n"
- "and returned as a new integer.")
-#define FUNC_NAME s_scm_htons
-{
- return scm_from_ushort (htons (scm_to_ushort (value)));
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_ntohs, "ntohs", 1, 0, 0,
- (SCM value),
- "Convert a 16 bit quantity from network to host byte ordering.\n"
- "@var{value} is packed into 2 bytes, which are then converted\n"
- "and returned as a new integer.")
-#define FUNC_NAME s_scm_ntohs
-{
- return scm_from_ushort (ntohs (scm_to_ushort (value)));
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_htonl, "htonl", 1, 0, 0,
- (SCM value),
- "Convert a 32 bit quantity from host to network byte ordering.\n"
- "@var{value} is packed into 4 bytes, which are then converted\n"
- "and returned as a new integer.")
-#define FUNC_NAME s_scm_htonl
-{
- return scm_from_ulong (htonl (scm_to_uint32 (value)));
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_ntohl, "ntohl", 1, 0, 0,
- (SCM value),
- "Convert a 32 bit quantity from network to host byte ordering.\n"
- "@var{value} is packed into 4 bytes, which are then converted\n"
- "and returned as a new integer.")
-#define FUNC_NAME s_scm_ntohl
-{
- return scm_from_ulong (ntohl (scm_to_uint32 (value)));
-}
-#undef FUNC_NAME
-
#ifdef HAVE_INET_NETOF
SCM_DEFINE (scm_inet_netof, "inet-netof", 1, 0, 0,
(SCM address),
diff --git a/libguile/socket.h b/libguile/socket.h
index fcddd78..a211867 100644
--- a/libguile/socket.h
+++ b/libguile/socket.h
@@ -3,7 +3,7 @@
#ifndef SCM_SOCKET_H
#define SCM_SOCKET_H
-/* Copyright (C) 1995,1996,1997,2000,2001, 2004, 2005, 2006, 2008 Free
Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,2000,2001, 2004, 2005, 2006, 2008, 2014 Free
Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -27,10 +27,6 @@
-SCM_API SCM scm_htons (SCM in);
-SCM_API SCM scm_ntohs (SCM in);
-SCM_API SCM scm_htonl (SCM in);
-SCM_API SCM scm_ntohl (SCM in);
SCM_API SCM scm_inet_aton (SCM address);
SCM_API SCM scm_inet_ntoa (SCM inetid);
SCM_API SCM scm_inet_netof (SCM address);
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index af8126d..7b25a3b 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -1,6 +1,6 @@
/* srfi-4.c --- Uniform numeric vector datatypes.
*
- * Copyright (C) 2001, 2004, 2006, 2009, 2010 Free Software Foundation,
Inc.
+ * Copyright (C) 2001, 2004, 2006, 2009, 2010, 2014 Free Software
Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -137,32 +137,15 @@
scm_t_array_handle *h, \
size_t *lenp, ssize_t *incp) \
{ \
- scm_uniform_vector_elements (uvec, h, lenp, incp); \
- if (h->element_type == ETYPE (TAG)) \
- return ((ctype*)h->writable_elements) + h->base*width; \
- /* otherwise... */ \
- else \
- { \
- size_t sfrom, sto, lfrom, lto; \
- if (h->dims != &h->dim0) \
- { \
- h->dim0 = h->dims[0]; \
- h->dims = &h->dim0; \
- } \
- sfrom = scm_i_array_element_type_sizes [h->element_type]; \
- sto = scm_i_array_element_type_sizes [ETYPE (TAG)]; \
- lfrom = h->dim0.ubnd - h->dim0.lbnd + 1; \
- lto = lfrom * sfrom / sto; \
- if (lto * sto != lfrom * sfrom) \
- { \
- scm_array_handle_release (h); \
- scm_wrong_type_arg (#tag"vector-elements", SCM_ARG1, uvec); \
- } \
- h->dim0.ubnd = h->dim0.lbnd + lto; \
- h->base = h->base * sto / sfrom; \
- h->element_type = ETYPE (TAG); \
- return ((ctype*)h->writable_elements) + h->base*width; \
- } \
+ if (!scm_is_bytevector (uvec) \
+ || (scm_c_bytevector_length (uvec) % width)) \
+ scm_wrong_type_arg_msg (NULL, 0, uvec, #tag "vector"); \
+ scm_array_get_handle (uvec, h); \
+ if (lenp) \
+ *lenp = scm_c_bytevector_length (uvec) / width; \
+ if (incp) \
+ *incp = 1; \
+ return ((ctype *)h->writable_elements); \
}
@@ -231,13 +214,15 @@ SCM_DEFINE (scm_make_srfi_4_vector, "make-srfi-4-vector",
2, 1, 0,
"Make a srfi-4 vector")
#define FUNC_NAME s_scm_make_srfi_4_vector
{
- int i;
- for (i = 0; i <= SCM_ARRAY_ELEMENT_TYPE_LAST; i++)
- if (scm_is_eq (type, scm_i_array_element_types[i]))
+ int c_type;
+ size_t c_len;
+
+ for (c_type = 0; c_type <= SCM_ARRAY_ELEMENT_TYPE_LAST; c_type++)
+ if (scm_is_eq (type, scm_i_array_element_types[c_type]))
break;
- if (i > SCM_ARRAY_ELEMENT_TYPE_LAST)
+ if (c_type > SCM_ARRAY_ELEMENT_TYPE_LAST)
scm_wrong_type_arg_msg (FUNC_NAME, SCM_ARG1, type, "vector type");
- switch (i)
+ switch (c_type)
{
case SCM_ARRAY_ELEMENT_TYPE_U8:
case SCM_ARRAY_ELEMENT_TYPE_S8:
@@ -252,7 +237,10 @@ SCM_DEFINE (scm_make_srfi_4_vector, "make-srfi-4-vector",
2, 1, 0,
case SCM_ARRAY_ELEMENT_TYPE_C32:
case SCM_ARRAY_ELEMENT_TYPE_C64:
{
- SCM ret = scm_i_make_typed_bytevector (scm_to_size_t (len), i);
+ SCM ret;
+
+ c_len = scm_to_size_t (len);
+ ret = scm_i_make_typed_bytevector (c_len, c_type);
if (SCM_UNBNDP (fill) || scm_is_eq (len, SCM_INUM0))
; /* pass */
@@ -262,17 +250,11 @@ SCM_DEFINE (scm_make_srfi_4_vector, "make-srfi-4-vector",
2, 1, 0,
else
{
scm_t_array_handle h;
- size_t len;
- ssize_t pos, inc;
-
- scm_uniform_vector_writable_elements (ret, &h, &len, &inc);
-
- for (pos = 0; pos != h.dims[0].ubnd; pos += inc)
- scm_array_handle_set (&h, pos, fill);
-
- /* Initialize the last element. */
- scm_array_handle_set (&h, pos, fill);
+ size_t i;
+ scm_array_get_handle (ret, &h);
+ for (i = 0; i < c_len; i++)
+ scm_array_handle_set (&h, i, fill);
scm_array_handle_release (&h);
}
return ret;
diff --git a/libguile/uniform.c b/libguile/uniform.c
index a58242d..53031a7 100644
--- a/libguile/uniform.c
+++ b/libguile/uniform.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006,
2009, 2010, 2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006,
2009, 2010, 2013, 2014 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -23,10 +23,13 @@
# include <config.h>
#endif
+#define SCM_BUILDING_DEPRECATED_CODE
+
#include "libguile/_scm.h"
#include "libguile/__scm.h"
#include "libguile/uniform.h"
+#include "libguile/deprecation.h"
const size_t scm_i_array_element_type_sizes[SCM_ARRAY_ELEMENT_TYPE_LAST + 1] =
{
@@ -81,12 +84,18 @@ scm_array_handle_uniform_writable_elements
(scm_t_array_handle *h)
return ret;
}
+#if SCM_ENABLE_DEPRECATED
+
int
scm_is_uniform_vector (SCM obj)
{
scm_t_array_handle h;
int ret = 0;
+ scm_c_issue_deprecation_warning
+ ("scm_is_uniform_vector is deprecated. "
+ "Use scm_is_bytevector || scm_is_bitvector instead.");
+
if (scm_is_generalized_vector (obj))
{
scm_generalized_vector_get_handle (obj, &h);
@@ -99,6 +108,10 @@ scm_is_uniform_vector (SCM obj)
size_t
scm_c_uniform_vector_length (SCM uvec)
{
+ scm_c_issue_deprecation_warning
+ ("scm_c_uniform_vector_length is deprecated. "
+ "Use scm_c_array_length instead.");
+
if (!scm_is_uniform_vector (uvec))
scm_wrong_type_arg_msg ("uniform-vector-length", 1, uvec,
"uniform vector");
@@ -111,6 +124,10 @@ SCM_DEFINE (scm_uniform_vector_p, "uniform-vector?", 1, 0,
0,
"Return @code{#t} if @var{obj} is a uniform vector.")
#define FUNC_NAME s_scm_uniform_vector_p
{
+ scm_c_issue_deprecation_warning
+ ("uniform-vector? is deprecated. Use bytevector? and bitvector?, or "
+ "use array-type and array-rank instead.");
+
return scm_from_bool (scm_is_uniform_vector (obj));
}
#undef FUNC_NAME
@@ -123,6 +140,9 @@ SCM_DEFINE (scm_uniform_vector_element_type,
"uniform-vector-element-type", 1, 0
scm_t_array_handle h;
SCM ret;
+ scm_c_issue_deprecation_warning
+ ("uniform-vector-element-type is deprecated. Use array-type instead.");
+
if (!scm_is_uniform_vector (v))
scm_wrong_type_arg_msg (FUNC_NAME, SCM_ARG1, v, "uniform vector");
scm_array_get_handle (v, &h);
@@ -142,6 +162,11 @@ SCM_DEFINE (scm_uniform_vector_element_size,
"uniform-vector-element-size", 1, 0
size_t len;
ssize_t inc;
SCM ret;
+
+ scm_c_issue_deprecation_warning
+ ("uniform-vector-element-size is deprecated. Instead, treat the "
+ "uniform vector as a bytevector.");
+
scm_uniform_vector_elements (v, &h, &len, &inc);
ret = scm_from_size_t (scm_array_handle_uniform_element_size (&h));
scm_array_handle_release (&h);
@@ -152,6 +177,9 @@ SCM_DEFINE (scm_uniform_vector_element_size,
"uniform-vector-element-size", 1, 0
SCM
scm_c_uniform_vector_ref (SCM v, size_t idx)
{
+ scm_c_issue_deprecation_warning
+ ("scm_c_uniform_vector_ref is deprecated. Use scm_c_array_ref_1
instead.");
+
if (!scm_is_uniform_vector (v))
scm_wrong_type_arg_msg (NULL, 0, v, "uniform vector");
return scm_c_generalized_vector_ref (v, idx);
@@ -163,6 +191,9 @@ SCM_DEFINE (scm_uniform_vector_ref, "uniform-vector-ref",
2, 0, 0,
"homogeneous numeric vector @var{v}.")
#define FUNC_NAME s_scm_uniform_vector_ref
{
+ scm_c_issue_deprecation_warning
+ ("uniform-vector-ref is deprecated. Use array-ref instead.");
+
return scm_c_uniform_vector_ref (v, scm_to_size_t (idx));
}
#undef FUNC_NAME
@@ -170,6 +201,10 @@ SCM_DEFINE (scm_uniform_vector_ref, "uniform-vector-ref",
2, 0, 0,
void
scm_c_uniform_vector_set_x (SCM v, size_t idx, SCM val)
{
+ scm_c_issue_deprecation_warning
+ ("scm_c_uniform_vector_set_x is deprecated. Instead, use "
+ "scm_c_array_set_1_x, but note the change in the order of the
arguments.");
+
if (!scm_is_uniform_vector (v))
scm_wrong_type_arg_msg (NULL, 0, v, "uniform vector");
scm_c_generalized_vector_set_x (v, idx, val);
@@ -181,6 +216,10 @@ SCM_DEFINE (scm_uniform_vector_set_x,
"uniform-vector-set!", 3, 0, 0,
"homogeneous numeric vector @var{v} to @var{val}.")
#define FUNC_NAME s_scm_uniform_vector_set_x
{
+ scm_c_issue_deprecation_warning
+ ("uniform-vector-set! is deprecated. Instead, use array-set!, "
+ "but note the change in the order of the arguments.");
+
scm_c_uniform_vector_set_x (v, scm_to_size_t (idx), val);
return SCM_UNSPECIFIED;
}
@@ -191,6 +230,9 @@ SCM_DEFINE (scm_uniform_vector_to_list,
"uniform-vector->list", 1, 0, 0,
"Convert the uniform numeric vector @var{uvec} to a list.")
#define FUNC_NAME s_scm_uniform_vector_to_list
{
+ scm_c_issue_deprecation_warning
+ ("uniform-vector->list is deprecated. Use array->list instead.");
+
if (!scm_is_uniform_vector (uvec))
scm_wrong_type_arg_msg (FUNC_NAME, SCM_ARG1, uvec, "uniform vector");
return scm_array_to_list (uvec);
@@ -202,6 +244,10 @@ scm_uniform_vector_elements (SCM uvec,
scm_t_array_handle *h,
size_t *lenp, ssize_t *incp)
{
+ scm_c_issue_deprecation_warning
+ ("scm_uniform_vector_elements is deprecated. Use "
+ "scm_array_handle_uniform_elements instead.");
+
return scm_uniform_vector_writable_elements (uvec, h, lenp, incp);
}
@@ -211,6 +257,11 @@ scm_uniform_vector_writable_elements (SCM uvec,
size_t *lenp, ssize_t *incp)
{
void *ret;
+
+ scm_c_issue_deprecation_warning
+ ("scm_uniform_vector_writable_elements is deprecated. Use "
+ "scm_array_handle_uniform_writable_elements instead.");
+
scm_generalized_vector_get_handle (uvec, h);
/* FIXME nonlocal exit */
ret = scm_array_handle_uniform_writable_elements (h);
@@ -228,11 +279,17 @@ SCM_DEFINE (scm_uniform_vector_length,
"uniform-vector-length", 1, 0, 0,
"Return the number of elements in the uniform vector @var{v}.")
#define FUNC_NAME s_scm_uniform_vector_length
{
+ scm_c_issue_deprecation_warning
+ ("uniform-vector-length is deprecated. Use array-length instead.");
+
return scm_from_size_t (scm_c_uniform_vector_length (v));
}
#undef FUNC_NAME
+#endif /* SCM_ENABLE_DEPRECATED */
+
+
void
scm_init_uniform (void)
{
diff --git a/libguile/uniform.h b/libguile/uniform.h
index f0d5915..5dbbe35 100644
--- a/libguile/uniform.h
+++ b/libguile/uniform.h
@@ -3,7 +3,8 @@
#ifndef SCM_UNIFORM_H
#define SCM_UNIFORM_H
-/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008, 2009 Free
Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008, 2009,
+ * 2014 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -44,29 +45,34 @@ SCM_API size_t scm_array_handle_uniform_element_bit_size
(scm_t_array_handle *h)
SCM_API const void *scm_array_handle_uniform_elements (scm_t_array_handle *h);
SCM_API void *scm_array_handle_uniform_writable_elements (scm_t_array_handle
*h);
-SCM_API SCM scm_uniform_vector_p (SCM v);
-SCM_API SCM scm_uniform_vector_length (SCM v);
-SCM_API SCM scm_uniform_vector_element_type (SCM v);
-SCM_API SCM scm_uniform_vector_element_size (SCM v);
-SCM_API SCM scm_uniform_vector_ref (SCM v, SCM idx);
-SCM_API SCM scm_uniform_vector_set_x (SCM v, SCM idx, SCM val);
-SCM_API SCM scm_uniform_vector_to_list (SCM v);
-SCM_API SCM scm_uniform_vector_read_x (SCM v, SCM port_or_fd,
- SCM start, SCM end);
-SCM_API SCM scm_uniform_vector_write (SCM v, SCM port_or_fd,
- SCM start, SCM end);
-
-SCM_API int scm_is_uniform_vector (SCM obj);
-SCM_API size_t scm_c_uniform_vector_length (SCM v);
-SCM_API SCM scm_c_uniform_vector_ref (SCM v, size_t idx);
-SCM_API void scm_c_uniform_vector_set_x (SCM v, size_t idx, SCM val);
-SCM_API const void *scm_uniform_vector_elements (SCM uvec,
- scm_t_array_handle *h,
- size_t *lenp, ssize_t *incp);
-SCM_API void *scm_uniform_vector_writable_elements (SCM uvec,
- scm_t_array_handle *h,
- size_t *lenp,
- ssize_t *incp);
+#if SCM_ENABLE_DEPRECATED
+
+SCM_DEPRECATED SCM scm_uniform_vector_p (SCM v);
+SCM_DEPRECATED SCM scm_uniform_vector_length (SCM v);
+SCM_DEPRECATED SCM scm_uniform_vector_element_type (SCM v);
+SCM_DEPRECATED SCM scm_uniform_vector_element_size (SCM v);
+SCM_DEPRECATED SCM scm_uniform_vector_ref (SCM v, SCM idx);
+SCM_DEPRECATED SCM scm_uniform_vector_set_x (SCM v, SCM idx, SCM val);
+SCM_DEPRECATED SCM scm_uniform_vector_to_list (SCM v);
+SCM_DEPRECATED SCM scm_uniform_vector_read_x (SCM v, SCM port_or_fd,
+ SCM start, SCM end);
+SCM_DEPRECATED SCM scm_uniform_vector_write (SCM v, SCM port_or_fd,
+ SCM start, SCM end);
+
+SCM_DEPRECATED int scm_is_uniform_vector (SCM obj);
+SCM_DEPRECATED size_t scm_c_uniform_vector_length (SCM v);
+SCM_DEPRECATED SCM scm_c_uniform_vector_ref (SCM v, size_t idx);
+SCM_DEPRECATED void scm_c_uniform_vector_set_x (SCM v, size_t idx, SCM val);
+SCM_DEPRECATED const void *scm_uniform_vector_elements (SCM uvec,
+ scm_t_array_handle *h,
+ size_t *lenp,
+ ssize_t *incp);
+SCM_DEPRECATED void *scm_uniform_vector_writable_elements (SCM uvec,
+ scm_t_array_handle
*h,
+ size_t *lenp,
+ ssize_t *incp);
+
+#endif
SCM_INTERNAL void scm_init_uniform (void);
diff --git a/test-suite/tests/00-socket.test b/test-suite/tests/00-socket.test
index 5093575..309c358 100644
--- a/test-suite/tests/00-socket.test
+++ b/test-suite/tests/00-socket.test
@@ -1,7 +1,7 @@
;;;; socket.test --- test socket functions -*- scheme -*-
;;;;
;;;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-;;;; 2011, 2013 Free Software Foundation, Inc.
+;;;; 2011, 2013, 2014 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -25,27 +25,6 @@
;;;
-;;; htonl
-;;;
-
-(if (defined? 'htonl)
- (with-test-prefix "htonl"
-
- (pass-if "0" (eqv? 0 (htonl 0)))
-
- (pass-if-exception "-1" exception:out-of-range
- (htonl -1))
-
- ;; prior to guile 1.6.9 and 1.8.1, systems with 64-bit longs didn't
detect
- ;; an overflow for values 2^32 <= x < 2^63
- (pass-if-exception "2^32" exception:out-of-range
- (htonl (ash 1 32)))
-
- (pass-if-exception "2^1024" exception:out-of-range
- (htonl (ash 1 1024)))))
-
-
-;;;
;;; inet-ntop
;;;
@@ -151,27 +130,6 @@
(and (= (sockaddr:fam sa) AF_UNIX)
(string=? (sockaddr:path sa) "/tmp/unix-socket"))))))
-;;;
-;;; ntohl
-;;;
-
-(if (defined? 'ntohl)
- (with-test-prefix "ntohl"
-
- (pass-if "0" (eqv? 0 (ntohl 0)))
-
- (pass-if-exception "-1" exception:out-of-range
- (ntohl -1))
-
- ;; prior to guile 1.6.9 and 1.8.1, systems with 64-bit longs didn't
detect
- ;; an overflow for values 2^32 <= x < 2^63
- (pass-if-exception "2^32" exception:out-of-range
- (ntohl (ash 1 32)))
-
- (pass-if-exception "2^1024" exception:out-of-range
- (ntohl (ash 1 1024)))))
-
-
;;;
;;; AF_UNIX sockets and `make-socket-address'
diff --git a/test-suite/tests/arrays.test b/test-suite/tests/arrays.test
index 0b3d57c..830af14 100644
--- a/test-suite/tests/arrays.test
+++ b/test-suite/tests/arrays.test
@@ -1,6 +1,6 @@
;;;; unif.test --- tests guile's uniform arrays -*- scheme -*-
;;;;
-;;;; Copyright 2004, 2006, 2009, 2010, 2011, 2012, 2013 Free Software
Foundation, Inc.
+;;;; Copyright 2004, 2006, 2009, 2010, 2011, 2012, 2013, 2014 Free Software
Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -33,13 +33,6 @@
(cons 'read-error ".*array length must be non-negative.*"))
-(with-test-prefix "sanity"
- ;; At the current time of writing, bignums have a tc7 that is one bit
- ;; away from strings. It used to be that the vector implementation
- ;; registered for strings had the TYP7S mask, not the TYP7 mask,
- ;; making the system think that bignums were vectors. Doh!
- (pass-if (not (uniform-vector? 12345678901234567890123456789))))
-
(with-test-prefix "array?"
(let ((bool (make-typed-array 'b #t '(5 6)))
@@ -574,10 +567,10 @@
(eqv? 8 (array-ref s2 2))))))
;;;
-;;; uniform-vector-ref
+;;; typed array-ref
;;;
-(with-test-prefix "uniform-vector-ref"
+(with-test-prefix "typed array-ref"
(with-test-prefix "byte"
@@ -586,15 +579,15 @@
(pass-if "0"
(begin
(array-set! a 0 0)
- (= 0 (uniform-vector-ref a 0))))
+ (= 0 (array-ref a 0))))
(pass-if "127"
(begin
(array-set! a 127 0)
- (= 127 (uniform-vector-ref a 0))))
+ (= 127 (array-ref a 0))))
(pass-if "-128"
(begin
(array-set! a -128 0)
- (= -128 (uniform-vector-ref a 0)))))))
+ (= -128 (array-ref a 0)))))))
;;;
;;; syntax
diff --git a/test-suite/tests/bitvectors.test b/test-suite/tests/bitvectors.test
index 4e32c61..8541576 100644
--- a/test-suite/tests/bitvectors.test
+++ b/test-suite/tests/bitvectors.test
@@ -1,6 +1,6 @@
;;;; bitvectors.test --- tests guile's bitvectors -*- scheme -*-
;;;;
-;;;; Copyright 2010, 2011, 2013 Free Software Foundation, Inc.
+;;;; Copyright 2010, 2011, 2013, 2014 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -22,8 +22,8 @@
(with-test-prefix "predicates"
(pass-if (bitvector? #*1010101010))
- (pass-if (uniform-vector? #*1010101010))
- (pass-if (array? #*1010101010)))
+ (pass-if (array? #*1010101010))
+ (pass-if (eq? (array-type #*1010101010) 'b)))
(with-test-prefix "equality"
@@ -36,23 +36,22 @@
(with-test-prefix "lists"
(pass-if (equal? (bitvector->list #*10010) '(#t #f #f #t #f)))
(pass-if (equal? (array->list #*10010) '(#t #f #f #t #f)))
- (pass-if (equal? (uniform-vector->list #*10010) '(#t #f #f #t #f)))
(pass-if (equal? #*10010 (list->bitvector '(#t #f #f #t #f)))))
(with-test-prefix "ref and set"
- (with-test-prefix "bv"
+ (with-test-prefix "as bitvector"
(let ((bv (list->bitvector '(#f #f #t #f #t))))
(pass-if (eqv? (bitvector-ref bv 0) #f))
(pass-if (eqv? (bitvector-ref bv 2) #t))
(bitvector-set! bv 0 #t)
(pass-if (eqv? (bitvector-ref bv 0) #t))))
- (with-test-prefix "uv"
+ (with-test-prefix "as array"
(let ((bv (list->bitvector '(#f #f #t #f #t))))
- (pass-if (eqv? (uniform-vector-ref bv 0) #f))
- (pass-if (eqv? (uniform-vector-ref bv 2) #t))
- (uniform-vector-set! bv 0 #t)
- (pass-if (eqv? (uniform-vector-ref bv 0) #t)))))
+ (pass-if (eqv? (array-ref bv 0) #f))
+ (pass-if (eqv? (array-ref bv 2) #t))
+ (array-set! bv #t 0)
+ (pass-if (eqv? (array-ref bv 0) #t)))))
(with-test-prefix "bit-set*!"
(pass-if "#t"
diff --git a/test-suite/tests/ports.test b/test-suite/tests/ports.test
index c2f4480..c1a185f 100644
--- a/test-suite/tests/ports.test
+++ b/test-suite/tests/ports.test
@@ -243,7 +243,7 @@
(binary-test-string
(apply string
(map integer->char
- (uniform-vector->list
+ (array->list
(string->utf8 test-string))))))
(write-line test-string port)
(close-port port)
@@ -262,7 +262,7 @@
(binary-test-string
(apply string
(map integer->char
- (uniform-vector->list
+ (array->list
(string->utf8 test-string))))))
(write-line ";; coding: utf-8" port)
(write-line test-string port)
diff --git a/test-suite/tests/srfi-4.test b/test-suite/tests/srfi-4.test
index 9b76c7a..ffb1851 100644
--- a/test-suite/tests/srfi-4.test
+++ b/test-suite/tests/srfi-4.test
@@ -1,7 +1,7 @@
;;;; srfi-4.test --- Test suite for Guile's SRFI-4 functions. -*- scheme -*-
;;;; Martin Grabmueller, 2001-06-26
;;;;
-;;;; Copyright (C) 2001, 2006, 2010, 2011, 2013 Free Software Foundation, Inc.
+;;;; Copyright (C) 2001, 2006, 2010, 2011, 2013, 2014 Free Software
Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -50,9 +50,9 @@
(equal? (u8vector->list (u8vector 1 2 3 4))
(u8vector->list (list->u8vector '(1 2 3 4)))))
- (pass-if "u8vector->list/uniform-vector->list"
+ (pass-if "u8vector->list/array->list"
(equal? (u8vector->list (u8vector 1 2 3 4))
- (uniform-vector->list (u8vector 1 2 3 4))))
+ (array->list (u8vector 1 2 3 4))))
(pass-if "make-u8vector"
(equal? (list->u8vector '(7 7 7 7))
@@ -87,9 +87,9 @@
(equal? (s8vector->list (s8vector 1 2 3 4))
(s8vector->list (list->s8vector '(1 2 3 4)))))
- (pass-if "s8vector->list/uniform-vector->list"
+ (pass-if "s8vector->list/array->list"
(equal? (s8vector->list (s8vector 1 2 3 4))
- (uniform-vector->list (s8vector 1 2 3 4))))
+ (array->list (s8vector 1 2 3 4))))
(pass-if "make-s8vector"
(equal? (list->s8vector '(7 7 7 7))
@@ -125,9 +125,9 @@
(equal? (u16vector->list (u16vector 1 2 3 4))
(u16vector->list (list->u16vector '(1 2 3 4)))))
- (pass-if "u16vector->list/uniform-vector->list"
+ (pass-if "u16vector->list/array->list"
(equal? (u16vector->list (u16vector 1 2 3 4))
- (uniform-vector->list (u16vector 1 2 3 4))))
+ (array->list (u16vector 1 2 3 4))))
(pass-if "make-u16vector"
(equal? (list->u16vector '(7 7 7 7))
@@ -162,9 +162,9 @@
(equal? (s16vector->list (s16vector 1 2 3 4))
(s16vector->list (list->s16vector '(1 2 3 4)))))
- (pass-if "s16vector->list/uniform-vector->list"
+ (pass-if "s16vector->list/array->list"
(equal? (s16vector->list (s16vector 1 2 3 4))
- (uniform-vector->list (s16vector 1 2 3 4))))
+ (array->list (s16vector 1 2 3 4))))
(pass-if "make-s16vector"
(equal? (list->s16vector '(7 7 7 7))
@@ -199,9 +199,9 @@
(equal? (u32vector->list (u32vector 1 2 3 4))
(u32vector->list (list->u32vector '(1 2 3 4)))))
- (pass-if "u32vector->list/uniform-vector->list"
+ (pass-if "u32vector->list/array->list"
(equal? (u32vector->list (u32vector 1 2 3 4))
- (uniform-vector->list (u32vector 1 2 3 4))))
+ (array->list (u32vector 1 2 3 4))))
(pass-if "make-u32vector"
(equal? (list->u32vector '(7 7 7 7))
@@ -236,9 +236,9 @@
(equal? (s32vector->list (s32vector 1 2 3 4))
(s32vector->list (list->s32vector '(1 2 3 4)))))
- (pass-if "s32vector->list/uniform-vector->list"
+ (pass-if "s32vector->list/array->list"
(equal? (s32vector->list (s32vector 1 2 3 4))
- (uniform-vector->list (s32vector 1 2 3 4))))
+ (array->list (s32vector 1 2 3 4))))
(pass-if "make-s32vector"
(equal? (list->s32vector '(7 7 7 7))
@@ -273,9 +273,9 @@
(equal? (u64vector->list (u64vector 1 2 3 4))
(u64vector->list (list->u64vector '(1 2 3 4)))))
- (pass-if "u64vector->list/uniform-vector->list"
+ (pass-if "u64vector->list/array->list"
(equal? (u64vector->list (u64vector 1 2 3 4))
- (uniform-vector->list (u64vector 1 2 3 4))))
+ (array->list (u64vector 1 2 3 4))))
(pass-if "make-u64vector"
(equal? (list->u64vector '(7 7 7 7))
@@ -310,9 +310,9 @@
(equal? (s64vector->list (s64vector 1 2 3 4))
(s64vector->list (list->s64vector '(1 2 3 4)))))
- (pass-if "s64vector->list/uniform-vector->list"
+ (pass-if "s64vector->list/array->list"
(equal? (s64vector->list (s64vector 1 2 3 4))
- (uniform-vector->list (s64vector 1 2 3 4))))
+ (array->list (s64vector 1 2 3 4))))
(pass-if "make-s64vector"
(equal? (list->s64vector '(7 7 7 7))
@@ -347,9 +347,9 @@
(equal? (f32vector->list (f32vector 1 2 3 4))
(f32vector->list (list->f32vector '(1 2 3 4)))))
- (pass-if "f32vector->list/uniform-vector->list"
+ (pass-if "f32vector->list/array->list"
(equal? (f32vector->list (f32vector 1 2 3 4))
- (uniform-vector->list (f32vector 1 2 3 4))))
+ (array->list (f32vector 1 2 3 4))))
(pass-if "make-f32vector"
(equal? (list->f32vector '(7 7 7 7))
@@ -387,9 +387,9 @@
(equal? (f64vector->list (f64vector 1 2 3 4))
(f64vector->list (list->f64vector '(1 2 3 4)))))
- (pass-if "f64vector->list/uniform-vector->list"
+ (pass-if "f64vector->list/array->list"
(equal? (f64vector->list (f64vector 1 2 3 4))
- (uniform-vector->list (f64vector 1 2 3 4))))
+ (array->list (f64vector 1 2 3 4))))
(pass-if "make-f64vector"
(equal? (list->f64vector '(7 7 7 7))
@@ -427,9 +427,9 @@
(equal? (c32vector->list (c32vector 1 2 3 4))
(c32vector->list (list->c32vector '(1 2 3 4)))))
- (pass-if "c32vector->list/uniform-vector->list"
+ (pass-if "c32vector->list/array->list"
(equal? (c32vector->list (c32vector 1 2 3 4))
- (uniform-vector->list (c32vector 1 2 3 4))))
+ (array->list (c32vector 1 2 3 4))))
(pass-if "make-c32vector"
(equal? (list->c32vector '(7 7 7 7))
@@ -486,9 +486,9 @@
(equal? (c64vector->list (c64vector 1 2 3 4))
(c64vector->list (list->c64vector '(1 2 3 4)))))
- (pass-if "c64vector->list/uniform-vector->list"
+ (pass-if "c64vector->list/array->list"
(equal? (c64vector->list (c64vector 1 2 3 4))
- (uniform-vector->list (c64vector 1 2 3 4))))
+ (array->list (c64vector 1 2 3 4))))
(pass-if "make-c64vector"
(equal? (list->c64vector '(7 7 7 7))
hooks/post-receive
--
GNU Guile
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-199-gfb7dd00,
Andy Wingo <=