]> gitweb.factorcode.org Git - factor.git/commitdiff
Merge git://factorcode.org/git/factor
authorDoug Coleman <doug.coleman@gmail.com>
Mon, 5 Nov 2007 08:24:32 +0000 (02:24 -0600)
committerDoug Coleman <doug.coleman@gmail.com>
Mon, 5 Nov 2007 08:24:32 +0000 (02:24 -0600)
Conflicts:

extra/concurrency/concurrency.factor

1  2 
extra/concurrency/concurrency.factor

index bbb7a7045a631b5b49ed969353de7ef52763be35,e885877a37c508600ddee8ba08c1c649a5e4e9ae..426ef617caa7db126d2bb58ad6303c80ea93642b
@@@ -59,8 -59,8 +59,8 @@@ PRIVATE
  : mailbox-get-all* ( mailbox timeout -- array )
      (mailbox-block-if-empty)
      [ dup mailbox-empty? ]
 -    [ dup mailbox-data dlist-pop-front ]
 +    [ dup mailbox-data pop-front ]
-     { } unfold ;
+     [ ] unfold nip ;
  
  : mailbox-get-all ( mailbox -- array )
      f mailbox-get-all* ;