bootstrap: a few more paths

diff --git a/core/io/pathnames/pathnames-tests.factor b/core/io/pathnames/pathnames-tests.factor
index b821f6fbba180c5c4c340733ea05eff1665664b1..ac2ac7c5d92bb86f2873acb04e9bbb46820c4f0f 100644 (file)
--- a/core/io/pathnames/pathnames-tests.factor
+++ b/core/io/pathnames/pathnames-tests.factor
@@ -60,8 +60,8 @@ H{
     { current-directory "." }
     { "resource-path" ".." }
 } [
-    [ "../core/bootstrap/stage2.factor" ]
-    [ "resource:core/bootstrap/stage2.factor" absolute-path ]
+    [ "../basis/bootstrap/stage2.factor" ]
+    [ "resource:basis/bootstrap/stage2.factor" absolute-path ]
     unit-test
 ] with-variables
 
@@ -188,4 +188,4 @@ os windows? [
 
 ! Would be a core/ path except the path already exists in basis
 { "resource:basis/bootstrap/finish-bootstrap.factor" }
-[ "bootstrap/finish-bootstrap.factor" vocab-path ] unit-test
\ No newline at end of file
+[ "bootstrap/finish-bootstrap.factor" vocab-path ] unit-test

diff --git a/vm/layouts.hpp b/vm/layouts.hpp
index a5fdbcc64fdeb60b9baf7f2d5de0672231ca12fd..17c14da4585e99dec5f804d9c49f8e2b045e0414 100644 (file)
--- 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/bootstrap/layouts.factor
+// Must match leaf-stack-frame-size in basis/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.factor
+//   basis/bootstrap/layouts.factor
 #define FIXNUM_TYPE 0
 #define F_TYPE 1
 #define ARRAY_TYPE 2