From 8d07e763d9271b506fca24032dbe59d1e494d213 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Thu, 2 Aug 2018 13:34:38 -0700 Subject: [PATCH 01/10] tools.hexdump: use re-decode. --- basis/tools/hexdump/hexdump.factor | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/basis/tools/hexdump/hexdump.factor b/basis/tools/hexdump/hexdump.factor index d1cdbb9f26..a5c4bec619 100644 --- a/basis/tools/hexdump/hexdump.factor +++ b/basis/tools/hexdump/hexdump.factor @@ -86,8 +86,7 @@ M: byte-vector hexdump. all-bytes underlying>> hexdump-bytes ; : hexdump-main ( -- ) command-line get [ - input-stream get dup decoder? [ stream>> ] when - hexdump-stream + input-stream get binary re-decode hexdump-stream ] [ [ hexdump-file ] each ] if-empty ; From 739fb5d94f827fbc2377faf08173ba5f43aa3d00 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 3 Aug 2018 10:38:42 -0400 Subject: [PATCH 02/10] alien.data: Make with-scoped-allocation an $unchecked-example because it's breaking travisci --- basis/alien/data/data-docs.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/alien/data/data-docs.factor b/basis/alien/data/data-docs.factor index 8d947d127d..736636baf8 100644 --- a/basis/alien/data/data-docs.factor +++ b/basis/alien/data/data-docs.factor @@ -74,7 +74,7 @@ $nl "If no initial value is specified, the contents of the allocated memory are undefined." } { $warning "Reading or writing a scoped allocation buffer outside of the given quotation will cause memory corruption." } { $examples - { $example + { $unchecked-example "USING: accessors alien.c-types alien.data classes.struct kernel math math.functions prettyprint ; From 62f672c84d59f3a49e3137597d468b0b2777034f Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 3 Aug 2018 10:39:30 -0400 Subject: [PATCH 03/10] editors.ui: merge the authors file hanging around on my local repo. --- basis/editors/ui/authors.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 basis/editors/ui/authors.txt diff --git a/basis/editors/ui/authors.txt b/basis/editors/ui/authors.txt new file mode 100644 index 0000000000..7c1b2f2279 --- /dev/null +++ b/basis/editors/ui/authors.txt @@ -0,0 +1 @@ +Doug Coleman From 6b97111735f2785c3bd4347b3dcafc7a9a7fa9aa Mon Sep 17 00:00:00 2001 From: Mohamed Akram Date: Sat, 4 Aug 2018 17:23:29 +0400 Subject: [PATCH 04/10] help.tutorial: fix unicode vocabulary path --- basis/help/tutorial/tutorial.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/help/tutorial/tutorial.factor b/basis/help/tutorial/tutorial.factor index 86e7969ee3..39ce381618 100644 --- a/basis/help/tutorial/tutorial.factor +++ b/basis/help/tutorial/tutorial.factor @@ -178,7 +178,7 @@ $nl "This code starts with a string on the stack, removes non-alphabetical characters, and converts the result to lower case, leaving a new string on the stack. We put this code in a new word, and add the new word to " { $snippet "palindrome.factor" } ":" { $code ": normalize ( string -- string' ) [ Letter? ] filter >lower ;" } $nl -"You will need to add " { $vocab-link "unicode.case" } " and " { $vocab-link "unicode.categories" } " to the vocabulary search path, so that " { $link >lower } " and " { $link Letter? } " can be used in the source file." +"You will need to add " { $vocab-link "unicode" } " to the vocabulary search path, so that " { $link >lower } " and " { $link Letter? } " can be used in the source file." $nl "We modify " { $snippet "palindrome?" } " to first apply " { $snippet "normalize" } " to its input:" { $code ": palindrome? ( string -- ? ) normalize dup reverse = ;" } From ab53893cfecd7b0b2c8eb98485a238d55fd744b1 Mon Sep 17 00:00:00 2001 From: Mohamed Akram Date: Sat, 4 Aug 2018 17:24:39 +0400 Subject: [PATCH 05/10] help.tutorial: use array for test output --- basis/help/tutorial/tutorial.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/help/tutorial/tutorial.factor b/basis/help/tutorial/tutorial.factor index 39ce381618..a3f260587b 100644 --- a/basis/help/tutorial/tutorial.factor +++ b/basis/help/tutorial/tutorial.factor @@ -132,7 +132,7 @@ $nl { $unchecked-example "\"A man, a plan, a canal: Panama.\" palindrome? ." "f" } $nl "We would like it to output " { $link t } " there. We can encode this requirement with a unit test that we add to " { $snippet "palindrome-tests.factor" } ":" -{ $code "[ t ] [ \"A man, a plan, a canal: Panama.\" palindrome? ] unit-test" } +{ $code "{ t } [ \"A man, a plan, a canal: Panama.\" palindrome? ] unit-test" } $nl "If you now run unit tests, you will see a unit test failure:" { $code "\"palindrome\" test" } From 679ada55a93a461cdf2957e737e298ac2b79604b Mon Sep 17 00:00:00 2001 From: Benjamin Pollack Date: Thu, 2 Aug 2018 14:37:55 -0400 Subject: [PATCH 06/10] .gitignore: sort ignores --- .gitignore | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 68df555f07..ff653586bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,33 +1,33 @@ -*~ -*.gch* -*.obj -*.o -*.s -*.exe -Factor/factor -*.a -*.dll -*.lib -*.exp -*.res -*.RES -*.image -factor.image.fresh -*.dylib -factor.com *#*# -.DS_Store -.gdb_history *.*.marks +*.RES +*.a +*.bak +*.dll +*.dylib +*.exe +*.exp +*.gch* +*.image +*.lib +*.o +*.obj +*.res +*.s +*.so +*~ +.#* .*.swm .*.swn .*.swo .*.swp +.DS_Store +.gdb_history +Factor.app/Contents/_CodeSignature +Factor/factor +a.out +checksums.txt +factor.com +factor.image.fresh logs work -*.bak -.#* -checksums.txt -*.so -a.out -Factor.app/Contents/_CodeSignature From 1ae6aab5bffe217430649953fc94c1ac421db38a Mon Sep 17 00:00:00 2001 From: Benjamin Pollack Date: Thu, 2 Aug 2018 14:39:37 -0400 Subject: [PATCH 07/10] .gitignore: ignore Unix and macOS binaries --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ff653586bb..63eab8596b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,8 +23,9 @@ .*.swp .DS_Store .gdb_history +/factor +Factor.app/Contents/MacOS/factor Factor.app/Contents/_CodeSignature -Factor/factor a.out checksums.txt factor.com From 75c6a2cd91f64471158957bad416117c534bd057 Mon Sep 17 00:00:00 2001 From: Benjamin Pollack Date: Thu, 2 Aug 2018 17:04:50 -0400 Subject: [PATCH 08/10] .gitignore: only ignore logs and work in root --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 63eab8596b..31b3fa2c1d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,11 +24,11 @@ .DS_Store .gdb_history /factor +/logs +/work Factor.app/Contents/MacOS/factor Factor.app/Contents/_CodeSignature a.out checksums.txt factor.com factor.image.fresh -logs -work From 228417848995def31ec9880bb8bbf6a115b114f7 Mon Sep 17 00:00:00 2001 From: Benjamin Pollack Date: Sun, 12 Aug 2018 11:11:55 -0400 Subject: [PATCH 09/10] furnance.auth: fix documentation The docs were attempting to reference the CouchDB auth provider, but that fails, because the help vocab didn't include furnance.auth.couchdb. Since the CouchDB auth vocab has some pretty serious caveats (see its docs), remove it entirely for now. Also fixes two minor typos in the furnace.auth.couchdb docs. --- basis/furnace/auth/auth-docs.factor | 1 - basis/furnace/auth/providers/couchdb/couchdb-docs.factor | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/basis/furnace/auth/auth-docs.factor b/basis/furnace/auth/auth-docs.factor index 45bcb8a0ec..58317ee29a 100644 --- a/basis/furnace/auth/auth-docs.factor +++ b/basis/furnace/auth/auth-docs.factor @@ -121,7 +121,6 @@ $nl "furnace.auth.providers.null" "furnace.auth.providers.assoc" "furnace.auth.providers.db" - "furnace.auth.providers.couchdb" } ; ARTICLE: "furnace.auth.features" "Optional authentication features" diff --git a/basis/furnace/auth/providers/couchdb/couchdb-docs.factor b/basis/furnace/auth/providers/couchdb/couchdb-docs.factor index ec967f29d9..7481b7ac93 100644 --- a/basis/furnace/auth/providers/couchdb/couchdb-docs.factor +++ b/basis/furnace/auth/providers/couchdb/couchdb-docs.factor @@ -25,12 +25,12 @@ HELP: couchdb-auth-provider ARTICLE: "furnace.auth.providers.couchdb" "CouchDB Authentication Provider" "The " { $vocab-link "furnace.auth.providers.couchdb" } " vocabulary implements an authentication provider " - "which looks up authentication requests in a CouchDB. It is necessary to create a view " + "which looks up authentication requests in CouchDB. It is necessary to create a view " "associating usernames with user documents before using this vocabulary; see documentation " "for " { $link couchdb-auth-provider } "." $nl "Although this implementation guarantees that users with duplicate IDs/emails" - " cannot be created in a single CouchDB database, it provides so such guarentee if you are clustering " + " cannot be created in a single CouchDB database, it provides no such guarantee if you are clustering " "multiple DBs. In this case, you are responsible for ensuring the uniqueness of users across " "databases." $nl From 3f19ade4d3059a218566f16fc8bc35c21a32b627 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 12 Aug 2018 17:47:08 -0500 Subject: [PATCH 10/10] webapps.help: All docs.factorcode.org traffic should go to https. Per request on irc. --- extra/webapps/help/help.factor | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extra/webapps/help/help.factor b/extra/webapps/help/help.factor index fd53988b93..dd7c17529c 100644 --- a/extra/webapps/help/help.factor +++ b/extra/webapps/help/help.factor @@ -37,10 +37,10 @@ TUPLE: help-webapp < dispatcher ; :: ( help-dir -- webapp ) help-webapp new-dispatcher - "" add-responder - help-dir "search" add-responder - help-dir "content" add-responder - "resource:basis/definitions/icons/" "icons" add-responder ; + "" add-responder + help-dir "search" add-responder + help-dir "content" add-responder + "resource:basis/definitions/icons/" "icons" add-responder ; : run-help-webapp ( -- ) "docs" cache-file