summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2014-02-07 15:27:28 +0100
committerAndy Wingo <wingo@pobox.com>2014-02-07 15:27:28 +0100
commitcc620af7ca9bb7c2c841f9612fbdf97b68aaf277 (patch)
tree1b72380e3af361d56f9e629d903393d4824b21db
parent7affd3141b4f821fba911caa7a94d9cc9c03fafe (diff)
parent1e3fd6a0c81bb3e9900a93a9d1923cc788de0f99 (diff)
downloadguile-cc620af7ca9bb7c2c841f9612fbdf97b68aaf277.tar.gz
Merge commit '1e3fd6a0c81bb3e9900a93a9d1923cc788de0f99'
Conflicts: doc/ref/api-memory.texi libguile/weaks.c libguile/weaks.h module/ice-9/weak-vector.scm
-rw-r--r--doc/ref/api-memory.texi13
1 files changed, 12 insertions, 1 deletions
diff --git a/doc/ref/api-memory.texi b/doc/ref/api-memory.texi
index 6512650ce..130ff84db 100644
--- a/doc/ref/api-memory.texi
+++ b/doc/ref/api-memory.texi
@@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual.
-@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2012, 2013
+@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2012, 2013, 2014
@c Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions.
@@ -350,6 +350,17 @@ Return @code{#t} if @var{obj} is a weak vector. Note that all
weak hashes are also weak vectors.
@end deffn
+@deffn {Scheme Procedure} weak-vector-ref wvect k
+@deffnx {C Function} scm_weak_vector_ref (wvect, k)
+Return the @var{k}th element of the weak vector @var{wvect}, or
+@code{#f} if that element has been collected.
+@end deffn
+
+@deffn {Scheme Procedure} weak-vector-set! wvect k elt
+@deffnx {C Function} scm_weak_vector_set_x (wvect, k, elt)
+Set the @var{k}th element of the weak vector @var{wvect} to @var{elt}.
+@end deffn
+
@node Guardians
@subsection Guardians