Missed yet more renames

diff --git a/basis/alien/complex/functor/functor.factor b/basis/alien/complex/functor/functor.factor
index 90fb5174c19a96dface9c2393cf8da173514c468..1a4b32daa157db0649726aa857f0190f690014c9 100644 (file)
--- a/basis/alien/complex/functor/functor.factor
+++ b/basis/alien/complex/functor/functor.factor
@@ -24,7 +24,7 @@ STRUCT: T-class { real N-type } { imaginary N-type } ;
 : *T ( alien -- z )
     T-class memory>struct [ real>> ] [ imaginary>> ] bi rect> ; inline
 
-T-class c-type
+T-class lookup-c-type
 <T> 1quotation >>unboxer-quot
 *T 1quotation >>boxer-quot
 complex >>boxed-class

diff --git a/basis/db/queries/queries.factor b/basis/db/queries/queries.factor
index 118ac73c3e38920c3e25929a91b1ef7134ae3f72..409a6e8ab984012a7998b90b9c1b4af9ed2e7906 100644 (file)
--- a/basis/db/queries/queries.factor
+++ b/basis/db/queries/queries.factor
@@ -190,13 +190,13 @@ M: db-connection <select-by-slots-statement> ( tuple class -- statement )
     } 2cleave ;
 
 M: db-connection query>statement ( query -- tuple )
-    [ tuple>> dup class ] keep
+    [ tuple>> dup class-of ] keep
     [ <select-by-slots-statement> ] dip make-query* ;
 
 ! select ID, NAME, SCORE from EXAM limit 1 offset 3
 
 M: db-connection <count-statement> ( query -- statement )
-    [ tuple>> dup class ] keep
+    [ tuple>> dup class-of ] keep
     [ [ "select count(*) from " 0% 0% where-clause ] query-make ]
     dip make-query* ;
 

diff --git a/basis/db/tuples/tuples.factor b/basis/db/tuples/tuples.factor
index 45fbf31a0fb66aa52c6f0d3d0bd7b404170e87a7..fcb7df53cc0f08cceabe73f260640fc758f28ce1 100644 (file)
--- a/basis/db/tuples/tuples.factor
+++ b/basis/db/tuples/tuples.factor
@@ -29,7 +29,7 @@ SYMBOL: sql-counter
 GENERIC: eval-generator ( singleton -- object )
 
 : resulting-tuple ( exemplar-tuple row out-params -- tuple )
-    rot class new [
+    rot class-of new [
         '[ slot-name>> _ set-slot-named ] 2each
     ] keep ;
 
@@ -52,13 +52,13 @@ GENERIC: eval-generator ( singleton -- object )
     ] if ; inline
 
 : insert-db-assigned-statement ( tuple -- )
-    dup class
+    dup class-of
     db-connection get insert-statements>>
     [ <insert-db-assigned-statement> ] cache
     [ bind-tuple ] 2keep insert-tuple-set-key ;
 
 : insert-user-assigned-statement ( tuple -- )
-    dup class
+    dup class-of
     db-connection get insert-statements>>
     [ <insert-user-assigned-statement> ] cache
     [ bind-tuple ] keep execute-statement ;
@@ -131,17 +131,17 @@ ERROR: no-defined-persistent object ;
 : ensure-tables ( classes -- ) [ ensure-table ] each ;
 
 : insert-tuple ( tuple -- )
-    dup class ensure-defined-persistent db-assigned?
+    dup class-of ensure-defined-persistent db-assigned?
     [ insert-db-assigned-statement ] [ insert-user-assigned-statement ] if ;
 
 : update-tuple ( tuple -- )
-    dup class ensure-defined-persistent
+    dup class-of ensure-defined-persistent
     db-connection get update-statements>> [ <update-tuple-statement> ] cache
     [ bind-tuple ] keep execute-statement ;
 
 : delete-tuples ( tuple -- )
     dup
-    dup class ensure-defined-persistent
+    dup class-of ensure-defined-persistent
     <delete-tuples-statement> [
         [ bind-tuple ] keep execute-statement
     ] with-disposal ;

diff --git a/basis/db/types/types.factor b/basis/db/types/types.factor
index 1ad81ad3ee9e3a0936a8f83a7c585d210836a6d5..d6ab2417788642e102645da35983e287ae7b137e 100644 (file)
--- a/basis/db/types/types.factor
+++ b/basis/db/types/types.factor
@@ -38,7 +38,7 @@ SYMBOL: IGNORE
 ERROR: no-slot ;
 
 : offset-of-slot ( string tuple -- n )
