factor: Rename GENERIC# to GENERIC#:.

Fixes #1670.

diff --git a/basis/calendar/calendar.factor b/basis/calendar/calendar.factor
index 540b7f19408b5d758a32d313c59544ebe0296587..7875712de63072e5577570ff2c073c2fd3afdcd8 100644 (file)
--- a/basis/calendar/calendar.factor
+++ b/basis/calendar/calendar.factor
@@ -228,7 +228,7 @@ M: number +second ( timestamp n -- timestamp )
 
 PRIVATE>
 
-GENERIC# time+ 1 ( time1 time2 -- time3 )
+GENERIC#: time+ 1 ( time1 time2 -- time3 )
 
 M: timestamp time+
     [ clone ] dip (time+) drop ;

diff --git a/basis/compiler/cfg/gc-checks/gc-checks.factor b/basis/compiler/cfg/gc-checks/gc-checks.factor
index 1bed3c2beac85bb1b9e0184f54d759ae42cd9474..db4f73e5fbf5de96f650ae21d1241f7e372001a4 100644 (file)
--- a/basis/compiler/cfg/gc-checks/gc-checks.factor
+++ b/basis/compiler/cfg/gc-checks/gc-checks.factor
@@ -16,7 +16,7 @@ IN: compiler.cfg.gc-checks
 : blocks-with-gc ( cfg -- bbs )
     post-order [ insert-gc-check? ] filter ;
 
-GENERIC# gc-check-offsets* 1 ( call-index seen-allocation? insn n -- call-index seen-allocation? )
+GENERIC#: gc-check-offsets* 1 ( call-index seen-allocation? insn n -- call-index seen-allocation? )
 
 :: gc-check-here ( call-index seen-allocation? insn insn-index -- call-index seen-allocation? )
     seen-allocation? [ call-index , ] when

diff --git a/basis/compiler/cfg/intrinsics/simd/backend/backend.factor b/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
index 9233e26885c990ba4ca1f9ce08c20a13810bf13a..89823fd15b4cf790895398fa133317cc38f2f007 100644 (file)
--- a/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
+++ b/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
@@ -71,7 +71,7 @@ M: ##horizontal-shr-vector-imm insn-available? rep>> %horizontal-shr-vector-imm-
 : [vector-op-checked] ( #dup quot -- quot )
     '[ _ ndup [ @ ] { } make dup [ insn-available? ] all? ] ;
 
-GENERIC# >vector-op-cond 2 ( quot #pick #dup -- quotpair )
+GENERIC#: >vector-op-cond 2 ( quot #pick #dup -- quotpair )
 M:: callable >vector-op-cond ( quot #pick #dup -- quotpair )
     #dup quot [vector-op-checked] '[ 2drop @ ]
     #dup '[ % _ nnip ]

diff --git a/basis/compiler/cfg/representations/coalescing/coalescing.factor b/basis/compiler/cfg/representations/coalescing/coalescing.factor
index 2caa485045649ddeb13bd9b2ba612b4fd42d0d36..3639c570c9a77e9b487b8c75be4e634fc8513678 100644 (file)
--- a/basis/compiler/cfg/representations/coalescing/coalescing.factor
+++ b/basis/compiler/cfg/representations/coalescing/coalescing.factor
@@ -16,7 +16,7 @@ SYMBOL: components
         ] each
     ] simple-analysis ;
 
-GENERIC# visit-insn 1 ( insn disjoint-set -- )
+GENERIC#: visit-insn 1 ( insn disjoint-set -- )
 
 M: ##copy visit-insn
     [ [ dst>> ] [ src>> ] bi ] dip equate ;

diff --git a/basis/compiler/tests/redefine16.factor b/basis/compiler/tests/redefine16.factor
index 9bf1de3e323efcb75d42dc3b0b55065410db570d..effe18433eb50dc7c4ebfeecda2f26b1a6befc3a 100644 (file)
--- a/basis/compiler/tests/redefine16.factor
+++ b/basis/compiler/tests/redefine16.factor
@@ -4,8 +4,8 @@ IN: compiler.tests.redefine16
 
 [ ] [ [ "blah" "compiler.tests.redefine16" lookup-word forget ] with-compilation-unit ] unit-test
 
-[ ] [ "IN: compiler.tests.redefine16 GENERIC# blah 2 ( foo bar baz -- )" eval( -- ) ] unit-test
+[ ] [ "IN: compiler.tests.redefine16 GENERIC#: blah 2 ( foo bar baz -- )" eval( -- ) ] unit-test
 [ ] [ "IN: compiler.tests.redefine16 USING: strings math arrays prettyprint ; M: string blah 1 + 3array . ;" eval( -- ) ] unit-test
-[ ] [ "IN: compiler.tests.redefine16 GENERIC# blah 2 ( foo bar baz -- x )" eval( -- ) ] unit-test
+[ ] [ "IN: compiler.tests.redefine16 GENERIC#: blah 2 ( foo bar baz -- x )" eval( -- ) ] unit-test
 
 [ ] [ [ "blah" "compiler.tests.redefine16" lookup-word forget ] with-compilation-unit ] unit-test

diff --git a/basis/concurrency/mailboxes/mailboxes.factor b/basis/concurrency/mailboxes/mailboxes.factor
index 5bd8d8719b351aef738e7c9bf69f3d20129a426a..82ebe8631815b85e3c6e6737023c0d70a2d111a5 100755 (executable)
--- a/basis/concurrency/mailboxes/mailboxes.factor
+++ b/basis/concurrency/mailboxes/mailboxes.factor
@@ -40,7 +40,7 @@ M: mailbox mailbox-put
 : mailbox-peek ( mailbox -- obj )
     data>> peek-back ;
 
-GENERIC# mailbox-get-timeout 1 ( mailbox timeout -- obj )
+GENERIC#: mailbox-get-timeout 1 ( mailbox timeout -- obj )
 
 M: mailbox mailbox-get-timeout block-if-empty data>> pop-back ;
 

diff --git a/basis/cpu/x86/assembler/assembler.factor b/basis/cpu/x86/assembler/assembler.factor
index 84ff473567d88ff2cb2028072dcb8398efb8da93..2d5b77fd73909e566c0fc7eb407985376d2eddc2 100644 (file)
--- a/basis/cpu/x86/assembler/assembler.factor
+++ b/basis/cpu/x86/assembler/assembler.factor
@@ -61,7 +61,7 @@ M: indirect modifier
 
 M: register modifier drop 0b11 ;
 
-GENERIC# n, 1 ( value n -- )
+GENERIC#: n, 1 ( value n -- )
 
 M: integer n, >le % ;
 M: byte n, [ value>> ] dip n, ;
