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

classes: adding a check-instance for checking type of things. 

This will replace a bunch of not-a-thingy errors that we have in a few
places.  Those should probably go away anyway, in favor of better type
propagation or runtime JIT compilation.
master
John Benediktsson 2020-01-15 10:29:06 -08:00
parent b3582dd323
commit cd75a7eb4e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/classes/classes-tests.factor
View File

@ -140,3 +140,6 @@ GENERIC: generic-predicate? ( a -- b )
} [ } [
f { fixnum } { } f make-class-props f { fixnum } { } f make-class-props
] unit-test ] unit-test
{ "test" } [ "test" sequence check-instance ] unit-test
[ "test" fixnum check-instance ] [ not-an-instance? ] must-fail-with

11
core/classes/classes.factor
View File

@ -220,11 +220,11 @@ GENERIC: update-methods ( class seq -- )
dup class-usages dup class-usages
[ nip [ update-class ] each ] [ update-methods ] 2bi ; [ nip [ update-class ] each ] [ update-methods ] 2bi ;
: check-inheritance ( subclass superclass -- ) : check-inheritance ( subclass superclass -- subclass superclass )
2dup superclass-of? [ bad-inheritance ] [ 2drop ] if ; 2dup superclass-of? [ bad-inheritance ] when ;
: define-class ( word superclass members participants metaclass -- ) : define-class ( word superclass members participants metaclass -- )
[ 2dup check-inheritance ] 3dip [ check-inheritance ] 3dip
make-class-props [ (define-class) ] [ drop changed-definition ] 2bi ; make-class-props [ (define-class) ] [ drop changed-definition ] 2bi ;
: forget-predicate ( class -- ) : forget-predicate ( class -- )
@ -255,3 +255,8 @@ M: class metaclass-changed
M: class forget* ( class -- ) M: class forget* ( class -- )
[ call-next-method ] [ forget-class ] bi ; [ call-next-method ] [ forget-class ] bi ;
ERROR: not-an-instance obj class ;
: check-instance ( obj class -- obj )
[ dupd instance? ] keep [ not-an-instance ] curry unless ; inline