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

extra/alien/inline/inline.factor

@@ -65,7 +65,7 @@ PRIVATE>
     concat make-function ;
 
 : 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 linker-args set ;
 

extra/alien/inline/syntax/syntax-docs.factor

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

extra/alien/inline/syntax/syntax.factor

@@ -28,4 +28,4 @@ SYNTAX: ;C-LIBRARY compile-c-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 ;

extra/alien/marshall/marshall-docs.factor

@@ -330,7 +330,7 @@ HELP: out-arg-unmarshaller
 HELP: class-unmarshaller
 { $values
     { "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 }
     " named after the type argument, " { $snippet "pointer-unmarshaller" } " will return a quotation which "
@@ -376,7 +376,7 @@ HELP: struct-primitive-unmarshaller
 HELP: struct-unmarshaller
 { $values
     { "type" "a C type string" }
-    { "quot" quotation }
+    { "quot/f" quotation }
 }
 { $description "Returns a quotation which wraps its argument in the subclass of "
     { $link struct-wrapper } " which matches the " { $snippet "type" } " arg."