[Guile-commits] Success: Hydra job gnu:guile-master:tarball on x86_64-linux

2014-02-08 Thread Hydra Build Daemon
Hi,

The status of Hydra job gnu:guile-master:tarball (on x86_64-linux) has changed 
from "Failed with output" to "Success".  For details, see

  http://hydra.nixos.org/build/8795797

This is likely due to 9 commits by Bjørn Forsman , 
Gergely Risko , Jan Malakhovski , Mark H 
Weaver , Peter Simons , Shea Levy 
 or William A. Kennington III .

Yay!

Regards,

The Hydra build daemon.



[Guile-commits] Success: Hydra job gnu:guile-master:build_enable_guile_debug on x86_64-linux

2014-02-08 Thread Hydra Build Daemon
Hi,

The status of Hydra job gnu:guile-master:build_enable_guile_debug (on 
x86_64-linux) has changed from "Failed with output" to "Success".  For details, 
see

  http://hydra.nixos.org/build/8795793

This is likely due to 9 commits by Bjørn Forsman , 
Gergely Risko , Jan Malakhovski , Mark H 
Weaver , Peter Simons , Shea Levy 
 or William A. Kennington III .

Yay!

Regards,

The Hydra build daemon.



[Guile-commits] Success: Hydra job gnu:guile-master:build_disable_deprecated_disable_discouraged on x86_64-linux

2014-02-08 Thread Hydra Build Daemon
Hi,

The status of Hydra job 
gnu:guile-master:build_disable_deprecated_disable_discouraged (on x86_64-linux) 
has changed from "Failed with output" to "Success".  For details, see

  http://hydra.nixos.org/build/8795788

This is likely due to 9 commits by Bjørn Forsman , 
Gergely Risko , Jan Malakhovski , Mark H 
Weaver , Peter Simons , Shea Levy 
 or William A. Kennington III .

Yay!

Regards,

The Hydra build daemon.



[Guile-commits] Success: Hydra job gnu:guile-master:build_without_threads.i686-linux

2014-02-08 Thread Hydra Build Daemon
Hi,

The status of Hydra job gnu:guile-master:build_without_threads.i686-linux has 
changed from "Failed with output" to "Success".  For details, see

  http://hydra.nixos.org/build/8795790

This is likely due to 9 commits by Bjørn Forsman , 
Gergely Risko , Jan Malakhovski , Mark H 
Weaver , Peter Simons , Shea Levy 
 or William A. Kennington III .

Yay!

Regards,

The Hydra build daemon.



[Guile-commits] Success: Hydra job gnu:guile-master:build_without_threads.x86_64-linux

2014-02-08 Thread Hydra Build Daemon
Hi,

The status of Hydra job gnu:guile-master:build_without_threads.x86_64-linux has 
changed from "Failed with output" to "Success".  For details, see

  http://hydra.nixos.org/build/8795791

This is likely due to 9 commits by Bjørn Forsman , 
Gergely Risko , Jan Malakhovski , Mark H 
Weaver , Peter Simons , Shea Levy 
 or William A. Kennington III .

Yay!

Regards,

The Hydra build daemon.



[Guile-commits] Success: Hydra job gnu:guile-master:build_disable_networking on x86_64-linux

2014-02-08 Thread Hydra Build Daemon
Hi,

The status of Hydra job gnu:guile-master:build_disable_networking (on 
x86_64-linux) has changed from "Failed with output" to "Success".  For details, 
see

  http://hydra.nixos.org/build/8795796

This is likely due to 9 commits by Bjørn Forsman , 
Gergely Risko , Jan Malakhovski , Mark H 
Weaver , Peter Simons , Shea Levy 
 or William A. Kennington III .

Yay!

Regards,

The Hydra build daemon.



[Guile-commits] Success: Hydra job gnu:guile-master:build.x86_64-linux

2014-02-08 Thread Hydra Build Daemon
Hi,

The status of Hydra job gnu:guile-master:build.x86_64-linux has changed from 
"Failed with output" to "Success".  For details, see

  http://hydra.nixos.org/build/8795800

This is likely due to 9 commits by Bjørn Forsman , 
Gergely Risko , Jan Malakhovski , Mark H 
Weaver , Peter Simons , Shea Levy 
 or William A. Kennington III .

