From 7226b2b45d0fa50a8750c69a4aae3ce1a27cf140 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 3 Jun 2016 11:35:17 -0700 Subject: [PATCH] core: rename MIXIN: --- core/alien/c-types/c-types.factor | 2 +- core/assocs/assocs.factor | 2 +- core/checksums/checksums.factor | 2 +- core/classes/algebra/algebra-tests.factor | 4 ++-- core/classes/classes.factor | 2 +- .../intersection/intersection-tests.factor | 2 +- core/classes/mixin/mixin-tests.factor | 18 +++++++++--------- core/definitions/definitions.factor | 2 +- core/fry/fry.factor | 2 +- core/generic/standard/standard-tests.factor | 4 ++-- core/growable/growable.factor | 2 +- core/io/files/files.factor | 4 ++-- core/io/io.factor | 4 ++-- core/io/streams/plain/plain.factor | 2 +- core/sequences/sequences.factor | 6 +++--- core/sets/sets.factor | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/core/alien/c-types/c-types.factor b/core/alien/c-types/c-types.factor index f7d8ce8efd..e63c13aeac 100644 --- a/core/alien/c-types/c-types.factor +++ b/core/alien/c-types/c-types.factor @@ -115,7 +115,7 @@ GENERIC: heap-size ( name -- size ) M: abstract-c-type heap-size size>> ; -MIXIN: value-type +mixin: value-type MACRO: alien-value ( c-type -- quot: ( c-ptr offset -- value ) ) [ c-type-getter ] [ c-type-boxer-quot ] bi append ; diff --git a/core/assocs/assocs.factor b/core/assocs/assocs.factor index ff944f8754..6210cc42b7 100644 --- a/core/assocs/assocs.factor +++ b/core/assocs/assocs.factor @@ -4,7 +4,7 @@ USING: accessors arrays kernel math sequences sequences.private vectors ; in: assocs -MIXIN: assoc +mixin: assoc GENERIC: at* ( key assoc -- value/f ? ) GENERIC: value-at* ( value assoc -- key/f ? ) diff --git a/core/checksums/checksums.factor b/core/checksums/checksums.factor index c02fc7355c..c3c0ef9a6c 100644 --- a/core/checksums/checksums.factor +++ b/core/checksums/checksums.factor @@ -4,7 +4,7 @@ USING: accessors byte-arrays byte-vectors io io.backend io.files kernel math math.parser sequences ; in: checksums -MIXIN: checksum +mixin: checksum TUPLE: checksum-state { bytes-read integer } diff --git a/core/classes/algebra/algebra-tests.factor b/core/classes/algebra/algebra-tests.factor index f9aee4fe93..091eb27a62 100644 --- a/core/classes/algebra/algebra-tests.factor +++ b/core/classes/algebra/algebra-tests.factor @@ -36,7 +36,7 @@ INTERSECTION: generic-class generic class ; UNION: union-with-one-member a ; -MIXIN: mixin-with-one-member +mixin: mixin-with-one-member INSTANCE: union-with-one-member mixin-with-one-member ! class<= @@ -127,7 +127,7 @@ INSTANCE: union-with-one-member mixin-with-one-member { t } [ a union-with-one-member class<= ] unit-test { f } [ union-with-one-member class-not integer class<= ] unit-test -MIXIN: empty-mixin +mixin: empty-mixin { f } [ empty-mixin class-not null class<= ] unit-test { f } [ empty-mixin null class<= ] unit-test diff --git a/core/classes/classes.factor b/core/classes/classes.factor index 66cbae51a9..c659b2d9a4 100644 --- a/core/classes/classes.factor +++ b/core/classes/classes.factor @@ -10,7 +10,7 @@ PREDICATE: class < word "class" word-prop ; PREDICATE: defining-class < word "defining-class" word-prop ; -MIXIN: classoid +mixin: classoid INSTANCE: class classoid INSTANCE: defining-class classoid diff --git a/core/classes/intersection/intersection-tests.factor b/core/classes/intersection/intersection-tests.factor index 0e8ee00a59..43713781d8 100644 --- a/core/classes/intersection/intersection-tests.factor +++ b/core/classes/intersection/intersection-tests.factor @@ -3,7 +3,7 @@ in: classes.intersection.tests TUPLE: a ; TUPLE: a1 < a ; TUPLE: a2 < a ; TUPLE: a3 < a2 ; -MIXIN: b +mixin: b INSTANCE: a3 b INSTANCE: a1 b INTERSECTION: c a2 b ; diff --git a/core/classes/mixin/mixin-tests.factor b/core/classes/mixin/mixin-tests.factor index e2e00e4302..2d23fab168 100644 --- a/core/classes/mixin/mixin-tests.factor +++ b/core/classes/mixin/mixin-tests.factor @@ -5,13 +5,13 @@ vectors words ; in: classes.mixin.tests ! Test mixins -MIXIN: sequence-mixin +mixin: sequence-mixin INSTANCE: array sequence-mixin INSTANCE: vector sequence-mixin INSTANCE: slice sequence-mixin -MIXIN: assoc-mixin +mixin: assoc-mixin INSTANCE: hashtable assoc-mixin @@ -32,7 +32,7 @@ M: assoc-mixin collection-size assoc-size ; DEFER: mx1 FORGET: mx1 -MIXIN: mx1 +mixin: mx1 INSTANCE: integer mx1 @@ -84,12 +84,12 @@ use: io.streams.string ] times ! Method flattening interfered with mixin update -MIXIN: flat-mx-1 +mixin: flat-mx-1 TUPLE: flat-mx-1-1 ; INSTANCE: flat-mx-1-1 flat-mx-1 TUPLE: flat-mx-1-2 ; INSTANCE: flat-mx-1-2 flat-mx-1 TUPLE: flat-mx-1-3 ; INSTANCE: flat-mx-1-3 flat-mx-1 TUPLE: flat-mx-1-4 ; INSTANCE: flat-mx-1-4 flat-mx-1 -MIXIN: flat-mx-2 INSTANCE: flat-mx-2 flat-mx-1 +mixin: flat-mx-2 INSTANCE: flat-mx-2 flat-mx-1 TUPLE: flat-mx-2-1 ; INSTANCE: flat-mx-2-1 flat-mx-2 { t } [ T{ flat-mx-2-1 } flat-mx-1? ] unit-test @@ -104,11 +104,11 @@ TUPLE: flat-mx-2-1 ; INSTANCE: flat-mx-2-1 flat-mx-2 { t } [ "blah" "classes.mixin.tests" lookup-word mixin-class? ] unit-test -MIXIN: empty-mixin +mixin: empty-mixin { f } [ "hi" empty-mixin? ] unit-test -MIXIN: move-instance-declaration-mixin +mixin: move-instance-declaration-mixin { } [ "IN: classes.mixin.tests.a USE: strings USE: classes.mixin.tests INSTANCE: string move-instance-declaration-mixin" "move-mixin-test-1" parse-stream drop ] unit-test @@ -118,7 +118,7 @@ MIXIN: move-instance-declaration-mixin { { string } } [ move-instance-declaration-mixin class-members ] unit-test -MIXIN: silly-mixin +mixin: silly-mixin symbol: not-a-class [ [ \ not-a-class \ silly-mixin add-mixin-instance ] with-compilation-unit ] must-fail @@ -129,7 +129,7 @@ TUPLE: a-class ; [ [ \ a-class \ not-a-mixin add-mixin-instance ] with-compilation-unit ] must-fail ! Changing a mixin member's metaclass should not remove it from the mixin -MIXIN: metaclass-change-mixin +mixin: metaclass-change-mixin TUPLE: metaclass-change ; INSTANCE: metaclass-change metaclass-change-mixin diff --git a/core/definitions/definitions.factor b/core/definitions/definitions.factor index e9019ab4c0..b401ffeae6 100644 --- a/core/definitions/definitions.factor +++ b/core/definitions/definitions.factor @@ -3,7 +3,7 @@ USING: accessors assocs kernel namespaces sequences sets ; in: definitions -MIXIN: definition-mixin +mixin: definition-mixin ERROR: no-compilation-unit definition ; diff --git a/core/fry/fry.factor b/core/fry/fry.factor index df3cacc355..387934396a 100644 --- a/core/fry/fry.factor +++ b/core/fry/fry.factor @@ -26,7 +26,7 @@ M: callable count-inputs [ count-inputs ] map-sum ; M: fry-specifier count-inputs drop 1 ; M: object count-inputs drop 0 ; -MIXIN: fried +mixin: fried PREDICATE: fried-callable < callable count-inputs 0 > ; INSTANCE: fried-callable fried diff --git a/core/generic/standard/standard-tests.factor b/core/generic/standard/standard-tests.factor index 3262fdd256..0620e65a70 100644 --- a/core/generic/standard/standard-tests.factor +++ b/core/generic/standard/standard-tests.factor @@ -503,7 +503,7 @@ M: amb-union-4 amb-generic-4 drop "4" ; T{ amb-tuple-b f 3 } amb-tuple-b \ amb-generic-4 method-for-class execute( a -- b ) assert= ] unit-test -MIXIN: amb-mixin-5 +mixin: amb-mixin-5 INSTANCE: amb-tuple-a amb-mixin-5 INSTANCE: amb-tuple-d amb-mixin-5 @@ -539,7 +539,7 @@ M: amb-union-6 amb-generic-6 drop "6" ; T{ amb-tuple-b f 3 } amb-tuple-b \ amb-generic-6 method-for-class execute( a -- b ) assert= ] unit-test -MIXIN: amb-mixin-7 +mixin: amb-mixin-7 INSTANCE: amb-tuple-b amb-mixin-7 INSTANCE: amb-tuple-d amb-mixin-7 diff --git a/core/growable/growable.factor b/core/growable/growable.factor index bd566d7a98..e913ea1892 100644 --- a/core/growable/growable.factor +++ b/core/growable/growable.factor @@ -4,7 +4,7 @@ USING: accessors kernel math math.private sequences sequences.private ; in: growable -MIXIN: growable +mixin: growable SLOT: length SLOT: underlying diff --git a/core/io/files/files.factor b/core/io/files/files.factor index 95fdf520b7..184fa4423e 100644 --- a/core/io/files/files.factor +++ b/core/io/files/files.factor @@ -20,8 +20,8 @@ GENERIC: refill ( port handle -- event/f ) HOOK: wait-for-fd io-backend ( handle event -- ) -MIXIN: file-reader -MIXIN: file-writer +mixin: file-reader +mixin: file-writer M: file-reader stream-element-type drop +byte+ ; inline M: file-writer stream-element-type drop +byte+ ; inline diff --git a/core/io/io.factor b/core/io/io.factor index d0ae35393a..3849289d8c 100644 --- a/core/io/io.factor +++ b/core/io/io.factor @@ -34,8 +34,8 @@ GENERIC: stream-length ( stream -- n/f ) [ stream-write ] [ stream-nl ] bi ; inline ! Default streams -MIXIN: input-stream -MIXIN: output-stream +mixin: input-stream +mixin: output-stream symbol: error-stream : readln ( -- str/f ) input-stream get stream-readln ; inline diff --git a/core/io/streams/plain/plain.factor b/core/io/streams/plain/plain.factor index 5dc3c7db45..b8ed2cb308 100644 --- a/core/io/streams/plain/plain.factor +++ b/core/io/streams/plain/plain.factor @@ -3,7 +3,7 @@ USING: kernel io ; in: io.streams.plain -MIXIN: plain-writer +mixin: plain-writer M: plain-writer stream-nl CHAR: \n swap stream-write1 ; diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index 41933c2c18..4fd72d6cdd 100644 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -4,7 +4,7 @@ USING: accessors kernel kernel.private math math.order math.private slots.private ; in: sequences -MIXIN: sequence +mixin: sequence GENERIC: length ( seq -- n ) flushable GENERIC: set-length ( n seq -- ) @@ -59,7 +59,7 @@ M: integer bounds-check? ( n seq -- ? ) : bounds-check ( n seq -- n seq ) 2dup bounds-check? [ bounds-error ] unless ; inline -MIXIN: immutable-sequence +mixin: immutable-sequence ERROR: immutable element index sequence ; @@ -188,7 +188,7 @@ PRIVATE> [ length 1 - ] keep over 0 < [ 2drop f ] [ nth-unsafe ] if ; inline -MIXIN: virtual-sequence +mixin: virtual-sequence GENERIC: virtual-exemplar ( seq -- seq' ) GENERIC: virtual@ ( n seq -- n' seq' ) diff --git a/core/sets/sets.factor b/core/sets/sets.factor index 24736d1c46..240a667c36 100644 --- a/core/sets/sets.factor +++ b/core/sets/sets.factor @@ -4,7 +4,7 @@ USING: assocs hashtables kernel math sequences vectors ; in: sets ! Set protocol -MIXIN: set +mixin: set GENERIC: adjoin ( elt set -- ) GENERIC: ?adjoin ( elt set -- ? )