Merge branch 'marshall' of git://github.com/jedahu/factor

db4
Slava Pestov 2009-07-24 18:08:52 -05:00
commit e664f44cfe
4 changed files with 7 additions and 7 deletions

View File

@ -65,7 +65,7 @@ PRIVATE>
concat make-function ; concat make-function ;
: define-c-library ( name -- ) : define-c-library ( name -- )
c-library-name c-library set c-library-name [ c-library set ] [ "c-library" set ] bi
V{ } clone c-strings set V{ } clone c-strings set
V{ } clone linker-args set ; V{ } clone linker-args set ;

View File

@ -95,6 +95,6 @@ HELP: DELETE-C-LIBRARY:
} }
{ $see-also POSTPONE: delete-inline-library } ; { $see-also POSTPONE: delete-inline-library } ;
HELP: RAW-C: HELP: <RAW-C
{ $syntax "RAW-C:" "body" ";" } { $syntax "<RAW-C code RAW-C>" }
{ $description "Insert a string into the generated source file. Useful for macros and other details not implemented in " { $snippet "alien.inline" } "." } ; { $description "Insert a (multiline) string into the generated source file. Useful for macros and other details not implemented in " { $snippet "alien.inline" } "." } ;

View File

@ -28,4 +28,4 @@ SYNTAX: ;C-LIBRARY compile-c-library ;
SYNTAX: DELETE-C-LIBRARY: scan delete-inline-library ; SYNTAX: DELETE-C-LIBRARY: scan delete-inline-library ;
SYNTAX: RAW-C: parse-here raw-c ; SYNTAX: <RAW-C "RAW-C>" parse-multiline-string raw-c ;

View File

@ -330,7 +330,7 @@ HELP: out-arg-unmarshaller
HELP: class-unmarshaller HELP: class-unmarshaller
{ $values { $values
{ "type" " a C type string" } { "type" " a C type string" }
{ "quot" quotation } { "quot/f" quotation }
} }
{ $description "If in the vocab in which this word is called, there is a subclass of " { $link alien-wrapper } { $description "If in the vocab in which this word is called, there is a subclass of " { $link alien-wrapper }
" named after the type argument, " { $snippet "pointer-unmarshaller" } " will return a quotation which " " named after the type argument, " { $snippet "pointer-unmarshaller" } " will return a quotation which "
@ -376,7 +376,7 @@ HELP: struct-primitive-unmarshaller
HELP: struct-unmarshaller HELP: struct-unmarshaller
{ $values { $values
{ "type" "a C type string" } { "type" "a C type string" }
{ "quot" quotation } { "quot/f" quotation }
} }
{ $description "Returns a quotation which wraps its argument in the subclass of " { $description "Returns a quotation which wraps its argument in the subclass of "
{ $link struct-wrapper } " which matches the " { $snippet "type" } " arg." { $link struct-wrapper } " which matches the " { $snippet "type" } " arg."