From b9aa005310949b138e50518f9aeebaf45f2340a1 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 30 Jun 2008 05:13:50 -0500
Subject: [PATCH] More unit test fixes, load fixes

---
 core/generic/generic-tests.factor        | 8 ++++----
 extra/furnace/utilities/utilities.factor | 2 +-
 extra/logging/parser/parser.factor       | 2 +-
 extra/serialize/serialize.factor         | 4 ++--
 extra/tuple-syntax/tuple-syntax.factor   | 6 +++---
 extra/xmode/tokens/tokens.factor         | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/generic/generic-tests.factor b/core/generic/generic-tests.factor
index d41ffaecce..88e13ec0f8 100755
--- a/core/generic/generic-tests.factor
+++ b/core/generic/generic-tests.factor
@@ -144,7 +144,7 @@ M: integer generic-forget-test-1 / ;
 
 [ t ] [
     \ / usage [ word? ] filter
-    [ name>> "generic-forget-test-1/integer" = ] contains?
+    [ name>> "integer=>generic-forget-test-1" = ] contains?
 ] unit-test
 
 [ ] [
@@ -153,7 +153,7 @@ M: integer generic-forget-test-1 / ;
 
 [ f ] [
     \ / usage [ word? ] filter
-    [ name>> "generic-forget-test-1/integer" = ] contains?
+    [ name>> "integer=>generic-forget-test-1" = ] contains?
 ] unit-test
 
 GENERIC: generic-forget-test-2 ( a b -- c )
@@ -162,7 +162,7 @@ M: sequence generic-forget-test-2 = ;
 
 [ t ] [
     \ = usage [ word? ] filter
-    [ name>> "generic-forget-test-2/sequence" = ] contains?
+    [ name>> "sequence=>generic-forget-test-2" = ] contains?
 ] unit-test
 
 [ ] [
@@ -171,7 +171,7 @@ M: sequence generic-forget-test-2 = ;
 
 [ f ] [
     \ = usage [ word? ] filter
-    [ name>> "generic-forget-test-2/sequence" = ] contains?
+    [ name>> "sequence=>generic-forget-test-2" = ] contains?
 ] unit-test
 
 GENERIC: generic-forget-test-3 ( a -- b )
diff --git a/extra/furnace/utilities/utilities.factor b/extra/furnace/utilities/utilities.factor
index 60012d9f4c..4bfbdcd943 100644
--- a/extra/furnace/utilities/utilities.factor
+++ b/extra/furnace/utilities/utilities.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: words kernel sequences splitting ;
+USING: accessors words kernel sequences splitting ;
 IN: furnace.utilities
 
 : word>string ( word -- string )
diff --git a/extra/logging/parser/parser.factor b/extra/logging/parser/parser.factor
index 76162c666a..7215f29865 100755
--- a/extra/logging/parser/parser.factor
+++ b/extra/logging/parser/parser.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: parser-combinators memoize kernel sequences
+USING: accessors parser-combinators memoize kernel sequences
 logging arrays words strings vectors io io.files
 namespaces combinators combinators.lib logging.server
 calendar calendar.format ;
diff --git a/extra/serialize/serialize.factor b/extra/serialize/serialize.factor
index dc34920bbd..2d513a2184 100755
--- a/extra/serialize/serialize.factor
+++ b/extra/serialize/serialize.factor
@@ -188,7 +188,7 @@ M: word (serialize) ( obj -- )
 
 M: wrapper (serialize) ( obj -- )
     CHAR: W write1
-    wrapped (serialize) ;
+    wrapped>> (serialize) ;
 
 DEFER: (deserialize) ( -- obj )
 
@@ -239,7 +239,7 @@ SYMBOL: deserialized
     gensym {
         [ intern-object ]
         [ (deserialize) define ]
-        [ (deserialize) swap set-word-props ]
+        [ (deserialize) >>props drop ]
         [ ]
     } cleave ;
 
diff --git a/extra/tuple-syntax/tuple-syntax.factor b/extra/tuple-syntax/tuple-syntax.factor
index ce717f4211..0feb251691 100755
--- a/extra/tuple-syntax/tuple-syntax.factor
+++ b/extra/tuple-syntax/tuple-syntax.factor
@@ -1,5 +1,5 @@
-USING: kernel sequences slots parser lexer words classes
-slots.private mirrors ;
+USING: classes.tuple accessors kernel sequences slots parser
+lexer words classes slots.private mirrors ;
 IN: tuple-syntax
 
 ! TUPLE: foo bar baz ;
@@ -7,7 +7,7 @@ IN: tuple-syntax
 
 : parse-slot-writer ( tuple -- slot# )
     scan dup "}" = [ 2drop f ] [
-        but-last swap object-slots slot-named slot-spec-offset
+        but-last swap class all-slots slot-named offset>>
     ] if ;
 
 : parse-slots ( accum tuple -- accum tuple )
diff --git a/extra/xmode/tokens/tokens.factor b/extra/xmode/tokens/tokens.factor
index 549362773a..b8917529d6 100755
--- a/extra/xmode/tokens/tokens.factor
+++ b/extra/xmode/tokens/tokens.factor
@@ -1,4 +1,4 @@
-USING: parser words sequences namespaces kernel assocs
+USING: accessors parser words sequences namespaces kernel assocs
 compiler.units ;
 IN: xmode.tokens