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

mirrors: delete-at and clear-assoc are an error, fix #1757 

M\ mirror delete-at and M\ mirror clear-assoc
	have been made to throw a new
	mirror-slot-removal error, because
	it doesn't make sense to remove a
	tuple slot, and this behaviour should
	not have been relied on.
master
Cat Stevens 2020-03-11 20:28:02 -04:00 committed by John Benediktsson
parent c56dd706ce
commit 175a42bd49
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
basis/mirrors/mirrors-tests.factor
View File

@ -49,9 +49,8 @@ TUPLE: color
{ green integer }
{ blue integer } ;
{ T{ color f 0 0 0 } } [
1 2 3 color boa [ <mirror> clear-assoc ] keep
] unit-test
[ \ + make-mirror clear-assoc ] must-fail
[ \ + make-mirror [ "name" ] dip delete-at ] must-fail
! Test reshaping with a mirror
1 2 3 color boa <mirror> "mirror" set

13
basis/mirrors/mirrors.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs classes classes.tuple classes.tuple.private
combinators fry hash-sets hashtables kernel math sequences sets slots
slots.private ;
slots.private summary present formatting ;
IN: mirrors
TUPLE: mirror { object read-only } ;
@ -30,13 +30,16 @@ M: mirror set-at ( val key mirror -- )
[ object-slots slot-named check-set-slot ] [ object>> ] bi
swap set-slot ;
ERROR: mirror-slot-removal slots mirror method ;
M: mirror delete-at ( key mirror -- )
[ f ] 2dip set-at ;
\ delete-at mirror-slot-removal ;
M: mirror clear-assoc ( mirror -- )
[ object-slots ] [ object>> ] bi '[
[ initial>> ] [ offset>> _ swap set-slot ] bi
] each ;
[ object-slots ] keep \ clear-assoc mirror-slot-removal ;
M: mirror-slot-removal summary
drop "Slots cannot be removed from a tuple or a mirror of it" ;
M: mirror >alist ( mirror -- alist )
[ object-slots ] [ object>> ] bi '[