diff --git a/core/combinators/combinators-docs.factor b/core/combinators/combinators-docs.factor index 681a630d28..1b079ecae9 100644 --- a/core/combinators/combinators-docs.factor +++ b/core/combinators/combinators-docs.factor @@ -119,7 +119,7 @@ $nl "Quotations also implement the sequence protocol, and can be manipulated with sequence words; see " { $link "quotations" } ". However, such runtime quotation manipulation will not be optimized by the optimizing compiler." ; ARTICLE: "booleans" "Booleans" -"In Factor, any object that is not " { $link f } " has a true value, and " { $link f } " has a false value. The " { $link t } " object is the canonical true value." +"In Factor, any object that is not " { $link postpone\ f } " has a true value, and " { $link postpone\ f } " has a false value. The " { $link t } " object is the canonical true value." { $subsections f t } "A union class of the above:" { $subsections boolean } @@ -133,25 +133,25 @@ ARTICLE: "booleans" "Booleans" } "Boolean values are most frequently used for " { $link "conditionals" } "." { $heading "The f object and f class" } -"The " { $link f } " object is the unique instance of the " { $link f } " class; the two are distinct objects. The latter is also a parsing word which adds the " { $link f } " object to the parse tree at parse time. To refer to the class itself you must use " { $link postpone\ postpone\ } " or " { $link postpone\ \ } " to prevent the parsing word from executing." +"The " { $link postpone\ f } " object is the unique instance of the " { $link postpone\ f } " class; the two are distinct objects. The latter is also a parsing word which adds the " { $link postpone\ f } " object to the parse tree at parse time. To refer to the class itself you must use " { $link \ postpone\ } " or " { $link \ \ } " to prevent the parsing word from executing." $nl -"Here is the " { $link f } " object:" +"Here is the " { $link \ f } " object:" { $example "f ." "f" } -"Here is the " { $link f } " class:" -{ $example "\\ f ." "postpone\ f" } +"Here is the " { $link \ f } " class:" +{ $example "\\ f ." "postpone\\ f" } "They are not equal:" { $example "f \\ f = ." "f" } -"Here is an array containing the " { $link f } " object:" +"Here is an array containing the " { $link \ f } " object:" { $example "{ f } ." "{ f }" } -"Here is an array containing the " { $link f } " class:" -{ $example "{ postpone\ f } ." "{ postpone\ f }" } -"The " { $link f } " object is an instance of the " { $link f } " class:" -{ $example "USE: classes" "f class-of ." "postpone\ f" } -"The " { $link f } " class is an instance of " { $link word } ":" +"Here is an array containing the " { $link \ f } " class:" +{ $example "{ postpone\\ f } ." "{ postpone\\ f }" } +"The " { $link postpone\ f } " object is an instance of the " { $link postpone\ f } " class:" +{ $example "USE: classes" "f class-of ." "postpone\\ f" } +"The " { $link postpone\ f } " class is an instance of " { $link word } ":" { $example "USE: classes" "\\ f class-of ." "word" } "On the other hand, " { $link t } " is just a word, and there is no class which it is a unique instance of." { $example "t \\ t eq? ." "t" } -"Many words which search collections confuse the case of no element being present with an element being found equal to " { $link f } ". If this distinction is important, there is usually an alternative word which can be used; for example, compare " { $link at } " with " { $link at* } "." ; +"Many words which search collections confuse the case of no element being present with an element being found equal to " { $link postpone\ f } ". If this distinction is important, there is usually an alternative word which can be used; for example, compare " { $link at } " with " { $link at* } "." ; ARTICLE: "conditionals-boolean-equivalence" "Expressing conditionals with boolean logic" "Certain simple conditional forms can be expressed in a simpler manner using boolean logic." diff --git a/core/grouping/grouping-docs.factor b/core/grouping/grouping-docs.factor index 51ce48c5f1..91e1f34362 100644 --- a/core/grouping/grouping-docs.factor +++ b/core/grouping/grouping-docs.factor @@ -134,7 +134,7 @@ HELP: { $example "USING: grouping sequences math prettyprint kernel ;" "IN: scratchpad" - "CONSTANT: share-price { 13/50 51/100 13/50 1/10 4/5 17/20 33/50 3/25 19/100 3/100 }" + "CONSTANT: share-price { 13/50 51/100 13/50 1/10 4/5 17/20 33/50 3/25 19/100 3/100 } ;" "" "share-price 4 [ [ sum ] [ length ] bi / ] map ." "{ 113/400 167/400 201/400 241/400 243/400 91/200 1/4 }" diff --git a/core/kernel/kernel-docs.factor b/core/kernel/kernel-docs.factor index dca0d2dfce..ab67463d6f 100644 --- a/core/kernel/kernel-docs.factor +++ b/core/kernel/kernel-docs.factor @@ -638,7 +638,7 @@ $nl " \"San Francisco\"" " \"Los Angeles\"" " \"New York\"" - "}" + "} ;" "" ": add-tax ( price city -- price' )" " american-cities member? [ 1.1 * ] unless ;" diff --git a/core/syntax/syntax-docs.factor b/core/syntax/syntax-docs.factor index a80bd5f54e..893c3fb898 100644 --- a/core/syntax/syntax-docs.factor +++ b/core/syntax/syntax-docs.factor @@ -469,13 +469,13 @@ HELP: \ SINGLETONS: { $description "Creates a new singleton for every token until the " { $snippet ";" } "." } ; HELP: \ ALIAS: -{ $syntax "ALIAS: new-word existing-word" } +{ $syntax "ALIAS: new-word existing-word ;" } { $values { "new-word" word } { "existing-word" word } } { $description "Creates a new inlined word that calls the existing word." } { $examples { $example "USING: prettyprint sequences ;" "IN: alias.test" - "ALIAS: sequence-nth nth" + "ALIAS: sequence-nth nth ;" "0 { 10 20 30 } sequence-nth ." "10" } @@ -685,7 +685,7 @@ HELP: \ MATH: { $description "Defines a new generic word which uses the " { $link math-combination } " method combination." } ; HELP: \ HOOK: -{ $syntax "HOOK: word variable ( stack -- effect )" } +{ $syntax "HOOK: word variable ( stack -- effect ) ;" } { $values { "word" "a new word to define" } { "variable" word } } { $description "Defines a new hook word in the current vocabulary. Hook words are generic words which dispatch on the value of a variable, so methods are defined with " { $link \ M: } ". Hook words differ from other generic words in that the dispatch value is removed from the stack before the chosen method is called." } { $examples @@ -695,7 +695,7 @@ HELP: \ HOOK: "SYMBOL: transport" "TUPLE: land-transport ;" "TUPLE: air-transport ;" - "HOOK: deliver transport ( destination -- )" + "HOOK: deliver transport ( destination -- ) ;" "M: land-transport deliver \"Land delivery to \" write print ;" "M: air-transport deliver \"Air delivery to \" write print ;" "T{ air-transport } transport set" diff --git a/language/compiler/cfg/stacks/local/local-docs.factor b/language/compiler/cfg/stacks/local/local-docs.factor index d9d00b0e8b..7bab762303 100644 --- a/language/compiler/cfg/stacks/local/local-docs.factor +++ b/language/compiler/cfg/stacks/local/local-docs.factor @@ -62,8 +62,8 @@ HELP: translate-local-loc { $examples { $example "USING: compiler.cfg.stacks.local compiler.cfg.registers compiler.cfg.debugger namespaces prettyprint ;" - "D: 7 { { 3 0 } { 0 0 } } translate-local-loc ." - "D: 4" + "d: 7 { { 3 0 } { 0 0 } } translate-local-loc ." + "d: 4" } } { $see-also height-state } ; diff --git a/language/vocabs/files/files-docs.factor b/language/vocabs/files/files-docs.factor index 1009937662..9d8e5cbf6d 100644 --- a/language/vocabs/files/files-docs.factor +++ b/language/vocabs/files/files-docs.factor @@ -23,9 +23,9 @@ HELP: vocab-files $[ { "{" - " \"resource:core/alien/libraries/libraries.factor\"" - " \"resource:core/alien/libraries/libraries-docs.factor\"" - " \"resource:core/alien/libraries/libraries-tests.factor\"" + " \"vocab:alien/libraries/libraries.factor\"" + " \"vocab:alien/libraries/libraries-docs.factor\"" + " \"vocab:alien/libraries/libraries-tests.factor\"" "}" } "\n" join ] @@ -42,15 +42,15 @@ HELP: vocab-tests $[ { "{" - " \"resource:basis/xml/tests/cdata.factor\"" - " \"resource:basis/xml/tests/encodings.factor\"" - " \"resource:basis/xml/tests/funny-dtd.factor\"" - " \"resource:basis/xml/tests/soap.factor\"" - " \"resource:basis/xml/tests/state-parser-tests.factor\"" - " \"resource:basis/xml/tests/templating.factor\"" - " \"resource:basis/xml/tests/test.factor\"" - " \"resource:basis/xml/tests/xmltest.factor\"" - " \"resource:basis/xml/tests/xmode-dtd.factor\"" + " \"vocab:xml/tests/cdata.factor\"" + " \"vocab:xml/tests/encodings.factor\"" + " \"vocab:xml/tests/funny-dtd.factor\"" + " \"vocab:xml/tests/soap.factor\"" + " \"vocab:xml/tests/state-parser-tests.factor\"" + " \"vocab:xml/tests/templating.factor\"" + " \"vocab:xml/tests/test.factor\"" + " \"vocab:xml/tests/xmltest.factor\"" + " \"vocab:xml/tests/xmode-dtd.factor\"" "}" } "\n" join ] diff --git a/libs/math/bitwise/bitwise-docs.factor b/libs/math/bitwise/bitwise-docs.factor index 0b572ee1cf..a5c1aa5464 100644 --- a/libs/math/bitwise/bitwise-docs.factor +++ b/libs/math/bitwise/bitwise-docs.factor @@ -136,7 +136,7 @@ HELP: symbols>flags " { resize-handles 8 }" " { small-title-bar 16 }" " { normal-title-bar 32 }" - "}" + "} ;" "{ resize-handles close-button small-title-bar } window-controls>flags symbols>flags ." "25" }