core: fix tuple tests
Doug Coleman
parent
86b836a12e
commit
bb5236dd54
|
|
@ -40,7 +40,7 @@ INSTANCE: integer mx1 ;
|
|||
{ f } [ mx1 integer class<= ] unit-test
|
||||
{ f } [ mx1 number class<= ] unit-test
|
||||
|
||||
"in: classes.mixin.tests use: arrays INSTANCE: array mx1" eval( -- ) ;
|
||||
"in: classes.mixin.tests use: arrays INSTANCE: array mx1 ;" eval( -- )
|
||||
|
||||
{ t } [ array mx1 class<= ] unit-test
|
||||
{ f } [ mx1 number class<= ] unit-test
|
||||
|
|
@ -57,7 +57,7 @@ use: io.streams.string
|
|||
"USING: sequences ;"
|
||||
"in: classes.mixin.tests"
|
||||
"mixin: mixin-forget-test"
|
||||
"INSTANCE: sequence mixin-forget-test" ;
|
||||
"INSTANCE: sequence mixin-forget-test ;"
|
||||
"GENERIC: mixin-forget-test-g ( x -- y ) ;"
|
||||
"M: mixin-forget-test mixin-forget-test-g ;"
|
||||
} "\n" join <string-reader> "mixin-forget-test"
|
||||
|
|
@ -72,7 +72,7 @@ use: io.streams.string
|
|||
"USING: hashtables ;"
|
||||
"in: classes.mixin.tests"
|
||||
"mixin: mixin-forget-test"
|
||||
"INSTANCE: hashtable mixin-forget-test" ;
|
||||
"INSTANCE: hashtable mixin-forget-test ;"
|
||||
"GENERIC: mixin-forget-test-g ( x -- y ) ;"
|
||||
"M: mixin-forget-test mixin-forget-test-g ;"
|
||||
} "\n" join <string-reader> "mixin-forget-test"
|
||||
|
|
@ -96,7 +96,7 @@ TUPLE: flat-mx-2-1 ; INSTANCE: flat-mx-2-1 flat-mx-2 ;
|
|||
|
||||
! Too eager with reset-class
|
||||
|
||||
{ } [ "in: classes.mixin.tests mixin: blah singleton: boo INSTANCE: boo blah" <string-reader> "mixin-reset-test" parse-stream drop ] unit-test ;
|
||||
{ } [ "in: classes.mixin.tests mixin: blah singleton: boo INSTANCE: boo blah ;" <string-reader> "mixin-reset-test" parse-stream drop ] unit-test
|
||||
|
||||
{ t } [ "blah" "classes.mixin.tests" lookup-word mixin-class? ] unit-test
|
||||
|
||||
|
|
@ -110,9 +110,9 @@ mixin: empty-mixin
|
|||
|
||||
mixin: move-instance-declaration-mixin
|
||||
|
||||
{ } [ "in: classes.mixin.tests.a use: strings use: classes.mixin.tests INSTANCE: string move-instance-declaration-mixin" <string-reader> "move-mixin-test-1" parse-stream drop ] unit-test ;
|
||||
{ } [ "in: classes.mixin.tests.a use: strings use: classes.mixin.tests INSTANCE: string move-instance-declaration-mixin ;" <string-reader> "move-mixin-test-1" parse-stream drop ] unit-test
|
||||
|
||||
{ } [ "in: classes.mixin.tests.b use: strings use: classes.mixin.tests INSTANCE: string move-instance-declaration-mixin" <string-reader> "move-mixin-test-2" parse-stream drop ] unit-test ;
|
||||
{ } [ "in: classes.mixin.tests.b use: strings use: classes.mixin.tests INSTANCE: string move-instance-declaration-mixin ;" <string-reader> "move-mixin-test-2" parse-stream drop ] unit-test
|
||||
|
||||
{ } [ "in: classes.mixin.tests.a" <string-reader> "move-mixin-test-1" parse-stream drop ] unit-test
|
||||
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ C: <empty> empty ;
|
|||
[ t length ] [ object>> t eq? ] must-fail-with
|
||||
|
||||
{ "<constructor-test>" }
|
||||
[ "in: classes.tuple.test TUPLE: constructor-test ; C: <constructor-test> constructor-test" eval( -- ) last-word name>> ] unit-test
|
||||
[ "in: classes.tuple.test TUPLE: constructor-test ; C: <constructor-test> constructor-test ;" eval( -- ) last-word name>> ] unit-test
|
||||
|
||||
TUPLE: size-test a b c d ;
|
||||
|
||||
|
|
@ -106,7 +106,7 @@ GENERIC: <yo-momma> ( a -- b ) ;
|
|||
|
||||
TUPLE: yo-momma ;
|
||||
|
||||
{ } [ "in: classes.tuple.tests C: <yo-momma> yo-momma" eval( -- ) ] unit-test
|
||||
{ } [ "in: classes.tuple.tests C: <yo-momma> yo-momma ;" eval( -- ) ] unit-test
|
||||
|
||||
{ f } [ \ <yo-momma> generic? ] unit-test
|
||||
|
||||
|
|
@ -282,7 +282,7 @@ TUPLE: electronic-device ;
|
|||
|
||||
{ t } [ laptop new computer?' ] unit-test
|
||||
|
||||
{ } [ "in: classes.tuple.tests TUPLE: computer < electronic-device cpu ram ; C: <computer> computer C: <laptop> laptop C: <server> server" eval( -- ) ] unit-test
|
||||
{ } [ "in: classes.tuple.tests TUPLE: computer < electronic-device cpu ram ; C: <computer> computer ; C: <laptop> laptop ; C: <server> server ;" eval( -- ) ] unit-test
|
||||
|
||||
{ t } [ laptop new computer?' ] unit-test
|
||||
|
||||
|
|
@ -300,17 +300,17 @@ TUPLE: electronic-device ;
|
|||
{ f } [ "server" get laptop? ] unit-test
|
||||
{ t } [ "server" get server? ] unit-test
|
||||
|
||||
{ } [ "in: classes.tuple.tests TUPLE: computer cpu ram ; C: <computer> computer C: <laptop> laptop C: <server> server" eval( -- ) ] unit-test
|
||||
{ } [ "in: classes.tuple.tests TUPLE: computer cpu ram ; C: <computer> computer ; C: <laptop> laptop ; C: <server> server ;" eval( -- ) ] unit-test
|
||||
|
||||
{ f } [ "laptop" get electronic-device? ] unit-test
|
||||
{ t } [ "laptop" get computer? ] unit-test
|
||||
|
||||
{ } [ "in: classes.tuple.tests TUPLE: computer < electronic-device cpu ram disk ; C: <computer> computer C: <laptop> laptop C: <server> server" eval( -- ) ] unit-test
|
||||
{ } [ "in: classes.tuple.tests TUPLE: computer < electronic-device cpu ram disk ; C: <computer> computer ; C: <laptop> laptop ; C: <server> server ;" eval( -- ) ] unit-test
|
||||
|
||||
test-laptop-slot-values
|
||||
test-server-slot-values
|
||||
|
||||
{ } [ "in: classes.tuple.tests TUPLE: electronic-device voltage ; C: <computer> computer C: <laptop> laptop C: <server> server" eval( -- ) ] unit-test
|
||||
{ } [ "in: classes.tuple.tests TUPLE: electronic-device voltage ; C: <computer> computer ; C: <laptop> laptop ; C: <server> server ;" eval( -- ) ] unit-test
|
||||
|
||||
test-laptop-slot-values
|
||||
test-server-slot-values
|
||||
|
|
@ -323,7 +323,7 @@ TUPLE: make-me-some-accessors voltage grounded? ;
|
|||
{ } [ "laptop" get 220 >>voltage drop ] unit-test
|
||||
{ } [ "server" get 110 >>voltage drop ] unit-test
|
||||
|
||||
{ } [ "in: classes.tuple.tests TUPLE: electronic-device voltage grounded? ; C: <computer> computer" eval( -- ) ] unit-test
|
||||
{ } [ "in: classes.tuple.tests TUPLE: electronic-device voltage grounded? ; C: <computer> computer ;" eval( -- ) ] unit-test
|
||||
|
||||
test-laptop-slot-values
|
||||
test-server-slot-values
|
||||
|
|
@ -331,7 +331,7 @@ test-server-slot-values
|
|||
{ 220 } [ "laptop" get voltage>> ] unit-test
|
||||
{ 110 } [ "server" get voltage>> ] unit-test
|
||||
|
||||
{ } [ "in: classes.tuple.tests TUPLE: electronic-device grounded? voltage ; C: <computer> computer C: <laptop> laptop C: <server> server" eval( -- ) ] unit-test
|
||||
{ } [ "in: classes.tuple.tests TUPLE: electronic-device grounded? voltage ; C: <computer> computer ; C: <laptop> laptop ; C: <server> server ;" eval( -- ) ] unit-test
|
||||
|
||||
test-laptop-slot-values
|
||||
test-server-slot-values
|
||||
|
|
@ -340,7 +340,7 @@ test-server-slot-values
|
|||
{ 110 } [ "server" get voltage>> ] unit-test
|
||||
|
||||
! Reshaping superclass and subclass simultaneously
|
||||
{ } [ "in: classes.tuple.tests TUPLE: electronic-device voltage ; TUPLE: computer < electronic-device cpu ram ; C: <computer> computer C: <laptop> laptop C: <server> server" eval( -- ) ] unit-test
|
||||
{ } [ "in: classes.tuple.tests TUPLE: electronic-device voltage ; TUPLE: computer < electronic-device cpu ram ; C: <computer> computer ; C: <laptop> laptop ; C: <server> server ;" eval( -- ) ] unit-test
|
||||
|
||||
test-laptop-slot-values
|
||||
test-server-slot-values
|
||||
|
|
|
|||
|
|
@ -77,9 +77,9 @@ M: user-input-tuple send-queued-gesture
|
|||
'[ _ \ user-input-tuple queue-gesture ] unless-empty ;
|
||||
|
||||
! Gesture objects
|
||||
TUPLE: drag # ; C: <drag> drag
|
||||
TUPLE: button-up mods # ; C: <button-up> button-up
|
||||
TUPLE: button-down mods # ; C: <button-down> button-down
|
||||
TUPLE: drag # ; C: <drag> drag ;
|
||||
TUPLE: button-up mods # ; C: <button-up> button-up ;
|
||||
TUPLE: button-down mods # ; C: <button-down> button-down ;
|
||||
|
||||
SINGLETONS:
|
||||
motion
|
||||
|
|
|
|||
Loading…
Reference in New Issue