Yay!

Regards,

The Hydra build daemon.



[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-199-gfb7dd00

2014-02-08 Thread Andy Wingo
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 
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 
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 
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,
-@c   2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+@c   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} argumen

[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-201-g24cac65

2014-02-08 Thread Andy Wingo
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=24cac6554073bb6e691605cd6ac6196f3c0851a3

The branch, stable-2.0 has been updated
   via  24cac6554073bb6e691605cd6ac6196f3c0851a3 (commit)
   via  5cfeff11cc58148c58a85a879fd7a3e7cfbbe8e2 (commit)
  from  fb7dd00169304a5922838e4d2f25253640a35def (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 24cac6554073bb6e691605cd6ac6196f3c0851a3
Author: Andy Wingo 
Date:   Sat Feb 8 16:13:54 2014 +0100

Deprecate the use of the vector interface on arrays

* libguile/vectors.c (scm_is_vector): Deprecate use on weak vectors and
  arrays.
  (scm_is_simple_vector): Deprecate use on weak vectors.
  (scm_vector_length, scm_c_vector_ref, scm_c_vector_set_x): Deprecate
  use on arrays.

* libguile/sort.c: Adapt to check explicitly for arrays.

commit 5cfeff11cc58148c58a85a879fd7a3e7cfbbe8e2
Author: Andy Wingo 
Date:   Sat Feb 8 16:02:59 2014 +0100

Deprecate use of vector-length, vector-ref, vector-set! as 
primitive-generics

* libguile/vectors.c (scm_vector_length, scm_c_vector_ref):
  (scm_c_vector_set_x): Deprecate the use of vector-length, vector-ref,
  and vector-set! as primitive generics.

---

Summary of changes:
 libguile/sort.c|   16 +++
 libguile/vectors.c |   76 +++
 2 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/libguile/sort.c b/libguile/sort.c
index 2a36320..998be89 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 1999, 2000, 2001, 2002, 2004, 2006, 2007, 2008, 2009,
- *   2010, 2011, 2012 Free Software Foundation, Inc.
+ *   2010, 2011, 2012, 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
@@ -377,12 +377,13 @@ SCM_DEFINE (scm_sort_x, "sort!", 2, 0, 0,
   SCM_VALIDATE_LIST_COPYLEN (1, items, len);
   return scm_merge_list_step (&items, less, len);
 }
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+   || (scm_is_array (items) && scm_c_array_rank (items) == 1))
 {
   scm_restricted_vector_sort_x (items,
less,
scm_from_int (0),
-   scm_vector_length (items));
+   scm_array_length (items));
   return items;
 }
   else
@@ -403,7 +404,8 @@ SCM_DEFINE (scm_sort, "sort", 2, 0, 0,
 
   if (scm_is_pair (items))
 return scm_sort_x (scm_list_copy (items), less);
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+   || (scm_is_array (items) && scm_c_array_rank (items) == 1))
 return scm_sort_x (scm_vector_copy (items), less);
   else
 SCM_WRONG_TYPE_ARG (1, items);