-    class all-slots slot-named dup [ no-slot ] unless offset>> ;
+    class-of all-slots slot-named dup [ no-slot ] unless offset>> ;
 
 : get-slot-named ( name tuple -- value )
     [ nip ] [ offset-of-slot ] 2bi slot ;
@@ -62,7 +62,7 @@ ERROR: not-persistent class ;
 
 : set-primary-key ( value tuple -- )
     [
-        class db-columns
+        class-of db-columns
         find-primary-key first slot-name>>
     ] keep set-slot-named ;
 

diff --git a/basis/ftp/server/server.factor b/basis/ftp/server/server.factor
index 369c4969a640f22d06d839d9d7f646a94d8f6129..80d699fd1f7e35df096e6655f793513333fc0402 100644 (file)
--- a/basis/ftp/server/server.factor
+++ b/basis/ftp/server/server.factor
@@ -126,7 +126,7 @@ ERROR: type-error type ;
     ] recover ;
 
 : random-local-server ( -- server )
-    remote-address get class new binary <server> ;
+    remote-address get class-of new binary <server> ;
 
 : port>bytes ( port -- hi lo )
     [ -8 shift ] keep [ 8 bits ] bi@ ;

diff --git a/basis/furnace/utilities/utilities.factor b/basis/furnace/utilities/utilities.factor
index 94762d7591c13b30c3c58275c714bb08de624178..9ba34dcddc68e8da8b8a235dbe77ee57d1b0cb12 100644 (file)
--- a/basis/furnace/utilities/utilities.factor
+++ b/basis/furnace/utilities/utilities.factor
@@ -31,7 +31,7 @@ ERROR: no-such-responder responder ;
 
 : base-path ( string -- seq )
     dup responder-nesting get
