]> gitweb.factorcode.org Git - factor.git/commitdiff
dlists: use maybe: dlist-link.
authorDoug Coleman <doug.coleman@gmail.com>
Wed, 23 Nov 2011 03:38:46 +0000 (19:38 -0800)
committerDoug Coleman <doug.coleman@gmail.com>
Wed, 23 Nov 2011 03:38:46 +0000 (19:38 -0800)
basis/dlists/dlists.factor

index bbac957aa2900909b149cd3bdf63bb7d87a94297..758b7047080df160e8f89e169c31c2f2888cff10 100644 (file)
@@ -6,13 +6,7 @@ deques fry hashtables kernel parser search-deques sequences
 summary vocabs.loader ;
 IN: dlists
 
-MIXIN: ?dlist-node
-
-INSTANCE: f ?dlist-node
-
-TUPLE: dlist-link { prev ?dlist-node } { next ?dlist-node } ;
-
-INSTANCE: dlist-link ?dlist-node
+TUPLE: dlist-link { prev maybe: dlist-link } { next maybe: dlist-link } ;
 
 TUPLE: dlist-node < dlist-link obj ;
 
@@ -28,8 +22,8 @@ M: dlist-link obj>> ;
     \ dlist-node new-dlist-link ; inline
 
 TUPLE: dlist
-{ front ?dlist-node }
-{ back ?dlist-node } ;
+{ front maybe: dlist-link }
+{ back maybe: dlist-link } ;
 
 : <dlist> ( -- list )
     dlist new ; inline