@@ -214,7 +214,7 @@ M: operand POP { 0b000 f 0x8f } 1-operand ;
 : maybe-zero-extend ( reg imm -- reg' imm )
     dup zero-extendable? [ [ 32-bit-version-of ] dip ] when ;
 
-GENERIC# (MOV-I) 1 ( dst src -- )
+GENERIC#: (MOV-I) 1 ( dst src -- )
 
 M: register (MOV-I)
     {
@@ -273,7 +273,7 @@ M: operand CALL { 0b010 t 0xff } 1-operand ;
 
 <PRIVATE
 
-GENERIC# JUMPcc 1 ( addr opcode -- )
+GENERIC#: JUMPcc 1 ( addr opcode -- )
 M: integer JUMPcc extended-opcode, 4, ;
 
 : SETcc ( dst opcode -- )

diff --git a/basis/db/db.factor b/basis/db/db.factor
index a9e7bdca240f224f3e569b9bfe0209795c8001c6..de041aee2a8acb5e211c93cb2c5901a130802b44 100644 (file)
--- a/basis/db/db.factor
+++ b/basis/db/db.factor
@@ -41,8 +41,8 @@ TUPLE: result-set sql in-params out-params handle n max ;
 GENERIC: query-results ( query -- result-set )
 GENERIC: #rows ( result-set -- n )
 GENERIC: #columns ( result-set -- n )
-GENERIC# row-column 1 ( result-set column -- obj )
-GENERIC# row-column-typed 1 ( result-set column -- sql )
+GENERIC#: row-column 1 ( result-set column -- obj )
+GENERIC#: row-column-typed 1 ( result-set column -- sql )
 GENERIC: advance-row ( result-set -- )
 GENERIC: more-rows? ( result-set -- ? )
 

diff --git a/basis/delegate/delegate-tests.factor b/basis/delegate/delegate-tests.factor
index 845e227e61ab09af3b32ad5b8ef778fb30b6363b..1d23bc610e1b813c0eb923bf9a0849219fb67582 100644 (file)
--- a/basis/delegate/delegate-tests.factor
+++ b/basis/delegate/delegate-tests.factor
@@ -12,7 +12,7 @@ C: <goodbye> goodbye
 
 GENERIC: foo ( x -- y )
 GENERIC: bar ( a -- b )
-GENERIC# whoa 1 ( s t -- w )
+GENERIC#: whoa 1 ( s t -- w )
 PROTOCOL: baz foo { bar 0 } { whoa 1 } ;
 
 : hello-test ( hello/goodbye -- array )

diff --git a/basis/delegate/delegate.factor b/basis/delegate/delegate.factor
index e1c44d1efab8f393943bb74dafe1f0068530305d..06d52832249744a64743eee59d24db8d592e0fc3 100644 (file)
--- a/basis/delegate/delegate.factor
+++ b/basis/delegate/delegate.factor
@@ -62,7 +62,7 @@ PREDICATE: consult-method < method
 M: consult-method reset-word
     [ call-next-method ] [ f "consultation" set-word-prop ] bi ;
 
-GENERIC# (consult-method-quot) 2 ( consultation quot word -- object )
+GENERIC#: (consult-method-quot) 2 ( consultation quot word -- object )
 
 M: consultation (consult-method-quot)
     '[ _ call _ execute ] nip ;

diff --git a/basis/images/loader/loader.factor b/basis/images/loader/loader.factor
index 1496ae00ae76a730c44bd17917678232814aabbc..00a501f81048ab18109e2b9f411f732d91bca966 100644 (file)
--- a/basis/images/loader/loader.factor
+++ b/basis/images/loader/loader.factor
@@ -22,7 +22,7 @@ PRIVATE>
 
 ! Image Decode
 
-GENERIC# load-image* 1 ( obj class -- image )
+GENERIC#: load-image* 1 ( obj class -- image )
 
 GENERIC: stream>image* ( stream class -- image )
 

diff --git a/basis/io/files/info/unix/unix.factor b/basis/io/files/info/unix/unix.factor
index c0466cf3ba830fe8c73b316256d040ff4d83131f..a6e8a34561986d9ef5068a565915c750f2060200 100644 (file)
--- a/basis/io/files/info/unix/unix.factor
+++ b/basis/io/files/info/unix/unix.factor
@@ -111,7 +111,7 @@ M: unix stat>type ( stat -- type )
     [ dup stat-mode ] 2dip
     [ bitor ] [ unmask ] if [ chmod ] unix-system-call drop ;
 
-GENERIC# file-mode? 1 ( obj mask -- ? )
+GENERIC#: file-mode? 1 ( obj mask -- ? )
 
 M: integer file-mode? mask? ;
 M: string file-mode? [ stat-mode ] dip mask? ;

diff --git a/basis/io/sockets/sockets.factor b/basis/io/sockets/sockets.factor
index 4cee6fb3a49a97ac51246f8cb21fbeb069a59e23..2654acf76de514a4b5eb27bcfc9368c492f987f5 100644 (file)
--- a/basis/io/sockets/sockets.factor
+++ b/basis/io/sockets/sockets.factor
@@ -16,7 +16,7 @@ IN: io.sockets
     { [ os unix? ] [ "unix.ffi" ] }
 } cond use-vocab >>
 
-GENERIC# with-port 1 ( addrspec port -- addrspec )
+GENERIC#: with-port 1 ( addrspec port -- addrspec )
 
 ! Addressing
 <PRIVATE

diff --git a/basis/io/streams/limited/limited.factor b/basis/io/streams/limited/limited.factor
index 1455c8fa8c2812cedaf4e5efa11f35687fd2734b..79438d5bc5b0c7d59144c13cb21f7373b751b3d7 100644 (file)
--- a/basis/io/streams/limited/limited.factor
+++ b/basis/io/streams/limited/limited.factor
@@ -20,7 +20,7 @@ INSTANCE: limited-stream input-stream
     [ drop file-info size>> ] 2bi
     <limited-stream> ;
 
-GENERIC# limit-stream 1 ( stream limit -- stream' )
+GENERIC#: limit-stream 1 ( stream limit -- stream' )
 
 M: decoder limit-stream ( stream limit -- stream' )
     '[ stream>> _ limit-stream ] [ code>> ] [ cr>> ] tri

diff --git a/basis/json/writer/writer.factor b/basis/json/writer/writer.factor
index 8e6e1784cf69db9dc44bea6b5064fabf902b9a1e..4f91e7eb6a487289e266cee1cac4ce4e26e298ee 100644 (file)
--- a/basis/json/writer/writer.factor
+++ b/basis/json/writer/writer.factor
@@ -22,7 +22,7 @@ SYMBOL: json-escape-unicode?
 f json-escape-unicode? set-global
 
 ! Writes the object out to a stream in JSON format
-GENERIC# stream-json-print 1 ( obj stream -- )
+GENERIC#: stream-json-print 1 ( obj stream -- )
 
 : json-print ( obj -- )
     output-stream get stream-json-print ;

diff --git a/basis/listener/listener.factor b/basis/listener/listener.factor
index 12e8b1ebf57ede2495c045ac33f6f0d6d35216cd..46806b5404781e38af974784beb210bc142b6432 100644 (file)
--- a/basis/listener/listener.factor
+++ b/basis/listener/listener.factor
@@ -8,7 +8,7 @@ vocabs.parser ;
 IN: listener
 
 GENERIC: stream-read-quot ( stream -- quot/f )
-GENERIC# prompt. 1 ( stream prompt -- )
+GENERIC#: prompt. 1 ( stream prompt -- )
 
 : prompt ( -- str )
     manifest get current-vocab>> [ name>> "IN: " prepend ] [ "" ] if*

diff --git a/basis/locals/locals-tests.factor b/basis/locals/locals-tests.factor
index 228638b5b7015760a5dcbe52336d06d3d867b784..d9edb6bf0a64ce4f222267baab00877c96ecaef4 100644 (file)
--- a/basis/locals/locals-tests.factor
+++ b/basis/locals/locals-tests.factor
@@ -103,7 +103,7 @@ write-test-2 "q" set
 
 GENERIC: lambda-generic ( a b -- c )
 
-GENERIC# lambda-generic-1 1 ( a b -- c )
+GENERIC#: lambda-generic-1 1 ( a b -- c )
 
 M:: integer lambda-generic-1 ( a b -- c ) a b * ;
 
@@ -112,7 +112,7 @@ M:: string lambda-generic-1 ( a b -- c )
 
 M:: integer lambda-generic ( a b -- c ) a b lambda-generic-1 ;
 
-GENERIC# lambda-generic-2 1 ( a b -- c )
+GENERIC#: lambda-generic-2 1 ( a b -- c )
 
 M:: integer lambda-generic-2 ( a b -- c )
     a CHAR: x <string> b lambda-generic ;

diff --git a/basis/math/floats/env/env.factor b/basis/math/floats/env/env.factor
index 3d281b06c83d9f708e4214859dc8cd3855b0d919..4f8d01a4605d13d9d1f361ceff3779632f67f350 100644 (file)
--- a/basis/math/floats/env/env.factor
+++ b/basis/math/floats/env/env.factor
@@ -67,16 +67,16 @@ HOOK: (fp-env-registers) cpu ( -- registers )
 GENERIC: (set-fp-env-register) ( fp-env -- )
 
 GENERIC: (get-exception-flags) ( fp-env -- exceptions )
-GENERIC# (set-exception-flags) 1 ( fp-env exceptions -- fp-env )
+GENERIC#: (set-exception-flags) 1 ( fp-env exceptions -- fp-env )
 
 GENERIC: (get-fp-traps) ( fp-env -- exceptions )
-GENERIC# (set-fp-traps) 1 ( fp-env exceptions -- fp-env )
+GENERIC#: (set-fp-traps) 1 ( fp-env exceptions -- fp-env )
 
 GENERIC: (get-rounding-mode) ( fp-env -- mode )
-GENERIC# (set-rounding-mode) 1 ( fp-env mode -- fp-env )
+GENERIC#: (set-rounding-mode) 1 ( fp-env mode -- fp-env )
 
 GENERIC: (get-denormal-mode) ( fp-env -- mode )
-GENERIC# (set-denormal-mode) 1 ( fp-env mode -- fp-env )
+GENERIC#: (set-denormal-mode) 1 ( fp-env mode -- fp-env )
 
 : change-fp-env-registers ( quot -- )
     (fp-env-registers) swap [ (set-fp-env-register) ] compose each ; inline

diff --git a/basis/math/functions/functions.factor b/basis/math/functions/functions.factor
index ba51876d15cfb0c3efdff5f341d7635e6fe8736f..ce061ae4dc2b8f5293fae3dcd36f2e331a467d80 100644 (file)
--- a/basis/math/functions/functions.factor
+++ b/basis/math/functions/functions.factor
@@ -32,7 +32,7 @@ M: real sqrt
 : (^n) ( z w -- z^w )
     dup fixnum? [ (^fixnum) ] [ (^bignum) ] if ; inline
 
-GENERIC# ^n 1 ( z w -- z^w ) foldable
+GENERIC#: ^n 1 ( z w -- z^w ) foldable
 
 M: fixnum ^n (^n) ;
 
@@ -168,7 +168,7 @@ M: integer frexp
 
 DEFER: copysign
 
-GENERIC# ldexp 1 ( x exp -- y )
+GENERIC#: ldexp 1 ( x exp -- y )
 
 M: float ldexp
     over fp-special? [ over zero? ] unless* [ drop ] [

diff --git a/basis/math/vectors/vectors.factor b/basis/math/vectors/vectors.factor
index b4df54150538d8e1e898e08c114642c8ee3fa576..8ae3cc4fbf8faeb305d2640b9e22cd69cc1e9ea2 100644 (file)
--- a/basis/math/vectors/vectors.factor
+++ b/basis/math/vectors/vectors.factor
@@ -9,25 +9,25 @@ IN: math.vectors
 GENERIC: vneg ( v -- w )
 M: object vneg [ neg ] map ; inline
 
-GENERIC# v+n 1 ( v n -- w )
+GENERIC#: v+n 1 ( v n -- w )
 M: object v+n [ + ] curry map ; inline
 
 GENERIC: n+v ( n v -- w )
 M: object n+v [ + ] with map ; inline
 
-GENERIC# v-n 1 ( v n -- w )
+GENERIC#: v-n 1 ( v n -- w )
 M: object v-n [ - ] curry map ; inline
 
 GENERIC: n-v ( n v -- w )
 M: object n-v [ - ] with map ; inline
 
-GENERIC# v*n 1 ( v n -- w )
+GENERIC#: v*n 1 ( v n -- w )
 M: object v*n [ * ] curry map ; inline
 
 GENERIC: n*v ( n v -- w )
 M: object n*v [ * ] with map ; inline
 
-GENERIC# v/n 1 ( v n -- w )
+GENERIC#: v/n 1 ( v n -- w )
 M: object v/n [ / ] curry map ; inline
 
 GENERIC: n/v ( n v -- w )
@@ -116,31 +116,31 @@ M: object vbitxor [ bitxor ] 2map ; inline
 GENERIC: vbitnot ( v -- w )
 M: object vbitnot [ bitnot ] map ; inline
 
-GENERIC# vbroadcast 1 ( u n -- v )
+GENERIC#: vbroadcast 1 ( u n -- v )
 M:: object vbroadcast ( u n -- v ) u length n u nth <repetition> u like ; inline
 
-GENERIC# vshuffle-elements 1 ( v perm -- w )
+GENERIC#: vshuffle-elements 1 ( v perm -- w )
 M: object vshuffle-elements
     over length 0 pad-tail
     swap [ '[ _ nth ] ] keep map-as ; inline
 
-GENERIC# vshuffle2-elements 1 ( u v perm -- w )
+GENERIC#: vshuffle2-elements 1 ( u v perm -- w )
 M: object vshuffle2-elements
     [ append ] dip vshuffle-elements ; inline
 
-GENERIC# vshuffle-bytes 1 ( v perm -- w )
+GENERIC#: vshuffle-bytes 1 ( v perm -- w )
 
 GENERIC: vshuffle ( v perm -- w )
 M: array vshuffle ( v perm -- w )
     vshuffle-elements ; inline
 
-GENERIC# vlshift 1 ( v n -- w )
+GENERIC#: vlshift 1 ( v n -- w )
 M: object vlshift '[ _ shift ] map ; inline
-GENERIC# vrshift 1 ( v n -- w )
+GENERIC#: vrshift 1 ( v n -- w )
 M: object vrshift neg '[ _ shift ] map ; inline
 
-GENERIC# hlshift 1 ( v n -- w )
-GENERIC# hrshift 1 ( v n -- w )
+GENERIC#: hlshift 1 ( v n -- w )
+GENERIC#: hrshift 1 ( v n -- w )
 
 GENERIC: (vmerge-head) ( u v -- h )
 M: object (vmerge-head) over length 2 /i '[ _ head-slice ] bi@ [ zip ] keep concat-as ; inline

diff --git a/basis/random/random.factor b/basis/random/random.factor
index d1ee076a1f7b3ecf4b60ee2188280b2329b12d8f..37e05bb6aa53ff3bc9ab1e92472b44448fe57f9d 100644 (file)
--- a/basis/random/random.factor
+++ b/basis/random/random.factor
@@ -14,7 +14,7 @@ SYMBOL: system-random-generator
 SYMBOL: secure-random-generator
 SYMBOL: random-generator
 
-GENERIC# seed-random 1 ( obj seed -- obj )
+GENERIC#: seed-random 1 ( obj seed -- obj )
 GENERIC: random-32* ( obj -- n )
 GENERIC: random-bytes* ( n obj -- byte-array )
 
@@ -76,7 +76,7 @@ PRIVATE>
         [ 32 shift obj random-32* + ] [ 32 + ] [ 32 - ] tri*
     ] while drop [ m * ] [ neg shift ] bi* ; inline
 
-GENERIC# (random-integer) 1 ( m obj -- n )
+GENERIC#: (random-integer) 1 ( m obj -- n )
 M: fixnum (random-integer) ( m obj -- n ) random-integer-loop ;
 M: bignum (random-integer) ( m obj -- n ) random-integer-loop ;
 

diff --git a/basis/regexp/classes/classes.factor b/basis/regexp/classes/classes.factor
index e50d7bfccba710110a1ea3c75ae2dd8920929ae8..515747dbe621a89b995ae88dd52322ebe40a29db 100644 (file)
--- a/basis/regexp/classes/classes.factor
+++ b/basis/regexp/classes/classes.factor
@@ -274,7 +274,7 @@ M: primitive-class class-member?
 TUPLE: condition question yes no ;
 C: <condition> condition
 
-GENERIC# answer 2 ( class from to -- new-class )
+GENERIC#: answer 2 ( class from to -- new-class )
 
 M:: object answer ( class from to -- new-class )
     class from = to class ? ;
@@ -291,7 +291,7 @@ M: or-class answer
 M: not-class answer
     [ class>> ] 2dip answer <not-class> ;
 
-GENERIC# substitute 1 ( class from to -- new-class )
+GENERIC#: substitute 1 ( class from to -- new-class )
 M: object substitute answer ;
 M: not-class substitute [ <not-class> ] bi@ answer ;
 

diff --git a/basis/tools/annotations/annotations.factor b/basis/tools/annotations/annotations.factor
index dd71e63ffb428622ed65684306d8f6ce1f56e8da..56636e2417d840aa3679ee3efc587362315fe234 100644 (file)
--- a/basis/tools/annotations/annotations.factor
+++ b/basis/tools/annotations/annotations.factor
@@ -42,7 +42,7 @@ PREDICATE: annotated < word "unannotated-def" word-prop >boolean ;
     [ check-annotate-twice ] dip
     [ dup def>> 2dup "unannotated-def" set-word-prop ] dip ;
 
-GENERIC# (annotate) 1 ( word quot -- )
+GENERIC#: (annotate) 1 ( word quot -- )
 
 M: generic (annotate)
     '[ _ (annotate) ] annotate-generic ;
@@ -51,7 +51,7 @@ M: word (annotate)
     prepare-annotate
     call( old -- new ) define ;
 
-GENERIC# (deep-annotate) 1 ( word quot -- )
+GENERIC#: (deep-annotate) 1 ( word quot -- )
 
 M: generic (deep-annotate)
     '[ _ (deep-annotate) ] annotate-generic ;

diff --git a/basis/tools/crossref/crossref.factor b/basis/tools/crossref/crossref.factor
index bddfd77c4394a191394e68b682ce1b0d65b25237..c7098fc366487fa83c24bd47bffa1bd0976b3d1a 100644 (file)
--- a/basis/tools/crossref/crossref.factor
+++ b/basis/tools/crossref/crossref.factor
@@ -15,7 +15,7 @@ GENERIC: uses ( defspec -- seq )
 
 SYMBOL: visited
 
-GENERIC# quot-uses 1 ( obj set -- )
+GENERIC#: quot-uses 1 ( obj set -- )
 
 M: object quot-uses 2drop ;
 

diff --git a/basis/ui/gadgets/worlds/worlds.factor b/basis/ui/gadgets/worlds/worlds.factor
index 908adb0e23b279ba777032e2b9a6f6cbea966d72..a4d092f0aa4b5cbfd81e9ed45a6b8fea6d960efd 100644 (file)
--- a/basis/ui/gadgets/worlds/worlds.factor
+++ b/basis/ui/gadgets/worlds/worlds.factor
@@ -129,7 +129,7 @@ M: world request-focus-on ( child gadget -- )
     [ T{ rgba f 0.0 0.0 0.0 0.0 } ]
     [ T{ rgba f 1.0 1.0 1.0 1.0 } ] if ;
 
-GENERIC# apply-world-attributes 1 ( world attributes -- world )
+GENERIC#: apply-world-attributes 1 ( world attributes -- world )
 
 M: world apply-world-attributes
     {

diff --git a/basis/ui/pixel-formats/pixel-formats.factor b/basis/ui/pixel-formats/pixel-formats.factor
index a0aedc09f1eda88c17c8503ca8b9bed95b58b9b8..a67786eb35f72a72e78fadbc3038ad67b1c9dbbd 100644 (file)
--- a/basis/ui/pixel-formats/pixel-formats.factor
+++ b/basis/ui/pixel-formats/pixel-formats.factor
@@ -64,4 +64,4 @@ M: pixel-format dispose*
 
 GENERIC: world-pixel-format-attributes ( world -- attributes )
 
-GENERIC# check-world-pixel-format 1 ( world pixel-format -- )
+GENERIC#: check-world-pixel-format 1 ( world pixel-format -- )

diff --git a/basis/ui/tools/listener/completion/completion.factor b/basis/ui/tools/listener/completion/completion.factor
index 8b623f04b1f9555acdb6f4d8aedcd237d23d6882..8054ed75e550568d085fbd665c6e4849249588fb 100644 (file)
--- a/basis/ui/tools/listener/completion/completion.factor
+++ b/basis/ui/tools/listener/completion/completion.factor
@@ -126,7 +126,7 @@ M: object completion-string present ;
 
 M: method completion-string method-completion-string ;
 
-GENERIC# accept-completion-hook 1 ( item popup -- )
+GENERIC#: accept-completion-hook 1 ( item popup -- )
 
 : insert-completion ( item popup -- )
     [ completion-string ] [ completion-loc/doc/elt ] bi* set-elt-string ;

diff --git a/basis/ui/traverse/traverse.factor b/basis/ui/traverse/traverse.factor
index d5e51d5804cc058e48da11cb216882811789ef7b..5e7c8e7cf7dba59b32b1fa842c610d0e54bd2f5e 100644 (file)
--- a/basis/ui/traverse/traverse.factor
+++ b/basis/ui/traverse/traverse.factor
@@ -89,7 +89,7 @@ M: node gadget-text*
 : gadget-at-path ( parent path -- gadget )
     [ swap nth-gadget ] each ;
 
-GENERIC# leaves* 1 ( tree set -- )
+GENERIC#: leaves* 1 ( tree set -- )
 
 M: node leaves* [ children>> ] dip leaves* ;
 

diff --git a/basis/unix/linux/proc/proc.factor b/basis/unix/linux/proc/proc.factor
index e05eb37744bcea87f0ac55b0037d151d2000c912..f952982601b6594bebc096f23b0d502b71cb3af6 100644 (file)
--- a/basis/unix/linux/proc/proc.factor
+++ b/basis/unix/linux/proc/proc.factor
@@ -278,7 +278,7 @@ TUPLE: proc-uptime up idle ;
 
 ! /proc/pid/*
 
-GENERIC# proc-pid-path 1 ( object string -- path )
+GENERIC#: proc-pid-path 1 ( object string -- path )
 
 M: integer proc-pid-path ( pid string -- path )
     [ "/proc/" ] 2dip

diff --git a/core/alien/strings/strings.factor b/core/alien/strings/strings.factor
index b5d92e02a0e90e7d6605f334df86c4effd183b8b..74fdfb56370214cd2dc0cf39837830b1eca5d324 100644 (file)
--- a/core/alien/strings/strings.factor
+++ b/core/alien/strings/strings.factor
@@ -7,7 +7,7 @@ namespaces sequences sequences.private strings strings.private
 system system.private ;
 IN: alien.strings
 
-GENERIC# alien>string 1 ( c-ptr encoding -- string/f )
+GENERIC#: alien>string 1 ( c-ptr encoding -- string/f )
 
 M: c-ptr alien>string
     [ <memory-stream> ] [ <decoder> ] bi*
@@ -24,7 +24,7 @@ ERROR: invalid-c-string string ;
 : check-string ( string -- )
     0 over member-eq? [ invalid-c-string ] [ drop ] if ;
 
-GENERIC# string>alien 1 ( string encoding -- byte-array )
+GENERIC#: string>alien 1 ( string encoding -- byte-array )
 
 M: c-ptr string>alien drop ;
 

diff --git a/core/bootstrap/syntax.factor b/core/bootstrap/syntax.factor
index f2fef33f7b8f21b4a4bc4d66944f69fdbad513e1..b5e2fcf8d460d9ea50e0ecfaea7e9e6331b8d3d1 100644 (file)
--- a/core/bootstrap/syntax.factor
+++ b/core/bootstrap/syntax.factor
@@ -20,7 +20,7 @@ IN: bootstrap.syntax
         "DEFER:"
         "ERROR:"
         "FORGET:"
-        "GENERIC#"
+        "GENERIC#:"
         "GENERIC:"
         "HOOK:"
         "H{"

diff --git a/core/checksums/checksums.factor b/core/checksums/checksums.factor
index ca849e1b879e3eaa738467b04c90f59f1b156466..c5fc5f7058a093ffed59dc3668fdcb1afc4fc770 100644 (file)
--- a/core/checksums/checksums.factor
+++ b/core/checksums/checksums.factor
@@ -35,7 +35,7 @@ M: checksum-state clone
     new BV{ } clone >>bytes ;
 
 GENERIC: initialize-checksum-state ( checksum -- checksum-state )
-GENERIC# add-checksum-bytes 1 ( checksum-state data -- checksum-state )
+GENERIC#: add-checksum-bytes 1 ( checksum-state data -- checksum-state )
 GENERIC: get-checksum ( checksum-state -- value )
 
 : with-checksum-state ( ..a checksum quot: ( ..a checksum-state -- ..b ) -- ..b )

diff --git a/core/classes/tuple/parser/parser.factor b/core/classes/tuple/parser/parser.factor
index 90a34ae860433ecb138ee223d270ee6df62527c5..08b57a747bf837011da9dc5981a833c280fe2544 100644 (file)
--- a/core/classes/tuple/parser/parser.factor
+++ b/core/classes/tuple/parser/parser.factor
@@ -91,7 +91,7 @@ ERROR: bad-slot-name class slot ;
 : parse-slot-values ( class slots -- values )
     [ (parse-slot-values) ] { } make ;
 
-GENERIC# boa>object 1 ( class slots -- tuple )
+GENERIC#: boa>object 1 ( class slots -- tuple )
 
 M: tuple-class boa>object
     swap slots>tuple ;

diff --git a/core/classes/tuple/tuple-tests.factor b/core/classes/tuple/tuple-tests.factor
index 0c1719c55d4102b6437a01d37e88327796133841..50a608ed1d3296f6e2e8c669e78981c89739cc51 100644 (file)
--- a/core/classes/tuple/tuple-tests.factor
+++ b/core/classes/tuple/tuple-tests.factor
@@ -139,8 +139,8 @@ M: integer forget-robustness-generic ;
 ] with-compilation-unit
 
 ! rapido found this one
-GENERIC# m1 0 ( s n -- n )
-GENERIC# m2 1 ( s n -- v )
+GENERIC#: m1 0 ( s n -- n )
+GENERIC#: m2 1 ( s n -- v )
 
 TUPLE: t1 ;
 

diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor
index 1f5ce09bcba350b9466e8430bc9abaaf5bb89bbc..9c84375ceb01401b4ad1e45eddc7dd0b30e1a155 100644 (file)
--- a/core/classes/tuple/tuple.factor
+++ b/core/classes/tuple/tuple.factor
@@ -277,7 +277,7 @@ M: tuple-class update-class
     dup final-class? [ bad-superclass ] when
     dup class? [ bad-superclass ] unless drop ;
 
-GENERIC# (define-tuple-class) 2 ( class superclass slots -- )
+GENERIC#: (define-tuple-class) 2 ( class superclass slots -- )
 
 : thrower-effect ( slots -- effect )
     [ name>> ] map { "*" } <effect> ;

diff --git a/core/generic/generic-docs.factor b/core/generic/generic-docs.factor
index 0dc143d6d1f11a9123381c22b4bbe0f0dce7c927..be247856bc9083f40d59bf5cecb772e45c1e5f3f 100644 (file)
--- a/core/generic/generic-docs.factor
+++ b/core/generic/generic-docs.factor
@@ -61,7 +61,7 @@ ARTICLE: "method-combination" "Custom method combination"
 "A table of built-in method combination defining words, and the method combinations themselves:"
 { $table
     { { $link POSTPONE: GENERIC: } { $link standard-combination } }
-    { { $link POSTPONE: GENERIC# } { $link standard-combination } }
+    { { $link POSTPONE: GENERIC#: } { $link standard-combination } }
     { { $link POSTPONE: HOOK: } { $link hook-combination } }
     { { $link POSTPONE: MATH: } { $link math-combination } }
 }
@@ -93,7 +93,7 @@ $nl
 "Generic words which dispatch on the object at the top of the stack:"
 { $subsections POSTPONE: GENERIC: }
 "A method combination which dispatches on a specified stack position:"
-{ $subsections POSTPONE: GENERIC# }
+{ $subsections POSTPONE: GENERIC#: }
 "A method combination which dispatches on the value of a variable at the time the generic word is called:"
 { $subsections POSTPONE: HOOK: }
 "A method combination which dispatches on a pair of stack values, which must be numbers, and upgrades both to the same type of number:"
@@ -114,7 +114,7 @@ ABOUT: "generic"
 HELP: generic
 { $class-description "The class of generic words, documented in " { $link "generic" } "." } ;
 
-{ generic define-generic define-simple-generic POSTPONE: GENERIC: POSTPONE: GENERIC# POSTPONE: MATH: POSTPONE: HOOK: } related-words
+{ generic define-generic define-simple-generic POSTPONE: GENERIC: POSTPONE: GENERIC#: POSTPONE: MATH: POSTPONE: HOOK: } related-words
 
 HELP: make-generic
 { $values { "word" generic } }

diff --git a/core/generic/generic.factor b/core/generic/generic.factor
index c861f7c54bc894dd9c3c90fd1711f5ceae24f75d..65fbb300f4833183c9deacc9e5d8a43af35c4205 100644 (file)
--- a/core/generic/generic.factor
+++ b/core/generic/generic.factor
@@ -186,7 +186,7 @@ M: method forget*
         [ call-next-method ] bi
     ] if ;
 
-GENERIC# check-combination-effect 1 ( combination effect -- )
+GENERIC#: check-combination-effect 1 ( combination effect -- )
 
 M: object check-combination-effect 2drop ;
 

diff --git a/core/generic/standard/standard-docs.factor b/core/generic/standard/standard-docs.factor
index 13e4554b5a4a718af59dbbe39cc899767cd3e03e..b69543f1c5f2cb940b562228674540092882a59f 100644 (file)
--- a/core/generic/standard/standard-docs.factor
+++ b/core/generic/standard/standard-docs.factor
@@ -10,7 +10,7 @@ HELP: standard-combination
 { $examples
     "A generic word for append strings and characters to a sequence, dispatching on the object underneath the top of the stack:"
     { $code
-        "GENERIC# build-string 1 ( elt str -- )"
+        "GENERIC#: build-string 1 ( elt str -- )"
         "M: string build-string swap push-all ;"
         "M: integer build-string push ;"
     }

diff --git a/core/generic/standard/standard-tests.factor b/core/generic/standard/standard-tests.factor
index ac9f0efe09b69fe7902b4015dc068ba1984b44c7..bc48c2f2bd4f0788e0fb712d10d17520816f823b 100644 (file)
--- a/core/generic/standard/standard-tests.factor
+++ b/core/generic/standard/standard-tests.factor
@@ -194,7 +194,7 @@ M: byte-array small-lo-tag drop "byte-array" ;
 ] must-fail
 { } [ "IN: generic.standard.tests GENERIC: unhappy ( x -- x )" eval( -- ) ] unit-test
 
-GENERIC# complex-combination 1 ( a b -- c )
+GENERIC#: complex-combination 1 ( a b -- c )
 M: string complex-combination drop ;
 M: object complex-combination nip ;
 
@@ -368,13 +368,13 @@ M: c funky* "c" , call-next-method ;
 [ "IN: generic.standard.tests GENERIC: broken-generic ( -- )" eval( -- ) ]
 [ error>> bad-dispatch-position? ]
 must-fail-with
-[ "IN: generic.standard.tests GENERIC# broken-generic# -1 ( a -- b )" eval( -- ) ]
+[ "IN: generic.standard.tests GENERIC#: broken-generic# -1 ( a -- b )" eval( -- ) ]
 [ error>> bad-dispatch-position? ]
 must-fail-with
-[ "IN: generic.standard.tests GENERIC# broken-generic# 1 ( a -- b )" eval( -- ) ]
+[ "IN: generic.standard.tests GENERIC#: broken-generic# 1 ( a -- b )" eval( -- ) ]
 [ error>> bad-dispatch-position? ]
 must-fail-with
-[ "IN: generic.standard.tests GENERIC# broken-generic# 2/3 ( a b c -- )" eval( -- ) ]
+[ "IN: generic.standard.tests GENERIC#: broken-generic# 2/3 ( a b c -- )" eval( -- ) ]
 [ error>> bad-dispatch-position? ]
 must-fail-with
 

diff --git a/core/generic/standard/standard.factor b/core/generic/standard/standard.factor
index e097b2a552a273f05d3209e3de91e3056bf7d677..45cac2fa128ac52a33e7ffbf22f6420cfe494377 100644 (file)
--- a/core/generic/standard/standard.factor
+++ b/core/generic/standard/standard.factor
@@ -63,6 +63,6 @@ M: standard-combination inline-cache-quots
 M: standard-combination mega-cache-quot
     combination get #>> make-empty-cache \ mega-cache-lookup [ ] 4sequence ;
 
-M: standard-generic definer drop \ GENERIC# f ;
+M: standard-generic definer drop \ GENERIC#: f ;
 
 M: simple-generic definer drop \ GENERIC: f ;

diff --git a/core/io/encodings/encodings.factor b/core/io/encodings/encodings.factor
index 054fa5915f9b4c22b1113a3590c0105c936345de..fc1d24375e15c06c3a40dee4a48353c34dbc4ef0 100644 (file)
--- a/core/io/encodings/encodings.factor
+++ b/core/io/encodings/encodings.factor
@@ -205,7 +205,7 @@ INSTANCE: encoder plain-writer
 
 PRIVATE>
 
-GENERIC# re-encode 1 ( stream encoding -- newstream )
+GENERIC#: re-encode 1 ( stream encoding -- newstream )
 
 M: object re-encode <encoder> ;
 
@@ -218,7 +218,7 @@ M: encoder re-encode [ stream>> ] dip re-encode ;
     [ [ output-stream get ] dip re-encode ] dip
     with-output-stream* ; inline
 
-GENERIC# re-decode 1 ( stream encoding -- newstream )
+GENERIC#: re-decode 1 ( stream encoding -- newstream )
 
 M: object re-decode <decoder> ;
 

diff --git a/core/io/encodings/utf16/utf16.factor b/core/io/encodings/utf16/utf16.factor
index 2e1b2f560546942284c3151fced92f089efba790..b18db487b2829041f62a5e4018e75629ffb08a14 100644 (file)
--- a/core/io/encodings/utf16/utf16.factor
+++ b/core/io/encodings/utf16/utf16.factor
@@ -114,7 +114,7 @@ M: utf16le encode-char ( char stream encoding -- )
 : ascii-string>utf16be ( string stream -- )
     [ 1 swap ascii-string>utf16-byte-array ] dip stream-write ; inline
 
-GENERIC# encode-string-utf16le 1 ( string stream -- )
+GENERIC#: encode-string-utf16le 1 ( string stream -- )
 
 M: object encode-string-utf16le
     [ char>utf16le ] curry each ; inline
@@ -126,7 +126,7 @@ M: string encode-string-utf16le
 
 M: utf16le encode-string drop encode-string-utf16le ;
 
-GENERIC# encode-string-utf16be 1 ( string stream -- )
+GENERIC#: encode-string-utf16be 1 ( string stream -- )
 
 M: object encode-string-utf16be
     [ char>utf16be ] curry each ; inline

diff --git a/core/io/encodings/utf8/utf8.factor b/core/io/encodings/utf8/utf8.factor
index 4979daad15bd1c5b06b289d4a24b568c919a8759..0ac41b581251143a58a575809131f5294e233125 100644 (file)
--- a/core/io/encodings/utf8/utf8.factor
+++ b/core/io/encodings/utf8/utf8.factor
@@ -84,7 +84,7 @@ M: utf8 decode-until (decode-until) ;
 M: utf8 encode-char
     drop char>utf8 ;
 
-GENERIC# encode-string-utf8 1 ( string stream -- )
+GENERIC#: encode-string-utf8 1 ( string stream -- )
 
 M: object encode-string-utf8
     [ char>utf8 ] curry each ; inline

diff --git a/core/math/math.factor b/core/math/math.factor
index 0e556d6109783e19aab427db7613d6cf57f934c9..c70a16567314f1839eaa7eaabbade037c696a13a 100644 (file)
--- a/core/math/math.factor
+++ b/core/math/math.factor
@@ -119,9 +119,9 @@ MATH: /mod ( x y -- z w ) foldable
 MATH: bitand ( x y -- z ) foldable
 MATH: bitor  ( x y -- z ) foldable
 MATH: bitxor ( x y -- z ) foldable
-GENERIC# shift 1 ( x n -- y ) foldable
+GENERIC#: shift 1 ( x n -- y ) foldable
 GENERIC: bitnot ( x -- y ) foldable
-GENERIC# bit? 1 ( x n -- ? ) foldable
+GENERIC#: bit? 1 ( x n -- ? ) foldable
 
 GENERIC: abs ( x -- y ) foldable
 

diff --git a/core/math/parser/parser.factor b/core/math/parser/parser.factor
index 49ebf8383bf7d9aeadec2266238cfef6b33c9256..5a683d921db6922d647f0d58ee6940901c0265b7 100644 (file)
--- a/core/math/parser/parser.factor
+++ b/core/math/parser/parser.factor
@@ -464,7 +464,7 @@ M: fixnum (positive>dec)
 
 PRIVATE>
 
-GENERIC# >base 1 ( n radix -- str )
+GENERIC#: >base 1 ( n radix -- str )
 
 : number>string ( n -- str ) 10 >base ; inline
 

diff --git a/core/parser/parser-tests.factor b/core/parser/parser-tests.factor
index 3245608ab723798a1c879a837ffa909eb8d6b396..58ea85917bbf045b9c091296091b8db1a1ca3dfe 100644 (file)
--- a/core/parser/parser-tests.factor
+++ b/core/parser/parser-tests.factor
@@ -438,7 +438,7 @@ DEFER: foo
     {
         "IN: parser.tests"
         "USING: math arrays kernel ;"
-        "GENERIC# change-combination 1 ( obj a -- b )"
+        "GENERIC#: change-combination 1 ( obj a -- b )"
         "M: integer change-combination 2drop 1 ;"
         "M: array change-combination 2drop 2 ;"
     } "\n" join <string-reader> "change-combination-test" parse-stream drop

diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index 392ed174e6ec940144a1703e64453cbfac48cfe9..055392e882081b8b776e073d7f5e9ff787bd31a7 100644 (file)
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -51,7 +51,7 @@ M: sequence shorten 2dup length < [ set-length ] [ 2drop ] if ; inline
 
 ERROR: bounds-error index seq ;
 
-GENERIC# bounds-check? 1 ( n seq -- ? )
+GENERIC#: bounds-check? 1 ( n seq -- ? )
 
 M: integer bounds-check? ( n seq -- ? )
     dupd length < [ 0 >= ] [ drop f ] if ; inline

diff --git a/core/slots/slots.factor b/core/slots/slots.factor
index 5488f03bd662da95ed73ef42336bbcb866bae741..d0a9459af8d8a61a9d8729d72c1d1266c7de3608 100644 (file)
--- a/core/slots/slots.factor
+++ b/core/slots/slots.factor
@@ -33,7 +33,7 @@ PREDICATE: writer-method < method "writing" word-prop >boolean ;
     [ 2drop make-inline ]
     3tri ;
 
-GENERIC# reader-quot 1 ( class slot-spec -- quot )
+GENERIC#: reader-quot 1 ( class slot-spec -- quot )
 
 M: object reader-quot
     nip [
@@ -87,7 +87,7 @@ M: object instance-check-quot
         \ unless ,
     ] [ ] make ;
 
-GENERIC# writer-quot 1 ( class slot-spec -- quot )
+GENERIC#: writer-quot 1 ( class slot-spec -- quot )
 
 M: object writer-quot
     nip

diff --git a/core/syntax/syntax-docs.factor b/core/syntax/syntax-docs.factor
index a4f93aea5066b56e55ed801662e6a5416c89bcba..a61fd1c4d02a697d57533558874aaac53ce497e5 100644 (file)
--- a/core/syntax/syntax-docs.factor
+++ b/core/syntax/syntax-docs.factor
@@ -669,14 +669,14 @@ HELP: GENERIC:
 { $values { "word" "a new word to define" } }
 { $description "Defines a new generic word in the current vocabulary. Initially, it contains no methods, and thus will throw a " { $link no-method } " error when called." } ;
 
-HELP: GENERIC#
-{ $syntax "GENERIC# word n ( stack -- effect )" }
+HELP: GENERIC#:
+{ $syntax "GENERIC#: word n ( stack -- effect )" }
 { $values { "word" "a new word to define" } { "n" "the stack position to dispatch on" } }
 { $description "Defines a new generic word which dispatches on the " { $snippet "n" } "th most element from the top of the stack in the current vocabulary. Initially, it contains no methods, and thus will throw a " { $link no-method } " error when called." }
 { $notes
     "The following two definitions are equivalent:"
     { $code "GENERIC: foo ( obj -- )" }
-    { $code "GENERIC# foo 0 ( obj -- )" }
+    { $code "GENERIC#: foo 0 ( obj -- )" }
 } ;
 
 HELP: MATH:

diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor
index bd5baa3c4005262c86bbf4fcdfdfda3a46a945ab..0e21d311a5c4fb0353588a88ac9b060fe83f4d95 100644 (file)
--- a/core/syntax/syntax.factor
+++ b/core/syntax/syntax.factor
@@ -164,7 +164,7 @@ IN: bootstrap.syntax
         [ simple-combination ] (GENERIC:)
     ] define-core-syntax
 
-    "GENERIC#" [
+    "GENERIC#:" [
         [ scan-number <standard-combination> ] (GENERIC:)
     ] define-core-syntax
 

diff --git a/extra/cpu/arm/assembler/assembler.factor b/extra/cpu/arm/assembler/assembler.factor
index cd04754387ce2311a61e3fdb0b588b9b20740e13..cd4f77ada4be6746f3a154b1a5e374972e0ed700 100644 (file)
--- a/extra/cpu/arm/assembler/assembler.factor
+++ b/extra/cpu/arm/assembler/assembler.factor
@@ -84,7 +84,7 @@ SYMBOL: cond-code
 : insn ( bitspec -- ) bitfield (insn) ; inline
 
 ! Branching instructions
-GENERIC# (B) 1 ( target l -- )
+GENERIC#: (B) 1 ( target l -- )
 
 M: integer (B) { 24 { 1 25 } { 0 26 } { 1 27 } 0 } insn ;
 
@@ -109,7 +109,7 @@ PRIVATE>
 : sinsn ( bitspec -- )
     bitfield S> [ 20 2^ bitor ] when (insn) ; inline
 
-GENERIC# shift-imm/reg 2 ( shift-imm/Rs Rm shift -- n )
+GENERIC#: shift-imm/reg 2 ( shift-imm/Rs Rm shift -- n )
 
 M: integer shift-imm/reg ( shift-imm Rm shift -- n )
     { { 0 4 } 5 { register 0 } 7 } bitfield ;
@@ -294,7 +294,7 @@ SYMBOL: have-BLX?
 
 <PRIVATE
 
-GENERIC# (BX) 1 ( Rm l -- )
+GENERIC#: (BX) 1 ( Rm l -- )
 
 M: register-class (BX) ( Rm l -- )
     {

diff --git a/extra/cursors/cursors.factor b/extra/cursors/cursors.factor
index 3c928cc02eec19bc5bbe95f8d7fd42c2fcda3353..f51e2fd13334059653e4e38a70990134b7647052 100644 (file)
--- a/extra/cursors/cursors.factor
+++ b/extra/cursors/cursors.factor
@@ -40,8 +40,8 @@ GENERIC: dec-cursor ( cursor -- cursor' )
 MIXIN: random-access-cursor
 INSTANCE: random-access-cursor bidirectional-cursor
 
-GENERIC# cursor+ 1 ( cursor n -- cursor' )
-GENERIC# cursor- 1 ( cursor n -- cursor' )
+GENERIC#: cursor+ 1 ( cursor n -- cursor' )
+GENERIC#: cursor- 1 ( cursor n -- cursor' )
 GENERIC: cursor-distance ( cursor cursor -- n )
 GENERIC: cursor<  ( cursor cursor -- ? )
 GENERIC: cursor>  ( cursor cursor -- ? )
@@ -391,7 +391,7 @@ M: pusher-cursor set-cursor-value growable>> push ; inline
 : new-growable-cursor ( begin end exemplar -- cursor result )
     [ swap cursor-distance-hint ] dip new-resizable [ <pusher-cursor> ] keep ; inline
 
-GENERIC# new-sequence-cursor 1 ( begin end exemplar -- cursor result )
+GENERIC#: new-sequence-cursor 1 ( begin end exemplar -- cursor result )
 
 M: random-access-cursor new-sequence-cursor
     [ swap cursor-distance ] dip new-sequence [ begin-cursor ] keep ; inline

diff --git a/extra/game/loop/loop.factor b/extra/game/loop/loop.factor
index 29e649f6f31f99b2b560023b8ff18f3bdd6865d5..5b2dceeadb3878b9599549ec75636ca8911f393c 100755 (executable)
--- a/extra/game/loop/loop.factor
+++ b/extra/game/loop/loop.factor
@@ -38,7 +38,7 @@ TUPLE: game-loop-error-state error game-loop ;
     [ draw-timer>> iteration-start-nanos>> nano-count swap - ]
     [ tick-interval-nanos>> ] bi /f 1.0 min ;
 
-GENERIC# record-benchmarking 1 ( loop quot -- )
+GENERIC#: record-benchmarking 1 ( loop quot -- )
 
 M: object record-benchmarking
     call( loop -- ) ;

diff --git a/extra/game/models/loader/loader.factor b/extra/game/models/loader/loader.factor
index b065bd843d629b2483b2f726ccf65ab55512dd31..2589f0b6f4fb0e4d60905ae68bcaeaf443e4990a 100644 (file)
--- a/extra/game/models/loader/loader.factor
+++ b/extra/game/models/loader/loader.factor
@@ -26,7 +26,7 @@ types [ H{ } clone ] initialize
 
 PRIVATE>
 
-GENERIC# load-models* 2 ( obj encoding class -- models )
+GENERIC#: load-models* 2 ( obj encoding class -- models )
 
 GENERIC: stream>models ( stream class -- models )
 

diff --git a/extra/gml/types/types.factor b/extra/gml/types/types.factor
index a4de9d3aef4279d3b6bcb48b9fe2bf320abc97ca..b5660311b820a683082e1d7db4adc27ca9c76088 100644 (file)
--- a/extra/gml/types/types.factor
+++ b/extra/gml/types/types.factor
@@ -23,12 +23,12 @@ INSTANCE: proc sequence
 
 : wrap ( n seq -- n seq ) [ length rem ] keep ; inline
 
-GENERIC# (gml-get) 1 ( collection key -- elt )
+GENERIC#: (gml-get) 1 ( collection key -- elt )
 
 M: sequence (gml-get) swap wrap nth ;
 M: hashtable (gml-get) of ;
 
-GENERIC# (gml-put) 2 ( collection key elt -- )
+GENERIC#: (gml-put) 2 ( collection key elt -- )
 
 M:: sequence (gml-put) ( collection key elt -- )
     elt key collection wrap set-nth ;

diff --git a/extra/gpu/framebuffers/framebuffers.factor b/extra/gpu/framebuffers/framebuffers.factor
index 41f3f444138e6eac91e8115d46debd5fde254192..e5617f5118cded9af1980a99639821d4c09e9277 100644 (file)
--- a/extra/gpu/framebuffers/framebuffers.factor
+++ b/extra/gpu/framebuffers/framebuffers.factor
@@ -141,7 +141,7 @@ GENERIC: framebuffer-handle ( framebuffer -- handle )
 M: system-framebuffer framebuffer-handle drop 0 ;
 M: framebuffer framebuffer-handle handle>> ;
 
-GENERIC# allocate-framebuffer-attachment 1 ( framebuffer-attachment dim -- )
+GENERIC#: allocate-framebuffer-attachment 1 ( framebuffer-attachment dim -- )
 
 M: texture-attachment allocate-framebuffer-attachment
     [ [ texture>> ] [ level>> ] bi ] dip f allocate-texture ;

diff --git a/extra/gpu/render/render.factor b/extra/gpu/render/render.factor
index 6e4564e06cc6496dd4f441aa376e0f5143494f52..81143ecdd70824d5b78d2ebdede0c90afff33747 100755 (executable)
--- a/extra/gpu/render/render.factor
+++ b/extra/gpu/render/render.factor
@@ -139,7 +139,7 @@ ERROR: invalid-uniform-type uniform ;
 
 GENERIC: render-vertex-indexes ( primitive-mode vertex-indexes -- )
 
-GENERIC# render-vertex-indexes-instanced 1 ( primitive-mode vertex-indexes instances -- )
+GENERIC#: render-vertex-indexes-instanced 1 ( primitive-mode vertex-indexes instances -- )
 
 GENERIC: gl-array-element-type ( array -- type )
 M: uchar-array  gl-array-element-type drop GL_UNSIGNED_BYTE  ; inline
@@ -264,14 +264,14 @@ GENERIC: >uniform-int-array ( sequence -- c-array )
 GENERIC: >uniform-uint-array ( sequence -- c-array )
 GENERIC: >uniform-float-array  ( sequence -- c-array )
 
-GENERIC# >uniform-bvec-array 1 ( sequence dim -- c-array )
-GENERIC# >uniform-ivec-array 1 ( sequence dim -- c-array )
-GENERIC# >uniform-uvec-array 1 ( sequence dim -- c-array )
-GENERIC# >uniform-vec-array  1 ( sequence dim -- c-array )
+GENERIC#: >uniform-bvec-array 1 ( sequence dim -- c-array )
+GENERIC#: >uniform-ivec-array 1 ( sequence dim -- c-array )
+GENERIC#: >uniform-uvec-array 1 ( sequence dim -- c-array )
+GENERIC#: >uniform-vec-array  1 ( sequence dim -- c-array )
 
-GENERIC# >uniform-matrix 2 ( sequence cols rows -- c-array )
+GENERIC#: >uniform-matrix 2 ( sequence cols rows -- c-array )
 
-GENERIC# >uniform-matrix-array 2 ( sequence cols rows -- c-array )
+GENERIC#: >uniform-matrix-array 2 ( sequence cols rows -- c-array )
 
 GENERIC: bind-uniform-bvec2 ( index sequence -- )
 GENERIC: bind-uniform-bvec3 ( index sequence -- )

diff --git a/extra/gpu/textures/textures.factor b/extra/gpu/textures/textures.factor
index 9d3b66df0c7ca246b2181d6c23db8a644e02f969..9e171d604b406b76d39904aba4fee02ce3d26662 100644 (file)
--- a/extra/gpu/textures/textures.factor
+++ b/extra/gpu/textures/textures.factor
@@ -203,7 +203,7 @@ M: cube-map-face     texture-data-gl-target
 
 PRIVATE>
 
-GENERIC# allocate-texture 3 ( tdt level dim data -- )
+GENERIC#: allocate-texture 3 ( tdt level dim data -- )
 
 M: texture-1d-data-target allocate-texture ( tdt level dim data -- )
     [ ] [ glTexImage1D ] (allocate-texture) ;
@@ -214,7 +214,7 @@ M: texture-2d-data-target allocate-texture ( tdt level dim data -- )
 M: texture-3d-data-target allocate-texture ( tdt level dim data -- )
     [ first3 ] [ glTexImage3D ] (allocate-texture) ;
 
-GENERIC# allocate-compressed-texture 3 ( tdt level dim compressed-data -- )
+GENERIC#: allocate-compressed-texture 3 ( tdt level dim compressed-data -- )
 
 M: texture-1d-data-target allocate-compressed-texture ( tdt level dim compressed-data -- )
     [ ] [ glCompressedTexImage1D ] (allocate-compressed-texture) ;
@@ -225,7 +225,7 @@ M: texture-2d-data-target allocate-compressed-texture ( tdt level dim compressed
 M: texture-3d-data-target allocate-compressed-texture ( tdt level dim compressed-data -- )
     [ first3 ] [ glCompressedTexImage3D ] (allocate-compressed-texture) ;
 
-GENERIC# update-texture 4 ( tdt level loc dim data -- )
+GENERIC#: update-texture 4 ( tdt level loc dim data -- )
 
 M: texture-1d-data-target update-texture ( tdt level loc dim data -- )
     [ ] [ glTexSubImage1D ] (update-texture) ;
@@ -236,7 +236,7 @@ M: texture-2d-data-target update-texture ( tdt level loc dim data -- )
 M: texture-3d-data-target update-texture ( tdt level loc dim data -- )
     [ first3 ] [ glTexSubImage3D ] (update-texture) ;
 
-GENERIC# update-compressed-texture 4 ( tdt level loc dim compressed-data -- )
+GENERIC#: update-compressed-texture 4 ( tdt level loc dim compressed-data -- )
 
 M: texture-1d-data-target update-compressed-texture ( tdt level loc dim compressed-data -- )
     [ ] [ glCompressedTexSubImage1D ] (update-compressed-texture) ;
@@ -251,7 +251,7 @@ M: texture-3d-data-target update-compressed-texture ( tdt level loc dim compress
     { [ dim>> ] [ bitmap>> ] [ component-order>> ] [ component-type>> ] } cleave
     <texture-data> ; inline
 
-GENERIC# texture-dim 1 ( tdt level -- dim )
+GENERIC#: texture-dim 1 ( tdt level -- dim )
 
 M:: texture-1d-data-target texture-dim ( tdt level -- dim )
     tdt bind-tdt :> texture

diff --git a/extra/graphviz/notation/notation.factor b/extra/graphviz/notation/notation.factor
index 6361c519c54c79b9f2b87d113983043cd1546093..53e2e56a573149590e49aa138c45ceb075d7a813 100644 (file)
--- a/extra/graphviz/notation/notation.factor
+++ b/extra/graphviz/notation/notation.factor
@@ -11,7 +11,7 @@ IN: graphviz.notation
 
 <PRIVATE
 
-! GENERIC# =attr 1 ( graphviz-obj val -- graphviz-obj' )
+! GENERIC#: =attr 1 ( graphviz-obj val -- graphviz-obj' )
 ! M: edge/node =attr
 !   present over attributes>> attr<< ;
 ! M: sub/graph =attr

diff --git a/extra/monads/monads.factor b/extra/monads/monads.factor
index d8d4e35a3542faab52d78dc22f3b99c080851bdd..485e5431605af1b6ab7c9724c969eed5972cbe1c 100644 (file)
--- a/extra/monads/monads.factor
+++ b/extra/monads/monads.factor
@@ -6,9 +6,9 @@ shuffle ;
 IN: monads
 
 ! Functors
-GENERIC# fmap 1 ( functor quot -- functor' )
-GENERIC# <$ 1 ( functor quot -- functor' )
-GENERIC# $> 1 ( functor quot -- functor' )
+GENERIC#: fmap 1 ( functor quot -- functor' )
+GENERIC#: <$ 1 ( functor quot -- functor' )
+GENERIC#: $> 1 ( functor quot -- functor' )
 
 ! Monads
 

diff --git a/extra/mongodb/driver/driver.factor b/extra/mongodb/driver/driver.factor
index bfad87b739f7c75ada9f2fae5431f8a97d008b71..cd9fb587f7dd708aa6e0d74a6448851bca558d06 100644 (file)
--- a/extra/mongodb/driver/driver.factor
+++ b/extra/mongodb/driver/driver.factor
@@ -214,7 +214,7 @@ PRIVATE>
 : key-spec ( spec-quot -- spec-assoc )
     output>array >hashtable ; inline
 
-GENERIC# hint 1 ( mdb-query-msg index-hint -- mdb-query-msg )
+GENERIC#: hint 1 ( mdb-query-msg index-hint -- mdb-query-msg )
 
 M: mdb-query-msg hint
     >>hint ;

diff --git a/extra/project-euler/215/215.factor b/extra/project-euler/215/215.factor
index 1006b7a4cf25de71ce0ca2d96a8af19b4fbd32e1..c1e26a71ec5907492f49697c6a3232d780aa829a 100644 (file)
--- a/extra/project-euler/215/215.factor
+++ b/extra/project-euler/215/215.factor
@@ -42,8 +42,8 @@ C: <end> end
     [ [ two>> ] [ three>> ] bi ] 2dip bi* ; inline
 
 GENERIC: merge ( t t -- t )
-GENERIC# block-merge 1 ( t t -- t )
-GENERIC# end-merge 1 ( t t -- t )
+GENERIC#: block-merge 1 ( t t -- t )
+GENERIC#: end-merge 1 ( t t -- t )
 M: block merge block-merge ;
 M: end   merge end-merge ;
 M: block block-merge [ [ two>>   ] bi@ merge ]

diff --git a/extra/tools/dns/dns.factor b/extra/tools/dns/dns.factor
index fe72417dd04877a7b9c2bad8ec75231d30fcc81f..56127b3d5a4b25a2590725a83523ff5e0286d2ce 100644 (file)
--- a/extra/tools/dns/dns.factor
+++ b/extra/tools/dns/dns.factor
@@ -34,7 +34,7 @@ IN: tools.dns
     [ dns-AAAA-query aaaa-message. ]
     [ dns-MX-query mx-message. ] tri ;
 
-GENERIC# dns-host 1 ( servers domain -- )
+GENERIC#: dns-host 1 ( servers domain -- )
 
 M: sequence dns-host ( servers domain -- )
     '[ _ host ] with-dns-servers ;

diff --git a/extra/variants/variants.factor b/extra/variants/variants.factor
index 998fc19c850e83188c00989856750b4310fc8b92..b153e649aa2d4e7aaf59abb6b3f78bb39bcac75d 100644 (file)
--- a/extra/variants/variants.factor
+++ b/extra/variants/variants.factor
@@ -55,7 +55,7 @@ SYNTAX: VARIANT-MEMBER:
 MACRO: unboa ( class -- quot )
     <wrapper> \ boa [ ] 2sequence [undo] ;
 
-GENERIC# (match-branch) 1 ( class quot -- class quot' )
+GENERIC#: (match-branch) 1 ( class quot -- class quot' )
 
 M: singleton-class (match-branch)
     \ drop prefix ;

diff --git a/extra/zeromq/zeromq.factor b/extra/zeromq/zeromq.factor
index 61e29c60c3493896040dd20979a881f226cc06fa..e49b0901b19be7af2b78babf1f7480092c7c0d16 100644 (file)
--- a/extra/zeromq/zeromq.factor
+++ b/extra/zeromq/zeromq.factor
@@ -34,8 +34,8 @@ MEMO: zmq-msg-size ( -- x )
 : <zmq_msg_t> ( -- byte-array )
     zmq-msg-size (byte-array) ;
 
-GENERIC# zmq-setopt 2 ( obj name value -- )
-GENERIC# zmq-getopt 1 ( obj name -- value )
+GENERIC#: zmq-setopt 2 ( obj name value -- )
+GENERIC#: zmq-getopt 1 ( obj name -- value )
 
 TUPLE: zmq-message underlying ;
 

diff --git a/unmaintained/ui/gadgets/layout/layout.factor b/unmaintained/ui/gadgets/layout/layout.factor
index c187b01946d33e520845cf09b0a8cbf0affeee9d..06ec26cedefa8a100b940747e1d19ba40b9f3ecd 100644 (file)
--- a/unmaintained/ui/gadgets/layout/layout.factor
+++ b/unmaintained/ui/gadgets/layout/layout.factor
@@ -66,11 +66,11 @@ GENERIC: >layout ( gadget -- layout )
 M: gadget >layout f <layout> ;
 M: layout >layout ;
 
-GENERIC# (add-gadget-at) 2 ( parent item n -- )
+GENERIC#: (add-gadget-at) 2 ( parent item n -- )
 M: gadget (add-gadget-at) -rot [ add-gadget ] keep insert-gadget ;
 M: track (add-gadget-at) -rot >layout [ add-layout ] keep [ gadget>> insert-gadget ] [ size>> insert-size ] 3bi ;
 
-GENERIC# add-gadget-at 1 ( item location -- )
+GENERIC#: add-gadget-at 1 ( item location -- )
 M: object add-gadget-at insertion-point -rot (add-gadget-at) ;
 M: model add-gadget-at parent>> dup book:book? [ "No models in books" throw ]
    [ dup model>> dup collection? [ nip swap add-connection ] [ drop [ 1array <collection> ] dip model<< ] if ] if ;