From 7f0d6f34a732ebe82f52a0e21de7367935d6cd81 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 4 Jun 2016 00:14:33 -0700 Subject: [PATCH] factor: slot: --- core/alien/alien.factor | 2 +- core/classes/tuple/tuple-docs.factor | 4 ++-- core/classes/tuple/tuple-tests.factor | 6 +++--- core/delegate/delegate-tests.factor | 2 +- core/destructors/destructors.factor | 2 +- core/growable/growable.factor | 4 ++-- core/io/streams/sequence/sequence.factor | 4 ++-- core/slots/slots-tests.factor | 2 +- core/syntax/syntax-docs.factor | 4 ++-- core/syntax/syntax.factor | 2 +- ffi/mongodb/tuple/collection/collection.factor | 6 +++--- ffi/opengl/textures/textures.factor | 2 +- frameworks/furnace/sessions/sessions.factor | 2 +- frameworks/ui/gadgets/glass/glass.factor | 2 +- frameworks/ui/gadgets/labels/labels.factor | 2 +- frameworks/ui/gadgets/theme/theme.factor | 2 +- frameworks/ui/render/render.factor | 2 +- frameworks/ui/tools/browser/popups/popups.factor | 2 +- frameworks/ui/tools/common/common.factor | 2 +- frameworks/ui/tools/listener/completion/completion.factor | 4 ++-- frameworks/ui/tools/listener/listener.factor | 2 +- language/classes/struct/struct.factor | 2 +- language/classes/struct/vectored/vectored.factor | 4 ++-- language/compiler/cfg/builder/blocks/blocks.factor | 4 ++-- language/io/files/windows/windows.factor | 4 ++-- language/io/sockets/sockets.factor | 2 +- libs/http/server/cgi/cgi.factor | 2 +- misc/fuel/strange-syntax.factor | 2 +- webapps/site-watcher/db/db.factor | 4 ++-- webapps/webapps/mason/version/files/files.factor | 6 +++--- 30 files changed, 45 insertions(+), 45 deletions(-) diff --git a/core/alien/alien.factor b/core/alien/alien.factor index 25d94d40eb..d238b7d181 100755 --- a/core/alien/alien.factor +++ b/core/alien/alien.factor @@ -43,7 +43,7 @@ M: slice >c-ptr [ [ from>> ] [ element-size ] bi * ] [ seq>> >c-ptr ] bi ; inline -SLOT: underlying +slot: underlying M: object >c-ptr underlying>> ; inline diff --git a/core/classes/tuple/tuple-docs.factor b/core/classes/tuple/tuple-docs.factor index c9c8d6cebc..168940ba07 100644 --- a/core/classes/tuple/tuple-docs.factor +++ b/core/classes/tuple/tuple-docs.factor @@ -303,10 +303,10 @@ ARTICLE: "protocol-slots" "Protocol slots" "A " { $emphasis "protocol slot" } " is one which is assumed to exist by the implementation of a class, without being defined on the class itself. The burden is on subclasses (or mixin instances) to provide this slot." $nl "Protocol slots are defined using a parsing word:" -{ $subsections postpone: SLOT: } +{ $subsections postpone: slot: } "Protocol slots are used where the implementation of a superclass needs to assume that each subclass defines certain slots, however the slots of each subclass are potentially declared with different class specializers, thus preventing the slots from being defined in the superclass." $nl -"For example, the " { $link growable } " mixin provides an implementation of the sequence protocol which wraps an underlying sequence, resizing it as necessary when elements are added beyond the length of the sequence. It assumes that the concrete mixin instances define two slots, " { $snippet "length" } " and " { $snippet "underlying" } ". These slots are defined as protocol slots: " { $snippet "SLOT: length" } " and " { $snippet "SLOT: underlying" } ". " +"For example, the " { $link growable } " mixin provides an implementation of the sequence protocol which wraps an underlying sequence, resizing it as necessary when elements are added beyond the length of the sequence. It assumes that the concrete mixin instances define two slots, " { $snippet "length" } " and " { $snippet "underlying" } ". These slots are defined as protocol slots: " { $snippet "slot: length" } " and " { $snippet "slot: underlying" } ". " "An alternate approach would be to define " { $link growable } " as a tuple class with these two slots, and have other classes subclass it as required. However, this rules out subclasses defining these slots with custom type declarations." $nl "For example, compare the definitions of the " { $link sbuf } " class," diff --git a/core/classes/tuple/tuple-tests.factor b/core/classes/tuple/tuple-tests.factor index a7ee99fe51..472181ec05 100644 --- a/core/classes/tuple/tuple-tests.factor +++ b/core/classes/tuple/tuple-tests.factor @@ -631,10 +631,10 @@ M: bogus-hashcode-1 hashcode* 2drop 0 >bignum ; { } [ T{ bogus-hashcode-2 f T{ bogus-hashcode-1 } } hashcode drop ] unit-test defer: change-slot-test -SLOT: kex +slot: kex { } [ - "in: classes.tuple.tests USING: kernel accessors ; TUPLE: change-slot-test ; SLOT: kex M: change-slot-test kex>> drop 3 ;" + "in: classes.tuple.tests USING: kernel accessors ; TUPLE: change-slot-test ; slot: kex M: change-slot-test kex>> drop 3 ;" "change-slot-test" parse-stream drop ] unit-test @@ -650,7 +650,7 @@ SLOT: kex { t } [ \ change-slot-test \ kex>> ?lookup-method >boolean ] unit-test { } [ - "in: classes.tuple.tests USING: kernel accessors ; TUPLE: change-slot-test ; SLOT: kex M: change-slot-test kex>> drop 3 ;" + "in: classes.tuple.tests USING: kernel accessors ; TUPLE: change-slot-test ; slot: kex M: change-slot-test kex>> drop 3 ;" "change-slot-test" parse-stream drop ] unit-test diff --git a/core/delegate/delegate-tests.factor b/core/delegate/delegate-tests.factor index cfc3feeb28..42033472a6 100644 --- a/core/delegate/delegate-tests.factor +++ b/core/delegate/delegate-tests.factor @@ -145,7 +145,7 @@ PROTOCOL: silly-protocol do-me ; ! A slot protocol issue defer: slot-protocol-test-3 -SLOT: y +slot: y { f } [ \ slot-protocol-test-3 \ y>> ?lookup-method >boolean ] unit-test diff --git a/core/destructors/destructors.factor b/core/destructors/destructors.factor index 1d77aacec9..8fb1fafc1b 100755 --- a/core/destructors/destructors.factor +++ b/core/destructors/destructors.factor @@ -12,7 +12,7 @@ symbol: debug-leaks? >continuation ] when diff --git a/core/growable/growable.factor b/core/growable/growable.factor index ef45ad8341..ab1c6d9f49 100644 --- a/core/growable/growable.factor +++ b/core/growable/growable.factor @@ -6,8 +6,8 @@ in: growable mixin: growable -SLOT: length -SLOT: underlying +slot: length +slot: underlying M: growable length length>> ; inline M: growable nth-unsafe underlying>> nth-unsafe ; inline diff --git a/core/io/streams/sequence/sequence.factor b/core/io/streams/sequence/sequence.factor index af371f16e7..517c7e6f5d 100644 --- a/core/io/streams/sequence/sequence.factor +++ b/core/io/streams/sequence/sequence.factor @@ -6,8 +6,8 @@ sequences.private strings ; in: io.streams.sequence ! Readers -SLOT: underlying -SLOT: i +slot: underlying +slot: i : >sequence-stream< ( stream -- i underlying ) [ i>> ] [ underlying>> ] bi ; inline diff --git a/core/slots/slots-tests.factor b/core/slots/slots-tests.factor index 760cd1172d..9a696fed88 100644 --- a/core/slots/slots-tests.factor +++ b/core/slots/slots-tests.factor @@ -19,7 +19,7 @@ TUPLE: hello length ; [ "xyz" 4 >>length ] [ no-method? ] must-fail-with ! Test protocol slots -SLOT: my-protocol-slot-test +slot: my-protocol-slot-test TUPLE: protocol-slot-test-tuple x ; diff --git a/core/syntax/syntax-docs.factor b/core/syntax/syntax-docs.factor index b432912955..1026180424 100644 --- a/core/syntax/syntax-docs.factor +++ b/core/syntax/syntax-docs.factor @@ -789,8 +789,8 @@ HELP: read-only { initial: read-only } related-words -HELP: SLOT: -{ $syntax "SLOT: name" } +HELP: slot: +{ $syntax "slot: name" } { $values { "name" "a slot name" } } { $description "Defines a protocol slot; that is, defines the accessor words for a slot named " { $snippet "slot" } " without associating it with any specific tuple." } ; diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor index e146dbae22..4988f715e2 100644 --- a/core/syntax/syntax.factor +++ b/core/syntax/syntax.factor @@ -243,7 +243,7 @@ in: bootstrap.syntax "INSTANCE:" [ location [ - scan-word scan-word 2dup add-mixin-instance + scan-word scan-word ";" expect 2dup add-mixin-instance ] dip remember-definition ] define-core-syntax diff --git a/ffi/mongodb/tuple/collection/collection.factor b/ffi/mongodb/tuple/collection/collection.factor index 5235876fde..9efbbb6e0e 100644 --- a/ffi/mongodb/tuple/collection/collection.factor +++ b/ffi/mongodb/tuple/collection/collection.factor @@ -20,9 +20,9 @@ FROM: mongodb.tuple => +transient+ +load+ ; mixin: mdb-persistent -SLOT: id -SLOT: _id -SLOT: _mfd +slot: id +slot: _id +slot: _mfd type) : image-data-format ( component-order component-type -- gl-format gl-type ) [ (component-order>format) ] [ (component-type>type) ] 2bi ; -SLOT: display-list +slot: display-list : draw-texture ( texture -- ) display-list>> [ glCallList ] when* ; diff --git a/frameworks/furnace/sessions/sessions.factor b/frameworks/furnace/sessions/sessions.factor index 78176427a7..a90b22fcc7 100644 --- a/frameworks/furnace/sessions/sessions.factor +++ b/frameworks/furnace/sessions/sessions.factor @@ -106,7 +106,7 @@ M: sessions call-responder* ( path responder -- response ) request-session [ begin-session ] unless* existing-session put-session-cookie ; -SLOT: session +slot: session : check-session ( state/f -- state/f ) dup [ dup session>> session get id>> = [ drop f ] unless ] when ; diff --git a/frameworks/ui/gadgets/glass/glass.factor b/frameworks/ui/gadgets/glass/glass.factor index be4759c4c3..9ae1c46de2 100644 --- a/frameworks/ui/gadgets/glass/glass.factor +++ b/frameworks/ui/gadgets/glass/glass.factor @@ -53,7 +53,7 @@ PRIVATE> { T{ drag } [ update-clicked drop ] } } set-gestures -SLOT: popup +slot: popup > ( label -- string ) text>> dup string? [ "\n" join ] unless ; inline diff --git a/frameworks/ui/gadgets/theme/theme.factor b/frameworks/ui/gadgets/theme/theme.factor index 7f2df686a6..437f175612 100644 --- a/frameworks/ui/gadgets/theme/theme.factor +++ b/frameworks/ui/gadgets/theme/theme.factor @@ -3,7 +3,7 @@ USING: accessors io.pathnames sequences ui.images ui.theme ; in: ui.gadgets.theme -SLOT: font ! Temporarily necessary to fix Windows bootstrap. +slot: font ! Temporarily necessary to fix Windows bootstrap. : theme-image ( name -- image-name ) "vocab:ui/gadgets/theme/" prepend-path ".tiff" append ; diff --git a/frameworks/ui/render/render.factor b/frameworks/ui/render/render.factor index 429b627f35..42fd5f877e 100644 --- a/frameworks/ui/render/render.factor +++ b/frameworks/ui/render/render.factor @@ -27,7 +27,7 @@ symbol: viewport-translation [ clip namespaces:set ] bi do-clip ; -SLOT: background-color +slot: background-color : gl-init ( -- ) check-extensions "1.0" require-gl-version diff --git a/frameworks/ui/tools/browser/popups/popups.factor b/frameworks/ui/tools/browser/popups/popups.factor index 4bfe71b415..b87cb18fb1 100644 --- a/frameworks/ui/tools/browser/popups/popups.factor +++ b/frameworks/ui/tools/browser/popups/popups.factor @@ -39,7 +39,7 @@ links-popup H{ { T{ key-down f f "ESC" } [ hide-glass ] } } set-gestures -SLOT: model +slot: model : show-links-popup ( browser-gadget quot title -- ) [ dup model>> ] 2dip diff --git a/frameworks/ui/tools/common/common.factor b/frameworks/ui/tools/common/common.factor index 1963b8e1bc..71fd286fbc 100644 --- a/frameworks/ui/tools/common/common.factor +++ b/frameworks/ui/tools/common/common.factor @@ -26,7 +26,7 @@ M: tool layout* [ [ dim>> ] [ class-of ] bi set-tool-dim ] bi ; -SLOT: scroller +slot: scroller : com-page-up ( tool -- ) scroller>> scroll-up-page ; diff --git a/frameworks/ui/tools/listener/completion/completion.factor b/frameworks/ui/tools/listener/completion/completion.factor index ac47bf498b..a7b8f2b379 100644 --- a/frameworks/ui/tools/listener/completion/completion.factor +++ b/frameworks/ui/tools/listener/completion/completion.factor @@ -14,8 +14,8 @@ ui.tools.listener.popups vocabs words ; in: ui.tools.listener.completion ! We don't directly depend on the listener tool but we use a few slots -SLOT: interactor -SLOT: history +slot: interactor +slot: history : history-list ( interactor -- alist ) history>> elements>> diff --git a/frameworks/ui/tools/listener/listener.factor b/frameworks/ui/tools/listener/listener.factor index dde8c5b0ee..9c7566973c 100644 --- a/frameworks/ui/tools/listener/listener.factor +++ b/frameworks/ui/tools/listener/listener.factor @@ -36,7 +36,7 @@ INSTANCE: interactor input-stream [ thread>> dup [ thread-registered? ] when ] } 1&& not ; -SLOT: manifest +slot: manifest M: interactor manifest>> dup interactor-busy? [ drop f ] [ diff --git a/language/classes/struct/struct.factor b/language/classes/struct/struct.factor index 40ed0982d0..0d58e1fb3d 100644 --- a/language/classes/struct/struct.factor +++ b/language/classes/struct/struct.factor @@ -35,7 +35,7 @@ TUPLE: struct-bit-slot-spec < struct-slot-spec PREDICATE: struct-class < tuple-class superclass-of \ struct eq? ; -SLOT: fields +slot: fields : struct-slots ( struct-class -- slots ) "c-type" word-prop fields>> ; diff --git a/language/classes/struct/vectored/vectored.factor b/language/classes/struct/vectored/vectored.factor index d786f494aa..e0206d2ca0 100644 --- a/language/classes/struct/vectored/vectored.factor +++ b/language/classes/struct/vectored/vectored.factor @@ -42,8 +42,8 @@ MACRO: (vectored-element>) ( struct-class -- quot: ( elt -- struct ) ) [ struct-slots [ name>> reader-word 1quotation ] map ] keep '[ _ cleave _ ] ; -SLOT: (n) -SLOT: (vectored) +slot: (n) +slot: (vectored) FUNCTOR: define-vectored-accessors ( S>> S<< T -- ) diff --git a/language/compiler/cfg/builder/blocks/blocks.factor b/language/compiler/cfg/builder/blocks/blocks.factor index ece860546a..3e1322cbb6 100644 --- a/language/compiler/cfg/builder/blocks/blocks.factor +++ b/language/compiler/cfg/builder/blocks/blocks.factor @@ -4,8 +4,8 @@ USING: accessors arrays compiler.cfg compiler.cfg.instructions compiler.cfg.stacks compiler.cfg.stacks.local compiler.cfg.utilities kernel make math namespaces sequences ; in: compiler.cfg.builder.blocks -SLOT: in-d -SLOT: out-d +slot: in-d +slot: out-d : set-basic-block ( basic-block -- ) dup begin-local-analysis instructions>> building set ; diff --git a/language/io/files/windows/windows.factor b/language/io/files/windows/windows.factor index 79c5264c36..62455ef384 100755 --- a/language/io/files/windows/windows.factor +++ b/language/io/files/windows/windows.factor @@ -12,7 +12,7 @@ windows.time windows.types windows.winsock ; SPECIALIZED-ARRAY: ushort in: io.files.windows -SLOT: file +slot: file : CreateFile-flags ( DWORD -- DWORD ) flags{ FILE_FLAG_BACKUP_SEMANTICS FILE_FLAG_OVERLAPPED } bitor ; @@ -281,7 +281,7 @@ SYMBOLS: +read-only+ +hidden+ +system+ +sparse-file+ +reparse-point+ +compressed+ +offline+ +not-content-indexed+ +encrypted+ ; -SLOT: attributes +slot: attributes : read-only? ( file-info -- ? ) attributes>> +read-only+ swap member? ; diff --git a/language/io/sockets/sockets.factor b/language/io/sockets/sockets.factor index 80004f85a0..09b07832dc 100644 --- a/language/io/sockets/sockets.factor +++ b/language/io/sockets/sockets.factor @@ -69,7 +69,7 @@ M: local present path>> "Unix domain socket: " prepend ; M: local protocol drop 0 ; -SLOT: port +slot: port TUPLE: ipv4 { host maybe{ string } read-only } ; diff --git a/libs/http/server/cgi/cgi.factor b/libs/http/server/cgi/cgi.factor index 7c205cf326..58798ed2e8 100644 --- a/libs/http/server/cgi/cgi.factor +++ b/libs/http/server/cgi/cgi.factor @@ -59,7 +59,7 @@ in: http.server.cgi ] with-stream ] >>body ; -SLOT: special +slot: special : enable-cgi ( responder -- responder ) [ serve-cgi ] "application/x-cgi-script" diff --git a/misc/fuel/strange-syntax.factor b/misc/fuel/strange-syntax.factor index eec44595c8..8bc32c6d1c 100644 --- a/misc/fuel/strange-syntax.factor +++ b/misc/fuel/strange-syntax.factor @@ -39,7 +39,7 @@ C-TYPE: cairo_snurface_t main: majn ! ! SLOT - SLOT: komba + slot: komba ! ! SYNTAX << diff --git a/webapps/site-watcher/db/db.factor b/webapps/site-watcher/db/db.factor index 359d9a97ed..7247b33dfa 100644 --- a/webapps/site-watcher/db/db.factor +++ b/webapps/site-watcher/db/db.factor @@ -57,12 +57,12 @@ TUPLE: spidering-site < watching-site max-depth max-count ; C: spidering-site -SLOT: site +slot: site M: watching-site site>> site-id>> site-with-id ; -SLOT: account +slot: account M: watching-site account>> account-name>> account new swap >>account-name select-tuple ; diff --git a/webapps/webapps/mason/version/files/files.factor b/webapps/webapps/mason/version/files/files.factor index 00f402b0a3..375284c365 100644 --- a/webapps/webapps/mason/version/files/files.factor +++ b/webapps/webapps/mason/version/files/files.factor @@ -10,13 +10,13 @@ in: webapps.mason.version.files : remote-directory ( string -- string' ) [ package-directory get ] dip "/" glue ; -SLOT: os -SLOT: cpu +slot: os +slot: cpu : platform ( builder -- string ) [ os>> ] [ cpu>> ] bi (platform) ; -SLOT: last-release +slot: last-release : binary-package-name ( builder -- string ) [ [ platform % "/" % ] [ last-release>> % ] bi ] "" make