Move definition of 't' from syntax to bootstrap/primitives to fix bootstrap, now...

diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index bd0f2008fc9975d62597ae1ccfeb016d9931cfdb..95334eb0e7aa37bf6283c64c43957b8855e4a8e4 100755 (executable)
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -4,11 +4,11 @@ USING: alien alien.strings arrays byte-arrays generic hashtables
 hashtables.private io io.encodings.ascii kernel math
 math.private math.order namespaces make parser sequences strings
 vectors words quotations assocs layouts classes classes.private
-classes.builtin classes.tuple classes.tuple.private
-kernel.private vocabs vocabs.loader source-files definitions
-slots classes.union classes.intersection classes.predicate
-compiler.units bootstrap.image.private io.files accessors
-combinators ;
+classes.builtin classes.singleton classes.tuple
+classes.tuple.private kernel.private vocabs vocabs.loader
+source-files definitions slots classes.union
+classes.intersection classes.predicate compiler.units
+bootstrap.image.private io.files accessors combinators ;
 IN: bootstrap.primitives
 
 "Creating primitives and basic runtime structures..." print flush
@@ -156,6 +156,8 @@ call( -- )
 "f" "syntax" create [ not ] "predicate" set-word-prop
 "f?" "syntax" vocab-words delete-at
 
+"t" "syntax" lookup define-singleton-class
+
 ! Some unions
 "c-ptr" "alien" create [
     "alien" "alien" lookup ,

diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor
index 9b47d29a9e38944cf499586927859f64ef5c30a5..803287a89d7481e970bbc09a9eeabe48e7948de7 100644 (file)
--- a/core/syntax/syntax.factor
+++ b/core/syntax/syntax.factor
@@ -76,7 +76,6 @@ IN: bootstrap.syntax
     "NAN:" [ 16 scan-base <fp-nan> suffix! ] define-core-syntax
 
     "f" [ f suffix! ] define-core-syntax
-    "t" "syntax" lookup define-singleton-class
 
     "CHAR:" [
         scan-token {