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

Inheritance work in progress

db4
Slava Pestov 2008-03-26 18:37:28 -05:00
parent 690621ffb6
commit be5a09c9e3
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/prettyprint/prettyprint.factor
View File

@ -257,6 +257,9 @@ M: predicate-class see-class*
M: tuple-class see-class* M: tuple-class see-class*
<colon \ TUPLE: pprint-word <colon \ TUPLE: pprint-word
dup pprint-word dup pprint-word
dup superclass tuple eq? [
"<" text dup superclass pprint-word
] unless
"slot-names" word-prop [ text ] each "slot-names" word-prop [ text ] each
pprint-; block> ; pprint-; block> ;

14
core/tuples/tuples-tests.factor
View File

@ -3,7 +3,7 @@ math.constants parser sequences tools.test words assocs
namespaces quotations sequences.private classes continuations namespaces quotations sequences.private classes continuations
generic.standard effects tuples tuples.private arrays vectors generic.standard effects tuples tuples.private arrays vectors
strings compiler.units accessors classes.algebra calendar strings compiler.units accessors classes.algebra calendar
prettyprint io.streams.string ; prettyprint io.streams.string splitting ;
IN: tuples.tests IN: tuples.tests
TUPLE: rect x y w h ; TUPLE: rect x y w h ;
@ -247,8 +247,8 @@ C: <erg's-reshape-problem> erg's-reshape-problem
! Inheritance ! Inheritance
TUPLE: computer cpu ram ; TUPLE: computer cpu ram ;
[ "IN: tuples.tests TUPLE: computer cpu ram ;\n" ] [ [ "TUPLE: computer cpu ram ;" ] [
[ \ computer see ] with-string-writer [ \ computer see ] with-string-writer string-lines second
] unit-test ] unit-test
TUPLE: laptop < computer battery ; TUPLE: laptop < computer battery ;
@ -264,8 +264,8 @@ C: <laptop> laptop
[ t ] [ "laptop" get computer? ] unit-test [ t ] [ "laptop" get computer? ] unit-test
[ t ] [ "laptop" get tuple? ] unit-test [ t ] [ "laptop" get tuple? ] unit-test
[ "IN: tuples.tests TUPLE: laptop < computer battery ;\n" ] [ [ "TUPLE: laptop < computer battery ;" ] [
[ \ laptop see ] with-string-writer [ \ laptop see ] with-string-writer string-lines second
] unit-test ] unit-test
TUPLE: server < computer rackmount? ; TUPLE: server < computer rackmount? ;
@ -288,8 +288,8 @@ C: <server> server
[ f ] [ laptop server class< ] unit-test [ f ] [ laptop server class< ] unit-test
[ f ] [ laptop server classes-intersect? ] unit-test [ f ] [ laptop server classes-intersect? ] unit-test
[ "IN: tuples.tests TUPLE: server < computer rackmount ;\n" ] [ [ "TUPLE: server < computer rackmount? ;" ] [
[ \ server see ] with-string-writer [ \ server see ] with-string-writer string-lines second
] unit-test ] unit-test
[ [