From 8a2f1d0451cdb10ef6eb843b5774c6a4de7eaf3e Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 28 Jul 2008 22:57:43 -0500
Subject: [PATCH] More core cleanups

---
 {core => basis}/libc/authors.txt           |  0
 {core => basis}/libc/libc-docs.factor      |  0
 {core => basis}/libc/libc-tests.factor     |  0
 {core => basis}/libc/libc.factor           | 19 ++++++++++++-------
 {core => basis}/libc/summary.txt           |  0
 {core => basis}/libc/tags.txt              |  0
 core/bootstrap/stage1.factor               |  6 +-----
 core/init/init-tests.factor                |  7 -------
 core/io/streams/nested/nested-tests.factor |  3 ---
 9 files changed, 13 insertions(+), 22 deletions(-)
 rename {core => basis}/libc/authors.txt (100%)
 rename {core => basis}/libc/libc-docs.factor (100%)
 rename {core => basis}/libc/libc-tests.factor (100%)
 rename {core => basis}/libc/libc.factor (85%)
 rename {core => basis}/libc/summary.txt (100%)
 rename {core => basis}/libc/tags.txt (100%)
 delete mode 100644 core/init/init-tests.factor
 delete mode 100644 core/io/streams/nested/nested-tests.factor

diff --git a/core/libc/authors.txt b/basis/libc/authors.txt
similarity index 100%
rename from core/libc/authors.txt
rename to basis/libc/authors.txt
diff --git a/core/libc/libc-docs.factor b/basis/libc/libc-docs.factor
similarity index 100%
rename from core/libc/libc-docs.factor
rename to basis/libc/libc-docs.factor
diff --git a/core/libc/libc-tests.factor b/basis/libc/libc-tests.factor
similarity index 100%
rename from core/libc/libc-tests.factor
rename to basis/libc/libc-tests.factor
diff --git a/core/libc/libc.factor b/basis/libc/libc.factor
similarity index 85%
rename from core/libc/libc.factor
rename to basis/libc/libc.factor
index cda5260397..ca651e3990 100755
--- a/core/libc/libc.factor
+++ b/basis/libc/libc.factor
@@ -2,7 +2,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov
 ! Copyright (C) 2007, 2008 Doug Coleman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien assocs continuations destructors init kernel
+USING: alien assocs continuations destructors kernel
 namespaces accessors sets ;
 IN: libc
 
@@ -20,7 +20,14 @@ IN: libc
 : (realloc) ( alien size -- newalien )
     "void*" "libc" "realloc" { "void*" "ulong" } alien-invoke ;
 
-SYMBOL: mallocs
+SYMBOL: malloc-expiry
+
+: mallocs ( -- assoc )
+    malloc-expiry get-global dup expired? [
+        drop
+        -1 <alien> malloc-expiry set-global
+        H{ } clone dup \ mallocs set-global
+    ] when ;
 
 PRIVATE>
 
@@ -35,19 +42,17 @@ ERROR: realloc-error ptr size ;
 
 <PRIVATE
 
-[ H{ } clone mallocs set-global ] "libc" add-init-hook
-
 : add-malloc ( alien -- )
-    mallocs get-global conjoin ;
+    mallocs conjoin ;
 
 : delete-malloc ( alien -- )
     [
-        mallocs get-global delete-at*
+        mallocs delete-at*
         [ double-free ] unless drop
     ] when* ;
 
 : malloc-exists? ( alien -- ? )
-    mallocs get-global key? ;
+    mallocs key? ;
 
 PRIVATE>
 
diff --git a/core/libc/summary.txt b/basis/libc/summary.txt
similarity index 100%
rename from core/libc/summary.txt
rename to basis/libc/summary.txt
diff --git a/core/libc/tags.txt b/basis/libc/tags.txt
similarity index 100%
rename from core/libc/tags.txt
rename to basis/libc/tags.txt
diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index 8ca3c151ac..f9a0ddce8f 100755
--- a/core/bootstrap/stage1.factor
+++ b/core/bootstrap/stage1.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-IN: bootstrap.stage1
 USING: arrays debugger generic hashtables io assocs
 kernel.private kernel math memory namespaces parser
 prettyprint sequences vectors words system splitting
 init io.files bootstrap.image bootstrap.image.private vocabs
 vocabs.loader system debugger continuations ;
+IN: bootstrap.stage1
 
 { "resource:core" } vocab-roots set
 
@@ -33,10 +33,6 @@ load-help? off
     "math.floats" require
     "memory" require
 
-    ! this must add its init hook before io.backend does
-    "libc" require
-
-    ! "io.thread" require
     "io.streams.c" require
     "vocabs.loader" require
     
diff --git a/core/init/init-tests.factor b/core/init/init-tests.factor
deleted file mode 100644
index ce68a1d7ab..0000000000
--- a/core/init/init-tests.factor
+++ /dev/null
@@ -1,7 +0,0 @@
-IN: init.tests
-USING: init namespaces sequences math tools.test kernel ;
-
-[ t ] [
-    init-hooks get [ first "libc" = ] find drop
-    init-hooks get [ first "io.backend" = ] find drop <
-] unit-test
diff --git a/core/io/streams/nested/nested-tests.factor b/core/io/streams/nested/nested-tests.factor
deleted file mode 100644
index 402cb19c3b..0000000000
--- a/core/io/streams/nested/nested-tests.factor
+++ /dev/null
@@ -1,3 +0,0 @@
-USING: io io.streams.string io.streams.nested kernel math
-namespaces io.styles tools.test ;
-IN: io.streams.nested.tests