bootstrap: this is more fragile than I would like.

diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index 85cad41af5404748391cf661431e4a9505ed9f75..87791fb3a958898ce334f6ddc15ad1918434b62a 100644 (file)
--- a/core/bootstrap/stage1.factor
+++ b/core/bootstrap/stage1.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs bootstrap.image.private hash-sets hashtables init
 io io.files kernel kernel.private make memory namespaces parser
-parser.notes sequences system vocabs.hierarchy vocabs.loader ;
+parser.notes sequences system vocabs.hierarchy vocabs ;
 
 "Bootstrap stage 1..." print flush
 
@@ -22,7 +22,20 @@ load-help? off
         boot
     ] %
 
-    load-all
+    "math.integers" require
+    "math.ratios" require
+    "math.floats" require
+    "memory" require
+
+    "io.streams.c" require
+    "io.streams.byte-array" require ! for utf16 on Windows
+    "vocabs.loader" require
+
+    "syntax" require
+
+    "locals" require
+    "locals.fry" require
+    "locals.macros" require
 
     "vocab:bootstrap/layouts.factor" parse-file %
 

diff --git a/core/slots/slots.factor b/core/slots/slots.factor
index 79a24c4885aaafa1e40184c05913c2490e25b33d..c0812b5d127a49fc5689661a82fa822b8d9790fc 100644 (file)
--- a/core/slots/slots.factor
+++ b/core/slots/slots.factor
@@ -1,6 +1,5 @@
 ! Copyright (C) 2005, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-IN: alien DEFER: pinned-alien DEFER: <bad-alien> ! for bootstrap
 USING: accessors alien arrays assocs byte-arrays classes
 classes.algebra classes.algebra.private classes.maybe
 combinators generic generic.standard hashtables kernel