More unit test fixes, load fixes

diff --git a/core/generic/generic-tests.factor b/core/generic/generic-tests.factor
index d41ffaecce06cac1092c1082f1cd7ca4727c3eab..88e13ec0f8611d97851f3b1c9000483928c0b365 100755 (executable)
--- 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 60012d9f4ce593d1c5602fde1d61bb948c6e9f87..4bfbdcd943888c82ff58e331761847cfdced9ee8 100644 (file)
--- 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 76162c666a6a5a11ba10a6d8b1ce77386471a471..7215f2986518e64341b465611b78323ed8a7a471 100755 (executable)
--- a/extra/logging/parser/parser.factor
+++ b/extra/logging/parser/parser.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
-USING: parser-combinators memoize kernel sequences\r
+USING: accessors parser-combinators memoize kernel sequences\r
 logging arrays words strings vectors io io.files\r
 namespaces combinators combinators.lib logging.server\r
 calendar calendar.format ;\r

diff --git a/extra/serialize/serialize.factor b/extra/serialize/serialize.factor
index dc34920bbd89938af80f21d8fb959c7d7a0a2a59..2d513a2184da1665774db0a3a3fa45de695b40a4 100755 (executable)
--- 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 ce717f4211dfdeb7f98400ebfad6b8a13adbb711..0feb25169174d4f8d8ecc6cee1e02515918b2be6 100755 (executable)
--- 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 549362773ac5cb1b414ca8bfee83cef156a6082f..b8917529d6d9d808a7a84dad513082abca471a94 100755 (executable)
--- 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