From 67f511bb580c93e684ce033876951cfe433306fb Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 10 Sep 2009 21:41:12 -0500 Subject: [PATCH 1/3] Load fixes --- basis/specialized-vectors/specialized-vectors.factor | 2 +- extra/benchmark/benchmark.factor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/specialized-vectors/specialized-vectors.factor b/basis/specialized-vectors/specialized-vectors.factor index dbadd7a74a..58fb97764b 100644 --- a/basis/specialized-vectors/specialized-vectors.factor +++ b/basis/specialized-vectors/specialized-vectors.factor @@ -3,7 +3,7 @@ USING: accessors alien.c-types assocs compiler.units functors growable kernel lexer namespaces parser prettyprint.custom sequences specialized-arrays specialized-arrays.private strings -vocabs vocabs.parser ; +vocabs vocabs.parser fry ; QUALIFIED: vectors.functor IN: specialized-vectors diff --git a/extra/benchmark/benchmark.factor b/extra/benchmark/benchmark.factor index b6e65f44cb..ee9285a0a8 100755 --- a/extra/benchmark/benchmark.factor +++ b/extra/benchmark/benchmark.factor @@ -19,7 +19,7 @@ PRIVATE> : record-benchmark ( vocab -- ) [ "=== " write print flush ] [ - [ [ require ] [ (run-benchmark) ] [ ] tri timings ] + [ [ require ] [ run-benchmark ] [ ] tri timings ] [ swap errors ] recover get set-at ] bi ; From a82c840e866dcb456cb993b508771bd03d30df13 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 11 Sep 2009 17:59:04 -0500 Subject: [PATCH 2/3] Doc fixes --- .../short-circuit/short-circuit-docs.factor | 16 ++++++++-------- basis/ui/gadgets/worlds/worlds-docs.factor | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/basis/combinators/short-circuit/short-circuit-docs.factor b/basis/combinators/short-circuit/short-circuit-docs.factor index db7056bd5a..5bd364e0e9 100644 --- a/basis/combinators/short-circuit/short-circuit-docs.factor +++ b/basis/combinators/short-circuit/short-circuit-docs.factor @@ -5,35 +5,35 @@ math kernel ; IN: combinators.short-circuit HELP: 0&& -{ $values { "quots" "a sequence of quotations with stack effect " { $snippet "( -- )" } } { "?" "the result of the last quotation, or " { $link f } } } +{ $values { "quots" "a sequence of quotations with stack effect " { $snippet "( -- ? )" } } { "?" "the result of the last quotation, or " { $link f } } } { $description "If every quotation in the sequence outputs a true value, outputs the result of the last quotation, otherwise outputs " { $link f } "." } ; HELP: 0|| -{ $values { "quots" "a sequence of quotations with stack effect " { $snippet "( -- )" } } { "?" "the first true result, or " { $link f } } } +{ $values { "quots" "a sequence of quotations with stack effect " { $snippet "( -- ? )" } } { "?" "the first true result, or " { $link f } } } { $description "If every quotation in the sequence outputs " { $link f } ", outputs " { $link f } ", otherwise outputs the result of the first quotation that did not yield " { $link f } "." } ; HELP: 1&& -{ $values { "obj" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj -- )" } } { "?" "the result of the last quotation, or " { $link f } } } +{ $values { "obj" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj -- ? )" } } { "?" "the result of the last quotation, or " { $link f } } } { $description "If every quotation in the sequence outputs a true value, outputs the result of the last quotation, otherwise outputs " { $link f } "." } ; HELP: 1|| -{ $values { "obj" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj -- )" } } { "?" "the first true result, or " { $link f } } } +{ $values { "obj" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj -- ? )" } } { "?" "the first true result, or " { $link f } } } { $description "Returns true if any quotation in the sequence returns true. Each quotation takes the same element from the datastack and must return a boolean." } ; HELP: 2&& -{ $values { "obj1" object } { "obj2" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj1 obj2 -- )" } } { "?" "the result of the last quotation, or " { $link f } } } +{ $values { "obj1" object } { "obj2" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj1 obj2 -- ? )" } } { "?" "the result of the last quotation, or " { $link f } } } { $description "If every quotation in the sequence outputs a true value, outputs the result of the last quotation, otherwise outputs " { $link f } "." } ; HELP: 2|| -{ $values { "obj1" object } { "obj2" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj1 obj2 -- )" } } { "?" "the first true result, or " { $link f } } } +{ $values { "obj1" object } { "obj2" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj1 obj2 -- ? )" } } { "?" "the first true result, or " { $link f } } } { $description "Returns true if any quotation in the sequence returns true. Each quotation takes the same two elements from the datastack and must return a boolean." } ; HELP: 3&& -{ $values { "obj1" object } { "obj2" object } { "obj3" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj1 obj2 obj3 -- )" } } { "?" "the result of the last quotation, or " { $link f } } } +{ $values { "obj1" object } { "obj2" object } { "obj3" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj1 obj2 obj3 -- ? )" } } { "?" "the result of the last quotation, or " { $link f } } } { $description "If every quotation in the sequence outputs a true value, outputs the result of the last quotation, otherwise outputs " { $link f } "." } ; HELP: 3|| -{ $values { "obj1" object } { "obj2" object } { "obj3" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj1 obj2 obj3 -- )" } } { "?" "the first true result, or " { $link f } } } +{ $values { "obj1" object } { "obj2" object } { "obj3" object } { "quots" "a sequence of quotations with stack effect " { $snippet "( obj1 obj2 obj3 -- ? )" } } { "?" "the first true result, or " { $link f } } } { $description "Returns true if any quotation in the sequence returns true. Each quotation takes the same three elements from the datastack and must return a boolean." } ; HELP: n&& diff --git a/basis/ui/gadgets/worlds/worlds-docs.factor b/basis/ui/gadgets/worlds/worlds-docs.factor index fe662b898c..7359ac82d3 100755 --- a/basis/ui/gadgets/worlds/worlds-docs.factor +++ b/basis/ui/gadgets/worlds/worlds-docs.factor @@ -26,8 +26,7 @@ HELP: ungrab-input HELP: set-title { $values { "string" string } { "world" world } } -{ $description "Sets the title bar of the native window containing the world." } -{ $notes "This word should not be called directly by user code. Instead, change the " { $snippet "title" } " slot model; see " { $link "models" } "." } ; +{ $description "Sets the title bar of the native window containing the world." } ; HELP: set-gl-context { $values { "world" world } } From 9dfa6f12f773fbdf8634eef6d25678c157e7b9c3 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 11 Sep 2009 18:16:28 -0500 Subject: [PATCH 3/3] definitions.icons: add icons for authors and tags, fixing bug reported by tsculpt --- basis/definitions/icons/icons.factor | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/basis/definitions/icons/icons.factor b/basis/definitions/icons/icons.factor index 7562658ea4..ca1c8a8fe0 100644 --- a/basis/definitions/icons/icons.factor +++ b/basis/definitions/icons/icons.factor @@ -2,7 +2,8 @@ ! See http://factorcode.org/license.txt for BSD license. USING: assocs classes.predicate fry generic io.pathnames kernel macros sequences vocabs words words.symbol words.constant -lexer parser help.topics help.markup namespaces sorting ; +lexer parser help.topics help.markup help.vocabs namespaces +sorting ; IN: definitions.icons GENERIC: definition-icon ( definition -- path ) @@ -40,6 +41,8 @@ ICON: word-link word-help-article ICON: link help-article ICON: runnable-vocab runnable-vocab ICON: vocab open-vocab +ICON: vocab-tag help-article +ICON: vocab-author help-article ICON: vocab-link unopen-vocab : $definition-icons ( element -- )