steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

functors: FUNCTOR: ;FUNCTOR -> <FUNCTOR: ;FUNCTOR> 

Functors contain nested definitions, much like <PRIVATE PRIVATE> blocks.
A new parser will be able to parse nested definitions unambigiously without
knowledge of the definition of <FUNCTOR: itself, which is not the case if
it looks like FUNCTOR: instead.
modern-harvey2
Doug Coleman 2017-08-05 20:41:19 -05:00
parent 21e42a5d3b
commit 27b3c4cccf
21 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/alien/complex/functor/functor.factor
View File

@ -4,7 +4,7 @@ USING: accessors alien alien.c-types classes.struct functors
kernel math math.functions quotations ; kernel math math.functions quotations ;
IN: alien.complex.functor IN: alien.complex.functor
FUNCTOR: define-complex-type ( N T -- ) <FUNCTOR: define-complex-type ( N T -- )
N-type IS ${N} N-type IS ${N}
@ -29,4 +29,4 @@ T-class lookup-c-type
complex >>boxed-class complex >>boxed-class
drop drop
;FUNCTOR ;FUNCTOR>

4
basis/alien/destructors/destructors.factor
View File

@ -6,7 +6,7 @@ IN: alien.destructors
TUPLE: alien-destructor alien ; TUPLE: alien-destructor alien ;
FUNCTOR: define-destructor ( F -- ) <FUNCTOR: define-destructor ( F -- )
F-destructor DEFINES-CLASS ${F}-destructor F-destructor DEFINES-CLASS ${F}-destructor
<F-destructor> DEFINES <${F}-destructor> <F-destructor> DEFINES <${F}-destructor>
@ -27,6 +27,6 @@ M: F-destructor dispose alien>> F N ndrop ;
: |F ( alien -- alien ) dup <F-destructor> |dispose drop ; inline : |F ( alien -- alien ) dup <F-destructor> |dispose drop ; inline
;FUNCTOR ;FUNCTOR>
SYNTAX: DESTRUCTOR: scan-word define-destructor ; SYNTAX: DESTRUCTOR: scan-word define-destructor ;

12
basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor
View File

@ -57,7 +57,7 @@ MIXIN: dataflow-analysis
M: dataflow-analysis join-sets 2drop assoc-refine ; M: dataflow-analysis join-sets 2drop assoc-refine ;
M: dataflow-analysis ignore-block? drop kill-block?>> ; M: dataflow-analysis ignore-block? drop kill-block?>> ;
FUNCTOR: define-analysis ( name -- ) <FUNCTOR: define-analysis ( name -- )
name DEFINES-CLASS ${name} name DEFINES-CLASS ${name}
name-ins DEFINES ${name}-ins name-ins DEFINES ${name}-ins
@ -77,7 +77,7 @@ SYMBOL: name-outs
: name-out ( bb -- set ) name-outs get at ; : name-out ( bb -- set ) name-outs get at ;
;FUNCTOR ;FUNCTOR>
! ! ! Forward dataflow analysis ! ! ! Forward dataflow analysis
@ -88,7 +88,7 @@ M: forward-analysis block-order drop reverse-post-order ;
M: forward-analysis successors drop successors>> ; M: forward-analysis successors drop successors>> ;
M: forward-analysis predecessors drop predecessors>> ; M: forward-analysis predecessors drop predecessors>> ;
FUNCTOR: define-forward-analysis ( name -- ) <FUNCTOR: define-forward-analysis ( name -- )
name IS ${name} name IS ${name}
name-ins IS ${name}-ins name-ins IS ${name}-ins
@ -103,7 +103,7 @@ INSTANCE: name forward-analysis
name run-dataflow-analysis name run-dataflow-analysis
[ name-ins set ] [ name-outs set ] bi* ; [ name-ins set ] [ name-outs set ] bi* ;
;FUNCTOR ;FUNCTOR>
! ! ! Backward dataflow analysis ! ! ! Backward dataflow analysis
@ -114,7 +114,7 @@ M: backward-analysis block-order drop post-order ;
M: backward-analysis successors drop predecessors>> ; M: backward-analysis successors drop predecessors>> ;
M: backward-analysis predecessors drop successors>> ; M: backward-analysis predecessors drop successors>> ;
FUNCTOR: define-backward-analysis ( name -- ) <FUNCTOR: define-backward-analysis ( name -- )
name IS ${name} name IS ${name}
name-ins IS ${name}-ins name-ins IS ${name}-ins
@ -129,7 +129,7 @@ INSTANCE: name backward-analysis
\ name run-dataflow-analysis \ name run-dataflow-analysis
[ name-outs set ] [ name-ins set ] bi* ; [ name-outs set ] [ name-ins set ] bi* ;
;FUNCTOR ;FUNCTOR>
PRIVATE> PRIVATE>

