From 097dad070ae9000067324fe31889830f87534aeb Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 14 Jan 2008 11:42:21 -1000 Subject: [PATCH] minor tweaks to make these modules load with load-everything --- extra/channels/channels-docs.factor | 2 +- extra/channels/remote/remote-docs.factor | 4 ++-- extra/channels/sniffer/backend/backend.factor | 3 +++ extra/channels/sniffer/bsd/bsd.factor | 5 +++-- extra/channels/sniffer/sniffer.factor | 4 +--- extra/coroutines/coroutines-docs.factor | 5 +++-- extra/cryptlib/libcl/libcl.factor | 7 ++----- extra/crypto/md5/md5-docs.factor | 3 ++- extra/hardware-info/backend/backend.factor | 14 +++++++++++++ extra/hardware-info/hardware-info.factor | 21 +++++-------------- extra/hardware-info/macosx/macosx.factor | 2 +- extra/hardware-info/windows/ce/ce.factor | 5 ++--- extra/hardware-info/windows/nt/nt.factor | 2 +- extra/hardware-info/windows/windows.factor | 9 ++++---- extra/html/parser/utils/utils.factor | 1 - .../basic-authentication-docs.factor | 5 +++-- extra/id3/id3-docs.factor | 3 ++- extra/inverse/inverse-docs.factor | 3 ++- extra/inverse/inverse.factor | 4 +++- extra/io/sniffer/backend/backend.factor | 6 ++++++ extra/io/sniffer/bsd/bsd.factor | 4 ++-- .../io/sniffer/filter/backend/backend.factor | 17 +++++++++++++++ extra/io/sniffer/filter/bsd/bsd.factor | 5 +++-- extra/io/sniffer/filter/filter.factor | 15 ++----------- extra/io/sniffer/sniffer.factor | 6 ------ extra/jamshred/game/game.factor | 2 +- extra/jamshred/player/player.factor | 2 +- extra/json/reader/reader-docs.factor | 5 +++-- extra/json/writer/writer-docs.factor | 3 ++- extra/json/writer/writer.factor | 2 +- extra/lisp/listener/listener.factor | 4 ++-- extra/mad/mad.factor | 7 ++----- .../simple/simple-docs.factor | 4 ++-- extra/xml-rpc/xml-rpc-docs.factor | 3 ++- 34 files changed, 101 insertions(+), 86 deletions(-) create mode 100644 extra/channels/sniffer/backend/backend.factor create mode 100644 extra/hardware-info/backend/backend.factor create mode 100644 extra/io/sniffer/backend/backend.factor create mode 100644 extra/io/sniffer/filter/backend/backend.factor diff --git a/extra/channels/channels-docs.factor b/extra/channels/channels-docs.factor index 8487d59e7f..521a4a4ae2 100644 --- a/extra/channels/channels-docs.factor +++ b/extra/channels/channels-docs.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2007 Chris Double. ! See http://factorcode.org/license.txt for BSD license. -USING: help.syntax help.markup channels ; +USING: help.syntax help.markup ; IN: channels HELP: diff --git a/extra/channels/remote/remote-docs.factor b/extra/channels/remote/remote-docs.factor index 5400f147f4..862084e1d9 100644 --- a/extra/channels/remote/remote-docs.factor +++ b/extra/channels/remote/remote-docs.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2007 Chris Double. ! See http://factorcode.org/license.txt for BSD license. -USING: help.syntax help.markup channels channels.remote concurrency.distributed ; +USING: help.syntax help.markup channels concurrency.distributed ; IN: channels.remote HELP: @@ -59,4 +59,4 @@ $nl { $snippet "\"myhost.com\" 9001 \"ID123456\" \n\"hello\" over to" } ; -ABOUT: { "remote-channels" "remote-channels" } \ No newline at end of file +ABOUT: { "remote-channels" "remote-channels" } diff --git a/extra/channels/sniffer/backend/backend.factor b/extra/channels/sniffer/backend/backend.factor new file mode 100644 index 0000000000..c7c2e420cb --- /dev/null +++ b/extra/channels/sniffer/backend/backend.factor @@ -0,0 +1,3 @@ +USING: io.backend ; + +HOOK: sniff-channel io-backend ( -- channel ) diff --git a/extra/channels/sniffer/bsd/bsd.factor b/extra/channels/sniffer/bsd/bsd.factor index ba8e5ceeb9..0ba267bb03 100644 --- a/extra/channels/sniffer/bsd/bsd.factor +++ b/extra/channels/sniffer/bsd/bsd.factor @@ -2,8 +2,9 @@ ! See http://factorcode.org/license.txt for BSD license. ! ! Wrap a sniffer in a channel -USING: kernel channels channels.sniffer concurrency io -io.sniffer io.sniffer.bsd io.unix.backend ; +USING: kernel channels channels.sniffer.backend concurrency io +io.sniffer.backend io.sniffer.bsd io.unix.backend ; +IN: channels.sniffer.bsd M: unix-io sniff-channel ( -- channel ) "/dev/bpf0" "en1" [ diff --git a/extra/channels/sniffer/sniffer.factor b/extra/channels/sniffer/sniffer.factor index 8edd035cca..1502201225 100755 --- a/extra/channels/sniffer/sniffer.factor +++ b/extra/channels/sniffer/sniffer.factor @@ -3,11 +3,9 @@ ! ! Wrap a sniffer in a channel USING: kernel channels concurrency io io.backend -io.sniffer system vocabs.loader ; +io.sniffer io.sniffer.backend system vocabs.loader ; : (sniff-channel) ( stream channel -- ) 4096 pick stream-read-partial over to (sniff-channel) ; -HOOK: sniff-channel io-backend ( -- channel ) - bsd? [ "channels.sniffer.bsd" require ] when diff --git a/extra/coroutines/coroutines-docs.factor b/extra/coroutines/coroutines-docs.factor index ed3788db48..327c60e017 100644 --- a/extra/coroutines/coroutines-docs.factor +++ b/extra/coroutines/coroutines-docs.factor @@ -1,5 +1,6 @@ ! Copyright (C) 2005 Chris Double, 2007 Clemens Hofreither. -USING: help.markup help.syntax coroutines ; +USING: help.markup help.syntax ; +IN: coroutines HELP: cocreate { $values { "quot" "a quotation with stack effect ( value -- )" } { "co" "a coroutine" } } @@ -51,4 +52,4 @@ HELP: coterminate HELP: current-coro { $description "Variable which contains the currently executing coroutine, or " { $link f } " if none is executing. User code should treat this variable as read-only." } { $see-also cocreate coresume coyield } -; \ No newline at end of file +; diff --git a/extra/cryptlib/libcl/libcl.factor b/extra/cryptlib/libcl/libcl.factor index 3cc0d50095..38e6817f6c 100644 --- a/extra/cryptlib/libcl/libcl.factor +++ b/extra/cryptlib/libcl/libcl.factor @@ -12,14 +12,11 @@ USING: alien kernel system combinators alien.syntax ; IN: cryptlib.libcl -: load-libcl ( -- ) - "libcl" { +<< "libcl" { { [ win32? ] [ "cl32.dll" "stdcall" ] } { [ macosx? ] [ "libcl.dylib" "cdecl" ] } { [ unix? ] [ "libcl.so" "cdecl" ] } - } cond add-library ; parsing - -load-libcl + } cond add-library >> ! =============================================== ! Machine-dependant types diff --git a/extra/crypto/md5/md5-docs.factor b/extra/crypto/md5/md5-docs.factor index 53c737554b..fd8bf3f74d 100644 --- a/extra/crypto/md5/md5-docs.factor +++ b/extra/crypto/md5/md5-docs.factor @@ -1,5 +1,6 @@ USING: help.markup help.syntax kernel math sequences quotations -crypto.common crypto.md5 ; +crypto.common ; +IN: crypto.md5 HELP: stream>md5 { $values { "stream" "a stream" } { "byte-array" "md5 hash" } } diff --git a/extra/hardware-info/backend/backend.factor b/extra/hardware-info/backend/backend.factor new file mode 100644 index 0000000000..d79678de0c --- /dev/null +++ b/extra/hardware-info/backend/backend.factor @@ -0,0 +1,14 @@ +IN: hardware-info.backend + +SYMBOL: os +HOOK: cpus os ( -- n ) + +HOOK: memory-load os ( -- n ) +HOOK: physical-mem os ( -- n ) +HOOK: available-mem os ( -- n ) +HOOK: total-page-file os ( -- n ) +HOOK: available-page-file os ( -- n ) +HOOK: total-virtual-mem os ( -- n ) +HOOK: available-virtual-mem os ( -- n ) +HOOK: available-virtual-extended-mem os ( -- n ) + diff --git a/extra/hardware-info/hardware-info.factor b/extra/hardware-info/hardware-info.factor index 9b3c969dc3..0515646a5f 100755 --- a/extra/hardware-info/hardware-info.factor +++ b/extra/hardware-info/hardware-info.factor @@ -1,26 +1,15 @@ -USING: alien.syntax math prettyprint system combinators -vocabs.loader ; +USING: alien.syntax kernel math prettyprint system +combinators vocabs.loader hardware-info.backend ; IN: hardware-info -SYMBOL: os -HOOK: cpus os ( -- n ) - -HOOK: memory-load os ( -- n ) -HOOK: physical-mem os ( -- n ) -HOOK: available-mem os ( -- n ) -HOOK: total-page-file os ( -- n ) -HOOK: available-page-file os ( -- n ) -HOOK: total-virtual-mem os ( -- n ) -HOOK: available-virtual-mem os ( -- n ) -HOOK: available-virtual-extended-mem os ( -- n ) - : kb. ( x -- ) 10 2^ /f . ; : megs. ( x -- ) 20 2^ /f . ; : gigs. ( x -- ) 30 2^ /f . ; -{ +<< { { [ windows? ] [ "hardware-info.windows" ] } { [ linux? ] [ "hardware-info.linux" ] } { [ macosx? ] [ "hardware-info.macosx" ] } -} cond require + { [ t ] [ f ] } +} cond [ require ] when* >> diff --git a/extra/hardware-info/macosx/macosx.factor b/extra/hardware-info/macosx/macosx.factor index ad3060944e..c246a95186 100644 --- a/extra/hardware-info/macosx/macosx.factor +++ b/extra/hardware-info/macosx/macosx.factor @@ -1,5 +1,5 @@ USING: alien alien.c-types alien.syntax byte-arrays kernel -namespaces sequences unix hardware-info ; +namespaces sequences unix hardware-info.backend ; IN: hardware-info.macosx TUPLE: macosx ; diff --git a/extra/hardware-info/windows/ce/ce.factor b/extra/hardware-info/windows/ce/ce.factor index 42fd9e5343..9fb15ef823 100644 --- a/extra/hardware-info/windows/ce/ce.factor +++ b/extra/hardware-info/windows/ce/ce.factor @@ -1,5 +1,6 @@ USING: alien.c-types hardware-info hardware-info.windows -kernel math namespaces windows windows.kernel32 ; +kernel math namespaces windows windows.kernel32 +hardware-info.backend ; IN: hardware-info.windows.ce T{ wince } os set-global @@ -29,5 +30,3 @@ M: wince total-virtual-mem ( -- n ) M: wince available-virtual-mem ( -- n ) memory-status MEMORYSTATUS-dwAvailVirtual ; - - diff --git a/extra/hardware-info/windows/nt/nt.factor b/extra/hardware-info/windows/nt/nt.factor index 2b2522e6ee..f412754cdf 100644 --- a/extra/hardware-info/windows/nt/nt.factor +++ b/extra/hardware-info/windows/nt/nt.factor @@ -1,5 +1,5 @@ USING: alien alien.c-types hardware-info hardware-info.windows -kernel libc math namespaces +kernel libc math namespaces hardware-info.backend windows windows.advapi32 windows.kernel32 ; IN: hardware-info.windows.nt diff --git a/extra/hardware-info/windows/windows.factor b/extra/hardware-info/windows/windows.factor index 5352d64698..a49e4f254a 100755 --- a/extra/hardware-info/windows/windows.factor +++ b/extra/hardware-info/windows/windows.factor @@ -1,6 +1,6 @@ USING: alien alien.c-types kernel libc math namespaces -windows windows.kernel32 windows.advapi32 hardware-info -words combinators vocabs.loader ; +windows windows.kernel32 windows.advapi32 +words combinators vocabs.loader hardware-info.backend ; IN: hardware-info.windows TUPLE: wince ; @@ -70,7 +70,8 @@ M: windows cpus ( -- n ) : system-windows-directory ( -- str ) \ GetSystemWindowsDirectory get-directory ; -{ +<< { { [ wince? ] [ "hardware-info.windows.ce" ] } { [ winnt? ] [ "hardware-info.windows.nt" ] } -} cond require + { [ t ] [ f ] } +} cond [ require ] when* >> diff --git a/extra/html/parser/utils/utils.factor b/extra/html/parser/utils/utils.factor index febd1716ed..b574799b38 100644 --- a/extra/html/parser/utils/utils.factor +++ b/extra/html/parser/utils/utils.factor @@ -2,7 +2,6 @@ USING: assocs circular combinators continuations hashtables hashtables.private io kernel math namespaces prettyprint quotations sequences splitting state-parser strings ; -USING: html.parser ; IN: html.parser.utils : string-parse-end? diff --git a/extra/http/basic-authentication/basic-authentication-docs.factor b/extra/http/basic-authentication/basic-authentication-docs.factor index 9add842db6..68d6e6bf1d 100644 --- a/extra/http/basic-authentication/basic-authentication-docs.factor +++ b/extra/http/basic-authentication/basic-authentication-docs.factor @@ -1,6 +1,7 @@ ! Copyright (C) 2007 Chris Double. ! See http://factorcode.org/license.txt for BSD license. -USING: help.markup help.syntax http.basic-authentication crypto.sha2 ; +USING: help.markup help.syntax crypto.sha2 ; +IN: http.basic-authentication HELP: realms { $description @@ -65,4 +66,4 @@ $nl "it is best to use Basic Authentication with SSL." ; IN: http.basic-authentication -ABOUT: { "http-authentication" "basic-authentication" } \ No newline at end of file +ABOUT: { "http-authentication" "basic-authentication" } diff --git a/extra/id3/id3-docs.factor b/extra/id3/id3-docs.factor index 47edee7437..8083514c0d 100644 --- a/extra/id3/id3-docs.factor +++ b/extra/id3/id3-docs.factor @@ -1,6 +1,7 @@ ! Coyright (C) 2007 Adam Wendt ! See http://factorcode.org/license.txt for BSD license. -USING: id3 help.syntax help.markup ; +USING: help.syntax help.markup ; +IN: id3 ARTICLE: "id3-tags" "ID3 Tags" "The " { $vocab-link "id3" } " vocabulary is used to read ID3 tags from MP3 audio streams." diff --git a/extra/inverse/inverse-docs.factor b/extra/inverse/inverse-docs.factor index f8ae3bfbdb..8204f7174c 100644 --- a/extra/inverse/inverse-docs.factor +++ b/extra/inverse/inverse-docs.factor @@ -1,4 +1,5 @@ -USING: inverse help.syntax help.markup ; +USING: help.syntax help.markup ; +IN: inverse HELP: [undo] { $values { "quot" "a quotation" } { "undo" "the inverse of the quotation" } } diff --git a/extra/inverse/inverse.factor b/extra/inverse/inverse.factor index cade645dde..b97748514c 100644 --- a/extra/inverse/inverse.factor +++ b/extra/inverse/inverse.factor @@ -63,7 +63,9 @@ UNION: explicit-inverse normal-inverse math-inverse pop-inverse ; { { [ dup word? not over symbol? or ] [ , ] } { [ dup explicit-inverse? ] [ , ] } - { [ dup compound? over { if dispatch } member? not and ] + ! { [ dup compound? over { if dispatch } member? not and ] + ! [ word-def [ inline-word ] each ] } + { [ dup word? over { if dispatch } member? not and ] [ word-def [ inline-word ] each ] } { [ drop t ] [ "Quotation is not invertible" throw ] } } cond ; diff --git a/extra/io/sniffer/backend/backend.factor b/extra/io/sniffer/backend/backend.factor new file mode 100644 index 0000000000..53bf37a290 --- /dev/null +++ b/extra/io/sniffer/backend/backend.factor @@ -0,0 +1,6 @@ +USING: io.backend kernel system vocabs.loader ; +IN: io.sniffer.backend + +SYMBOL: sniffer-type +TUPLE: sniffer ; +HOOK: io-backend ( obj -- sniffer ) diff --git a/extra/io/sniffer/bsd/bsd.factor b/extra/io/sniffer/bsd/bsd.factor index 91266b7be3..6a0d092807 100644 --- a/extra/io/sniffer/bsd/bsd.factor +++ b/extra/io/sniffer/bsd/bsd.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2007 Elie Chaftari, Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: alien.c-types alien.syntax destructors hexdump io -io.buffers io.nonblocking io.sniffer io.sockets io.streams.lines +io.buffers io.nonblocking io.sockets io.streams.lines io.unix.backend io.unix.files kernel libc locals math qualified -sequences ; +sequences io.sniffer.backend ; QUALIFIED: unix IN: io.sniffer.bsd diff --git a/extra/io/sniffer/filter/backend/backend.factor b/extra/io/sniffer/filter/backend/backend.factor new file mode 100644 index 0000000000..dade8bdebf --- /dev/null +++ b/extra/io/sniffer/filter/backend/backend.factor @@ -0,0 +1,17 @@ +USING: byte-arrays combinators io io.backend +io.sockets.headers io.sniffer.backend kernel +prettyprint sequences ; +IN: io.sniffer.filter.backend + +HOOK: sniffer-loop io-backend ( stream -- ) +HOOK: packet. io-backend ( string -- ) + +: (packet.) ( string -- ) + dup 14 head >byte-array + "--Ethernet Header--" print + dup etherneth. + dup etherneth-type { + ! HEX: 800 [ ] ! IP + ! HEX: 806 [ ] ! ARP + [ "Unknown type: " write .h ] + } case 2drop ; diff --git a/extra/io/sniffer/filter/bsd/bsd.factor b/extra/io/sniffer/filter/bsd/bsd.factor index c6882352d0..c18cae41e5 100644 --- a/extra/io/sniffer/filter/bsd/bsd.factor +++ b/extra/io/sniffer/filter/bsd/bsd.factor @@ -1,7 +1,8 @@ USING: alien.c-types hexdump io io.backend io.sockets.headers io.sockets.headers.bsd kernel io.sniffer io.sniffer.bsd -io.sniffer.filter io.streams.string io.unix.backend math -sequences system byte-arrays ; +io.streams.string io.unix.backend math +sequences system byte-arrays io.sniffer.filter.backend +io.sniffer.filter.backend io.sniffer.backend ; IN: io.sniffer.filter.bsd ! http://www.iana.org/assignments/ethernet-numbers diff --git a/extra/io/sniffer/filter/filter.factor b/extra/io/sniffer/filter/filter.factor index 3240810e7f..91c0ab5a5c 100755 --- a/extra/io/sniffer/filter/filter.factor +++ b/extra/io/sniffer/filter/filter.factor @@ -1,19 +1,8 @@ USING: alien.c-types byte-arrays combinators hexdump io io.backend io.streams.string io.sockets.headers kernel math -prettyprint io.sniffer sequences system vocabs.loader ; +prettyprint io.sniffer sequences system vocabs.loader +io.sniffer.filter.backend ; IN: io.sniffer.filter -HOOK: sniffer-loop io-backend ( stream -- ) -HOOK: packet. io-backend ( string -- ) - -: (packet.) ( string -- ) - dup 14 head >byte-array - "--Ethernet Header--" print - dup etherneth. - dup etherneth-type { - ! HEX: 800 [ ] ! IP - ! HEX: 806 [ ] ! ARP - [ "Unknown type: " write .h ] - } case 2drop ; bsd? [ "io.sniffer.filter.bsd" require ] when diff --git a/extra/io/sniffer/sniffer.factor b/extra/io/sniffer/sniffer.factor index 04491ca709..6fd74f9e1c 100755 --- a/extra/io/sniffer/sniffer.factor +++ b/extra/io/sniffer/sniffer.factor @@ -1,10 +1,4 @@ USING: io.backend kernel system vocabs.loader ; IN: io.sniffer -SYMBOL: sniffer-type - -TUPLE: sniffer ; - -HOOK: io-backend ( obj -- sniffer ) - bsd? [ "io.sniffer.bsd" require ] when diff --git a/extra/jamshred/game/game.factor b/extra/jamshred/game/game.factor index 667d81aeb4..fe517d68fd 100644 --- a/extra/jamshred/game/game.factor +++ b/extra/jamshred/game/game.factor @@ -1,4 +1,4 @@ -USING: kernel opengl arrays sequences jamshred jamshred.tunnel +USING: kernel opengl arrays sequences jamshred.tunnel jamshred.player math.vectors ; IN: jamshred.game diff --git a/extra/jamshred/player/player.factor b/extra/jamshred/player/player.factor index ddbd03eeb9..4daecf29a2 100644 --- a/extra/jamshred/player/player.factor +++ b/extra/jamshred/player/player.factor @@ -1,4 +1,4 @@ -USING: colors jamshred.game jamshred.oint jamshred.tunnel kernel +USING: colors jamshred.oint jamshred.tunnel kernel math math.constants sequences ; IN: jamshred.player diff --git a/extra/json/reader/reader-docs.factor b/extra/json/reader/reader-docs.factor index 43edb6c43d..ea4dcbf954 100644 --- a/extra/json/reader/reader-docs.factor +++ b/extra/json/reader/reader-docs.factor @@ -1,7 +1,8 @@ ! Copyright (C) 2006 Chris Double. ! See http://factorcode.org/license.txt for BSD license. -USING: help.markup help.syntax json.reader ; +USING: help.markup help.syntax ; +IN: json.reader HELP: json> "( string -- object )" { $values { "string" "a string in JSON format" } { "object" "yhe object deserialized from the JSON string" } } -{ $description "Deserializes the JSON formatted string into a Factor object. JSON objects are converted to Factor hashtables. All other JSON objects convert to their obvious Factor equivalents." } ; \ No newline at end of file +{ $description "Deserializes the JSON formatted string into a Factor object. JSON objects are converted to Factor hashtables. All other JSON objects convert to their obvious Factor equivalents." } ; diff --git a/extra/json/writer/writer-docs.factor b/extra/json/writer/writer-docs.factor index cc26f74843..21aa8b2cb5 100644 --- a/extra/json/writer/writer-docs.factor +++ b/extra/json/writer/writer-docs.factor @@ -1,6 +1,7 @@ ! Copyright (C) 2006 Chris Double. ! See http://factorcode.org/license.txt for BSD license. -USING: help.markup help.syntax json.writer ; +USING: help.markup help.syntax ; +IN: json.writer HELP: >json "( obj -- string )" { $values { "obj" "an object" } { "string" "the object converted to JSON format" } } diff --git a/extra/json/writer/writer.factor b/extra/json/writer/writer.factor index 4370a38411..6c7d6cebb2 100644 --- a/extra/json/writer/writer.factor +++ b/extra/json/writer/writer.factor @@ -13,7 +13,7 @@ GENERIC: json-print ( obj -- ) [ json-print ] string-out ; M: f json-print ( f -- ) - "false" write ; + drop "false" write ; M: string json-print ( obj -- ) CHAR: " write1 "\"" split "\\\"" join CHAR: \r swap remove "\n" split "\\r\\n" join write CHAR: " write1 ; diff --git a/extra/lisp/listener/listener.factor b/extra/lisp/listener/listener.factor index 5af44ba362..91f0bb2a8d 100644 --- a/extra/lisp/listener/listener.factor +++ b/extra/lisp/listener/listener.factor @@ -5,7 +5,7 @@ USING: kernel parser namespaces io prettyprint math arrays sequences IN: lisp.listener -: parse-stdio ( -- quot/f ) stdio get parse-interactive ; +: parse-stdio ( -- quot/f ) stdio get read-quot ; : stuff? ( -- ? ) datastack length 0 > ; @@ -25,4 +25,4 @@ use [ clone ] change { "lisp" "lisp.syntax" } add-use ! [ listener-hook get call prompt. lisp-listen ] until-quit until-quit -] with-scope ; \ No newline at end of file +] with-scope ; diff --git a/extra/mad/mad.factor b/extra/mad/mad.factor index 27b053352b..ce65c066b4 100644 --- a/extra/mad/mad.factor +++ b/extra/mad/mad.factor @@ -4,14 +4,11 @@ USING: alien alien.c-types alien.syntax combinators kernel math system ; IN: mad -: load-mad-library ( -- ) - "mad" { +<< "mad" { { [ macosx? ] [ "libmad.0.dylib" ] } { [ unix? ] [ "libmad.so" ] } { [ windows? ] [ "mad.dll" ] } - } cond "cdecl" add-library ; parsing - -load-mad-library + } cond "cdecl" add-library >> LIBRARY: mad diff --git a/extra/parser-combinators/simple/simple-docs.factor b/extra/parser-combinators/simple/simple-docs.factor index c2cca6e4a0..bba37ca4ca 100755 --- a/extra/parser-combinators/simple/simple-docs.factor +++ b/extra/parser-combinators/simple/simple-docs.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2006 Chris Double. ! See http://factorcode.org/license.txt for BSD license. -USING: help.syntax help.markup parser-combinators -parser-combinators.simple ; +USING: help.syntax help.markup parser-combinators ; +IN: parser-combinators.simple HELP: 'digit' { $values diff --git a/extra/xml-rpc/xml-rpc-docs.factor b/extra/xml-rpc/xml-rpc-docs.factor index 323e103d4c..8c20df1fd0 100644 --- a/extra/xml-rpc/xml-rpc-docs.factor +++ b/extra/xml-rpc/xml-rpc-docs.factor @@ -1,4 +1,5 @@ -USING: xml-rpc help.syntax help.markup ; +USING: help.syntax help.markup ; +IN: xml-rpc HELP: send-rpc { $values { "rpc" "an RPC data type" } { "xml" "an XML document" } }