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

Fix unit test failure in compiler

db4
Slava Pestov 2008-09-03 17:24:06 -05:00
parent 194762776e
commit d12f55be31
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,10 +62,13 @@ TUPLE: check-mixin-class mixin ;
] if-mixin-member? ; ] if-mixin-member? ;
: remove-mixin-instance ( class mixin -- ) : remove-mixin-instance ( class mixin -- )
#! The order of the three clauses is important here. The last
#! one must come after the other two so that the entries it
#! adds to changed-generics are not overwritten.
[ [
[ class-usages update-methods ]
[ [ swap remove ] change-mixin-class ] [ [ swap remove ] change-mixin-class ]
[ nip update-classes ] [ nip update-classes ]
[ class-usages update-methods ]
2tri 2tri
] [ 2drop ] if-mixin-member? ; ] [ 2drop ] if-mixin-member? ;

3
core/compiler/units/units.factor
View File

@ -110,8 +110,7 @@ SYMBOL: update-tuples-hook
: (compiled-generic-usages) ( generic class -- assoc ) : (compiled-generic-usages) ( generic class -- assoc )
dup class? [ dup class? [
[ compiled-generic-usage ] dip [ compiled-generic-usage ] dip
[ [ classes-intersect? ] [ null class<= ] bi or nip ] [ classes-intersect? nip ] curry assoc-filter
curry assoc-filter
] [ 2drop f ] if ; ] [ 2drop f ] if ;
: compiled-generic-usages ( assoc -- assocs ) : compiled-generic-usages ( assoc -- assocs )