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

qualified: docs fix

db4
Bruno Deferrari 2008-04-12 19:09:46 -03:00
parent 7ef3109ff1
commit 2f4cec443c
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extra/qualified/qualified-docs.factor
View File

@ -15,31 +15,19 @@ HELP: QUALIFIED-WITH:
HELP: FROM: HELP: FROM:
{ $syntax "FROM: vocab => words ... ;" } { $syntax "FROM: vocab => words ... ;" }
<<<<<<< HEAD:extra/qualified/qualified-docs.factor
{ $description "Imports " { $snippet "words" } " from " { $snippet "vocab" } "." } { $description "Imports " { $snippet "words" } " from " { $snippet "vocab" } "." }
=======
{ $description "Imports the specified words from vocab." }
>>>>>>> 04e914c... qualified: fixing docs a bit.:extra/qualified/qualified-docs.factor
{ $examples { $code { $examples { $code
"FROM: math.parser => bin> hex> ; ! imports only bin> and hex>" } } ; "FROM: math.parser => bin> hex> ; ! imports only bin> and hex>" } } ;
HELP: EXCLUDE: HELP: EXCLUDE:
{ $syntax "EXCLUDE: vocab => words ... ;" } { $syntax "EXCLUDE: vocab => words ... ;" }
<<<<<<< HEAD:extra/qualified/qualified-docs.factor
{ $description "Imports everything from " { $snippet "vocab" } " excluding " { $snippet "words" } "." } { $description "Imports everything from " { $snippet "vocab" } " excluding " { $snippet "words" } "." }
=======
{ $description "Imports everything from vocab excluding the specified words" }
>>>>>>> 04e914c... qualified: fixing docs a bit.:extra/qualified/qualified-docs.factor
{ $examples { $code { $examples { $code
"EXCLUDE: math.parser => bin> hex> ; ! imports everythin but bin> and hex>" } } ; "EXCLUDE: math.parser => bin> hex> ; ! imports everythin but bin> and hex>" } } ;
HELP: RENAME: HELP: RENAME:
{ $syntax "RENAME: word vocab => newname " } { $syntax "RENAME: word vocab => newname " }
<<<<<<< HEAD:extra/qualified/qualified-docs.factor
{ $description "Imports " { $snippet "word" } " from " { $snippet "vocab" } ", but renamed to " { $snippet "newname" } "." } { $description "Imports " { $snippet "word" } " from " { $snippet "vocab" } ", but renamed to " { $snippet "newname" } "." }
=======
{ $description "Imports word from vocab, but renamed to newname." }
>>>>>>> 04e914c... qualified: fixing docs a bit.:extra/qualified/qualified-docs.factor
{ $examples { $code { $examples { $code
"RENAME: + math => -" "RENAME: + math => -"
"2 3 - ! => 5" } } ; "2 3 - ! => 5" } } ;