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

Merge branch 'master' of git://tiodante.com/git/factor

db4
William Schlieper 2008-07-16 01:06:58 -04:00
parent fce7afcf9e 62fdbfd671
commit 174021e44e
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extra/irc/client/client.factor
View File

@ -241,7 +241,8 @@ M: quit handle-incoming-irc ( quit -- )
[ >nick/mode 2array ] map >hashtable ; [ >nick/mode 2array ] map >hashtable ;
M: names-reply handle-incoming-irc ( names-reply -- ) M: names-reply handle-incoming-irc ( names-reply -- )
[ names-reply>participants ] [ channel>> listener> ] bi (>>participants) ; [ names-reply>participants ] [ channel>> listener> ] bi
[ (>>participants) ] [ drop ] if* ;
M: irc-broadcasted-message handle-incoming-irc ( irc-broadcasted-message -- ) M: irc-broadcasted-message handle-incoming-irc ( irc-broadcasted-message -- )
broadcast-message-to-listeners ; broadcast-message-to-listeners ;
@ -265,11 +266,6 @@ M: part handle-outgoing-irc ( part -- )
! Reader/Writer ! Reader/Writer
! ====================================== ! ======================================
: irc-mailbox-get ( mailbox quot -- )
[ 5 seconds ] dip
'[ , , , [ mailbox-get-timeout ] dip call ]
[ drop ] recover ; inline
: handle-reader-message ( irc-message -- ) : handle-reader-message ( irc-message -- )
irc> in-messages>> mailbox-put ; irc> in-messages>> mailbox-put ;
@ -299,14 +295,14 @@ DEFER: (connect-irc)
[ (reader-loop) ] [ handle-disconnect ] recover ; [ (reader-loop) ] [ handle-disconnect ] recover ;
: writer-loop ( -- ) : writer-loop ( -- )
irc> out-messages>> [ handle-outgoing-irc ] irc-mailbox-get ; irc> out-messages>> mailbox-get handle-outgoing-irc ;
! ====================================== ! ======================================
! Processing loops ! Processing loops
! ====================================== ! ======================================
: in-multiplexer-loop ( -- ) : in-multiplexer-loop ( -- )
irc> in-messages>> [ handle-incoming-irc ] irc-mailbox-get ; irc> in-messages>> mailbox-get handle-incoming-irc ;
: strings>privmsg ( name string -- privmsg ) : strings>privmsg ( name string -- privmsg )
privmsg new [ (>>trailing) ] keep [ (>>name) ] keep ; privmsg new [ (>>trailing) ] keep [ (>>name) ] keep ;
@ -319,9 +315,8 @@ DEFER: (connect-irc)
} cond ; } cond ;
: listener-loop ( name listener -- ) : listener-loop ( name listener -- )
out-messages>> swap out-messages>> mailbox-get maybe-annotate-with-name
'[ , swap maybe-annotate-with-name irc> out-messages>> mailbox-put ] irc> out-messages>> mailbox-put ;
irc-mailbox-get ;
: spawn-irc-loop ( quot name -- ) : spawn-irc-loop ( quot name -- )
[ '[ irc> is-running>> [ @ ] when irc> is-running>> ] ] dip [ '[ irc> is-running>> [ @ ] when irc> is-running>> ] ] dip