From f2a40f88dc4bb13a2974fb6ee8a5a2fbd706aefd Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Sat, 26 Sep 2020 21:29:52 -0700
Subject: [PATCH] bootstrap: rename layouts/layouts.factor to layouts.factor.

---
 core/bootstrap/{layouts => }/layouts.factor | 0
 core/bootstrap/layouts/authors.txt          | 1 -
 core/bootstrap/layouts/summary.txt          | 1 -
 core/bootstrap/primitives-docs.factor       | 7 -------
 core/bootstrap/primitives.factor            | 2 +-
 core/bootstrap/stage1.factor                | 3 ++-
 vm/layouts.hpp                              | 4 ++--
 7 files changed, 5 insertions(+), 13 deletions(-)
 rename core/bootstrap/{layouts => }/layouts.factor (100%)
 delete mode 100644 core/bootstrap/layouts/authors.txt
 delete mode 100644 core/bootstrap/layouts/summary.txt
 delete mode 100644 core/bootstrap/primitives-docs.factor

diff --git a/core/bootstrap/layouts/layouts.factor b/core/bootstrap/layouts.factor
similarity index 100%
rename from core/bootstrap/layouts/layouts.factor
rename to core/bootstrap/layouts.factor
diff --git a/core/bootstrap/layouts/authors.txt b/core/bootstrap/layouts/authors.txt
deleted file mode 100644
index 1901f27a24..0000000000
--- a/core/bootstrap/layouts/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Slava Pestov
diff --git a/core/bootstrap/layouts/summary.txt b/core/bootstrap/layouts/summary.txt
deleted file mode 100644
index 8f4f749b0c..0000000000
--- a/core/bootstrap/layouts/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Description of low-level object layout for image generation
diff --git a/core/bootstrap/primitives-docs.factor b/core/bootstrap/primitives-docs.factor
deleted file mode 100644
index cc051e3a13..0000000000
--- a/core/bootstrap/primitives-docs.factor
+++ /dev/null
@@ -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"
diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index c6bb5fd3e1..3707a112dc 100644
--- a/core/bootstrap/primitives.factor
+++ b/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
 
diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index 7fe5515cfe..d7b3c9cb13 100644
--- a/core/bootstrap/stage1.factor
+++ b/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
diff --git a/vm/layouts.hpp b/vm/layouts.hpp
index e60201ed5d..a5fdbcc64f 100644
--- a/vm/layouts.hpp
+++ b/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
-- 
2.34.1