-    [ second class superclasses [ name>> = ] with any? ] with find nip
+    [ second class-of superclasses [ name>> = ] with any? ] with find nip
     [ first ] [ no-such-responder ] ?if ;
 
 : resolve-base-path ( string -- string' )

diff --git a/basis/gobject-introspection/standard-types/standard-types.factor b/basis/gobject-introspection/standard-types/standard-types.factor
index 67398e39285f41a2ce3b9377534735a8e9be252b..4435f439f8dcdec704a69f4fcc66c33699f82fd6 100644 (file)
--- a/basis/gobject-introspection/standard-types/standard-types.factor
+++ b/basis/gobject-introspection/standard-types/standard-types.factor
@@ -34,7 +34,7 @@ TYPEDEF: void* gpointer
 TYPEDEF: guint32 gunichar
 TYPEDEF: void* va_list
 
-int c-type clone
+int lookup-c-type clone
     [ >c-bool ] >>unboxer-quot
     [ c-bool> ] >>boxer-quot
     object >>boxed-class

diff --git a/basis/gobject-introspection/types/types.factor b/basis/gobject-introspection/types/types.factor
index 05ec8ef5db2a82c23a1911289449750ac08dda5c..463af64a1abddc41295ddfda52f229e29592104b 100644 (file)
--- a/basis/gobject-introspection/types/types.factor
+++ b/basis/gobject-introspection/types/types.factor
@@ -85,7 +85,7 @@ ERROR: unknown-type-error type ;
     qualified-type-name type-infos get-global at ;
 
 :: register-type ( c-type type-info name -- )
-    type-info lookup-c-type >>c-type name
+    type-info c-type >>c-type name
     type-infos get-global set-at ;
 
 : register-standard-type ( c-type name -- )

diff --git a/basis/inverse/inverse.factor b/basis/inverse/inverse.factor
index b4a3b72b3c8d89232f4b1001ca016b4092e69d8c..aa970f4f4fbfc977ffc2ad3d1db2b4e260ae561d 100644 (file)
--- a/basis/inverse/inverse.factor
+++ b/basis/inverse/inverse.factor
@@ -225,7 +225,7 @@ DEFER: __
 \ prepend 1 [ [ ?head assure ] curry ] define-pop-inverse
 
 : assure-same-class ( obj1 obj2 -- )
-    [ class ] bi@ = assure ; inline
+    [ class-of ] bi@ = assure ; inline
 
 \ output>sequence 2 [ [undo] '[ dup _ assure-same-class _ input<sequence ] ] define-pop-inverse
 \ input<sequence 1 [ [undo] '[ _ { } output>sequence ] ] define-pop-inverse

diff --git a/basis/opengl/annotations/annotations.factor b/basis/opengl/annotations/annotations.factor
index a82c645ef29037df416727e3a5d4138ae48fa387..9e84732cfe5b0e524e94f5bf366265ec2b64e814 100644 (file)
--- a/basis/opengl/annotations/annotations.factor
+++ b/basis/opengl/annotations/annotations.factor
@@ -25,7 +25,7 @@ gl-error-log [ V{ } clone ] initialize
     name>> { [ "glGetError" = not ] [ "gl" head? ] [ third LETTER? ] } 1&& ;
 
 : gl-functions ( -- words )
-    "opengl.gl" vocab words [ gl-function? ] filter ;
+    "opengl.gl" lookup-vocab words [ gl-function? ] filter ;
 
 : annotate-gl-functions ( quot -- )
     [

diff --git a/basis/serialize/serialize.factor b/basis/serialize/serialize.factor
index a999a20eb63bcfe076e8c78bfb213510be4343a1..fa0a72e7e58f732c64867b2ceaf3b689f3c82b13 100644 (file)
--- a/basis/serialize/serialize.factor
+++ b/basis/serialize/serialize.factor
@@ -93,7 +93,7 @@ M: float (serialize) ( obj -- )
 M: tuple (serialize) ( obj -- )
     [
         CHAR: T write1
-        [ class (serialize) ]
+        [ class-of (serialize) ]
         [ add-object ]
         [ tuple>array rest (serialize) ]
         tri

diff --git a/basis/smtp/smtp.factor b/basis/smtp/smtp.factor
index 75c6db9bbe6a92e4375687d6ef5dc5c62a6e0637..771ac5b19b66807bdbfec5202de9557350514024 100644 (file)
--- a/basis/smtp/smtp.factor
+++ b/basis/smtp/smtp.factor
@@ -111,7 +111,7 @@ TUPLE: response code messages ;
 ERROR: smtp-error response ;
 
 M: smtp-error error.
-    "SMTP error (" write dup class pprint ")" print
+    "SMTP error (" write dup class-of pprint ")" print
     response>> messages>> [ print ] each ;
 
 ERROR: smtp-server-busy < smtp-error ;

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 72a2c4b881a96e0b67f28b4824d27c68fb8ef537..348bc3be0ed8b2a91d16770c2dbf00bbc74af3d5 100755 (executable)
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -58,21 +58,21 @@ IN: tools.deploy.shaker
     ] when ;
 
 : strip-debugger ( -- )
-    strip-debugger? "debugger" vocab and [
+    strip-debugger? "debugger" lookup-vocab and [
         "Stripping debugger" show
         "vocab:tools/deploy/shaker/strip-debugger.factor"
         run-file
     ] when ;
 
 : strip-ui-error-hook ( -- )
-    strip-debugger? deploy-ui? get and "ui" vocab and [
+    strip-debugger? deploy-ui? get and "ui" lookup-vocab and [
         "Installing generic UI error hook" show
         "vocab:tools/deploy/shaker/strip-ui-error-hook.factor"
         run-file
     ] when ;
 
 : strip-libc ( -- )
-    "libc" vocab [
+    "libc" lookup-vocab [
         "Stripping manual memory management debug code" show
         "vocab:tools/deploy/shaker/strip-libc.factor"
         run-file
@@ -88,28 +88,28 @@ IN: tools.deploy.shaker
     "vocab:tools/deploy/shaker/strip-call.factor" run-file ;
 
 : strip-cocoa ( -- )
-    "cocoa" vocab [
+    "cocoa" lookup-vocab [
         "Stripping unused Cocoa methods" show
         "vocab:tools/deploy/shaker/strip-cocoa.factor"
         run-file
     ] when ;
 
 : strip-gobject ( -- )
-    "gobject-introspection.types" vocab [
+    "gobject-introspection.types" lookup-vocab [
         "Stripping GObject type info" show
         "vocab:tools/deploy/shaker/strip-gobject.factor"
         run-file
     ] when ;
 
 : strip-gtk-icon ( -- )
-    "ui.backend.gtk" vocab [
+    "ui.backend.gtk" lookup-vocab [
         "Stripping GTK icon loading code" show
         "vocab:tools/deploy/shaker/strip-gtk-icon.factor"
         run-file
     ] when ;
 
 : strip-specialized-arrays ( -- )
-    strip-dictionary? "specialized-arrays" vocab and [
+    strip-dictionary? "specialized-arrays" lookup-vocab and [
         "Stripping specialized arrays" show
         "vocab:tools/deploy/shaker/strip-specialized-arrays.factor"
         run-file

diff --git a/basis/typed/prettyprint/prettyprint.factor b/basis/typed/prettyprint/prettyprint.factor
index 4bb8814e4cad00f26462966da331dc166d620108..68950dfbb8f72f78e8363794d94b58330256a234 100644 (file)
--- a/basis/typed/prettyprint/prettyprint.factor
+++ b/basis/typed/prettyprint/prettyprint.factor
@@ -17,7 +17,7 @@ M: input-mismatch-error summary
         "” expected input value of type " %
         dup expected-type>> name>> %
         " but got " %
-        dup value>> class name>> %
+        dup value>> class-of name>> %
         drop
     ] "" make ;
 
@@ -28,6 +28,6 @@ M: output-mismatch-error summary
         "” expected to output value of type " %
         dup expected-type>> name>> %
         " but gave " %
-        dup value>> class name>> %
+        dup value>> class-of name>> %
         drop
     ] "" make ;

diff --git a/extra/annotations/annotations-docs.factor b/extra/annotations/annotations-docs.factor
index 8685d954e82227e9d9028522895a3b45090ca80b..292f181f84d8e6bdb633babf2725c1d1f950d12e 100644 (file)
--- a/extra/annotations/annotations-docs.factor
+++ b/extra/annotations/annotations-docs.factor
@@ -56,7 +56,7 @@ annotation-tags natural-sort
 ] bi
 <article> "annotations" add-article
 
-"annotations" vocab "annotations" >>help drop
+"annotations" lookup-vocab "annotations" >>help drop
 
 annotation-tags [
     {

diff --git a/extra/boids/boids.factor b/extra/boids/boids.factor
index 27afc062b3402de5c0c2b3dfe6f0ca999d1b68b3..0ff4344ae16fe038275f2252de034d517db86633 100644 (file)
--- a/extra/boids/boids.factor
+++ b/extra/boids/boids.factor
@@ -93,7 +93,7 @@ M: range-observer model-changed
     dup [ deg>rad cos behavior angle-cos<< ] connect
     horizontal <slider> { 1 2 } grid-add
 
-    behavior class name>> <labeled-gadget> ;
+    behavior class-of name>> <labeled-gadget> ;
 
 :: set-population ( n boids-gadget -- )
     boids-gadget [

diff --git a/extra/fuel/help/help.factor b/extra/fuel/help/help.factor
index dcf5d69a748252cfe28f2540e8902f354d3b7c71..510b55e60adcfee575e24689c4793468efe82794 100644 (file)
--- a/extra/fuel/help/help.factor
+++ b/extra/fuel/help/help.factor
@@ -96,7 +96,7 @@ PRIVATE>
 
 : (fuel-word-synopsis) ( word usings -- str/f )
     [
-        [ vocab ] filter interactive-vocabs [ append ] change
+        [ lookup-vocab ] filter interactive-vocabs [ append ] change
         fuel-find-word [ synopsis ] [ f ] if*
     ] with-scope ;
 

diff --git a/extra/graphviz/builder/builder.factor b/extra/graphviz/builder/builder.factor
index 7d3ec797b283bcf5037803a2e14ab27e2bbbd684..b75b1e7d423abc55def93789959ad81d8d5773ff 100644 (file)
--- a/extra/graphviz/builder/builder.factor
+++ b/extra/graphviz/builder/builder.factor
@@ -38,7 +38,7 @@ M: object (build-alien) improper-statement-error ;
     if ; inline
 
 : build-alien-attrs ( alien attrs -- )
-    [ class "slots" word-prop ] [ tuple>array rest ] bi
+    [ class-of "slots" word-prop ] [ tuple>array rest ] bi
     [ [ name>> ] dip build-alien-attr ] 2each drop ;
 
 M: graph-attributes (build-alien)

diff --git a/extra/llvm/invoker/invoker.factor b/extra/llvm/invoker/invoker.factor
index 4fd68d3965adda409dcac149be9ec4056da4ac98..b49d255968f5e19c63bd20f05fc9c55fe8ee8392 100644 (file)
--- a/extra/llvm/invoker/invoker.factor
+++ b/extra/llvm/invoker/invoker.factor
@@ -40,8 +40,8 @@ TUPLE: function name alien return params ;
     "alien.llvm" create swap
     [
         dup name>> function-pointer ,
-        dup return>> lookup-c-type ,
-        dup params>> [ second lookup-c-type ] map ,
+        dup return>> c:lookup-c-type ,
+        dup params>> [ second c:lookup-c-type ] map ,
         cdecl , \ alien-indirect ,
     ] [ ] make swap function-effect [ define-declared ] with-compilation-unit ;
 

diff --git a/extra/macho/macho.factor b/extra/macho/macho.factor
index 2b96829bbec997991b135556affd75e0e8a2eaeb..943f816c2c6dd1d930e27ec8330645430f550c73 100644 (file)
--- a/extra/macho/macho.factor
+++ b/extra/macho/macho.factor
@@ -890,7 +890,7 @@ TYPED: macho-header ( c-ptr -- macho: mach_header_32/64 )
 
 TYPED: load-commands ( macho: mach_header_32/64 -- load-commands )
     [
-        [ class heap-size ]
+        [ class-of heap-size ]
         [ >c-ptr <displaced-alien> ]
         [ ncmds>> ] tri iota [
             drop read-command
@@ -908,7 +908,7 @@ TYPED: load-commands ( macho: mach_header_32/64 -- load-commands )
 
 : segment-sections ( segment-command -- sections )
     {
-        [ class heap-size ]
+        [ class-of heap-size ]
         [ >c-ptr <displaced-alien> ]
         [ nsects>> ]
         [ segment_command_64? ]

diff --git a/extra/memory/pools/pools.factor b/extra/memory/pools/pools.factor
index a053c058537d23333999916659b15aaada4d69a6..a1da283d03b1134f7eab4ab967ad912630a33081 100644 (file)
--- a/extra/memory/pools/pools.factor
+++ b/extra/memory/pools/pools.factor
@@ -47,7 +47,7 @@ PRIVATE>
     class-pool pool-new ;
 
 : free-to-pool ( object -- )
-    dup class class-pool pool-free ;
+    dup class-of class-pool pool-free ;
 
 SYNTAX: POOL:
     scan-word scan-word '[ _ swap <pool> ] [ swap set-class-pool ] bi ;

diff --git a/extra/mongodb/tuple/collection/collection.factor b/extra/mongodb/tuple/collection/collection.factor
index eeb73141960e2bbad89c1bf22daeacee2c40fdc6..272fc3df1b7c7dd282a45f1b52ac46cda2537fcc 100644 (file)
--- a/extra/mongodb/tuple/collection/collection.factor
+++ b/extra/mongodb/tuple/collection/collection.factor
@@ -39,13 +39,13 @@ MEMO: id-slot ( class -- slot )
 PRIVATE>
 
 : >toid ( object -- toid )
-   [ id>> ] [ class id-slot ] bi <toid> ;
+   [ id>> ] [ class-of id-slot ] bi <toid> ;
 
 M: mdb-persistent id>> ( object -- id )
-   dup class id-slot reader-word execute( object -- id ) ;
+   dup class-of id-slot reader-word execute( object -- id ) ;
 
 M: mdb-persistent id<< ( object value -- )
-   over class id-slot writer-word execute( object value -- ) ;
+   over class-of id-slot writer-word execute( object value -- ) ;
 
 
  
@@ -125,10 +125,10 @@ M: tuple-class tuple-collection ( tuple -- mdb-collection )
     (mdb-collection) ;
  
 M: mdb-persistent tuple-collection ( tuple -- mdb-collection )
-    class (mdb-collection) ;
+    class-of (mdb-collection) ;
  
 M: mdb-persistent mdb-slot-map ( tuple -- string )
-    class (mdb-slot-map) ;
+    class-of (mdb-slot-map) ;
 
 M: tuple-class mdb-slot-map ( class -- assoc )
     (mdb-slot-map) ;
@@ -137,7 +137,7 @@ M: mdb-collection mdb-slot-map ( collection -- assoc )
     classes>> [ mdb-slot-map ] map assoc-combine ;
 
 M: mdb-persistent mdb-index-map
-    class (mdb-index-map) ;
+    class-of (mdb-index-map) ;
 M: tuple-class mdb-index-map
     (mdb-index-map) ;
 M: mdb-collection mdb-index-map

diff --git a/extra/mongodb/tuple/state/state.factor b/extra/mongodb/tuple/state/state.factor
index bbae2b039959c09487b95ee29de0026b7ec3b1d6..3bab1240a65f350028c2cb0ebec6c3d3e813d082 100644 (file)
--- a/extra/mongodb/tuple/state/state.factor
+++ b/extra/mongodb/tuple/state/state.factor
@@ -10,7 +10,7 @@ CONSTANT: MDB_TUPLE_INFO       "_mfd_t_info"
 PRIVATE>
 
 : <tuple-info> ( tuple -- tuple-info )
-    class [ V{ } clone ] dip over
+    class-of [ V{ } clone ] dip over
     [ [ name>> ] dip push ]
     [ [ vocabulary>> ] dip push ] 2bi ; inline
 

diff --git a/extra/multi-methods/multi-methods.factor b/extra/multi-methods/multi-methods.factor
index df32526a127016a4d6cc10b494cf2a1f5a118c0a..921c316376af67f8153d204fa4791eeae14a8eb1 100644 (file)
--- a/extra/multi-methods/multi-methods.factor
+++ b/extra/multi-methods/multi-methods.factor
@@ -202,7 +202,7 @@ M: no-method error.
     dup arguments>> short.
     nl
     "Inputs have signature:" print
-    dup arguments>> [ class ] map niceify-method .
+    dup arguments>> [ class-of ] map niceify-method .
     nl
     "Available methods: " print
     generic>> methods canonicalize-specializers drop sort-methods

diff --git a/extra/persistency/persistency.factor b/extra/persistency/persistency.factor
index db999f4c988ab13ae31a67c6d7b1f6aa8fbbab11..58ab48053718e5c7f5bb56abf45a0929d8306032 100644 (file)
--- a/extra/persistency/persistency.factor
+++ b/extra/persistency/persistency.factor
@@ -18,7 +18,7 @@ SYNTAX: STORED-TUPLE: parse-tuple-definition [ drop persistent ] dip [ remove-ty
 : define-db ( database class -- ) swap [ [ ensure-table ] with-db ] [ "database" set-word-prop ] 2bi ;
 
 : query>tuple ( tuple/query -- tuple ) dup query? [ tuple>> ] when ;
-: w/db ( query quot -- ) [ dup query>tuple class "database" word-prop ] dip with-db ; inline
+: w/db ( query quot -- ) [ dup query>tuple class-of "database" word-prop ] dip with-db ; inline
 : get-tuples ( query -- tuples ) [ select-tuples ] w/db ;
 : get-tuple ( query -- tuple ) [ select-tuple ] w/db ;
 : store-tuple ( tuple -- ) [ insert-tuple ] w/db ;

diff --git a/extra/project-euler/project-euler.factor b/extra/project-euler/project-euler.factor
index 77017ce5780e4fd91f9a8334edd36599a873170f..6b25f98bb3deeda74196c28290e14ff757060407 100644 (file)
--- a/extra/project-euler/project-euler.factor
+++ b/extra/project-euler/project-euler.factor
@@ -40,7 +40,7 @@ IN: project-euler
 
 : solution-path ( n -- str/f )
     number>euler "project-euler." prepend
-    vocab where dup [ first <pathname> ] when ;
+    lookup-vocab where dup [ first <pathname> ] when ;
 
 PRIVATE>
 

diff --git a/extra/update/util/util.factor b/extra/update/util/util.factor
index 77cd916139f9778fb13025559b01efdc128ac6a3..d0290ed94f0f5b46f9ef55dcb37f6378d73ed6cd 100644 (file)
--- a/extra/update/util/util.factor
+++ b/extra/update/util/util.factor
@@ -17,7 +17,7 @@ IN: update.util
 DEFER: to-strings
 
 : to-string ( obj -- str )
-  dup class
+  dup class-of
     {
       { \ string    [ ] }
       { \ quotation [ call( -- string ) ] }

diff --git a/extra/variants/variants.factor b/extra/variants/variants.factor
index 55ee0390e0d8ad2d5f086deba43fcd182544eb0a..3a2bb3180d007f620f910f79f3c45f676b1ddb7e 100644 (file)
--- a/extra/variants/variants.factor
+++ b/extra/variants/variants.factor
@@ -62,7 +62,7 @@ M: object (match-branch)
     over \ unboa [ ] 2sequence prepend ;
 
 : ?class ( object -- class )
-    dup word? [ class ] unless ;
+    dup word? [ class-of ] unless ;
 
 MACRO: match ( branches -- )
     [ dup callable? [ first2 (match-branch) 2array ] unless ] map