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

Fix classes.tuple unit test failures

db4
Slava Pestov 2008-05-10 16:28:02 -05:00
parent 5d61651cb2
commit 0a3429810c
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/classes/tuple/tuple-tests.factor
View File

@ -541,7 +541,7 @@ TUPLE: another-forget-accessors-test ;
] unit-test ] unit-test
! Missing error check ! Missing error check
[ "IN: tuples.test USE: words TUPLE: wrong-superclass < word ;" eval ] must-fail [ "IN: classes.tuple.tests USE: words TUPLE: wrong-superclass < word ;" eval ] must-fail
TUPLE: subclass-forget-test ; TUPLE: subclass-forget-test ;
@ -554,3 +554,5 @@ TUPLE: subclass-forget-test-3 < subclass-forget-test-2 ;
[ f ] [ subclass-forget-test-1 tuple-class? ] unit-test [ f ] [ subclass-forget-test-1 tuple-class? ] unit-test
[ f ] [ subclass-forget-test-2 tuple-class? ] unit-test [ f ] [ subclass-forget-test-2 tuple-class? ] unit-test
[ subclass-forget-test-3 new ] must-fail [ subclass-forget-test-3 new ] must-fail
[ "IN: classes.tuple.tests TUPLE: subclass-forget-test-4 < subclass-forget-test-2 ;" eval ] must-fail

5
core/classes/tuple/tuple.factor
View File

@ -226,6 +226,11 @@ M: tuple-class reset-class
} reset-props } reset-props
] bi ; ] bi ;
M: tuple-class forget*
[ [ reset-class ] each-subclass ]
[ call-next-method ]
bi ;
M: tuple-class rank-class drop 0 ; M: tuple-class rank-class drop 0 ;
M: tuple clone M: tuple clone

6
core/generic/generic.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: words kernel sequences namespaces assocs hashtables USING: words kernel sequences namespaces assocs hashtables
definitions kernel.private classes classes.private definitions kernel.private classes classes.private
classes.algebra quotations arrays vocabs effects ; classes.algebra quotations arrays vocabs effects combinators ;
IN: generic IN: generic
! Method combination protocol ! Method combination protocol
@ -147,10 +147,12 @@ M: method-body forget*
[ implementors ] [ [ swap 2array ] curry ] bi map forget-all ; [ implementors ] [ [ swap 2array ] curry ] bi map forget-all ;
M: class forget* ( class -- ) M: class forget* ( class -- )
{
[ forget-methods ] [ forget-methods ]
[ update-map- ] [ update-map- ]
[ reset-class ]
[ call-next-method ] [ call-next-method ]
tri ; } cleave ;
M: assoc update-methods ( assoc -- ) M: assoc update-methods ( assoc -- )
implementors* [ make-generic ] each ; implementors* [ make-generic ] each ;