From 0a8020c06bfb0bebe3b92d876beb9548097c75ad Mon Sep 17 00:00:00 2001
From: otoburb <otoburb@gmail.com>
Date: Wed, 10 Nov 2010 18:09:45 +0000
Subject: [PATCH 1/7] Fixed extra/webapps/imagebin vocab to increment path
count correctly and added file detection.
---
extra/webapps/imagebin/imagebin.factor | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/extra/webapps/imagebin/imagebin.factor b/extra/webapps/imagebin/imagebin.factor
index bb8720466c..24cd92ca2a 100644
--- a/extra/webapps/imagebin/imagebin.factor
+++ b/extra/webapps/imagebin/imagebin.factor
@@ -3,7 +3,8 @@
USING: accessors furnace.actions furnace.redirection
html.forms http http.server http.server.dispatchers
io.directories io.encodings.utf8 io.files io.pathnames
-kernel math.parser multiline namespaces sequences urls ;
+kernel math.parser multiline namespaces sequences urls
+math ;
IN: webapps.imagebin
TUPLE: imagebin < dispatcher path n ;
@@ -14,13 +15,13 @@ TUPLE: imagebin < dispatcher path n ;
: next-image-path ( -- path )
imagebin get
- [ path>> ] [ n>> number>string ] bi append-path ;
+ [ path>> ] [ [ 1 + ] change-n n>> number>string ] bi append-path ;
M: imagebin call-responder*
[ imagebin set ] [ call-next-method ] bi ;
: move-image ( mime-file -- )
- next-image-path
+ [ next-image-path dup exists? ] [ drop ] while
[ [ temporary-path>> ] dip move-file ]
[ [ filename>> ] dip ".txt" append utf8 set-file-contents ] 2bi ;
From e4bf5f104ed0725caabcb1ad22743f9293b6495a Mon Sep 17 00:00:00 2001
From: otoburb <otoburb@gmail.com>
Date: Thu, 11 Nov 2010 17:42:10 +0000
Subject: [PATCH 2/7] basis/help/apropos: Trimming whitespace before and after
search query. Allows accidental/reflex whitespace to be corrected so results
can still be returned.
---
basis/help/apropos/apropos.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/basis/help/apropos/apropos.factor b/basis/help/apropos/apropos.factor
index 933761871d..010c797a55 100644
--- a/basis/help/apropos/apropos.factor
+++ b/basis/help/apropos/apropos.factor
@@ -71,4 +71,4 @@ M: apropos >link ;
INSTANCE: apropos topic
: apropos ( str -- )
- <apropos> print-topic nl ;
+ [ blank? ] trim <apropos> print-topic nl ;
From 61096c16576a8ec53a6aa7eea3f101f165ca5c28 Mon Sep 17 00:00:00 2001
From: otoburb <otoburb@gmail.com>
Date: Thu, 11 Nov 2010 17:53:51 +0000
Subject: [PATCH 3/7] basis/help/apropos: Added unicode.categories. Missing
from previous commit.
---
basis/help/apropos/apropos.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/basis/help/apropos/apropos.factor b/basis/help/apropos/apropos.factor
index 010c797a55..9377f0a656 100644
--- a/basis/help/apropos/apropos.factor
+++ b/basis/help/apropos/apropos.factor
@@ -3,7 +3,7 @@
USING: accessors arrays assocs fry help.markup help.topics io
kernel make math math.parser namespaces sequences sorting
summary tools.completion vocabs.hierarchy help.vocabs
-vocabs words unicode.case help ;
+vocabs words unicode.case help unicode.categories ;
IN: help.apropos
: $completions ( seq -- )
From 5dab71369201ab270f97d3ccf402c6ad940cc306 Mon Sep 17 00:00:00 2001
From: otoburb <otoburb@gmail.com>
Date: Sun, 2 Jan 2011 08:27:50 +0000
Subject: [PATCH 4/7] basis/db/tuples: Minor doc fix for 'select-tuples'
---
basis/db/tuples/tuples-docs.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/basis/db/tuples/tuples-docs.factor b/basis/db/tuples/tuples-docs.factor
index 36e6b4bf2c..50f60d8adb 100644
--- a/basis/db/tuples/tuples-docs.factor
+++ b/basis/db/tuples/tuples-docs.factor
@@ -139,7 +139,7 @@ HELP: select-tuples
{ $values
{ "query/tuple" tuple }
{ "tuples" "an array of tuples" } }
-{ $description "A SQL query is constructed from the slots of the exemplar tuple that are not " { $link f } ". Returns a multiple tuples from the database that match the query constructed from the exemplar tuple." } ;
+{ $description "A SQL query is constructed from the slots of the exemplar tuple that are not " { $link f } ". Returns an array of multiple tuples from the database that match the query constructed from the exemplar tuple." } ;
HELP: count-tuples
{ $values
From aafc8850600c5c437aea43ad4ba3037e52b78465 Mon Sep 17 00:00:00 2001
From: otoburb <otoburb@gmail.com>
Date: Tue, 11 Jan 2011 03:00:14 +0000
Subject: [PATCH 5/7] Typo in "make.factor" documentation
---
core/make/make-docs.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/make/make-docs.factor b/core/make/make-docs.factor
index 2cbf82ae33..2a74af7049 100644
--- a/core/make/make-docs.factor
+++ b/core/make/make-docs.factor
@@ -37,7 +37,7 @@ $nl
{ $code "'[ 2 _ + ]" } ;
ARTICLE: "namespaces-make" "Making sequences with variables"
-"The " { $vocab-link "make" } " vocabulary implements a facility for constructing sequences by holding an collector sequence in a variable. Storing the collector sequence in a variable rather than the stack may allow code to be written with less stack manipulation."
+"The " { $vocab-link "make" } " vocabulary implements a facility for constructing sequences by holding a collector sequence in a variable. Storing the collector sequence in a variable rather than the stack may allow code to be written with less stack manipulation."
$nl
"Sequence construction is wrapped in a combinator:"
{ $subsections make }
From 4817ba5a9317ebf2e1eb819cbbe11d1107bb7d24 Mon Sep 17 00:00:00 2001
From: otoburb <otoburb@gmail.com>
Date: Sun, 13 Mar 2011 20:41:15 +0000
Subject: [PATCH 6/7] smart-docs output>array typo fix
---
basis/combinators/smart/smart-docs.factor | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/basis/combinators/smart/smart-docs.factor b/basis/combinators/smart/smart-docs.factor
index cdd2744888..bc7b88a0fc 100644
--- a/basis/combinators/smart/smart-docs.factor
+++ b/basis/combinators/smart/smart-docs.factor
@@ -23,7 +23,7 @@ HELP: output>array
{ "quot" quotation }
{ "newquot" quotation }
}
-{ $description "Infers the number or outputs from the quotation and constructs an array from those outputs." }
+{ $description "Infers the number of outputs from the quotation and constructs an array from those outputs." }
{ $examples
{ $example
"USING: combinators combinators.smart math prettyprint ;
From b0baf118af8aab707dc31953a90cb10690f0737c Mon Sep 17 00:00:00 2001
From: otoburb <otoburb@gmail.com>
Date: Tue, 15 Mar 2011 01:51:27 +0000
Subject: [PATCH 7/7] holidays.factor: Replaced use of deprecated 'spin' word
with locals.
---
extra/calendar/holidays/holidays.factor | 7 ++++---
extra/calendar/holidays/us/us.factor | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/extra/calendar/holidays/holidays.factor b/extra/calendar/holidays/holidays.factor
index 0b8a1bb781..7a87a1df45 100644
--- a/extra/calendar/holidays/holidays.factor
+++ b/extra/calendar/holidays/holidays.factor
@@ -1,7 +1,7 @@
! Copyright (C) 2009 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs calendar fry kernel parser sequences
-shuffle vocabs words memoize ;
+USING: accessors assocs calendar fry kernel locals parser
+sequences vocabs words memoize ;
IN: calendar.holidays
SINGLETONS: all world commonwealth-of-nations ;
@@ -15,7 +15,8 @@ SYNTAX: HOLIDAY:
parse-definition (( timestamp/n -- timestamp )) define-declared ;
SYNTAX: HOLIDAY-NAME:
- scan-word "holiday" word-prop scan-word scan-object spin set-at ;
+ [let scan-word "holiday" word-prop :> holidays scan-word :> name scan-object :> value
+ value name holidays set-at ] ;
>>
GENERIC: holidays ( n singleton -- seq )
diff --git a/extra/calendar/holidays/us/us.factor b/extra/calendar/holidays/us/us.factor
index 538836952f..87c367f941 100644
--- a/extra/calendar/holidays/us/us.factor
+++ b/extra/calendar/holidays/us/us.factor
@@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs calendar calendar.holidays
calendar.holidays.private combinators combinators.short-circuit
-fry kernel lexer math namespaces parser sequences shuffle
+fry kernel lexer math namespaces parser sequences
vocabs words ;
IN: calendar.holidays.us