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

db4
William Schlieper 2008-12-06 20:43:38 -05:00
commit d4567bdcde
1 changed files with 6 additions and 6 deletions

View File

@ -90,11 +90,11 @@ M: end-of-names >>command-parameters ( names-reply params -- names-reply )
first2 [ >>who ] [ >>channel ] bi* ; first2 [ >>who ] [ >>channel ] bi* ;
M: mode >>command-parameters ( mode params -- mode ) M: mode >>command-parameters ( mode params -- mode )
dup length 3 = [ dup length {
first3 [ >>name ] [ >>mode ] [ >>parameter ] tri* { 3 [ first3 [ >>name ] [ >>mode ] [ >>parameter ] tri* ] }
] [ { 2 [ first2 [ >>name ] [ >>mode ] bi* ] }
first2 [ >>name ] [ >>mode ] bi* [ drop first >>name dup trailing>> >>mode ]
] if ; } case ;
PRIVATE> PRIVATE>
@ -135,12 +135,12 @@ M: irc-message irc-message>server-line ( irc-message -- string )
: copy-message-in ( command irc-message -- command ) : copy-message-in ( command irc-message -- command )
{ {
[ parameters>> [ >>parameters ] [ >>command-parameters ] bi ]
[ line>> >>line ] [ line>> >>line ]
[ prefix>> >>prefix ] [ prefix>> >>prefix ]
[ command>> >>command ] [ command>> >>command ]
[ trailing>> >>trailing ] [ trailing>> >>trailing ]
[ timestamp>> >>timestamp ] [ timestamp>> >>timestamp ]
[ parameters>> [ >>parameters ] [ >>command-parameters ] bi ]
} cleave ; } cleave ;
PRIVATE> PRIVATE>