From 7f89cb73a16200ae7b5c0dd969dba05c998ce4e1 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 14 Apr 2008 05:27:04 -0500
Subject: [PATCH] Fix bootstrap

---
 core/bootstrap/primitives.factor | 18 +++++++++---------
 core/classes/tuple/tuple.factor  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index 9d3c28b068..f1e41ac2b6 100755
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -390,7 +390,7 @@ define-builtin
 
 ! Create special tombstone values
 "tombstone" "hashtables.private" create
-"tuple" "kernel" lookup
+tuple
 { } define-tuple-class
 
 "((empty))" "hashtables.private" create
@@ -403,7 +403,7 @@ define-builtin
 
 ! Some tuple classes
 "hashtable" "hashtables" create
-"tuple" "kernel" lookup
+tuple
 {
     {
         { "array-capacity" "sequences.private" }
@@ -424,7 +424,7 @@ define-builtin
 } define-tuple-class
 
 "sbuf" "sbufs" create
-"tuple" "kernel" lookup
+tuple
 {
     {
         { "string" "strings" }
@@ -440,7 +440,7 @@ define-builtin
 } define-tuple-class
 
 "vector" "vectors" create
-"tuple" "kernel" lookup
+tuple
 {
     {
         { "array" "arrays" }
@@ -456,7 +456,7 @@ define-builtin
 } define-tuple-class
 
 "byte-vector" "byte-vectors" create
-"tuple" "kernel" lookup
+tuple
 {
     {
         { "byte-array" "byte-arrays" }
@@ -472,7 +472,7 @@ define-builtin
 } define-tuple-class
 
 "bit-vector" "bit-vectors" create
-"tuple" "kernel" lookup
+tuple
 {
     {
         { "bit-array" "bit-arrays" }
@@ -488,7 +488,7 @@ define-builtin
 } define-tuple-class
 
 "float-vector" "float-vectors" create
-"tuple" "kernel" lookup
+tuple
 {
     {
         { "float-array" "float-arrays" }
@@ -504,7 +504,7 @@ define-builtin
 } define-tuple-class
 
 "curry" "kernel" create
-"tuple" "kernel" lookup
+tuple
 {
     {
         { "object" "kernel" }
@@ -525,7 +525,7 @@ define-builtin
 [ tuple-layout [ <tuple-boa> ] curry ] tri define
 
 "compose" "kernel" create
-"tuple" "kernel" lookup
+tuple
 {
     {
         { "object" "kernel" }
diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor
index b2356a5200..c14205e1d9 100755
--- a/core/classes/tuple/tuple.factor
+++ b/core/classes/tuple/tuple.factor
@@ -188,7 +188,7 @@ M: tuple-class update-class
     rot tuck [ superclass = ] [ slot-names = ] 2bi* and ;
 
 : valid-superclass? ( class -- ? )
-    [ tuple-class? ] [ tuple bootstrap-word eq? ] bi or ;
+    [ tuple-class? ] [ tuple eq? ] bi or ;
 
 : check-superclass ( superclass -- )
     dup valid-superclass? [ bad-superclass ] unless drop ;