steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2009-03-28 04:29:14 -05:00
parent cc80a51808 946cda03b5
commit a7255e433d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/syntax/syntax-docs.factor
View File

@ -556,12 +556,12 @@ HELP: BIN:
{ $examples { $example "USE: prettyprint" "BIN: 100 ." "4" } } ; { $examples { $example "USE: prettyprint" "BIN: 100 ." "4" } } ;
HELP: GENERIC: HELP: GENERIC:
{ $syntax "GENERIC: word" "GENERIC: word ( stack -- effect )" } { $syntax "GENERIC: word ( stack -- effect )" }
{ $values { "word" "a new word to define" } } { $values { "word" "a new word to define" } }
{ $description "Defines a new generic word in the current vocabulary. Initially, it contains no methods, and thus will throw a " { $link no-method } " error when called." } ; { $description "Defines a new generic word in the current vocabulary. Initially, it contains no methods, and thus will throw a " { $link no-method } " error when called." } ;
HELP: GENERIC# HELP: GENERIC#
{ $syntax "GENERIC# word n" "GENERIC# word n ( stack -- effect )" } { $syntax "GENERIC# word n ( stack -- effect )" }
{ $values { "word" "a new word to define" } { "n" "the stack position to dispatch on" } } { $values { "word" "a new word to define" } { "n" "the stack position to dispatch on" } }
{ $description "Defines a new generic word which dispatches on the " { $snippet "n" } "th most element from the top of the stack in the current vocabulary. Initially, it contains no methods, and thus will throw a " { $link no-method } " error when called." } { $description "Defines a new generic word which dispatches on the " { $snippet "n" } "th most element from the top of the stack in the current vocabulary. Initially, it contains no methods, and thus will throw a " { $link no-method } " error when called." }
{ $notes { $notes
@ -576,7 +576,7 @@ HELP: MATH:
{ $description "Defines a new generic word which uses the " { $link math-combination } " method combination." } ; { $description "Defines a new generic word which uses the " { $link math-combination } " method combination." } ;
HELP: HOOK: HELP: HOOK:
{ $syntax "HOOK: word variable" "HOOK: word variable ( stack -- effect ) " } { $syntax "HOOK: word variable ( stack -- effect ) " }
{ $values { "word" "a new word to define" } { "variable" word } } { $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 POSTPONE: M: } ". Hook words differ from other generic words in that the dispatch value is removed from the stack before the chosen method is called." } { $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 POSTPONE: 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 { $examples

4
extra/webapps/wiki/wiki-common.xml
View File

@ -20,7 +20,7 @@
</t:a> </t:a>
</h2> </h2>
<t:farkup t:name="parsed" t:parsed="true" /> <t:farkup t:name="content" />
</t:bind> </t:bind>
</div> </div>
</td> </td>
@ -58,7 +58,7 @@
<tr> <tr>
<td colspan="2" class="footer"> <td colspan="2" class="footer">
<t:bind t:name="footer"> <t:bind t:name="footer">
<t:farkup t:name="parsed" t:parsed="true" /> <t:farkup t:name="content" />
</t:bind> </t:bind>
</td> </td>
</tr> </tr>