From adc154e06bba18e2b16ea69ac0ac1ece66bca641 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 24 Aug 2009 20:27:22 -0500
Subject: [PATCH] destructors: already-unregistered error had the wrong
 content, also don't throw an error when disposing a disposable twice

---
 core/destructors/destructors-tests.factor | 11 ++++++++++-
 core/destructors/destructors.factor       |  8 ++++++--
 core/io/files/files-tests.factor          |  8 +++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/core/destructors/destructors-tests.factor b/core/destructors/destructors-tests.factor
index f9d0770d02..c55b5ef423 100644
--- a/core/destructors/destructors-tests.factor
+++ b/core/destructors/destructors-tests.factor
@@ -1,5 +1,5 @@
 USING: destructors kernel tools.test continuations accessors
-namespaces sequences ;
+namespaces sequences destructors.private ;
 IN: destructors.tests
 
 TUPLE: dispose-error ;
@@ -66,3 +66,12 @@ M: dummy-destructor dispose ( obj -- )
     ] ignore-errors destroyed?>>
 ] unit-test
 
+TUPLE: silly-disposable < disposable ;
+
+M: silly-disposable dispose* drop ;
+
+silly-disposable new-disposable "s" set
+"s" get dispose
+[ "s" get unregister-disposable ]
+[ disposable>> silly-disposable? ]
+must-fail-with
diff --git a/core/destructors/destructors.factor b/core/destructors/destructors.factor
index d306da18c4..4190cdaaf5 100644
--- a/core/destructors/destructors.factor
+++ b/core/destructors/destructors.factor
@@ -21,7 +21,7 @@ SLOT: continuation
     disposables get conjoin ;
 
 : unregister-disposable ( obj -- )
-    disposables get 2dup key? [ already-unregistered ] unless delete-at ;
+    disposables get 2dup key? [ delete-at ] [ drop already-unregistered ] if ;
 
 PRIVATE>
 
@@ -49,7 +49,11 @@ M: object dispose
     dup disposed>> [ drop ] [ t >>disposed dispose* ] if ;
 
 M: disposable dispose
-    [ unregister-disposable ] [ call-next-method ] bi ;
+    dup disposed>> [ drop ] [
+        [ unregister-disposable ]
+        [ call-next-method ]
+        bi
+    ] if ;
 
 : dispose-each ( seq -- )
     [
diff --git a/core/io/files/files-tests.factor b/core/io/files/files-tests.factor
index f57dafbdc6..6387e47dfc 100644
--- a/core/io/files/files-tests.factor
+++ b/core/io/files/files-tests.factor
@@ -152,4 +152,10 @@ USE: debugger.threads
     "non-byte-array-error" unique-file binary [
         "" write
     ] with-file-writer
-] [ no-method? ] must-fail-with
\ No newline at end of file
+] [ no-method? ] must-fail-with
+
+! What happens if we close a file twice?
+[ ] [
+    "closing-twice" unique-file ascii <file-writer>
+    [ dispose ] [ dispose ] bi
+] unit-test
\ No newline at end of file