diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt index f3862f6490..269f36bf87 100644 --- a/TODO.FACTOR.txt +++ b/TODO.FACTOR.txt @@ -2,6 +2,8 @@ should fix in 0.82: - constant branch folding - getenv, setenv, fast-slot stuff +- more flexible fixnum intrinsics +- compile if-intrinsic even if there is no #if there - 3 >n fep - amd64 %box-struct - get factor running on mac intel diff --git a/contrib/httpd/cont-responder.factor b/contrib/httpd/cont-responder.factor index d16486e7cd..908a20b7b7 100644 --- a/contrib/httpd/cont-responder.factor +++ b/contrib/httpd/cont-responder.factor @@ -136,17 +136,6 @@ TUPLE: resume value stdio ; flush ; -: (expired-page-handler) ( alist -- ) - #! Display a page has expired message. - #! TODO: Need to handle this better to enable - #! returning back to root continuation. - drop - - -

"This page has expired." write

- - flush ; - : expired-page-handler ( alist -- ) [ (expired-page-handler) ] show-final ; diff --git a/library/unix/io.factor b/library/unix/io.factor index eb68bc3956..f1eeb6fa7a 100644 --- a/library/unix/io.factor +++ b/library/unix/io.factor @@ -66,7 +66,7 @@ C: port ( handle buffer -- port ) 80 over set-port-sbuf ; : touch-port ( port -- ) - dup port-timeout dup 0 = + dup port-timeout dup zero? [ 2drop ] [ millis + swap set-port-cutoff ] if ; M: port set-timeout ( timeout port -- ) @@ -115,11 +115,8 @@ GENERIC: task-container ( task -- vector ) queue-empty? [ remove-io-task ] [ drop ] if r> ; : handle-fd ( task -- ) - dup do-io-task [ - dup io-task-port touch-port pop-callback continue - ] [ - drop - ] if ; + dup io-task-port touch-port dup do-io-task + [ pop-callback continue ] [ drop ] if ; : timeout? ( port -- ? ) port-cutoff dup zero? not swap millis < and ; @@ -145,7 +142,7 @@ GENERIC: task-container ( task -- vector ) f ; : io-multiplex ( timeout -- ) - >r FD_SETSIZE init-fdsets r> make-timeval select ( io-error ) drop + >r FD_SETSIZE init-fdsets r> make-timeval select io-error read-fdset get read-tasks get handle-fdset write-fdset get write-tasks get handle-fdset ;