From: Doug Coleman Date: Tue, 25 Oct 2011 00:00:09 +0000 (-0700) Subject: Missed yet more renames X-Git-Tag: 0.97~3761 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=763d9a3f7dbac882cff1b03bc674b36098c68a48 Missed yet more renames --- diff --git a/basis/alien/complex/functor/functor.factor b/basis/alien/complex/functor/functor.factor index 90fb5174c1..1a4b32daa1 100644 --- 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 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 118ac73c3e..409a6e8ab9 100644 --- a/basis/db/queries/queries.factor +++ b/basis/db/queries/queries.factor @@ -190,13 +190,13 @@ M: db-connection ( tuple class -- statement ) } 2cleave ; M: db-connection query>statement ( query -- tuple ) - [ tuple>> dup class ] keep + [ tuple>> dup class-of ] keep [ ] dip make-query* ; ! select ID, NAME, SCORE from EXAM limit 1 offset 3 M: db-connection ( 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 45fbf31a0f..fcb7df53cc 100644 --- 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>> [ ] cache [ bind-tuple ] 2keep insert-tuple-set-key ; : insert-user-assigned-statement ( tuple -- ) - dup class + dup class-of db-connection get insert-statements>> [ ] 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>> [ ] cache [ bind-tuple ] keep execute-statement ; : delete-tuples ( tuple -- ) dup - dup class ensure-defined-persistent + dup class-of ensure-defined-persistent [ [ bind-tuple ] keep execute-statement ] with-disposal ; diff --git a/basis/db/types/types.factor b/basis/db/types/types.factor index 1ad81ad3ee..d6ab241778 100644 --- 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 369c4969a6..80d699fd1f 100644 --- 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 ; + remote-address get class-of new binary ; : 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 94762d7591..9ba34dcddc 100644 --- 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 67398e3928..4435f439f8 100644 --- 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 05ec8ef5db..463af64a1a 100644 --- 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 b4a3b72b3c..aa970f4f4f 100644 --- 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 _ inputsequence ] ] define-pop-inverse diff --git a/basis/opengl/annotations/annotations.factor b/basis/opengl/annotations/annotations.factor index a82c645ef2..9e84732cfe 100644 --- 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 a999a20eb6..fa0a72e7e5 100644 --- 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 75c6db9bbe..771ac5b19b 100644 --- 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 72a2c4b881..348bc3be0e 100755 --- 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 4bb8814e4c..68950dfbb8 100644 --- 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 8685d954e8..292f181f84 100644 --- a/extra/annotations/annotations-docs.factor +++ b/extra/annotations/annotations-docs.factor @@ -56,7 +56,7 @@ annotation-tags natural-sort ] bi
"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 27afc062b3..0ff4344ae1 100644 --- 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 { 1 2 } grid-add - behavior class name>> ; + behavior class-of name>> ; :: set-population ( n boids-gadget -- ) boids-gadget [ diff --git a/extra/fuel/help/help.factor b/extra/fuel/help/help.factor index dcf5d69a74..510b55e60a 100644 --- 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 7d3ec797b2..b75b1e7d42 100644 --- 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 4fd68d3965..b49d255968 100644 --- 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 2b96829bbe..943f816c2c 100644 --- 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 ] [ 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 ] [ nsects>> ] [ segment_command_64? ] diff --git a/extra/memory/pools/pools.factor b/extra/memory/pools/pools.factor index a053c05853..a1da283d03 100644 --- 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 ] [ swap set-class-pool ] bi ; diff --git a/extra/mongodb/tuple/collection/collection.factor b/extra/mongodb/tuple/collection/collection.factor index eeb7314196..272fc3df1b 100644 --- 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 ; + [ id>> ] [ class-of id-slot ] bi ; 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 bbae2b0399..3bab1240a6 100644 --- 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 -- 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 df32526a12..921c316376 100644 --- 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 db999f4c98..58ab480537 100644 --- 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 77017ce578..6b25f98bb3 100644 --- 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 ] when ; + lookup-vocab where dup [ first ] when ; PRIVATE> diff --git a/extra/update/util/util.factor b/extra/update/util/util.factor index 77cd916139..d0290ed94f 100644 --- 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 55ee0390e0..3a2bb3180d 100644 --- 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