@@ -489,7 +491,8 @@ SCM_DEFINE (scm_stable_sort_x, "stable-sort!", 2, 0, 0,
   SCM_VALIDATE_LIST_COPYLEN (1, items, len);
   return scm_merge_list_step (&items, less, len);
 }
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+   || (scm_is_array (items) && scm_c_array_rank (items) == 1))
 {
   scm_t_array_handle temp_handle, vec_handle;
   SCM temp, *temp_elts, *vec_elts;
@@ -532,7 +535,8 @@ SCM_DEFINE (scm_stable_sort, "stable-sort", 2, 0, 0,
 
   if (scm_is_pair (items))
 return scm_stable_sort_x (scm_list_copy (items), less);
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+   || (scm_is_array (items) && scm_c_array_rank (items) == 1))
 return scm_stable_sort_x (scm_vector_copy (items), less);
   else
 SCM_WRONG_TYPE_ARG (1, items);
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 35a9ede..abcbfa0 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -47,12 +47,26 @@
 int
 scm_is_vector (SCM obj)
 {
-  if (SCM_I_IS_VECTOR (obj))
+  if (SCM_I_IS_NONWEAK_VECTOR (obj))
 return 1;
-  if  (SCM_I_ARRAYP (obj) && SCM_I_ARRAY_NDIM (obj) == 1)
+  if (SCM_I_WVECTP (obj))
+{
+  scm_c_issue_deprecation_warning
+("Expecting vector? to be true for weak vectors is deprecated.  "
+ "Use weak-vector? instead.");
+  return 1;
+}
+  if (SCM_I_ARRAYP (obj) && SCM_I_ARRAY_NDIM (obj) == 1)
 {
   SCM v = SCM_I_ARRAY_V (obj);
-  return SCM_I_IS_VECTOR (v);
+  if (SCM_I_IS_VECTOR (v))
+{
+  scm_c_issue_deprecation_warning
+("Expecting vector? to be true fo

[Guile-commits] GNU Guile branch, master, updated. v2.1.0-715-g787f7b6

2014-02-08 Thread Andy Wingo
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=787f7b644fa480b4815974c9850d5707881cf9f7

The branch, master has been updated
   via  787f7b644fa480b4815974c9850d5707881cf9f7 (commit)
   via  e0a00fe7e400aeb4d4314af410d43aea706cef62 (commit)
   via  24cac6554073bb6e691605cd6ac6196f3c0851a3 (commit)
   via  5cfeff11cc58148c58a85a879fd7a3e7cfbbe8e2 (commit)
  from  8051cf23044e5dbbece0d328102197a04ce5718d (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 787f7b644fa480b4815974c9850d5707881cf9f7
Merge: e0a00fe 24cac65
Author: Andy Wingo 
Date:   Sat Feb 8 17:00:32 2014 +0100

Merge commit '24cac6554073bb6e691605cd6ac6196f3c0851a3'

Conflicts:
libguile/vectors.c

commit e0a00fe7e400aeb4d4314af410d43aea706cef62
Merge: 8051cf2 5cfeff1
Author: Andy Wingo 
Date:   Sat Feb 8 16:54:01 2014 +0100

Merge commit '5cfeff11cc58148c58a85a879fd7a3e7cfbbe8e2'

Conflicts:
libguile/vectors.c

---

Summary of changes:
 libguile/sort.c|   16 +++--
 libguile/vectors.c |  165 +---
 2 files changed, 63 insertions(+), 118 deletions(-)

diff --git a/libguile/sort.c b/libguile/sort.c
index 2a36320..998be89 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 1999, 2000, 2001, 2002, 2004, 2006, 2007, 2008, 2009,
- *   2010, 2011, 2012 Free Software Foundation, Inc.
+ *   2010, 2011, 2012, 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
@@ -377,12 +377,13 @@ SCM_DEFINE (scm_sort_x, "sort!", 2, 0, 0,
   SCM_VALIDATE_LIST_COPYLEN (1, items, len);
   return scm_merge_list_step (&items, less, len);
 }
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+   || (scm_is_array (items) && scm_c_array_rank (items) == 1))
 {
   scm_restricted_vector_sort_x (items,
less,
scm_from_int (0),
-   scm_vector_length (items));
+   scm_array_length (items));
   return items;
 }
   else
@@ -403,7 +404,8 @@ SCM_DEFINE (scm_sort, "sort", 2, 0, 0,
 
   if (scm_is_pair (items))
 return scm_sort_x (scm_list_copy (items), less);
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+   || (scm_is_array (items) && scm_c_array_rank (items) == 1))
 return scm_sort_x (scm_vector_copy (items), less);
   else
 SCM_WRONG_TYPE_ARG (1, items);
@@ -489,7 +491,8 @@ SCM_DEFINE (scm_stable_sort_x, "stable-sort!", 2, 0, 0,
   SCM_VALIDATE_LIST_COPYLEN (1, items, len);
   return scm_merge_list_step (&items, less, len);
 }
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+   || (scm_is_array (items) && scm_c_array_rank (items) == 1))
 {
   scm_t_array_handle temp_handle, vec_handle;
   SCM temp, *temp_elts, *vec_elts;
@@ -532,7 +535,8 @@ SCM_DEFINE (scm_stable_sort, "stable-sort", 2, 0, 0,
 
   if (scm_is_pair (items))
 return scm_stable_sort_x (scm_list_copy (items), less);
-  else if (scm_is_vector (items))
+  else if (scm_is_simple_vector (items)
+   || (scm_is_array (items) && scm_c_array_rank (items) == 1))
 return scm_stable_sort_x (scm_vector_copy (items), less);
   else
 SCM_WRONG_TYPE_ARG (1, items);
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 09989a8..1c659de 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -46,20 +46,13 @@
 int
 scm_is_vector (SCM obj)
 {
-  if (SCM_I_IS_VECTOR (obj))
-return 1;
-  if  (SCM_I_ARRAYP (obj) && SCM_I_ARRAY_NDIM (obj) == 1)
-{
-  SCM v = SCM_I_ARRAY_V (obj);
-  return SCM_I_IS_VECTOR (v);
-}
-  return 0;
+  return SCM_I_IS_NONWEAK_VECTOR (obj);
 }
 
 int
 scm_is_simple_vector (SCM obj)
 {
-  return SCM_I_IS_VECTOR (obj);
+  return SCM_I_IS_NONWEAK_VECTOR (obj);
 }
 
 const SCM *
@@ -106,30 +99,24 @@ SCM_DEFINE (scm_vector_p, "vector?", 1, 0, 0,
 }
 #undef FUNC_NAME
 
-SCM_GPROC (s_vector_length, "vector-length", 1, 0, 0, scm_vector_length, 
g_vector_length);
-/* Returns the number of elements in @var{vector} as an exact integer.  */
-SCM
-scm_vector_length (SCM v)
+SCM_DEFINE (scm_vector_length, "vector-length", 1, 0, 0, 
+   (SCM v),
+"Returns the number of elements in @var{vector} as an exact 
integer.")
+#define FUNC_NAME s_scm_vector_length
 {
-  if (SCM_I_IS

[Guile-commits] GNU Guile branch, master, updated. v2.1.0-716-ga32488b

2014-02-08 Thread Andy Wingo
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=a32488ba13e81e51c1fef9fb057bdd805e8b3d72

The branch, master has been updated
   via  a32488ba13e81e51c1fef9fb057bdd805e8b3d72 (commit)
  from  787f7b644fa480b4815974c9850d5707881cf9f7 (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 a32488ba13e81e51c1fef9fb057bdd805e8b3d72
Author: Andy Wingo 
Date:   Sat Feb 8 17:14:47 2014 +0100

SCM_I_IS_VECTOR only true for tc7_vector, not weak vectors

* libguile/tags.h (SCM_TYP7S, SCM_HAS_TYP7S): Remove these, as we no
  longer do the differs-by-one-bit thing for vectors and weak vectors.
* libguile/vectors.h (SCM_I_IS_VECTOR): Use SCM_HAS_TYP7.
  (SCM_I_IS_NONWEAK_VECTOR): Remove.
* libguile/vm-engine.c (vector-length, vector-ref, vector-set!)
  (vector-ref/immediate, vector-set!/immediate): We can inline these
  instructions completely now.

* libguile/vm.c (vm_error_not_a_vector, vm_error_out_of_range): New
  error conditions.

---

Summary of changes:
 libguile/tags.h  |   15 +++
 libguile/vectors.c   |4 +-
 libguile/vectors.h   |5 +--
 libguile/vm-engine.c |   67 -
 libguile/vm.c|   15 +++
 5 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/libguile/tags.h b/libguile/tags.h
index 4a1b192..53d40d8 100644
--- a/libguile/tags.h
+++ b/libguile/tags.h
@@ -3,7 +3,7 @@
 #ifndef SCM_TAGS_H
 #define SCM_TAGS_H
 
-/* Copyright (C) 
1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2008,2009,2010,2011,2012,2013
+/* Copyright (C) 
1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2008,2009,2010,2011,2012,2013,2014
  * Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -335,14 +335,9 @@ typedef union SCM { struct { scm_t_bits n; } n; } SCM;
  *   111:  the cell belongs to some other heap object.
  *
  * tc7 (for tc3==1x1):
- *   See below for the list of types.  Note the special case of scm_tc7_vector
- *   and scm_tc7_wvect:  vectors and weak vectors are treated the same in many
- *   cases.  Thus, their tc7-codes are chosen to only differ in one bit.  This
- *   makes it possible to check an object at the same time for being a vector
- *   or a weak vector by comparing its tc7 code with that bit masked (using
- *   the TYP7S macro).  Three more special tc7-codes are of interest:
- *   numbers, ports and smobs in fact each represent collections of types,
- *   which are subdivided using tc16-codes.
+ *   See below for the list of types.  Three special tc7-codes are of
+ *   interest: numbers, ports and smobs in fact each represent
+ *   collections of types, which are subdivided using tc16-codes.
  *
  * tc16 (for tc7==scm_tc7_smob):
  *   The largest part of the space of smob types is not subdivided in a
@@ -396,11 +391,9 @@ typedef union SCM { struct { scm_t_bits n; } n; } SCM;
 
 #define SCM_ITAG7(x)   (127 & SCM_UNPACK (x))
 #define SCM_TYP7(x)(0x7f &SCM_CELL_TYPE (x))
-#define SCM_TYP7S(x)   ((0x7f & ~2) & SCM_CELL_TYPE (x))
 #define SCM_HAS_HEAP_TYPE(x, type, tag) \
   (SCM_NIMP (x) && type (x) == (tag))
 #define SCM_HAS_TYP7(x, tag)(SCM_HAS_HEAP_TYPE (x, SCM_TYP7, tag))
-#define SCM_HAS_TYP7S(x, tag)   (SCM_HAS_HEAP_TYPE (x, SCM_TYP7S, tag))
 
 /* If you change these numbers, change them also in (system vm
assembler).  */
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 1c659de..bb42e00 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -46,13 +46,13 @@
 int
 scm_is_vector (SCM obj)
 {
-  return SCM_I_IS_NONWEAK_VECTOR (obj);
+  return SCM_I_IS_VECTOR (obj);
 }
 
 int
 scm_is_simple_vector (SCM obj)
 {
-  return SCM_I_IS_NONWEAK_VECTOR (obj);
+  return SCM_I_IS_VECTOR (obj);
 }
 
 const SCM *
diff --git a/libguile/vectors.h b/libguile/vectors.h
index 4fe72b0..995f64f 100644
--- a/libguile/vectors.h
+++ b/libguile/vectors.h
@@ -3,7 +3,7 @@
 #ifndef SCM_VECTORS_H
 #define SCM_VECTORS_H
 
-/* Copyright (C) 1995,1996,1998,2000,2001,2002,2004,2005, 2006, 2008, 2009, 
2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,2000,2001,2002,2004,2005, 2006, 2008, 2009, 
2011, 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
@@ -63,8 +63,7 @@ SCM_API SCM *scm_vector_writable_elements (SCM vec,
 
 /* Internals */
 
-#define SCM_I_IS_VECTOR(x) (SCM_HAS_TYP7S (x, scm_t

[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-202-gd0a77f1

2014-02-08 Thread Mark H Weaver
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=d0a77f10f23fb95a8f4b1b36d475258a6bd447b8

The branch, stable-2.0 has been updated
   via  d0a77f10f23fb95a8f4b1b36d475258a6bd447b8 (commit)
  from  24cac6554073bb6e691605cd6ac6196f3c0851a3 (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 d0a77f10f23fb95a8f4b1b36d475258a6bd447b8
Author: Mark H Weaver 
Date:   Sat Feb 8 12:35:35 2014 -0500

Fix improper use of 'with-locale'.

* test-suite/guile-test (run-tests): Use 'setlocale' with check
  instead of 'with-locale'.

---

Summary of changes:
 test-suite/guile-test |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test-suite/guile-test b/test-suite/guile-test
index 43ea481..4a264b4 100755
--- a/test-suite/guile-test
+++ b/test-suite/guile-test
@@ -239,9 +239,10 @@
  (lambda ()
(for-each (lambda (test)
(display (string-append "Running " test "\n"))
-   (with-locale "C"
- (with-test-prefix test
-   (load (test-file-name test)
+   (when (defined? 'setlocale)
+ (setlocale LC_ALL "C"))
+   (with-test-prefix test
+ (load (test-file-name test
  tests
 (if (opt 'coverage #f)
 (let-values (((coverage-data _)
@@ -263,5 +264,4 @@
 
 ;;; Local Variables:
 ;;; mode: scheme
-;;; eval: (put 'with-locale 'scheme-indent-function 1)
 ;;; End:


hooks/post-receive
-- 
GNU Guile