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

Fix tuple redefinition bug

db4
Slava Pestov 2008-07-10 02:11:49 -05:00
parent 5d9c1ea0a0
commit 498986fe88
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -683,3 +683,17 @@ DEFER: error-y
[ t ] [ \ error-y tuple-class? ] unit-test [ t ] [ \ error-y tuple-class? ] unit-test
[ f ] [ \ error-y generic? ] unit-test [ f ] [ \ error-y generic? ] unit-test
[ ] [
"IN: classes.tuple.tests TUPLE: forget-subclass-test ; TUPLE: forget-subclass-test' < forget-subclass-test ;"
<string-reader> "forget-subclass-test" parse-stream
drop
] unit-test
[ ] [ "forget-subclass-test'" "classes.tuple.tests" lookup new "bad-object" set ] unit-test
[ ] [
"IN: classes.tuple.tests TUPLE: forget-subclass-test a ;"
<string-reader> "forget-subclass-test" parse-stream
drop
] unit-test

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

@ -194,13 +194,17 @@ ERROR: bad-superclass class ;
[ permute-slots ] [ class>> ] bi [ permute-slots ] [ class>> ] bi
slots>tuple ; slots>tuple ;
: outdated-tuple? ( tuple assoc -- ? )
over tuple? [
[ [ layout-of ] dip key? ]
[ drop class "forgotten" word-prop not ]
2bi and
] [ 2drop f ] if ;
: update-tuples ( -- ) : update-tuples ( -- )
outdated-tuples get outdated-tuples get
dup assoc-empty? [ drop ] [ dup assoc-empty? [ drop ] [
[ [ outdated-tuple? ] curry instances
over tuple?
[ >r layout-of r> key? ] [ 2drop f ] if
] curry instances
dup [ update-tuple ] map become dup [ update-tuple ] map become
] if ; ] if ;