From 7a317a3bb8115343e3c81e9bd2307379e7811131 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 20 Jun 2016 12:59:00 -0700 Subject: [PATCH] factor: FUNCTOR: to FUNCTOR< --- collections/sequences/cords/cords.factor | 4 +-- .../specialized-arrays.factor | 4 +-- .../specialized-vectors.factor | 4 +-- collections/vectors/functor/functor.factor | 4 +-- demos/talks/tc-lisp-talk/tc-lisp-talk.factor | 4 +-- .../ui/pixel-formats/pixel-formats.factor | 4 +-- language/alien/complex/functor/functor.factor | 4 +-- language/alien/destructors/destructors.factor | 4 +-- .../classes/struct/vectored/vectored.factor | 8 ++--- .../dataflow-analysis.factor | 12 +++---- .../cfg/renaming/functor/functor.factor | 4 +-- language/functors/functors-tests.factor | 36 +++++++++---------- language/functors/functors.factor | 6 ++-- libs/annotations/annotations.factor | 4 +-- libs/math/blas/matrices/matrices.factor | 4 +-- libs/math/blas/vectors/vectors.factor | 12 +++---- libs/math/vectors/simd/cords/cords.factor | 4 +-- libs/math/vectors/simd/simd.factor | 4 +-- libs/sorting/functor/functor.factor | 4 +-- libs/tokyo/assoc-functor/assoc-functor.factor | 4 +-- .../alien/marshall/private/private.factor | 4 +-- .../combinators/templates/templates.factor | 4 +-- 22 files changed, 71 insertions(+), 71 deletions(-) diff --git a/collections/sequences/cords/cords.factor b/collections/sequences/cords/cords.factor index 699837316f..d649be8b9c 100644 --- a/collections/sequences/cords/cords.factor +++ b/collections/sequences/cords/cords.factor @@ -27,7 +27,7 @@ GENERIC: cord-append ( seq1 seq2 -- cord ) ; M: object cord-append generic-cord boa ; inline -FUNCTOR: define-specialized-cord ( T C -- ) +FUNCTOR< define-specialized-cord ( T C -- ) T-cord DEFINES-CLASS ${C} @@ -41,7 +41,7 @@ M: T cord-append 2dup [ T instance? ] both? [ T-cord boa ] [ generic-cord boa ] if ; inline -FUNCTOR; +FUNCTOR> : cord-map ( cord quot -- cord' ) [ [ head>> ] dip call ] diff --git a/collections/specialized-arrays/specialized-arrays.factor b/collections/specialized-arrays/specialized-arrays.factor index 12d6522c75..811a0a841b 100644 --- a/collections/specialized-arrays/specialized-arrays.factor +++ b/collections/specialized-arrays/specialized-arrays.factor @@ -38,7 +38,7 @@ GENERIC: direct-like ( alien len exemplar -- seq ) ; M: byte-array nth-c-ptr ; inline M: byte-array direct-like drop uchar ; inline -FUNCTOR: define-array ( T -- ) +FUNCTOR< define-array ( T -- ) A DEFINES-CLASS ${T}-array 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 -FUNCTOR; +FUNCTOR> : specialized-array-vocab ( c-type -- vocab ) [ diff --git a/collections/specialized-vectors/specialized-vectors.factor b/collections/specialized-vectors/specialized-vectors.factor index b6478b6b0d..5baf1f7d3a 100644 --- a/collections/specialized-vectors/specialized-vectors.factor +++ b/collections/specialized-vectors/specialized-vectors.factor @@ -13,7 +13,7 @@ mixin: specialized-vector PRIVATE< -FUNCTOR: define-vector ( T -- ) +FUNCTOR< define-vector ( T -- ) V DEFINES-CLASS ${T}-vector @@ -56,7 +56,7 @@ SYNTAX: V{ \ } [ >V ] parse-literal ; INSTANCE: V specialized-vector ; INSTANCE: V growable ; -FUNCTOR; +FUNCTOR> : specialized-vector-vocab ( c-type -- vocab ) [ diff --git a/collections/vectors/functor/functor.factor b/collections/vectors/functor/functor.factor index c50fe99039..cb457876dd 100644 --- a/collections/vectors/functor/functor.factor +++ b/collections/vectors/functor/functor.factor @@ -4,7 +4,7 @@ USING: classes functors growable kernel math sequences sequences.private ; in: vectors.functor -FUNCTOR: define-vector ( V A -- ) +FUNCTOR< define-vector ( V A -- ) DEFINES <${V}> >V DEFINES >${V} @@ -32,4 +32,4 @@ M: V equal? over V instance? [ sequence= ] [ 2drop f ] if ; INSTANCE: V growable ; -FUNCTOR; +FUNCTOR> diff --git a/demos/talks/tc-lisp-talk/tc-lisp-talk.factor b/demos/talks/tc-lisp-talk/tc-lisp-talk.factor index c278669ab9..88b125f660 100644 --- a/demos/talks/tc-lisp-talk/tc-lisp-talk.factor +++ b/demos/talks/tc-lisp-talk/tc-lisp-talk.factor @@ -180,7 +180,7 @@ computer-name" } { $slide "Functor for sorting" { $code - "FUNCTOR: define-sorting ( NAME QUOT -- ) + "FUNCTOR< define-sorting ( NAME QUOT -- ) NAME<=> DEFINES ${NAME}<=> NAME>=< DEFINES ${NAME}>=< @@ -191,7 +191,7 @@ WHERE : NAME>=< ( obj1 obj2 -- >=< ) NAME<=> invert-comparison ; -FUNCTOR;" +FUNCTOR>" } } { $slide "Example of sorting functor" diff --git a/frameworks/ui/pixel-formats/pixel-formats.factor b/frameworks/ui/pixel-formats/pixel-formats.factor index 17048e7332..2f19fb5d75 100644 --- a/frameworks/ui/pixel-formats/pixel-formats.factor +++ b/frameworks/ui/pixel-formats/pixel-formats.factor @@ -60,7 +60,7 @@ M: pixel-format dispose* PRIVATE< -FUNCTOR: define-pixel-format-attribute-table ( NAME PERM TABLE -- ) +FUNCTOR< define-pixel-format-attribute-table ( NAME PERM TABLE -- ) >PFA DEFINES >${NAME} >PFA-int-array DEFINES >${NAME}-int-array @@ -81,7 +81,7 @@ M: pixel-format-attribute >PFA : >PFA-int-array ( attribute -- int-array ) [ >PFA ] map concat PERM prepend 0 suffix int >c-array ; -FUNCTOR; +FUNCTOR> SYNTAX: PIXEL-FORMAT-ATTRIBUTE-TABLE: scan-token scan-object scan-object ";" expect define-pixel-format-attribute-table ; diff --git a/language/alien/complex/functor/functor.factor b/language/alien/complex/functor/functor.factor index eb03d9b2c4..d023879156 100644 --- a/language/alien/complex/functor/functor.factor +++ b/language/alien/complex/functor/functor.factor @@ -4,7 +4,7 @@ USING: accessors alien alien.c-types classes.struct functors kernel math math.functions quotations ; in: alien.complex.functor -FUNCTOR: define-complex-type ( N T -- ) +FUNCTOR< define-complex-type ( N T -- ) N-type IS ${N} @@ -29,4 +29,4 @@ T-class lookup-c-type complex >>boxed-class drop -FUNCTOR; +FUNCTOR> diff --git a/language/alien/destructors/destructors.factor b/language/alien/destructors/destructors.factor index d17b7f71f5..620c0bc8f1 100644 --- a/language/alien/destructors/destructors.factor +++ b/language/alien/destructors/destructors.factor @@ -6,7 +6,7 @@ in: alien.destructors TUPLE: alien-destructor alien ; -FUNCTOR: define-destructor ( F -- ) +FUNCTOR< define-destructor ( F -- ) F-destructor DEFINES-CLASS ${F}-destructor DEFINES <${F}-destructor> @@ -27,6 +27,6 @@ M: F-destructor dispose alien>> F N ndrop ; : |F ( alien -- alien ) dup |dispose drop ; inline -FUNCTOR; +FUNCTOR> SYNTAX: destructor: scan-word define-destructor ; diff --git a/language/classes/struct/vectored/vectored.factor b/language/classes/struct/vectored/vectored.factor index 640e5f2b22..6e010a1ca8 100644 --- a/language/classes/struct/vectored/vectored.factor +++ b/language/classes/struct/vectored/vectored.factor @@ -45,7 +45,7 @@ MACRO: (vectored-element>) ( struct-class -- quot: ( elt -- struct ) ) slot: (n) slot: (vectored) -FUNCTOR: define-vectored-accessors ( S>> S<< T -- ) +FUNCTOR< define-vectored-accessors ( S>> S<< T -- ) WHERE @@ -54,14 +54,14 @@ M: T S>> M: T S<< [ (n)>> ] [ (vectored)>> S>> ] bi set-nth-unsafe ; inline -FUNCTOR; +FUNCTOR> PRIVATE> GENERIC: struct-transpose ( structstruct -- ssttrruucctt ) ; GENERIC: vectored-element> ( elt -- struct ) ; -FUNCTOR: define-vectored-struct ( T -- ) +FUNCTOR< define-vectored-struct ( T -- ) T-array [ T array-class-of ] @@ -111,7 +111,7 @@ M: T-array struct-transpose dup length [ nip iota ] [ drop ] [ nip (vectored-T) ] 2tri [ [ [ nth ] [ set-nth ] bi-curry* bi ] 2curry each ] keep ; inline -FUNCTOR; +FUNCTOR> SYNTAX: \ vectored-struct: scan-word define-vectored-struct ; diff --git a/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor b/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor index 0c9ecd390f..2dfd2f3416 100644 --- a/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor +++ b/language/compiler/cfg/dataflow-analysis/dataflow-analysis.factor @@ -57,7 +57,7 @@ mixin: dataflow-analysis M: dataflow-analysis join-sets 2drop assoc-refine ; M: dataflow-analysis ignore-block? drop kill-block?>> ; -FUNCTOR: define-analysis ( name -- ) +FUNCTOR< define-analysis ( name -- ) name DEFINES-CLASS ${name} name-ins DEFINES ${name}-ins @@ -77,7 +77,7 @@ symbol: name-outs : name-out ( bb -- set ) name-outs get at ; -FUNCTOR; +FUNCTOR> ! ! ! 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 predecessors drop predecessors>> ; -FUNCTOR: define-forward-analysis ( name -- ) +FUNCTOR< define-forward-analysis ( name -- ) name IS ${name} name-ins IS ${name}-ins @@ -103,7 +103,7 @@ INSTANCE: name forward-analysis ; name run-dataflow-analysis [ name-ins set ] [ name-outs set ] bi* ; -FUNCTOR; +FUNCTOR> ! ! ! Backward dataflow analysis @@ -114,7 +114,7 @@ M: backward-analysis block-order drop post-order ; M: backward-analysis successors drop predecessors>> ; M: backward-analysis predecessors drop successors>> ; -FUNCTOR: define-backward-analysis ( name -- ) +FUNCTOR< define-backward-analysis ( name -- ) name IS ${name} name-ins IS ${name}-ins @@ -129,7 +129,7 @@ INSTANCE: name backward-analysis ; \ name run-dataflow-analysis [ name-outs set ] [ name-ins set ] bi* ; -FUNCTOR; +FUNCTOR> PRIVATE> diff --git a/language/compiler/cfg/renaming/functor/functor.factor b/language/compiler/cfg/renaming/functor/functor.factor index 04adfaecf2..0a5bac52fb 100644 --- a/language/compiler/cfg/renaming/functor/functor.factor +++ b/language/compiler/cfg/renaming/functor/functor.factor @@ -12,7 +12,7 @@ in: compiler.cfg.renaming.functor '[ [ _ ] dip changer-word [ ] 2sequence ] map [ ] join [ 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-uses DEFINES ${NAME}-insn-uses @@ -83,6 +83,6 @@ insn-classes get [ insn-temp-slots empty? ] reject [ define ] each -FUNCTOR; +FUNCTOR> SYNTAX: \ RENAMING: scan-token scan-object scan-object scan-object ";" expect define-renaming ; diff --git a/language/functors/functors-tests.factor b/language/functors/functors-tests.factor index c2ae433912..2f73544086 100644 --- a/language/functors/functors-tests.factor +++ b/language/functors/functors-tests.factor @@ -5,7 +5,7 @@ in: functors.tests COMPILE< -FUNCTOR: define-box ( T -- ) +FUNCTOR< define-box ( T -- ) B DEFINES-CLASS ${T}-box DEFINES <${B}> @@ -16,7 +16,7 @@ TUPLE: B { value T } ; C: B ( T -- B ) ; -FUNCTOR; +FUNCTOR> \ float define-box @@ -30,7 +30,7 @@ COMPILE> [ execute ] [ execute ] bi ; inline COMPILE< -FUNCTOR: wrapper-test ( W -- ) +FUNCTOR< wrapper-test ( W -- ) WW DEFINES ${W}${W} @@ -38,7 +38,7 @@ WHERE : WW ( a -- b ) \ W twice ; -FUNCTOR; +FUNCTOR> \ sq wrapper-test @@ -48,7 +48,7 @@ COMPILE> COMPILE< -FUNCTOR: wrapper-test-2 ( W -- ) +FUNCTOR< wrapper-test-2 ( W -- ) W DEFINES ${W} @@ -56,7 +56,7 @@ WHERE : W ( a b -- c ) \ + execute ; -FUNCTOR; +FUNCTOR> "blah" wrapper-test-2 @@ -66,7 +66,7 @@ COMPILE> COMPILE< -FUNCTOR: symbol-test ( W -- ) +FUNCTOR< symbol-test ( W -- ) W DEFINES ${W} @@ -74,7 +74,7 @@ WHERE symbol: W -FUNCTOR; +FUNCTOR> "blorgh" symbol-test @@ -84,7 +84,7 @@ COMPILE> COMPILE< -FUNCTOR: generic-test ( W -- ) +FUNCTOR< generic-test ( W -- ) W DEFINES ${W} @@ -94,7 +94,7 @@ GENERIC: W ( a -- b ) ; M: object W ; M: integer W 1 + ; -FUNCTOR; +FUNCTOR> "snurv" generic-test @@ -126,7 +126,7 @@ COMPILE> test-redefinition -FUNCTOR: redefine-test ( W -- ) +FUNCTOR< redefine-test ( W -- ) W-word DEFINES ${W}-word W-tuple DEFINES-CLASS ${W}-tuple @@ -141,7 +141,7 @@ GENERIC: W-generic ( a -- b ) ; M: W-tuple W-generic ; symbol: W-symbol -FUNCTOR; +FUNCTOR> [ [ ] ] [ "in: functors.tests @@ -152,7 +152,7 @@ test-redefinition COMPILE< -FUNCTOR: define-a-struct ( T NAME TYPE N -- ) +FUNCTOR< define-a-struct ( T NAME TYPE N -- ) T-class DEFINES-CLASS ${T} @@ -165,7 +165,7 @@ STRUCT: T-class { z TYPE initial: 5 } { float { c:float 2 } } ; -FUNCTOR; +FUNCTOR> "a-struct" "nemo" c:char 2 define-a-struct @@ -213,7 +213,7 @@ COMPILE> COMPILE< -FUNCTOR: define-an-inline-word ( W -- ) +FUNCTOR< define-an-inline-word ( W -- ) W DEFINES ${W} W-W DEFINES ${W}-${W} @@ -223,7 +223,7 @@ WHERE : W ( -- ) ; inline : W-W ( -- ) W W ; -FUNCTOR; +FUNCTOR> "an-inline-word" define-an-inline-word @@ -234,7 +234,7 @@ COMPILE> COMPILE< -FUNCTOR: define-a-final-class ( T W -- ) +FUNCTOR< define-a-final-class ( T W -- ) T DEFINES-CLASS ${T} W DEFINES ${W} @@ -245,7 +245,7 @@ TUPLE: T ; final : W ( -- ) ; -FUNCTOR; +FUNCTOR> "a-final-tuple" "a-word" define-a-final-class diff --git a/language/functors/functors.factor b/language/functors/functors.factor index 47f9782775..9a09dd7deb 100644 --- a/language/functors/functors.factor +++ b/language/functors/functors.factor @@ -176,13 +176,13 @@ PRIVATE< functor-words [ "WHERE" parse-bindings drop [ swap suffix ] { } assoc>map concat - \ FUNCTOR; parse-until [ ] append-as + \ FUNCTOR> parse-until [ ] append-as qualified-vocabs pop* ! unuse the bindings ] with-lambda-scope ; -: (FUNCTOR:) ( -- word def effect ) +: (FUNCTOR<) ( -- word def effect ) scan-new-word [ parse-functor-body ] parse-locals-definition ; PRIVATE> -SYNTAX: \ FUNCTOR< (FUNCTOR:) define-declared ; +SYNTAX: \ FUNCTOR< (FUNCTOR<) define-declared ; diff --git a/libs/annotations/annotations.factor b/libs/annotations/annotations.factor index afeaef43d1..5a71e6cbbd 100644 --- a/libs/annotations/annotations.factor +++ b/libs/annotations/annotations.factor @@ -14,7 +14,7 @@ COMPILE< [ { [ word? ] [ vocabulary>> "annotations" = ] } 1&& not ] filter ; -FUNCTOR: define-annotation ( NAME -- ) +FUNCTOR< define-annotation ( NAME -- ) (NAME) DEFINES (${NAME}) !NAME DEFINES !${NAME} @@ -31,7 +31,7 @@ SYNTAX: \ !NAME (parse-annotation) \ (NAME) suffix! ; : NAMEs. ( -- ) NAMEs sorted-definitions. ; -FUNCTOR; +FUNCTOR> CONSTANT: annotation-tags { "XXX" "TODO" "FIXME" "BUG" "REVIEW" "LICENSE" diff --git a/libs/math/blas/matrices/matrices.factor b/libs/math/blas/matrices/matrices.factor index ad4d61e0b6..cf2bf727be 100644 --- a/libs/math/blas/matrices/matrices.factor +++ b/libs/math/blas/matrices/matrices.factor @@ -247,7 +247,7 @@ M: blas-matrix-base equal? COMPILE< -FUNCTOR: (define-blas-matrix) ( TYPE T U C -- ) +FUNCTOR< (define-blas-matrix) ( TYPE T U C -- ) VECTOR IS ${TYPE}-blas-vector IS <${TYPE}-blas-vector> @@ -296,7 +296,7 @@ SYNTAX: \ XMATRIX{ \ } [ >MATRIX ] parse-literal ; M: MATRIX pprint-delims drop \ XMATRIX{ \ } ; -FUNCTOR; +FUNCTOR> : define-real-blas-matrix ( TYPE T -- ) diff --git a/libs/math/blas/vectors/vectors.factor b/libs/math/blas/vectors/vectors.factor index 4bebc8a576..665c6bff0b 100644 --- a/libs/math/blas/vectors/vectors.factor +++ b/libs/math/blas/vectors/vectors.factor @@ -129,7 +129,7 @@ M: blas-vector-base virtual@ COMPILE< -FUNCTOR: (define-blas-vector) ( TYPE T -- ) +FUNCTOR< (define-blas-vector) ( TYPE T -- ) IS XCOPY IS ${T}COPY @@ -184,10 +184,10 @@ SYNTAX: \ XVECTOR{ \ } [ >VECTOR ] parse-literal ; M: VECTOR pprint-delims drop \ XVECTOR{ \ } ; -FUNCTOR; +FUNCTOR> -FUNCTOR: (define-real-blas-vector) ( TYPE T -- ) +FUNCTOR< (define-real-blas-vector) ( TYPE T -- ) VECTOR IS ${TYPE}-blas-vector XDOT IS ${T}DOT @@ -205,10 +205,10 @@ M: VECTOR Vnorm M: VECTOR Vasum (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 XDOTU IS ${C}DOTU @@ -227,7 +227,7 @@ M: VECTOR Vnorm M: VECTOR Vasum (prepare-nrm2) XXASUM ; -FUNCTOR; +FUNCTOR> : define-real-blas-vector ( TYPE T -- ) diff --git a/libs/math/vectors/simd/cords/cords.factor b/libs/math/vectors/simd/cords/cords.factor index 9988c6d9a1..a7db3451c5 100644 --- a/libs/math/vectors/simd/cords/cords.factor +++ b/libs/math/vectors/simd/cords/cords.factor @@ -8,7 +8,7 @@ in: math.vectors.simd.cords COMPILE< PRIVATE< -FUNCTOR: (define-simd-128-cord) ( A/2 A -- ) +FUNCTOR< (define-simd-128-cord) ( A/2 A -- ) A-rep IS ${A/2}-rep >A/2 IS >${A/2} @@ -72,7 +72,7 @@ SYNTAX: \ A{ \ } [ >A ] parse-literal ; A-rep >>rep \ A typedef -FUNCTOR; +FUNCTOR> : define-simd-128-cord ( A/2 T -- ) [ define-specialized-cord ] diff --git a/libs/math/vectors/simd/simd.factor b/libs/math/vectors/simd/simd.factor index d6daad6ac4..968cd0c5f6 100644 --- a/libs/math/vectors/simd/simd.factor +++ b/libs/math/vectors/simd/simd.factor @@ -263,7 +263,7 @@ PRIVATE< ! SIMD concrete type functor -FUNCTOR: define-simd-128 ( T -- ) +FUNCTOR< define-simd-128 ( T -- ) A DEFINES-CLASS ${T} A-rep IS ${T}-rep @@ -329,7 +329,7 @@ c: A-rep >>rep \ A c:typedef -FUNCTOR; +FUNCTOR> SYNTAX: SIMD-128: scan-token define-simd-128 ; diff --git a/libs/sorting/functor/functor.factor b/libs/sorting/functor/functor.factor index f8ad687a8d..4bdb08ce07 100644 --- a/libs/sorting/functor/functor.factor +++ b/libs/sorting/functor/functor.factor @@ -3,7 +3,7 @@ USING: functors kernel math.order sequences sorting ; in: sorting.functor -FUNCTOR: define-sorting ( NAME QUOT -- ) +FUNCTOR< define-sorting ( NAME QUOT -- ) NAME<=> DEFINES ${NAME}<=> NAME>=< DEFINES ${NAME}>=< @@ -13,4 +13,4 @@ WHERE : NAME<=> ( obj1 obj2 -- <=> ) QUOT compare ; : NAME>=< ( obj1 obj2 -- >=< ) NAME<=> invert-comparison ; -FUNCTOR; +FUNCTOR> diff --git a/libs/tokyo/assoc-functor/assoc-functor.factor b/libs/tokyo/assoc-functor/assoc-functor.factor index ae7f435147..96526a6826 100644 --- a/libs/tokyo/assoc-functor/assoc-functor.factor +++ b/libs/tokyo/assoc-functor/assoc-functor.factor @@ -5,7 +5,7 @@ destructors fry functors kernel locals sequences serialize tokyo.alien.tcutil tokyo.utils vectors ; in: tokyo.assoc-functor -FUNCTOR: define-tokyo-assoc-api ( T N -- ) +FUNCTOR< define-tokyo-assoc-api ( T N -- ) DBGET IS ${T}get DBPUT IS ${T}put @@ -57,4 +57,4 @@ M: TYPE equal? assoc= ; M: TYPE hashcode* assoc-hashcode ; -FUNCTOR; +FUNCTOR> diff --git a/unmaintained/alien/marshall/private/private.factor b/unmaintained/alien/marshall/private/private.factor index 188214b394..eb0b1c0311 100644 --- a/unmaintained/alien/marshall/private/private.factor +++ b/unmaintained/alien/marshall/private/private.factor @@ -23,7 +23,7 @@ MACRO: marshall-x* ( num-quot seq-quot -- alien ) : malloc-underlying ( obj -- alien ) underlying>> malloc-byte-array ; -FUNCTOR: define-primitive-marshallers ( TYPE -- ) +FUNCTOR< define-primitive-marshallers ( TYPE -- ) IS <${TYPE}> *TYPE IS *${TYPE} >TYPE-array IS >${TYPE}-array @@ -55,7 +55,7 @@ PRIVATE> *TYPE ; inline : unmarshall-TYPE*-free ( alien -- n ) [ unmarshall-TYPE* ] keep add-malloc free ; -FUNCTOR; +FUNCTOR> SYNTAX: PRIMITIVE-MARSHALLERS: ";" parse-tokens [ define-primitive-marshallers ] each ; diff --git a/unmaintained/models/combinators/templates/templates.factor b/unmaintained/models/combinators/templates/templates.factor index b062e80e87..946f114494 100644 --- a/unmaintained/models/combinators/templates/templates.factor +++ b/unmaintained/models/combinators/templates/templates.factor @@ -1,7 +1,7 @@ USING: kernel sequences functors fry macros generalizations ; in: models.combinators.templates FROM: models.combinators => #1 ; -FUNCTOR: fmaps ( W -- ) +FUNCTOR< fmaps ( W -- ) W IS ${W} w-n DEFINES ${W}-n w-2 DEFINES 2${W} @@ -20,4 +20,4 @@ MACRO: w-n* ( int -- quot ) dup '[ [ _ narray #1 ] dip [ _ firstn ] : w-2* ( a b quot -- mapped ) 2 w-n* ; inline : w-3* ( a b c quot -- mapped ) 3 w-n* ; inline : w-4* ( a b c d quot -- mapped ) 4 w-n* ; inline -FUNCTOR; +FUNCTOR>