mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-24 20:30:28 +02:00
Code Activity

Merge commit '9b5da400dd'

Browse source 
Conflicts:
	libguile/vectors.c
	test-suite/tests/weaks.test
This commit is contained in:
Andy Wingo 2014-02-07 15:36:06 +01:00
commit 9db57a19e1
3 changed files with 30 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test-suite/tests/guardians.test
View file

@ -1,7 +1,7 @@
;;;; guardians.test --- test suite for Guile Guardians -*- scheme -*-
;;;; Jim Blandy <jimb@red-bean.com> --- July 1999
;;;;
;;;; Copyright (C) 1999, 2001, 2006 Free Software Foundation, Inc.
;;;; Copyright (C) 1999, 2001, 2006, 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
@ -209,7 +209,7 @@
(gc)
(let ((p (cons #f #f)))
(g p)
(vector-set! v 0 p)
(weak-vector-set! v 0 p)
(set! p #f)) ;; clear refs left on the stack
(if (not (eq? (g) #f))
(throw 'unresolved)
@ -225,7 +225,7 @@
(gc)
(let ((p (cons #f #f)))
(g p)
(vector-set! v 0 p)
(weak-vector-set! v 0 p)
(set! p #f)) ;; clear refs left on the stack
(begin
(gc)
@ -233,7 +233,7 @@
(throw 'unresolved)
(begin
(gc)
(or (not (vector-ref v 0))
(or (not (weak-vector-ref v 0))
(throw 'unresolved))))))))
(with-test-prefix "guarding weak containers"
@ -243,11 +243,11 @@
(v (weak-vector #f)))
;; Note: We don't pass `(cons #f #f)' as an argument to `weak-vector'
;; otherwise references to it are likely to be left on the stack.
(vector-set! v 0 (cons #f #f))
(weak-vector-set! v 0 (cons #f #f))
(g v)
(gc)
(if (equal? (vector-ref v 0) (cons #f #f))
(if (equal? (weak-vector-ref v 0) (cons #f #f))
(throw 'unresolved)
#t))))

41
test-suite/tests/weaks.test
View file

@ -1,5 +1,6 @@
;;;; weaks.test --- tests guile's weaks -*- scheme -*-
;;;; Copyright (C) 1999, 2001, 2003, 2006, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
;;;; Copyright (C) 1999, 2001, 2003, 2006, 2009, 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
@ -57,13 +58,13 @@
(pass-if "create"
(let* ((lst '(a b c d e f g))
(wv (list->weak-vector lst)))
(and (eq? (vector-ref wv 0) 'a)
(eq? (vector-ref wv 1) 'b)
(eq? (vector-ref wv 2) 'c)
(eq? (vector-ref wv 3) 'd)
(eq? (vector-ref wv 4) 'e)
(eq? (vector-ref wv 5) 'f)
(eq? (vector-ref wv 6) 'g))))
(and (eq? (weak-vector-ref wv 0) 'a)
(eq? (weak-vector-ref wv 1) 'b)
(eq? (weak-vector-ref wv 2) 'c)
(eq? (weak-vector-ref wv 3) 'd)
(eq? (weak-vector-ref wv 4) 'e)
(eq? (weak-vector-ref wv 5) 'f)
(eq? (weak-vector-ref wv 6) 'g))))
(pass-if-exception "bad-args"
exception:wrong-type-arg
(list->weak-vector 32)))
@ -99,11 +100,11 @@
(define global-weak (make-weak-vector 10 #f))
(begin
(vector-set! global-weak 0 (string-copy "string"))
(vector-set! global-weak 1 (string-copy "beans"))
(vector-set! global-weak 2 (string-copy "to"))
(vector-set! global-weak 3 (string-copy "utah"))
(vector-set! global-weak 4 (string-copy "yum yum"))
(weak-vector-set! global-weak 0 (string-copy "string"))
(weak-vector-set! global-weak 1 (string-copy "beans"))
(weak-vector-set! global-weak 2 (string-copy "to"))
(weak-vector-set! global-weak 3 (string-copy "utah"))
(weak-vector-set! global-weak 4 (string-copy "yum yum"))
(gc))
;;; Normal weak vectors
@ -113,17 +114,17 @@
"weak-vector"
(pass-if "lives"
(begin
(vector-set! x 0 bar)
(weak-vector-set! x 0 bar)
(gc)
(and (vector-ref x 0) (eq? bar (vector-ref x 0)))))
(and (weak-vector-ref x 0) (eq? bar (weak-vector-ref x 0)))))
(pass-if "dies"
(begin
(gc)
(or (and (not (vector-ref global-weak 0))
(not (vector-ref global-weak 1))
(not (vector-ref global-weak 2))
(not (vector-ref global-weak 3))
(not (vector-ref global-weak 4)))
(or (and (not (weak-vector-ref global-weak 0))
(not (weak-vector-ref global-weak 1))
(not (weak-vector-ref global-weak 2))
(not (weak-vector-ref global-weak 3))
(not (weak-vector-ref global-weak 4)))
(throw 'unresolved))))))