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

classes.maybe: this restriction isn't necessary anymore.

locals-and-roots
John Benediktsson 2016-04-13 14:20:00 -07:00
parent 1ad06b4e44
commit ed22ef8ee7
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,8 +62,5 @@ M: f lol2 drop "lol22" ;
{ "lol22" } [ f lol2 ] unit-test { "lol22" } [ f lol2 ] unit-test
[ 3 lol2 ] [ no-method? ] must-fail-with [ 3 lol2 ] [ no-method? ] must-fail-with
{ t } [ \ + <maybe> classoid? ] unit-test
{ f } [ \ + <maybe> valid-classoid? ] unit-test
[ "IN: classes-tests maybe{ 1 2 3 }" eval( -- ) ] [ "IN: classes-tests maybe{ 1 2 3 }" eval( -- ) ]
[ error>> not-classoids? ] must-fail-with [ error>> not-classoids? ] must-fail-with

8
core/classes/maybe/maybe.factor
View File

@ -5,13 +5,7 @@ classes.algebra.private classes.private classes.union.private
kernel words ; kernel words ;
IN: classes.maybe IN: classes.maybe
! The class slot has to be a union of a word and a classoid TUPLE: maybe { class classoid initial: object read-only } ;
! for TUPLE: foo { a maybe{ foo } } ; and maybe{ union{ integer float } }
! to work.
! In the first case, foo is not yet a tuple-class when maybe{ is reached,
! thus it's not a classoid yet. union{ is a classoid, so the second case works.
! words are not generally classoids, so classoid alone is insufficient.
TUPLE: maybe { class union{ word classoid } initial: object read-only } ;
C: <maybe> maybe C: <maybe> maybe