bootstrap: change stage1 to do a load-all of resource:core.

diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index df26a6cb556770dd75f3dac758dd11c65c403c14..85cad41af5404748391cf661431e4a9505ed9f75 100644 (file)
--- a/core/bootstrap/stage1.factor
+++ b/core/bootstrap/stage1.factor
@@ -2,8 +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 vocabs.loader ;
-IN: bootstrap.stage1
+parser.notes sequences system vocabs.hierarchy vocabs.loader ;
 
 "Bootstrap stage 1..." print flush
 
@@ -23,20 +22,7 @@ load-help? off
         boot
     ] %
 
-    "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
+    load-all
 
     "vocab:bootstrap/layouts.factor" parse-file %
 

diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index 21cd30659166911d701a77b24386976ca0a294e6..6138cb517e4ea15a2e4bf715ca075b128d211b94 100644 (file)
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2004, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-IN: math DEFER: <= DEFER: - ! for bootstrap since math uses kernel
+IN: math DEFER: <= DEFER: - ! for bootstrap
 USING: kernel.private slots.private math.private ;
 IN: kernel
 

diff --git a/core/slots/slots.factor b/core/slots/slots.factor
index c0812b5d127a49fc5689661a82fa822b8d9790fc..79a24c4885aaafa1e40184c05913c2490e25b33d 100644 (file)
--- a/core/slots/slots.factor
+++ b/core/slots/slots.factor
@@ -1,5 +1,6 @@
 ! 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