From b010cd311687ed5a462821c00a436efa146426dd Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Sat, 30 May 2009 10:09:44 -0300 Subject: [PATCH 1/5] irc.logbot: Small refactoring --- extra/irc/logbot/logbot.factor | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/extra/irc/logbot/logbot.factor b/extra/irc/logbot/logbot.factor index ff8085a9a9..976a3832f4 100644 --- a/extra/irc/logbot/logbot.factor +++ b/extra/irc/logbot/logbot.factor @@ -21,15 +21,17 @@ SYMBOL: current-stream : timestamp-path ( timestamp -- path ) timestamp>ymd ".log" append log-directory prepend-path ; +: update-current-stream ( timestamp -- ) + current-stream get [ dispose ] when* + [ day-of-year current-day set ] + [ timestamp-path latin1 ] bi + current-stream set ; + +: same-day? ( timestamp -- ? ) day-of-year current-day get = ; + : timestamp>stream ( timestamp -- stream ) - dup day-of-year current-day get = [ - drop - ] [ - current-stream get [ dispose ] when* - [ day-of-year current-day set ] - [ timestamp-path latin1 ] bi - current-stream set - ] if current-stream get ; + dup same-day? [ drop ] [ update-current-stream ] if + current-stream get ; : log-message ( string timestamp -- ) [ add-timestamp ] [ timestamp>stream ] bi From 4c04ace2789c2849769d2b16bab81f9c816145ae Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Tue, 2 Jun 2009 09:09:27 -0300 Subject: [PATCH 2/5] irc.client: Temporary possible fix to the bug reported by anyhoo --- extra/irc/client/internals/internals.factor | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extra/irc/client/internals/internals.factor b/extra/irc/client/internals/internals.factor index 1b4a4550dc..b065dfe2f0 100644 --- a/extra/irc/client/internals/internals.factor +++ b/extra/irc/client/internals/internals.factor @@ -75,8 +75,9 @@ M: to-many-chats message-forwards sender>> participant-chats ; GENERIC: process-message ( irc-message -- ) M: object process-message drop ; M: ping process-message trailing>> /PONG ; -M: join process-message [ sender>> ] [ chat> ] bi join-participant ; -M: part process-message [ sender>> ] [ chat> ] bi part-participant ; +! FIXME: it shouldn't be checking for the presence of chat here... +M: join process-message [ sender>> ] [ chat> ] bi [ join-participant ] [ drop ] if* ; +M: part process-message [ sender>> ] [ chat> ] bi [ part-participant ] [ drop ] if* ; M: quit process-message sender>> quit-participant ; M: nick process-message [ trailing>> ] [ sender>> ] bi rename-participant* ; M: rpl-nickname-in-use process-message name>> "_" append /NICK ; From 8bf389e9b55cf13d25b7aeff87fbd8c7edb1f513 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Wed, 22 Jul 2009 20:48:38 -0300 Subject: [PATCH 3/5] basis.xml: Add test to check that pull-event doesn't raise an exception when called on a pull-xml object --- basis/xml/tests/test.factor | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/basis/xml/tests/test.factor b/basis/xml/tests/test.factor index 74ba931c79..e371c3aab5 100644 --- a/basis/xml/tests/test.factor +++ b/basis/xml/tests/test.factor @@ -73,3 +73,7 @@ SYMBOL: xml-file [ T{ xml-chunk f V{ "hello" } } ] [ "hello" string>xml-chunk ] unit-test [ "1.1" ] [ "" string>xml prolog>> version>> ] unit-test [ "ß" ] [ "ß" read-xml children>string ] unit-test + +! tests +! this tests just checks that pull-event doesn't raise an exception +[ ] [ "vocab:xml/tests/test.xml" binary [ pull-event drop ] with-file-reader ] unit-test \ No newline at end of file From d8434ceed2c779dc463e98d02529ba9dcc3dd458 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Wed, 22 Jul 2009 20:49:57 -0300 Subject: [PATCH 4/5] basis.xml: A fix for (calls init-parser so that the spot variable is binded) --- basis/xml/xml.factor | 1 + 1 file changed, 1 insertion(+) diff --git a/basis/xml/xml.factor b/basis/xml/xml.factor index cca1b5e2e0..a1d734f291 100755 --- a/basis/xml/xml.factor +++ b/basis/xml/xml.factor @@ -110,6 +110,7 @@ PRIVATE> TUPLE: pull-xml scope ; : ( -- pull-xml ) [ + init-parser input-stream [ ] change ! bring var in this scope init-xml text-now? on ] H{ } make-assoc From cb36a40dc4fccfd9bf73c789efc9103b83bed0a4 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 29 Jul 2009 07:04:52 -0500 Subject: [PATCH 5/5] compiler.cfg.linear-scan: more test fixes --- basis/compiler/cfg/linear-scan/linear-scan-tests.factor | 5 ----- basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/basis/compiler/cfg/linear-scan/linear-scan-tests.factor b/basis/compiler/cfg/linear-scan/linear-scan-tests.factor index 1673b1b365..f38946f8e2 100644 --- a/basis/compiler/cfg/linear-scan/linear-scan-tests.factor +++ b/basis/compiler/cfg/linear-scan/linear-scan-tests.factor @@ -1761,11 +1761,6 @@ test-diamond [ ] [ { 1 2 } test-linear-scan-on-cfg ] unit-test -[ ] [ - 1 get instructions>> first regs>> V int-regs 0 swap at - 2 get instructions>> first regs>> V int-regs 1 swap at assert= -] unit-test - ! Not until splitting is finished ! [ _copy ] [ 3 get instructions>> second class ] unit-test diff --git a/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor b/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor index b1b44cde44..ee3595dd06 100644 --- a/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor +++ b/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor @@ -1,6 +1,6 @@ IN: compiler.cfg.linear-scan.resolve.tests USING: compiler.cfg.linear-scan.resolve tools.test kernel namespaces -compiler.cfg.instructions cpu.architecture make +compiler.cfg.instructions cpu.architecture make sequences compiler.cfg.linear-scan.allocation.state ; [