4
basis/compiler/cfg/renaming/functor/functor.factor
View File

@ -12,7 +12,7 @@ IN: compiler.cfg.renaming.functor
'[ [ _ ] dip changer-word [ ] 2sequence ] map [ ] join '[ [ _ ] dip changer-word [ ] 2sequence ] map [ ] join
[ drop ] append ; [ drop ] append ;
FUNCTOR: define-renaming ( NAME DEF-QUOT USE-QUOT TEMP-QUOT -- ) <FUNCTOR: define-renaming ( NAME DEF-QUOT USE-QUOT TEMP-QUOT -- )
rename-insn-defs DEFINES ${NAME}-insn-defs rename-insn-defs DEFINES ${NAME}-insn-defs
rename-insn-uses DEFINES ${NAME}-insn-uses rename-insn-uses DEFINES ${NAME}-insn-uses
@ -83,6 +83,6 @@ insn-classes get [ insn-temp-slots empty? ] reject [
define define
] each ] each
;FUNCTOR ;FUNCTOR>
SYNTAX: RENAMING: scan-token scan-object scan-object scan-object define-renaming ; SYNTAX: RENAMING: scan-token scan-object scan-object scan-object define-renaming ;

36
basis/functors/functors-tests.factor
View File

@ -5,7 +5,7 @@ IN: functors.tests
<< <<
FUNCTOR: define-box ( T -- ) <FUNCTOR: define-box ( T -- )
B DEFINES-CLASS ${T}-box B DEFINES-CLASS ${T}-box
<B> DEFINES <${B}> <B> DEFINES <${B}>
@ -16,7 +16,7 @@ TUPLE: B { value T } ;
C: <B> B ( T -- B ) C: <B> B ( T -- B )
;FUNCTOR ;FUNCTOR>
\ float define-box \ float define-box
@ -30,7 +30,7 @@ C: <B> B ( T -- B )
[ execute ] [ execute ] bi ; inline [ execute ] [ execute ] bi ; inline
<< <<
FUNCTOR: wrapper-test ( W -- ) <FUNCTOR: wrapper-test ( W -- )
WW DEFINES ${W}${W} WW DEFINES ${W}${W}
@ -38,7 +38,7 @@ WHERE
: WW ( a -- b ) \ W twice ; : WW ( a -- b ) \ W twice ;
;FUNCTOR ;FUNCTOR>
\ sq wrapper-test \ sq wrapper-test
@ -48,7 +48,7 @@ WHERE
<< <<
FUNCTOR: wrapper-test-2 ( W -- ) <FUNCTOR: wrapper-test-2 ( W -- )
W DEFINES ${W} W DEFINES ${W}
@ -56,7 +56,7 @@ WHERE
: W ( a b -- c ) \ + execute ; : W ( a b -- c ) \ + execute ;
;FUNCTOR ;FUNCTOR>
"blah" wrapper-test-2 "blah" wrapper-test-2
@ -66,7 +66,7 @@ WHERE
<< <<
FUNCTOR: symbol-test ( W -- ) <FUNCTOR: symbol-test ( W -- )
W DEFINES ${W} W DEFINES ${W}
@ -74,7 +74,7 @@ WHERE
SYMBOL: W SYMBOL: W
;FUNCTOR ;FUNCTOR>
"blorgh" symbol-test "blorgh" symbol-test
@ -84,7 +84,7 @@ SYMBOL: W
<< <<
FUNCTOR: generic-test ( W -- ) <FUNCTOR: generic-test ( W -- )
W DEFINES ${W} W DEFINES ${W}
@ -94,7 +94,7 @@ GENERIC: W ( a -- b )
M: object W ; M: object W ;
M: integer W 1 + ; M: integer W 1 + ;
;FUNCTOR ;FUNCTOR>
"snurv" generic-test "snurv" generic-test
@ -126,7 +126,7 @@ M: integer W 1 + ;
test-redefinition test-redefinition
FUNCTOR: redefine-test ( W -- ) <FUNCTOR: redefine-test ( W -- )
W-word DEFINES ${W}-word W-word DEFINES ${W}-word
W-tuple DEFINES-CLASS ${W}-tuple W-tuple DEFINES-CLASS ${W}-tuple
@ -141,7 +141,7 @@ GENERIC: W-generic ( a -- b )
M: W-tuple W-generic ; M: W-tuple W-generic ;
SYMBOL: W-symbol SYMBOL: W-symbol
;FUNCTOR ;FUNCTOR>
[ [ ] ] [ [ [ ] ] [
"IN: functors.tests "IN: functors.tests
@ -152,7 +152,7 @@ test-redefinition
<< <<
FUNCTOR: define-a-struct ( T NAME TYPE N -- ) <FUNCTOR: define-a-struct ( T NAME TYPE N -- )
T-class DEFINES-CLASS ${T} T-class DEFINES-CLASS ${T}
@ -165,7 +165,7 @@ STRUCT: T-class
{ z TYPE initial: 5 } { z TYPE initial: 5 }
{ float { c:float 2 } } ; { float { c:float 2 } } ;
;FUNCTOR ;FUNCTOR>
"a-struct" "nemo" c:char 2 define-a-struct "a-struct" "nemo" c:char 2 define-a-struct
@ -213,7 +213,7 @@ STRUCT: T-class
<< <<
FUNCTOR: define-an-inline-word ( W -- ) <FUNCTOR: define-an-inline-word ( W -- )
W DEFINES ${W} W DEFINES ${W}
W-W DEFINES ${W}-${W} W-W DEFINES ${W}-${W}
@ -223,7 +223,7 @@ WHERE
: W ( -- ) ; inline : W ( -- ) ; inline
: W-W ( -- ) W W ; : W-W ( -- ) W W ;
;FUNCTOR ;FUNCTOR>
"an-inline-word" define-an-inline-word "an-inline-word" define-an-inline-word
@ -234,7 +234,7 @@ WHERE
<< <<
FUNCTOR: define-a-final-class ( T W -- ) <FUNCTOR: define-a-final-class ( T W -- )
T DEFINES-CLASS ${T} T DEFINES-CLASS ${T}
W DEFINES ${W} W DEFINES ${W}
@ -245,7 +245,7 @@ TUPLE: T ; final
: W ( -- ) ; : W ( -- ) ;
;FUNCTOR ;FUNCTOR>
"a-final-tuple" "a-word" define-a-final-class "a-final-tuple" "a-word" define-a-final-class

8
basis/functors/functors.factor
View File

@ -138,7 +138,7 @@ SYNTAX: DEFINES-PRIVATE [ begin-private create-word-in end-private ] (INTERPOLAT
SYNTAX: DEFINES-CLASS [ create-class-in ] (INTERPOLATE) ; SYNTAX: DEFINES-CLASS [ create-class-in ] (INTERPOLATE) ;
DEFER: ;FUNCTOR delimiter DEFER: ;FUNCTOR> delimiter
<PRIVATE <PRIVATE
@ -160,13 +160,13 @@ DEFER: ;FUNCTOR delimiter
functor-words [ functor-words [
"WHERE" parse-bindings drop "WHERE" parse-bindings drop
[ swap <def> suffix ] { } assoc>map concat [ swap <def> suffix ] { } assoc>map concat
\ ;FUNCTOR parse-until [ ] append-as \ ;FUNCTOR> parse-until [ ] append-as
qualified-vocabs pop* ! unuse the bindings qualified-vocabs pop* ! unuse the bindings
] with-lambda-scope ; ] with-lambda-scope ;
: (FUNCTOR:) ( -- word def effect ) : (<FUNCTOR:) ( -- word def effect )
scan-new-word [ parse-functor-body ] parse-locals-definition ; scan-new-word [ parse-functor-body ] parse-locals-definition ;
PRIVATE> PRIVATE>
SYNTAX: FUNCTOR: (FUNCTOR:) define-declared ; SYNTAX: <FUNCTOR: (<FUNCTOR:) define-declared ;

4
basis/math/vectors/simd/cords/cords.factor
View File

@ -8,7 +8,7 @@ IN: math.vectors.simd.cords
<< <<
<PRIVATE <PRIVATE
FUNCTOR: (define-simd-128-cord) ( A/2 A -- ) <FUNCTOR: (define-simd-128-cord) ( A/2 A -- )
A-rep IS ${A/2}-rep A-rep IS ${A/2}-rep
>A/2 IS >${A/2} >A/2 IS >${A/2}
@ -72,7 +72,7 @@ SYNTAX: A{ \ } [ >A ] parse-literal ;
A-rep >>rep A-rep >>rep
\ A typedef \ A typedef
;FUNCTOR ;FUNCTOR>
: define-simd-128-cord ( A/2 T -- ) : define-simd-128-cord ( A/2 T -- )
[ define-specialized-cord ] [ define-specialized-cord ]

4
basis/math/vectors/simd/simd.factor
View File

@ -263,7 +263,7 @@ M: simd-128 pprint* pprint-object ;
! SIMD concrete type functor ! SIMD concrete type functor
FUNCTOR: define-simd-128 ( T -- ) <FUNCTOR: define-simd-128 ( T -- )
A DEFINES-CLASS ${T} A DEFINES-CLASS ${T}
A-rep IS ${T}-rep A-rep IS ${T}-rep
@ -329,7 +329,7 @@ c:<c-type>
A-rep >>rep A-rep >>rep
\ A c:typedef \ A c:typedef
;FUNCTOR ;FUNCTOR>
SYNTAX: SIMD-128: SYNTAX: SIMD-128:
scan-token define-simd-128 ; scan-token define-simd-128 ;

4
basis/sequences/cords/cords.factor
View File

@ -27,7 +27,7 @@ GENERIC: cord-append ( seq1 seq2 -- cord )
M: object cord-append M: object cord-append
generic-cord boa ; inline generic-cord boa ; inline
FUNCTOR: define-specialized-cord ( T C -- ) <FUNCTOR: define-specialized-cord ( T C -- )
T-cord DEFINES-CLASS ${C} T-cord DEFINES-CLASS ${C}
@ -41,7 +41,7 @@ M: T cord-append
2dup [ T instance? ] both? 2dup [ T instance? ] both?
[ T-cord boa ] [ generic-cord boa ] if ; inline [ T-cord boa ] [ generic-cord boa ] if ; inline
;FUNCTOR ;FUNCTOR>
: cord-map ( cord quot -- cord' ) : cord-map ( cord quot -- cord' )
[ [ head>> ] dip call ] [ [ head>> ] dip call ]

4
basis/sorting/functor/functor.factor
View File

@ -3,7 +3,7 @@
USING: functors kernel math.order sequences sorting ; USING: functors kernel math.order sequences sorting ;
IN: sorting.functor IN: sorting.functor
FUNCTOR: define-sorting ( NAME QUOT -- ) <FUNCTOR: define-sorting ( NAME QUOT -- )
NAME<=> DEFINES ${NAME}<=> NAME<=> DEFINES ${NAME}<=>
NAME>=< DEFINES ${NAME}>=< NAME>=< DEFINES ${NAME}>=<
@ -13,4 +13,4 @@ WHERE
: NAME<=> ( obj1 obj2 -- <=> ) QUOT compare ; : NAME<=> ( obj1 obj2 -- <=> ) QUOT compare ;
: NAME>=< ( obj1 obj2 -- >=< ) NAME<=> invert-comparison ; : NAME>=< ( obj1 obj2 -- >=< ) NAME<=> invert-comparison ;
;FUNCTOR ;FUNCTOR>

4
basis/specialized-arrays/specialized-arrays.factor
View File

@ -38,7 +38,7 @@ GENERIC: direct-like ( alien len exemplar -- seq )
M: byte-array nth-c-ptr <displaced-alien> ; inline M: byte-array nth-c-ptr <displaced-alien> ; inline
M: byte-array direct-like drop uchar <c-direct-array> ; inline M: byte-array direct-like drop uchar <c-direct-array> ; inline
FUNCTOR: define-array ( T -- ) <FUNCTOR: define-array ( T -- )
A DEFINES-CLASS ${T}-array A DEFINES-CLASS ${T}-array
<A> DEFINES <${A}> <A> DEFINES <${A}>
@ -103,7 +103,7 @@ M: A vs* [ * \ T c-type-clamp ] 2map ; inline
M: A v*high [ * \ T heap-size neg shift ] 2map ; inline M: A v*high [ * \ T heap-size neg shift ] 2map ; inline
;FUNCTOR ;FUNCTOR>
: specialized-array-vocab ( c-type -- vocab ) : specialized-array-vocab ( c-type -- vocab )
[ [

4
basis/specialized-vectors/specialized-vectors.factor
View File

@ -13,7 +13,7 @@ MIXIN: specialized-vector
<PRIVATE <PRIVATE
FUNCTOR: define-vector ( T -- ) <FUNCTOR: define-vector ( T -- )
V DEFINES-CLASS ${T}-vector V DEFINES-CLASS ${T}-vector
@ -56,7 +56,7 @@ SYNTAX: V{ \ } [ >V ] parse-literal ;
INSTANCE: V specialized-vector INSTANCE: V specialized-vector
INSTANCE: V growable INSTANCE: V growable
;FUNCTOR ;FUNCTOR>
: specialized-vector-vocab ( c-type -- vocab ) : specialized-vector-vocab ( c-type -- vocab )
[ [

4
basis/tuple-arrays/tuple-arrays.factor
View File

@ -34,7 +34,7 @@ MACRO: write-tuple ( class -- quot )
PRIVATE> PRIVATE>
FUNCTOR: define-tuple-array ( CLASS -- ) <FUNCTOR: define-tuple-array ( CLASS -- )
CLASS IS ${CLASS} CLASS IS ${CLASS}
@ -71,6 +71,6 @@ M: CLASS-array like drop dup CLASS-array? [ >CLASS-array ] unless ; inline
INSTANCE: CLASS-array sequence INSTANCE: CLASS-array sequence
;FUNCTOR ;FUNCTOR>
SYNTAX: TUPLE-ARRAY: scan-word define-tuple-array ; SYNTAX: TUPLE-ARRAY: scan-word define-tuple-array ;

4
basis/vectors/functor/functor.factor
View File

@ -4,7 +4,7 @@ USING: classes functors growable kernel math sequences
sequences.private ; sequences.private ;
IN: vectors.functor IN: vectors.functor
FUNCTOR: define-vector ( V A <A> -- ) <FUNCTOR: define-vector ( V A <A> -- )
<V> DEFINES <${V}> <V> DEFINES <${V}>
>V DEFINES >${V} >V DEFINES >${V}
@ -32,4 +32,4 @@ M: V equal? over V instance? [ sequence= ] [ 2drop f ] if ;
INSTANCE: V growable INSTANCE: V growable
;FUNCTOR ;FUNCTOR>

4
extra/annotations/annotations.factor
View File

@ -14,7 +14,7 @@ IN: annotations
[ { [ word? ] [ vocabulary>> "annotations" = ] } 1&& not ] [ { [ word? ] [ vocabulary>> "annotations" = ] } 1&& not ]
filter ; filter ;
FUNCTOR: define-annotation ( NAME -- ) <FUNCTOR: define-annotation ( NAME -- )
(NAME) DEFINES (${NAME}) (NAME) DEFINES (${NAME})
!NAME DEFINES !${NAME} !NAME DEFINES !${NAME}
@ -31,7 +31,7 @@ SYNTAX: !NAME (parse-annotation) \ (NAME) suffix! ;
: NAMEs. ( -- ) : NAMEs. ( -- )
NAMEs sorted-definitions. ; NAMEs sorted-definitions. ;
;FUNCTOR ;FUNCTOR>
CONSTANT: annotation-tags { CONSTANT: annotation-tags {
"XXX" "TODO" "FIXME" "BUG" "REVIEW" "LICENSE" "XXX" "TODO" "FIXME" "BUG" "REVIEW" "LICENSE"

2
extra/arrays/shaped/shaped-tests.factor
View File

@ -52,4 +52,4 @@ IN: arrays.shaped.tests
] unit-test ] unit-test
{ } [ 15 <iota> { 3 5 1 } reshape drop ] unit-test { } [ 15 <iota> { 3 5 1 } reshape drop ] unit-test

8
extra/classes/struct/vectored/vectored.factor
View File

@ -45,7 +45,7 @@ MACRO: (vectored-element>) ( struct-class -- quot: ( elt -- struct ) )
SLOT: (n) SLOT: (n)
SLOT: (vectored) SLOT: (vectored)
FUNCTOR: define-vectored-accessors ( S>> S<< T -- ) <FUNCTOR: define-vectored-accessors ( S>> S<< T -- )
WHERE WHERE
@ -54,14 +54,14 @@ M: T S>>
M: T S<< M: T S<<
[ (n)>> ] [ (vectored)>> S>> ] bi set-nth-unsafe ; inline [ (n)>> ] [ (vectored)>> S>> ] bi set-nth-unsafe ; inline
;FUNCTOR ;FUNCTOR>
PRIVATE> PRIVATE>
GENERIC: struct-transpose ( structstruct -- ssttrruucctt ) GENERIC: struct-transpose ( structstruct -- ssttrruucctt )
GENERIC: vectored-element> ( elt -- struct ) GENERIC: vectored-element> ( elt -- struct )
FUNCTOR: define-vectored-struct ( T -- ) <FUNCTOR: define-vectored-struct ( T -- )
T-array [ T array-class-of ] T-array [ T array-class-of ]
@ -111,7 +111,7 @@ M: T-array struct-transpose
dup length [ nip <iota> ] [ drop ] [ nip (vectored-T) ] 2tri dup length [ nip <iota> ] [ drop ] [ nip (vectored-T) ] 2tri
[ [ [ nth ] [ set-nth ] bi-curry* bi ] 2curry each ] keep ; inline [ [ [ nth ] [ set-nth ] bi-curry* bi ] 2curry each ] keep ; inline
;FUNCTOR ;FUNCTOR>
SYNTAX: VECTORED-STRUCT: SYNTAX: VECTORED-STRUCT:
scan-word define-vectored-struct ; scan-word define-vectored-struct ;

4
extra/math/blas/matrices/matrices.factor
View File

@ -247,7 +247,7 @@ M: blas-matrix-base equal?
<< <<
FUNCTOR: (define-blas-matrix) ( TYPE T U C -- ) <FUNCTOR: (define-blas-matrix) ( TYPE T U C -- )
VECTOR IS ${TYPE}-blas-vector VECTOR IS ${TYPE}-blas-vector
<VECTOR> IS <${TYPE}-blas-vector> <VECTOR> IS <${TYPE}-blas-vector>
@ -296,7 +296,7 @@ SYNTAX: XMATRIX{ \ } [ >MATRIX ] parse-literal ;
M: MATRIX pprint-delims M: MATRIX pprint-delims
drop \ XMATRIX{ \ } ; drop \ XMATRIX{ \ } ;
;FUNCTOR ;FUNCTOR>
: define-real-blas-matrix ( TYPE T -- ) : define-real-blas-matrix ( TYPE T -- )

12
extra/math/blas/vectors/vectors.factor
View File

@ -129,7 +129,7 @@ M: blas-vector-base virtual@
<< <<
FUNCTOR: (define-blas-vector) ( TYPE T -- ) <FUNCTOR: (define-blas-vector) ( TYPE T -- )
<DIRECT-ARRAY> IS <direct-${TYPE}-array> <DIRECT-ARRAY> IS <direct-${TYPE}-array>
XCOPY IS ${T}COPY XCOPY IS ${T}COPY
@ -184,10 +184,10 @@ SYNTAX: XVECTOR{ \ } [ >VECTOR ] parse-literal ;
M: VECTOR pprint-delims M: VECTOR pprint-delims
drop \ XVECTOR{ \ } ; drop \ XVECTOR{ \ } ;
;FUNCTOR ;FUNCTOR>
FUNCTOR: (define-real-blas-vector) ( TYPE T -- ) <FUNCTOR: (define-real-blas-vector) ( TYPE T -- )
VECTOR IS ${TYPE}-blas-vector VECTOR IS ${TYPE}-blas-vector
XDOT IS ${T}DOT XDOT IS ${T}DOT
@ -205,10 +205,10 @@ M: VECTOR Vnorm
M: VECTOR Vasum M: VECTOR Vasum
(prepare-nrm2) XASUM ; (prepare-nrm2) XASUM ;
;FUNCTOR ;FUNCTOR>
FUNCTOR: (define-complex-blas-vector) ( TYPE C S -- ) <FUNCTOR: (define-complex-blas-vector) ( TYPE C S -- )
VECTOR IS ${TYPE}-blas-vector VECTOR IS ${TYPE}-blas-vector
XDOTU IS ${C}DOTU XDOTU IS ${C}DOTU
@ -227,7 +227,7 @@ M: VECTOR Vnorm
M: VECTOR Vasum M: VECTOR Vasum
(prepare-nrm2) XXASUM ; (prepare-nrm2) XXASUM ;
;FUNCTOR ;FUNCTOR>
: define-real-blas-vector ( TYPE T -- ) : define-real-blas-vector ( TYPE T -- )

4
extra/talks/tc-lisp-talk/tc-lisp-talk.factor
View File

@ -180,7 +180,7 @@ computer-name"
} }
{ $slide "Functor for sorting" { $slide "Functor for sorting"
{ $code { $code
"FUNCTOR: define-sorting ( NAME QUOT -- ) "<FUNCTOR: define-sorting ( NAME QUOT -- )
NAME<=> DEFINES ${NAME}<=> NAME<=> DEFINES ${NAME}<=>
NAME>=< DEFINES ${NAME}>=< NAME>=< DEFINES ${NAME}>=<
@ -191,7 +191,7 @@ WHERE
: NAME>=< ( obj1 obj2 -- >=< ) : NAME>=< ( obj1 obj2 -- >=< )
NAME<=> invert-comparison ; NAME<=> invert-comparison ;
;FUNCTOR" ;FUNCTOR>"
} }
} }
{ $slide "Example of sorting functor" { $slide "Example of sorting functor"

4
extra/tokyo/assoc-functor/assoc-functor.factor
View File

@ -5,7 +5,7 @@ destructors fry functors kernel locals sequences serialize
tokyo.alien.tcutil tokyo.utils vectors ; tokyo.alien.tcutil tokyo.utils vectors ;
IN: tokyo.assoc-functor IN: tokyo.assoc-functor
FUNCTOR: define-tokyo-assoc-api ( T N -- ) <FUNCTOR: define-tokyo-assoc-api ( T N -- )
DBGET IS ${T}get DBGET IS ${T}get
DBPUT IS ${T}put DBPUT IS ${T}put
@ -57,4 +57,4 @@ M: TYPE equal? assoc= ;
M: TYPE hashcode* assoc-hashcode ; M: TYPE hashcode* assoc-hashcode ;
;FUNCTOR ;FUNCTOR>