bootstrap: rename layouts/layouts.factor to layouts.factor.

core/bootstrap/layouts/authors.txt

@@ -1 +0,0 @@
-Slava Pestov

core/bootstrap/layouts/summary.txt

@@ -1 +0,0 @@
-Description of low-level object layout for image generation

core/bootstrap/primitives-docs.factor

@@ -1,7 +0,0 @@
-USING: bootstrap.image.private effects help.markup help.syntax strings ;
-IN: bootstrap.primitives
-
-ARTICLE: "bootstrap.primitives" "Bootstrap primitives"
-"A script file run to create the bootstrap image. Also see the vocab " { $link "bootstrap.image.primitives" } "." ;
-
-ABOUT: "bootstrap.primitives"

core/bootstrap/primitives.factor

@@ -21,7 +21,7 @@ H{ } clone sub-primitives set
 
 architecture get asm-file parse-file
 
-"vocab:bootstrap/layouts/layouts.factor" parse-file
+"vocab:bootstrap/layouts.factor" parse-file
 
 ! Now we have ( syntax-quot arch-quot layouts-quot ) on the stack
 

core/bootstrap/stage1.factor

@@ -35,7 +35,8 @@ load-help? off
     "vocabs.loader" require
 
     "syntax" require
-    "bootstrap.layouts" require
+
+    "vocab:bootstrap/layouts.factor" parse-file %
 
     [
         f parser-quiet? set-global

vm/layouts.hpp

@@ -9,7 +9,7 @@ inline static cell alignment_for(cell a, cell b) { return align(a, b) - a; }
 
 static const cell data_alignment = 16;
 
-// Must match leaf-stack-frame-size in core/layouts/layouts.factor
+// Must match leaf-stack-frame-size in core/bootstrap/layouts.factor
 #define LEAF_FRAME_SIZE 16
 
 #define WORD_SIZE (signed)(sizeof(cell) * 8)
@@ -21,7 +21,7 @@ static const cell data_alignment = 16;
 #define RETAG(x, tag) (UNTAG(x) | (tag))
 
 // Type tags, should be kept in sync with:
-//   core/bootstrap/layouts/layouts.factor
+//   core/bootstrap/layouts.factor
 #define FIXNUM_TYPE 0
 #define F_TYPE 1
 #define ARRAY_TYPE 2