[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-195-g495cea0

[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=495cea0c931de23f074892b3f32808e676712a18

The branch, stable-2.0 has been updated
       via  495cea0c931de23f074892b3f32808e676712a18 (commit)
       via  b86069c1308a6ca36f3a3bc56134b3f8fd693592 (commit)
       via  54cded99dc5db94b1df0dc417161ebef7c60d874 (commit)
      from  2f3b7e9a41677bfe802e8a1ee851827297384c58 (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 495cea0c931de23f074892b3f32808e676712a18
Author: Mark H Weaver <address@hidden>
Date:   Fri Feb 7 16:53:48 2014 -0500

    Better error reporting in 'weak-vector-ref' and 'weak-vector-set!'.
    
    * libguile/weaks.c (scm_c_weak_vector_ref, scm_c_weak_vector_set_x):
      Pass procedure name to 'scm_out_of_range'.

commit b86069c1308a6ca36f3a3bc56134b3f8fd693592
Author: Mark H Weaver <address@hidden>
Date:   Fri Feb 7 16:38:58 2014 -0500

    Make size argument optional to 'make-doubly-weak-hash-table'; fix docs.
    
    * libguile/hashtab.c (scm_make_doubly_weak_hash_table): Make 'size'
      argument optional, like the weak hash table constructors.
    
    * doc/ref/api-memory.texi (Weak hash tables): Document that 'size'
      argument is optional for the weak hash table constructors.

commit 54cded99dc5db94b1df0dc417161ebef7c60d874
Author: Mark H Weaver <address@hidden>
Date:   Fri Feb 7 16:26:38 2014 -0500

    Fix 'weak-vector?' doc: Weak hash tables are not weak vectors.
    
    * doc/ref/api-memory.texi (Weak vectors): In 'weak-vector?' entry, don't
      claim that weak hash tables are weak vectors.  Remove statement that
      weak vectors are mainly useful for implementing weak hash tables.

-----------------------------------------------------------------------

Summary of changes:
 doc/ref/api-memory.texi |   12 ++++--------
 libguile/hashtab.c      |    2 +-
 libguile/weaks.c        |    4 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/doc/ref/api-memory.texi b/doc/ref/api-memory.texi
index 8d0c8fe..657f745 100644
--- a/doc/ref/api-memory.texi
+++ b/doc/ref/api-memory.texi
@@ -359,9 +359,9 @@ they constitute a doubly-weak table has to be used.
 @node Weak hash tables
 @subsubsection Weak hash tables
 
address@hidden {Scheme Procedure} make-weak-key-hash-table size
address@hidden {Scheme Procedure} make-weak-value-hash-table size
address@hidden {Scheme Procedure} make-doubly-weak-hash-table size
address@hidden {Scheme Procedure} make-weak-key-hash-table [size]
address@hidden {Scheme Procedure} make-weak-value-hash-table [size]
address@hidden {Scheme Procedure} make-doubly-weak-hash-table [size]
 @deffnx {C Function} scm_make_weak_key_hash_table (size)
 @deffnx {C Function} scm_make_weak_value_hash_table (size)
 @deffnx {C Function} scm_make_doubly_weak_hash_table (size)
@@ -387,9 +387,6 @@ nor a weak value hash table.
 @node Weak vectors
 @subsubsection Weak vectors
 
-Weak vectors are mainly useful in Guile's implementation of weak hash
-tables.
-
 @deffn {Scheme Procedure} make-weak-vector size [fill]
 @deffnx {C Function} scm_make_weak_vector (size, fill)
 Return a weak vector with @var{size} elements. If the optional
@@ -409,8 +406,7 @@ the same way @code{list->vector} would.
 
 @deffn {Scheme Procedure} weak-vector? obj
 @deffnx {C Function} scm_weak_vector_p (obj)
-Return @code{#t} if @var{obj} is a weak vector. Note that all
-weak hashes are also weak vectors.
+Return @code{#t} if @var{obj} is a weak vector.
 @end deffn
 
 @deffn {Scheme Procedure} weak-vector-ref wvect k
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index 88cb199..9107ce5 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -519,7 +519,7 @@ SCM_DEFINE (scm_make_weak_value_hash_table, 
"make-weak-value-hash-table", 0, 1,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_make_doubly_weak_hash_table, "make-doubly-weak-hash-table", 1, 
0, 0, 
+SCM_DEFINE (scm_make_doubly_weak_hash_table, "make-doubly-weak-hash-table", 0, 
1, 0,
             (SCM n),
            "Return a hash table with weak keys and values with @var{size}\n"
            "buckets.  (@pxref{Hash Tables})")
diff --git a/libguile/weaks.c b/libguile/weaks.c
index b590998..85d79b4 100644
--- a/libguile/weaks.c
+++ b/libguile/weaks.c
@@ -212,7 +212,7 @@ scm_c_weak_vector_ref (SCM wvect, size_t k)
   SCM_VALIDATE_WEAK_VECTOR (1, wvect);
 
   if (k >= SCM_I_VECTOR_LENGTH (wvect))
-    scm_out_of_range (NULL, scm_from_size_t (k));
+    scm_out_of_range ("weak-vector-ref", scm_from_size_t (k));
   elt = (SCM_I_VECTOR_ELTS(wvect))[k];
 
   if (SCM_UNPACK (elt) == 0)
@@ -245,7 +245,7 @@ scm_c_weak_vector_set_x (SCM wvect, size_t k, SCM elt)
   SCM_VALIDATE_WEAK_VECTOR (1, wvect);
 
   if (k >= SCM_I_VECTOR_LENGTH (wvect))
-    scm_out_of_range (NULL, scm_from_size_t (k));
+    scm_out_of_range ("weak-vector-set!", scm_from_size_t (k));
 
   loc = & SCM_I_VECTOR_WELTS (wvect)[k];
   *loc = elt;


hooks/post-receive
-- 
GNU Guile