From adc4245d8b56de05e5bbf7b93935868319732bcd Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 11 Jan 2009 15:37:05 -0600 Subject: [PATCH 1/4] Clean up benchmark.nbody using a smart combinator --- extra/benchmark/nbody/nbody.factor | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extra/benchmark/nbody/nbody.factor b/extra/benchmark/nbody/nbody.factor index 84c41ee69f..37c4fc43c5 100644 --- a/extra/benchmark/nbody/nbody.factor +++ b/extra/benchmark/nbody/nbody.factor @@ -1,7 +1,7 @@ -! Copyright (C) 2008 Slava Pestov. +! Copyright (C) 2008, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors specialized-arrays.double fry kernel locals make math -math.constants math.functions math.vectors prettyprint +USING: accessors specialized-arrays.double fry kernel locals math +math.constants math.functions math.vectors prettyprint combinators.smart sequences hints arrays ; IN: benchmark.nbody @@ -53,7 +53,7 @@ TUPLE: nbody-system { bodies array read-only } ; offset-momentum drop ; inline : ( -- system ) - [ , , , , , ] { } make nbody-system boa + [ ] output>array nbody-system boa dup bodies>> init-bodies ; inline :: each-pair ( bodies pair-quot: ( other-body body -- ) each-quot: ( body -- ) -- ) From 908c06080a48dd4c1d27114bc408352eebb38871 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 11 Jan 2009 19:40:05 -0600 Subject: [PATCH 2/4] Fix scripting example in cookbook --- basis/help/cookbook/cookbook.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/help/cookbook/cookbook.factor b/basis/help/cookbook/cookbook.factor index 4ea90e086b..ebc711d527 100644 --- a/basis/help/cookbook/cookbook.factor +++ b/basis/help/cookbook/cookbook.factor @@ -267,8 +267,8 @@ $nl { $heading "Example: ls" } "Here is an example implementing a simplified version of the Unix " { $snippet "ls" } " command in Factor:" { $code - <" USING: command-line namespaces io io.files tools.files -sequences kernel ; + <" USING: command-line namespaces io io.files +io.pathnames tools.files sequences kernel ; command-line get [ current-directory get directory. From 1c1e36621a1e89115a36c1e3f1b0ba6c85004022 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 11 Jan 2009 19:40:17 -0600 Subject: [PATCH 3/4] Small cleanup for ui.gadgets.labels --- basis/ui/gadgets/labels/labels.factor | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/basis/ui/gadgets/labels/labels.factor b/basis/ui/gadgets/labels/labels.factor index 5706f47639..eff3c6f7bb 100644 --- a/basis/ui/gadgets/labels/labels.factor +++ b/basis/ui/gadgets/labels/labels.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2005, 2008 Slava Pestov. +! Copyright (C) 2005, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays hashtables io kernel math namespaces make opengl sequences strings splitting ui.gadgets @@ -12,11 +12,7 @@ TUPLE: label < gadget text font color ; text>> dup string? [ "\n" join ] unless ; inline : set-label-string ( string label -- ) - CHAR: \n pick memq? [ - [ string-lines ] dip (>>text) - ] [ - (>>text) - ] if ; inline + [ CHAR: \n over memq? [ string-lines ] when ] dip (>>text) ; inline : label-theme ( gadget -- gadget ) sans-serif-font >>font From 1536ac8b4976d05efae48ea865a0c433da40a098 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Sun, 11 Jan 2009 19:41:48 -0600 Subject: [PATCH 4/4] Fixing Unicode collation bug --- basis/unicode/breaks/breaks.factor | 13 ++++--------- basis/unicode/collation/collation.factor | 10 +++++----- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor index 10bc235805..0524825d43 100644 --- a/basis/unicode/breaks/breaks.factor +++ b/basis/unicode/breaks/breaks.factor @@ -4,8 +4,7 @@ USING: combinators.short-circuit unicode.categories kernel math combinators splitting sequences math.parser io.files io assocs arrays namespaces make math.ranges unicode.normalize.private values io.encodings.ascii unicode.syntax unicode.data compiler.units fry -alien.syntax sets accessors interval-maps memoize locals words -strings hints ; +alien.syntax sets accessors interval-maps memoize locals words ; IN: unicode.breaks : first-word ( str -- i ) [ unclip-slice word-break-prop over ] keep '[ swap _ word-break-next ] assoc-find 2drop - nip swap length or 1+ ; inline - -HINTS: first-word string ; + nip swap length or 1+ ; : >words ( str -- words ) [ first-word ] >pieces ; - -HINTS: >words string ; diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor index 90b280ee09..5718ae12a7 100644 --- a/basis/unicode/collation/collation.factor +++ b/basis/unicode/collation/collation.factor @@ -5,7 +5,7 @@ io.encodings.ascii kernel values splitting accessors math.parser ascii io assocs strings math namespaces make sorting combinators math.order arrays unicode.normalize unicode.data locals unicode.syntax macros sequences.deep words unicode.breaks -quotations ; +quotations combinators.short-circuit ; IN: unicode.collation