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

View File

@ -541,7 +541,7 @@ TUPLE: another-forget-accessors-test ;
] unit-test
! 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 ;
@ -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-2 tuple-class? ] unit-test
[ subclass-forget-test-3 new ] must-fail
[ "IN: classes.tuple.tests TUPLE: subclass-forget-test-4 < subclass-forget-test-2 ;" eval ] must-fail

View File

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

View File

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