Bootstrap fixes

diff --git a/library/bootstrap/boot-stage1.factor b/library/bootstrap/boot-stage1.factor
index cc19dac1c260814efa6ddba815ec48cdb5d848f0..71ae3beaf24113729e028846c1daf5789c1f158c 100644 (file)
--- a/library/bootstrap/boot-stage1.factor
+++ b/library/bootstrap/boot-stage1.factor
@@ -109,23 +109,22 @@ vectors words ;
         "/library/io/server.factor"
         "/library/tools/jedit.factor"
 
-        "/library/compiler/architecture.factor"
-
         "/library/compiler/inference/shuffle.factor"
         "/library/compiler/inference/dataflow.factor"
         "/library/compiler/inference/inference.factor"
         "/library/compiler/inference/branches.factor"
         "/library/compiler/inference/words.factor"
         "/library/compiler/inference/stack.factor"
+        "/library/compiler/inference/known-words.factor"
 
         "/library/compiler/optimizer/class-infer.factor"
         "/library/compiler/optimizer/kill-literals.factor"
         "/library/compiler/optimizer/optimizer.factor"
         "/library/compiler/optimizer/inline-methods.factor"
-        "/library/compiler/optimizer/known-words.factor"
         "/library/compiler/optimizer/call-optimizers.factor"
         "/library/compiler/optimizer/print-dataflow.factor"
 
+        "/library/compiler/generator/architecture.factor"
         "/library/compiler/generator/assembler.factor"
         "/library/compiler/generator/templates.factor"
         "/library/compiler/generator/xt.factor"
@@ -191,13 +190,6 @@ vectors words ;
         "/library/kernel.facts"
         "/library/threads.facts"
         "/library/words.facts"
-        "/library/compiler/alien/alien-callback.facts"
-        "/library/compiler/alien/alien-invoke.facts"
-        "/library/compiler/alien/aliens.facts"
-        "/library/compiler/alien/c-types.facts"
-        "/library/compiler/alien/malloc.facts"
-        "/library/compiler/alien/structs.facts"
-        "/library/compiler/alien/syntax.facts"
         "/library/bootstrap/image.facts"
         "/library/collections/growable.facts"
         "/library/collections/arrays.facts"
@@ -215,6 +207,14 @@ vectors words ;
         "/library/collections/flatten.facts"
         "/library/collections/vectors.facts"
         "/library/collections/virtual-sequences.facts"
+        "/library/compiler/alien/alien-callback.facts"
+        "/library/compiler/alien/alien-invoke.facts"
+        "/library/compiler/alien/aliens.facts"
+        "/library/compiler/alien/c-types.facts"
+        "/library/compiler/alien/malloc.facts"
+        "/library/compiler/alien/structs.facts"
+        "/library/compiler/alien/syntax.facts"
+        "/library/compiler/inference/inference.facts"
         "/library/compiler/compiler.facts"
         "/library/generic/early-generic.facts"
         "/library/generic/generic.facts"
@@ -222,7 +222,6 @@ vectors words ;
         "/library/generic/slots.facts"
         "/library/generic/standard-combination.facts"
         "/library/generic/tuple.facts"
-        "/library/inference/inference.facts"
         "/library/io/binary.facts"
         "/library/io/buffer.facts"
         "/library/io/c-streams.facts"

diff --git a/library/bootstrap/boot-stage2.factor b/library/bootstrap/boot-stage2.factor
index ba1de70cb33574b843f373d816a18d017fa2f3ad..2e315e95993bc5c6bc3598ca7694b4bc047544ad 100644 (file)
--- a/library/bootstrap/boot-stage2.factor
+++ b/library/bootstrap/boot-stage2.factor
@@ -23,6 +23,8 @@ H{ } clone help-graph set-global xref-articles
 
     "Compiling base..." print flush
 
+    \ + compile
+    \ = compile
     { "kernel" "sequences" "assembler" } compile-vocabs
 
     "Compiling system..." print flush

diff --git a/library/bootstrap/primitives.factor b/library/bootstrap/primitives.factor
index fee3cec058d9500a475d467ee5ba471b51198249..26a9491e4a0f98f57b1271f0a5eb9fd21b1f14e9 100644 (file)
--- a/library/bootstrap/primitives.factor
+++ b/library/bootstrap/primitives.factor
@@ -11,7 +11,7 @@ vectors words ;
 "Creating primitives and basic runtime structures..." print flush
 
 H{ } clone c-types set
-"/library/alien/primitive-types.factor" parse-resource
+"/library/compiler/alien/primitive-types.factor" parse-resource
 
 ! These symbols need the same hashcode in the target as in the
 ! host.

diff --git a/library/compiler/generator/generator.factor b/library/compiler/generator/generator.factor
index 0d3b2862a9c94d1b66de106baf51e4d3057ee41b..98616c2b080d22c5096861ab6b3de04a4d9b51d0 100644 (file)
--- a/library/compiler/generator/generator.factor
+++ b/library/compiler/generator/generator.factor
@@ -12,6 +12,10 @@ M: object stack-reserve* drop 0 ;
 : stack-reserve ( node -- n )
     0 swap [ stack-reserve* max ] each-node ;
 
+: if-intrinsic ( #call -- quot )
+    dup node-successor #if?
+    [ node-param "if-intrinsic" word-prop ] [ drop f ] if ;
+
 DEFER: #terminal?
 
 PREDICATE: #merge #terminal-merge node-successor #terminal? ;
@@ -130,10 +134,6 @@ M: #if generate-node ( node -- next )
 : define-if-intrinsic ( word quot template -- | quot: label -- )
     [with-template] "if-intrinsic" set-word-prop ;
 
-: if-intrinsic ( #call -- quot )
-    dup node-successor #if?
-    [ node-param "if-intrinsic" word-prop ] [ drop f ] if ;
-
 M: #call generate-node ( node -- next )
     dup if-intrinsic [
         >r <label> dup r> call

diff --git a/library/compiler/optimizer/optimizer.factor b/library/compiler/optimizer/optimizer.factor
index ae4cc58a8289e0bae15d0ad0eff75d05ee37fb03..4affecae6dac523a1e8090b30348c17a195b5bd7 100644 (file)
--- a/library/compiler/optimizer/optimizer.factor
+++ b/library/compiler/optimizer/optimizer.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2006 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 IN: optimizer
-USING: compiler generic hashtables inference io kernel
+USING: generic hashtables inference io kernel
 lists math namespaces sequences vectors ;
 
 SYMBOL: optimizer-changed