diff --git a/GNUmakefile b/GNUmakefile index 4447dfbede..c4796de63b 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -213,6 +213,8 @@ endif clean: rm -f vm/*.o rm -f factor.dll + rm -f factor.lib + rm -f factor.dll.lib rm -f libfactor.* rm -f libfactor-ffi-test.* rm -f Factor.app/Contents/Frameworks/libfactor.dylib diff --git a/Nmakefile b/Nmakefile index e964105d9f..07984e35c8 100755 --- a/Nmakefile +++ b/Nmakefile @@ -1,5 +1,10 @@ +!IF DEFINED(DEBUG) +LINK_FLAGS = /nologo /DEBUG shell32.lib +CL_FLAGS = /nologo /Zi /O2 /W3 /DFACTOR_DEBUG +!ELSE LINK_FLAGS = /nologo shell32.lib CL_FLAGS = /nologo /O2 /W3 +!ENDIF EXE_OBJS = factor.dll.lib vm\main-windows-nt.obj vm\factor.res @@ -50,11 +55,17 @@ DLL_OBJS = vm\os-windows-nt.obj \ .cpp.obj: cl /EHsc $(CL_FLAGS) /Fo$@ /c $< +.c.obj: + cl $(CL_FLAGS) /Fo$@ /c $< + .rs.res: rc $< all: factor.com factor.exe +libfactor-ffi-test.dll: vm/ffi_test.obj + link $(LINK_FLAGS) /out:libfactor-ffi-test.dll /dll vm/ffi_test.obj + factor.dll.lib: $(DLL_OBJS) link $(LINK_FLAGS) /implib:factor.dll.lib /out:factor.dll /dll $(DLL_OBJS) diff --git a/basis/alien/c-types/c-types.factor b/basis/alien/c-types/c-types.factor index 347d157a79..24221160ce 100644 --- a/basis/alien/c-types/c-types.factor +++ b/basis/alien/c-types/c-types.factor @@ -348,52 +348,6 @@ SYMBOLS: "alien_offset" >>unboxer \ void* define-primitive-type - - integer >>class - integer >>boxed-class - [ alien-signed-8 ] >>getter - [ set-alien-signed-8 ] >>setter - 8 >>size - 8-byte-alignment - "from_signed_8" >>boxer - "to_signed_8" >>unboxer - \ longlong define-primitive-type - - - integer >>class - integer >>boxed-class - [ alien-unsigned-8 ] >>getter - [ set-alien-unsigned-8 ] >>setter - 8 >>size - 8-byte-alignment - "from_unsigned_8" >>boxer - "to_unsigned_8" >>unboxer - \ ulonglong define-primitive-type - - - integer >>class - integer >>boxed-class - [ alien-signed-cell ] >>getter - [ set-alien-signed-cell ] >>setter - bootstrap-cell >>size - bootstrap-cell >>align - bootstrap-cell >>align-first - "from_signed_cell" >>boxer - "to_fixnum" >>unboxer - \ long define-primitive-type - - - integer >>class - integer >>boxed-class - [ alien-unsigned-cell ] >>getter - [ set-alien-unsigned-cell ] >>setter - bootstrap-cell >>size - bootstrap-cell >>align - bootstrap-cell >>align-first - "from_unsigned_cell" >>boxer - "to_cell" >>unboxer - \ ulong define-primitive-type - integer >>class integer >>boxed-class @@ -514,16 +468,75 @@ SYMBOLS: [ >float ] >>unboxer-quot \ double define-primitive-type - cpu x86.64? os windows? and [ + cell 8 = [ + + integer >>class + integer >>boxed-class + [ alien-signed-cell ] >>getter + [ set-alien-signed-cell ] >>setter + bootstrap-cell >>size + bootstrap-cell >>align + bootstrap-cell >>align-first + "from_signed_cell" >>boxer + "to_fixnum" >>unboxer + \ longlong define-primitive-type + + + integer >>class + integer >>boxed-class + [ alien-unsigned-cell ] >>getter + [ set-alien-unsigned-cell ] >>setter + bootstrap-cell >>size + bootstrap-cell >>align + bootstrap-cell >>align-first + "from_unsigned_cell" >>boxer + "to_cell" >>unboxer + \ ulonglong define-primitive-type + + os windows? [ + \ int c-type \ long define-primitive-type + \ uint c-type \ ulong define-primitive-type + ] [ + \ longlong c-type \ long define-primitive-type + \ ulonglong c-type \ ulong define-primitive-type + ] if + \ longlong c-type \ ptrdiff_t typedef \ longlong c-type \ intptr_t typedef + \ ulonglong c-type \ uintptr_t typedef \ ulonglong c-type \ size_t typedef ] [ - \ long c-type \ ptrdiff_t typedef - \ long c-type \ intptr_t typedef - \ ulong c-type \ uintptr_t typedef - \ ulong c-type \ size_t typedef + + integer >>class + integer >>boxed-class + [ alien-signed-8 ] >>getter + [ set-alien-signed-8 ] >>setter + 8 >>size + 8-byte-alignment + "from_signed_8" >>boxer + "to_signed_8" >>unboxer + \ longlong define-primitive-type + + + integer >>class + integer >>boxed-class + [ alien-unsigned-8 ] >>getter + [ set-alien-unsigned-8 ] >>setter + 8 >>size + 8-byte-alignment + "from_unsigned_8" >>boxer + "to_unsigned_8" >>unboxer + \ ulonglong define-primitive-type + + \ int c-type \ long define-primitive-type + \ uint c-type \ ulong define-primitive-type + + \ int c-type \ ptrdiff_t typedef + \ int c-type \ intptr_t typedef + + \ uint c-type \ uintptr_t typedef + \ uint c-type \ size_t typedef ] if ] with-compilation-unit diff --git a/basis/bootstrap/finish-bootstrap.factor b/basis/bootstrap/finish-bootstrap.factor index 70ccaedad4..387903d1e9 100644 --- a/basis/bootstrap/finish-bootstrap.factor +++ b/basis/bootstrap/finish-bootstrap.factor @@ -8,9 +8,14 @@ namespaces eval kernel vocabs.loader io ; (command-line) parse-command-line load-vocab-roots run-user-init - "e" get [ eval( -- ) ] when* - ignore-cli-args? not script get and - [ run-script ] [ "run" get run ] if* + + "e" get script get or [ + "e" get [ eval( -- ) ] when* + script get [ run-script ] when* + ] [ + "run" get run + ] if + output-stream get [ stream-flush ] when* 0 exit ] [ print-error 1 exit ] recover diff --git a/basis/cocoa/cocoa-tests.factor b/basis/cocoa/cocoa-tests.factor index 892d5ea38d..f35d151ad4 100644 --- a/basis/cocoa/cocoa-tests.factor +++ b/basis/cocoa/cocoa-tests.factor @@ -1,5 +1,5 @@ USING: cocoa cocoa.messages cocoa.subclassing cocoa.types -compiler kernel namespaces cocoa.classes cocoa.runtime +compiler.test kernel namespaces cocoa.classes cocoa.runtime tools.test memory compiler.units math core-graphics.types ; FROM: alien.c-types => int void ; IN: cocoa.tests diff --git a/basis/command-line/command-line-docs.factor b/basis/command-line/command-line-docs.factor index 697f95b14f..11ee46c227 100644 --- a/basis/command-line/command-line-docs.factor +++ b/basis/command-line/command-line-docs.factor @@ -37,10 +37,6 @@ HELP: main-vocab HELP: default-cli-args { $description "Sets global variables corresponding to default command line arguments." } ; -HELP: ignore-cli-args? -{ $values { "?" "a boolean" } } -{ $description "On Mac OS X, source files to run are supplied by the Cocoa API, so to avoid running them twice the startup code has to call this word." } ; - ARTICLE: "runtime-cli-args" "Command line switches for the VM" "A handful of command line switches are processed by the VM and not the library. They control low-level features." { $table diff --git a/basis/command-line/command-line.factor b/basis/command-line/command-line.factor index 939fb82f00..643afef669 100644 --- a/basis/command-line/command-line.factor +++ b/basis/command-line/command-line.factor @@ -67,7 +67,4 @@ SYMBOL: main-vocab-hook main-vocab "run" set ] bind ; -: ignore-cli-args? ( -- ? ) - os macosx? "run" get "ui" = and ; - [ default-cli-args ] "command-line" add-startup-hook diff --git a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor index 647c97d6c3..4b459e90fb 100644 --- a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor +++ b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor @@ -86,7 +86,7 @@ SYMBOLS: visited merge-sets levels again? ; cfg get reverse-post-order ; inline : filter-by ( flags seq -- seq' ) - [ drop ] pusher [ 2each ] dip ; + [ drop ] selector [ 2each ] dip ; HINTS: filter-by { bit-array object } ; @@ -107,4 +107,4 @@ PRIVATE> ] 2each ; inline : merge-set ( bbs -- bbs' ) - (merge-set) filter-by ; \ No newline at end of file + (merge-set) filter-by ; diff --git a/basis/compiler/cfg/stacks/uninitialized/uninitialized.factor b/basis/compiler/cfg/stacks/uninitialized/uninitialized.factor index e5fbfa6c40..5b2bbf3765 100644 --- a/basis/compiler/cfg/stacks/uninitialized/uninitialized.factor +++ b/basis/compiler/cfg/stacks/uninitialized/uninitialized.factor @@ -55,7 +55,7 @@ M: insn visit-insn drop ; 2dup [ length ] bi@ max '[ _ 1 pad-tail ] bi@ [ bitand ] 2map ; : (uninitialized-locs) ( seq quot -- seq' ) - [ [ drop 0 = ] pusher [ each-index ] dip ] dip map ; inline + [ [ drop 0 = ] selector [ each-index ] dip ] dip map ; inline PRIVATE> diff --git a/basis/compiler/compiler-docs.factor b/basis/compiler/compiler-docs.factor index f59d4fb027..5ee0e265e4 100644 --- a/basis/compiler/compiler-docs.factor +++ b/basis/compiler/compiler-docs.factor @@ -16,11 +16,7 @@ ARTICLE: "compiler-usage" "Calling the optimizing compiler" disable-optimizer enable-optimizer } -"Removing a word's optimized definition:" -{ $subsections decompile } -"Compiling a single quotation:" -{ $subsections compile-call } -"Higher-level words can be found in " { $link "compilation-units" } "." ; +"More words can be found in " { $link "compilation-units" } "." ; ARTICLE: "compiler-impl" "Compiler implementation" "The " { $vocab-link "compiler" } "vocabulary, in addition to providing the user-visible words of the compiler, implements the main compilation loop." @@ -60,10 +56,6 @@ $nl ABOUT: "compiler" -HELP: decompile -{ $values { "word" word } } -{ $description "Removes a word's optimized definition. The word will be compiled with the non-optimizing compiler until recompiled with the optimizing compiler again." } ; - HELP: compile-word { $values { "word" word } } { $description "Compile a single word." } @@ -72,8 +64,3 @@ HELP: compile-word HELP: optimizing-compiler { $description "Singleton class implementing " { $link recompile } " to call the optimizing compiler." } { $notes "This is an internal word, and user code should call " { $link compile } " instead." } ; - -HELP: compile-call -{ $values { "quot" quotation } } -{ $description "Compiles and runs a quotation." } -{ $notes "This word is used by compiler unit tests to test compilation of small pieces of code." } ; diff --git a/basis/compiler/compiler.factor b/basis/compiler/compiler.factor index 2375d8575d..bf9b049127 100644 --- a/basis/compiler/compiler.factor +++ b/basis/compiler/compiler.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2004, 2009 Slava Pestov. +! Copyright (C) 2004, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors kernel namespaces arrays sequences io words fry continuations vocabs assocs dlists definitions math graphs generic @@ -181,14 +181,6 @@ t compile-dependencies? set-global : compile-loop ( deque -- ) [ compile-word yield-hook get call( -- ) ] slurp-deque ; -: decompile ( word -- ) - dup def>> 2array 1array modify-code-heap ; - -: compile-call ( quot -- ) - [ dup infer define-temp ] with-compilation-unit execute ; - -\ compile-call t "no-compile" set-word-prop - SINGLETON: optimizing-compiler M: optimizing-compiler recompile ( words -- alist ) @@ -220,6 +212,3 @@ M: optimizing-compiler process-forgotten-words : disable-optimizer ( -- ) f compiler-impl set-global ; - -: recompile-all ( -- ) - all-words compile ; diff --git a/basis/compiler/test/authors.txt b/basis/compiler/test/authors.txt new file mode 100644 index 0000000000..d4f5d6b3ae --- /dev/null +++ b/basis/compiler/test/authors.txt @@ -0,0 +1 @@ +Slava Pestov \ No newline at end of file diff --git a/basis/compiler/test/test.factor b/basis/compiler/test/test.factor new file mode 100644 index 0000000000..cc7b382253 --- /dev/null +++ b/basis/compiler/test/test.factor @@ -0,0 +1,19 @@ +! Copyright (C) 2010 Slava Pestov. +! See http://factorcode.org/license.txt for BSD license. +USING: accessors arrays compiler.units kernel stack-checker +sequences vocabs words tools.test tools.test.private ; +IN: compiler.test + +: decompile ( word -- ) + dup def>> 2array 1array modify-code-heap ; + +: recompile-all ( -- ) + all-words compile ; + +: compile-call ( quot -- ) + [ dup infer define-temp ] with-compilation-unit execute ; + +<< \ compile-call t "no-compile" set-word-prop >> + +: compiler-test ( name -- ) + "resource:basis/compiler/tests/" ".factor" surround run-test-file ; diff --git a/basis/compiler/tests/codegen.factor b/basis/compiler/tests/codegen.factor index cff685eaf6..288940e660 100644 --- a/basis/compiler/tests/codegen.factor +++ b/basis/compiler/tests/codegen.factor @@ -1,4 +1,4 @@ -USING: generalizations accessors arrays compiler kernel +USING: generalizations accessors arrays compiler.test kernel kernel.private math hashtables.private math.private namespaces sequences tools.test namespaces.private slots.private sequences.private byte-arrays alien alien.accessors layouts diff --git a/basis/compiler/tests/curry.factor b/basis/compiler/tests/curry.factor index b541e19f34..ddbd9ba646 100644 --- a/basis/compiler/tests/curry.factor +++ b/basis/compiler/tests/curry.factor @@ -1,5 +1,5 @@ USING: tools.test quotations math kernel sequences -assocs namespaces make compiler.units compiler ; +assocs namespaces make compiler.units compiler.test ; IN: compiler.tests.curry [ 3 ] [ 5 [ [ 2 - ] curry call ] compile-call ] unit-test diff --git a/basis/compiler/tests/float.factor b/basis/compiler/tests/float.factor index 632a560c0d..0d4e30279e 100644 --- a/basis/compiler/tests/float.factor +++ b/basis/compiler/tests/float.factor @@ -1,5 +1,6 @@ -USING: compiler.units compiler kernel kernel.private memory math -math.private tools.test math.floats.private math.order fry ; +USING: compiler.units compiler.test kernel kernel.private memory +math math.private tools.test math.floats.private math.order fry +; IN: compiler.tests.float [ 5.0 ] [ [ 5.0 ] compile-call gc gc gc ] unit-test diff --git a/basis/compiler/tests/intrinsics.factor b/basis/compiler/tests/intrinsics.factor index 1c066f26a3..53017ff452 100644 --- a/basis/compiler/tests/intrinsics.factor +++ b/basis/compiler/tests/intrinsics.factor @@ -4,7 +4,7 @@ strings tools.test words continuations sequences.private hashtables.private byte-arrays system random layouts vectors sbufs strings.private slots.private alien math.order alien.accessors alien.c-types alien.data alien.syntax alien.strings -namespaces libc io.encodings.ascii classes compiler ; +namespaces libc io.encodings.ascii classes compiler.test ; FROM: math => float ; IN: compiler.tests.intrinsics diff --git a/basis/compiler/tests/optimizer.factor b/basis/compiler/tests/optimizer.factor index 865cd639a3..fe67cbbc37 100644 --- a/basis/compiler/tests/optimizer.factor +++ b/basis/compiler/tests/optimizer.factor @@ -4,7 +4,7 @@ sbufs strings tools.test vectors words sequences.private quotations classes classes.algebra classes.tuple.private continuations growable namespaces hints alien.accessors compiler.tree.builder compiler.tree.optimizer sequences.deep -compiler definitions generic.single shuffle math.order ; +compiler.test definitions generic.single shuffle math.order ; IN: compiler.tests.optimizer GENERIC: xyz ( obj -- obj ) diff --git a/basis/compiler/tests/simple.factor b/basis/compiler/tests/simple.factor index a86d5b8c52..df67cadd78 100644 --- a/basis/compiler/tests/simple.factor +++ b/basis/compiler/tests/simple.factor @@ -1,4 +1,4 @@ -USING: compiler compiler.units tools.test kernel kernel.private +USING: compiler.test compiler.units tools.test kernel kernel.private sequences.private math.private math combinators strings alien arrays memory vocabs parser eval quotations compiler.errors definitions ; diff --git a/basis/compiler/tests/tuples.factor b/basis/compiler/tests/tuples.factor index 3d6301249f..978c27768f 100644 --- a/basis/compiler/tests/tuples.factor +++ b/basis/compiler/tests/tuples.factor @@ -1,4 +1,4 @@ -USING: kernel tools.test compiler.units compiler ; +USING: kernel tools.test compiler.units compiler.test ; IN: compiler.tests.tuples TUPLE: color red green blue ; diff --git a/basis/compression/lzw/lzw-docs.factor b/basis/compression/lzw/lzw-docs.factor index dccfb25a39..28dc36902b 100644 --- a/basis/compression/lzw/lzw-docs.factor +++ b/basis/compression/lzw/lzw-docs.factor @@ -52,7 +52,7 @@ HELP: reset-lzw-uncompress } { $description "Reset the LZW uncompressor state (either at initialization time or immediately after receiving a Clear Code). " } ; -ARTICLE: "compression.lzw.differences" "LZW Differences between TIFF and GIF" +ARTICLE: "compression.lzw.differences" "LZW differences between TIFF and GIF" { $vocab-link "compression.lzw" } $nl "There are some subtle differences between the LZW algorithm used by TIFF and GIF images." @@ -66,7 +66,7 @@ $nl "TIFF and GIF both add the concept of a 'Clear Code' and a 'End of Information Code' to the LZW algorithm. In both cases, the 'Clear Code' is equal to 2**(code-size - 1) and the 'End of Information Code' is equal to the Clear Code + 1. These 2 codes are reserved in the string table. So in both cases, the LZW string table is initialized to have a length equal to the End of Information Code + 1." ; -ARTICLE: "compression.lzw" "LZW Compression" +ARTICLE: "compression.lzw" "LZW compression" { $vocab-link "compression.lzw" } $nl "Implements both the TIFF and GIF variations of the LZW algorithm." diff --git a/basis/concurrency/combinators/combinators.factor b/basis/concurrency/combinators/combinators.factor index 918b3c5ba0..44cad8de61 100644 --- a/basis/concurrency/combinators/combinators.factor +++ b/basis/concurrency/combinators/combinators.factor @@ -22,7 +22,7 @@ PRIVATE> ] (parallel-each) ; inline : parallel-filter ( seq quot -- newseq ) - over [ pusher [ parallel-each ] dip ] dip like ; inline + over [ selector [ parallel-each ] dip ] dip like ; inline > reg-class-of { @@ -163,12 +160,11 @@ M:: x86.64 %box ( n rep func -- ) ] [ rep load-return-value ] if - rep int-rep? [ param-reg-1 ] [ param-reg-0 ] if %mov-vm-ptr + rep int-rep? + cpu x86.64? os windows? and or + param-reg-1 param-reg-0 ? %mov-vm-ptr func f %alien-invoke ; -M: x86.64 %box-long-long ( n func -- ) - [ int-rep ] dip %box ; - : box-struct-field@ ( i -- operand ) 1 + cells param@ ; : %box-struct-field ( c-type i -- ) @@ -258,7 +254,7 @@ M: x86.64 %callback-value ( ctype -- ) M:: x86.64 %unary-float-function ( dst src func -- ) 0 src float-function-param - func f %alien-invoke + func "libm" load-library %alien-invoke dst float-function-return ; M:: x86.64 %binary-float-function ( dst src1 src2 func -- ) @@ -266,7 +262,7 @@ M:: x86.64 %binary-float-function ( dst src1 src2 func -- ) ! src2 is always a spill slot 0 src1 float-function-param 1 src2 float-function-param - func f %alien-invoke + func "libm" load-library %alien-invoke dst float-function-return ; M:: x86.64 %call-gc ( gc-root-count temp -- ) diff --git a/basis/cpu/x86/64/winnt/winnt.factor b/basis/cpu/x86/64/winnt/winnt.factor index a398c6565c..c75bb5a1b9 100644 --- a/basis/cpu/x86/64/winnt/winnt.factor +++ b/basis/cpu/x86/64/winnt/winnt.factor @@ -22,5 +22,5 @@ M: x86.64 dummy-int-params? t ; M: x86.64 dummy-fp-params? t ; -M: x86.64 temp-reg RAX ; +M: x86.64 temp-reg R11 ; diff --git a/basis/cpu/x86/x86.factor b/basis/cpu/x86/x86.factor index f2751b1be2..0cd557896b 100644 --- a/basis/cpu/x86/x86.factor +++ b/basis/cpu/x86/x86.factor @@ -56,8 +56,8 @@ M: x86 stack-frame-size ( stack-frame -- i ) 3 cells + align-stack ; -! Must be a volatile register not used for parameter passing, for safe -! use in calls in and out of C +! Must be a volatile register not used for parameter passing or +! integer return HOOK: temp-reg cpu ( -- reg ) HOOK: pic-tail-reg cpu ( -- reg ) diff --git a/basis/db/db.factor b/basis/db/db.factor index f26729f8ea..3c924e4698 100644 --- a/basis/db/db.factor +++ b/basis/db/db.factor @@ -113,7 +113,7 @@ M: object execute-statement* ( statement type -- ) ] if ; inline recursive : query-map ( statement quot -- seq ) - accumulator [ query-each ] dip { } like ; inline + collector [ query-each ] dip { } like ; inline : with-db ( db quot -- ) [ db-open db-connection ] dip diff --git a/basis/dlists/dlists.factor b/basis/dlists/dlists.factor index 89675c6469..668ba23054 100644 --- a/basis/dlists/dlists.factor +++ b/basis/dlists/dlists.factor @@ -153,7 +153,7 @@ M: dlist clear-deque ( dlist -- ) '[ obj>> @ ] dlist-each-node ; inline : dlist>seq ( dlist -- seq ) - [ ] accumulator [ dlist-each ] dip ; + [ ] collector [ dlist-each ] dip ; : 1dlist ( obj -- dlist ) [ push-front ] keep ; diff --git a/basis/documents/documents.factor b/basis/documents/documents.factor index aef4f4de78..dcd1bf5820 100644 --- a/basis/documents/documents.factor +++ b/basis/documents/documents.factor @@ -61,7 +61,7 @@ TUPLE: document < model locs undos redos inside-undo? ; ] if ; inline : map-lines ( from to quot -- results ) - accumulator [ each-line ] dip ; inline + collector [ each-line ] dip ; inline : start/end-on-line ( from to line# document -- n1 n2 ) [ start-on-line ] [ end-on-line ] bi-curry bi-curry bi* ; diff --git a/basis/environment/unix/unix.factor b/basis/environment/unix/unix.factor index 3fc8c2f79b..ec41e919d8 100644 --- a/basis/environment/unix/unix.factor +++ b/basis/environment/unix/unix.factor @@ -3,7 +3,7 @@ USING: alien alien.c-types alien.data alien.strings alien.syntax kernel layouts sequences system unix environment io.encodings.utf8 unix.utilities vocabs.loader -combinators alien.accessors ; +combinators alien.accessors unix.ffi ; IN: environment.unix HOOK: environ os ( -- void* ) diff --git a/basis/eval/eval-docs.factor b/basis/eval/eval-docs.factor index 250241dcfc..2021a2d10d 100644 --- a/basis/eval/eval-docs.factor +++ b/basis/eval/eval-docs.factor @@ -1,25 +1,73 @@ IN: eval -USING: help.markup help.syntax strings io effects ; +USING: help.markup help.syntax strings io effects parser +listener vocabs.parser debugger combinators ; + +HELP: (eval) +{ $values { "str" string } { "effect" effect } } +{ $description "Parses Factor source code from a string, and calls the resulting quotation, which must have the given stack effect." } +{ $notes "This word must be wrapped within " { $link with-file-vocabs } " or " { $link with-interactive-vocabs } ", since it assumes that the " { $link manifest } " variable is set in the current dynamic scope." } +{ $errors "Throws an error if the input is malformed, or if the evaluation itself throws an error." } ; HELP: eval { $values { "str" string } { "effect" effect } } { $description "Parses Factor source code from a string, and calls the resulting quotation, which must have the given stack effect." } +{ $notes "The code string is parsed and called in a new dynamic scope with an initial vocabulary search path consisting of just the " { $snippet "syntax" } " vocabulary. The evaluated code can use " { $link "word-search-syntax" } " to alter the search path." } { $errors "Throws an error if the input is malformed, or if the evaluation itself throws an error." } ; HELP: eval( { $syntax "eval( inputs -- outputs )" } { $description "Parses Factor source code from the string at the top of the stack, and calls the resulting quotation, which must have the given stack effect." } +{ $notes + "This parsing word is just a slightly nicer syntax for " { $link eval } ". The following are equivalent:" + { $code + "eval( inputs -- outputs )" + "(( inputs -- outputs )) eval" + } +} { $errors "Throws an error if the input is malformed, or if the evaluation itself throws an error." } ; HELP: eval>string { $values { "str" string } { "output" string } } -{ $description "Evaluates the Factor code in " { $snippet "str" } " with " { $link output-stream } " rebound to a string output stream, then outputs the resulting string. The code in the string must not take or leave any values on the stack." } ; +{ $description "Evaluates the Factor code in " { $snippet "str" } " with " { $link output-stream } " rebound to a string output stream, then outputs the resulting string. The code in the string must not take or leave any values on the stack." } +{ $errors "If the code throws an error, the error is caught, and the result of calling " { $link print-error } " on the error is returned." } ; -ARTICLE: "eval" "Evaluating strings at runtime" -"The " { $vocab-link "eval" } " vocabulary implements support for evaluating strings at runtime." +ARTICLE: "eval-vocabs" "Evaluating strings with a different vocabulary search path" +"Strings passed to " { $link eval } " are always evaluated with an initial vocabulary search path consisting of just the " { $snippet "syntax" } " vocabulary. This is the same search path that source files start out with. This behavior can be customized by taking advantage of the fact that " { $link eval } " is composed from two simpler words:" +{ $subsections + (eval) + with-file-vocabs +} +"Code in the listener tool starts out with a different initial search path, with more vocabularies are available by default. Strings of code can be evaluated in this search path by using " { $link (eval) } " with a different combinator:" +{ $subsections + with-interactive-vocabs +} +"When using " { $link (eval) } ", the quotation passed to " { $link with-file-vocabs } " and " { $link with-interactive-vocabs } " can also make specific vocabularies available to the evaluated string. This is done by having the quotation change the run-time vocabulary search path prior to calling " { $link (eval) } ". For run-time analogues of the parse-time " { $link "word-search-syntax" } " see " { $link "word-search-parsing" } "." +$nl +"The vocabulary set used by " { $link with-interactive-vocabs } " can be altered by rebinding a dynamic variable:" +{ $subsections interactive-vocabs } +{ $heading "Example" } +"In this example, a string is evaluated with a fictional " { $snippet "cad.objects" } " vocabulary in the search path by default, together with the listener's " { $link interactive-vocabs } "; the quotation is expected to produce a sequence on the stack:" +{ $code + """USING: eval listener vocabs.parser ; +[ + "cad-objects" use-vocab + (( -- seq )) (eval) +] with-interactive-vocabs""" +} +"Note that the search path in the outer code (set by the " { $link POSTPONE: USING: } " form) has no relation to the search path used when parsing the string parameter (this is determined by " { $link with-interactive-vocabs } " and " { $link use-vocab } ")." ; + +ARTICLE: "eval" "Evaluating strings at run time" +"The " { $vocab-link "eval" } " vocabulary implements support for evaluating strings of code dynamically." +$nl +"The main entry point is a parsing word, which wraps a library word:" { $subsections POSTPONE: eval( - eval>string -} ; + eval +} +"This pairing is analogous to that of " { $link POSTPONE: call( } " with " { $link call-effect } "." +$nl +"Advanced features:" +{ $subsections "eval-vocabs" eval>string } +; ABOUT: "eval" diff --git a/basis/game/input/dinput/dinput.factor b/basis/game/input/dinput/dinput.factor old mode 100644 new mode 100755 index 964b952cb8..e2c1fda759 --- a/basis/game/input/dinput/dinput.factor +++ b/basis/game/input/dinput/dinput.factor @@ -1,13 +1,12 @@ -USING: accessors alien alien.c-types alien.strings arrays -assocs byte-arrays combinators combinators.short-circuit -continuations game.input game.input.dinput.keys-array -io.encodings.utf16 io.encodings.utf16n kernel locals math -math.bitwise math.rectangles namespaces parser sequences -shuffle specialized-arrays ui.backend.windows vectors -windows.com windows.directx.dinput -windows.directx.dinput.constants .errors windows.kernel32 -windows.messages .ole32 windows.user32 classes.struct -alien.data ; +USING: accessors alien alien.c-types alien.strings arrays assocs +byte-arrays combinators combinators.short-circuit continuations +game.input game.input.dinput.keys-array io.encodings.utf16 +io.encodings.utf16n kernel locals math math.bitwise +math.rectangles namespaces parser sequences shuffle +specialized-arrays ui.backend.windows vectors windows.com +windows.directx.dinput windows.directx.dinput.constants +windows.kernel32 windows.messages windows.ole32 windows.errors +windows.user32 classes.struct alien.data ; SPECIALIZED-ARRAY: DIDEVICEOBJECTDATA IN: game.input.dinput @@ -315,7 +314,7 @@ CONSTANT: pov-values } case ; : fill-mouse-state ( buffer count -- state ) - [ +mouse-state+ get ] 2dip swap [ nth (fill-mouse-state) ] curry each ; + iota [ +mouse-state+ get ] 2dip swap [ nth (fill-mouse-state) ] curry each ; : get-device-state ( device DIJOYSTATE2 -- ) [ dup IDirectInputDevice8W::Poll ole32-error ] dip diff --git a/basis/grouping/grouping-tests.factor b/basis/grouping/grouping-tests.factor index 52b436507e..60500558a7 100644 --- a/basis/grouping/grouping-tests.factor +++ b/basis/grouping/grouping-tests.factor @@ -30,3 +30,5 @@ IN: grouping.tests [ f ] [ [ 1.0 1 1 ] all-equal? ] unit-test [ t ] [ { 1 2 3 4 } [ < ] monotonic? ] unit-test [ f ] [ { 1 2 3 4 } [ > ] monotonic? ] unit-test + +[ { 6 7 8 3 4 5 0 1 2 } ] [ 9 iota >array dup 3 reverse! drop ] unit-test diff --git a/basis/help/crossref/crossref.factor b/basis/help/crossref/crossref.factor index 5e4922c7ad..36d780c99b 100644 --- a/basis/help/crossref/crossref.factor +++ b/basis/help/crossref/crossref.factor @@ -7,10 +7,10 @@ IN: help.crossref : article-links ( topic elements -- seq ) [ article-content ] dip - collect-elements [ >link ] map ; + collect-elements ; : article-children ( topic -- seq ) - { $subsection $subsections } article-links ; + { $subsection $subsections } article-links [ >link ] map ; : help-path ( topic -- seq ) [ article-parent ] follow rest ; diff --git a/basis/help/lint/lint.factor b/basis/help/lint/lint.factor index e0cea42b4f..47b8820f18 100644 --- a/basis/help/lint/lint.factor +++ b/basis/help/lint/lint.factor @@ -69,7 +69,7 @@ PRIVATE> '[ _ vocab-help [ article drop ] when* ] check-something ; : check-vocab ( vocab -- ) - "Checking " write dup write "..." print + "Checking " write dup write "..." print flush [ check-about ] [ words [ check-word ] each ] [ vocab-articles get at [ check-article ] each ] diff --git a/basis/images/jpeg/jpeg.factor b/basis/images/jpeg/jpeg.factor index 9a67d43e7d..a7f08504bb 100644 --- a/basis/images/jpeg/jpeg.factor +++ b/basis/images/jpeg/jpeg.factor @@ -351,7 +351,7 @@ SINGLETONS: YUV420 YUV444 Y MAGIC! ; [ bitstream>> ] [ [ [ ] with map ] change-huff-tables drop ] bi jpeg> components>> [ fetch-tables ] each - [ decode-macroblock 2array ] accumulator + [ decode-macroblock 2array ] collector [ all-macroblocks ] dip jpeg> setup-bitmap draw-macroblocks jpeg> bitmap>> 3 [ color-transform ] map! drop diff --git a/basis/io/backend/unix/unix.factor b/basis/io/backend/unix/unix.factor index a8070525c7..1797edccf6 100644 --- a/basis/io/backend/unix/unix.factor +++ b/basis/io/backend/unix/unix.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: alien alien.c-types alien.syntax generic assocs kernel kernel.private math io.ports sequences strings sbufs threads -unix vectors io.buffers io.backend io.encodings math.parser +unix unix.ffi vectors io.buffers io.backend io.encodings math.parser continuations system libc namespaces make io.timeouts io.encodings.utf8 destructors destructors.private accessors summary combinators locals unix.time unix.types fry @@ -17,8 +17,8 @@ TUPLE: fd < disposable fd ; : init-fd ( fd -- fd ) [ |dispose - dup fd>> F_SETFL O_NONBLOCK fcntl io-error - dup fd>> F_SETFD FD_CLOEXEC fcntl io-error + dup fd>> F_SETFL O_NONBLOCK [ fcntl ] unix-system-call drop + dup fd>> F_SETFD FD_CLOEXEC [ fcntl ] unix-system-call drop ] with-destructors ; : ( n -- fd ) @@ -50,7 +50,7 @@ M: fd cancel-operation ( fd -- ) ] if ; M: unix tell-handle ( handle -- n ) - fd>> 0 SEEK_CUR lseek [ io-error ] [ ] bi ; + fd>> 0 SEEK_CUR [ lseek ] unix-system-call [ io-error ] [ ] bi ; M: unix seek-handle ( n seek-type handle -- ) swap { @@ -59,7 +59,7 @@ M: unix seek-handle ( n seek-type handle -- ) { io:seek-end [ SEEK_END ] } [ io:bad-seek-type ] } case - [ fd>> swap ] dip lseek io-error ; + [ fd>> swap ] dip [ lseek ] unix-system-call drop ; SYMBOL: +retry+ ! just try the operation again without blocking SYMBOL: +input+ diff --git a/basis/io/directories/search/search.factor b/basis/io/directories/search/search.factor index 4356a0b988..28d7f63d87 100644 --- a/basis/io/directories/search/search.factor +++ b/basis/io/directories/search/search.factor @@ -64,17 +64,17 @@ PRIVATE> setup-traversal iterate-directory-entries drop ; inline : recursive-directory-files ( path bfs? -- paths ) - [ ] accumulator [ each-file ] dip ; inline + [ ] collector [ each-file ] dip ; inline : recursive-directory-entries ( path bfs? -- directory-entries ) - [ ] accumulator [ each-directory-entry ] dip ; inline + [ ] collector [ each-directory-entry ] dip ; inline : find-file ( path bfs? quot -- path/f ) [ ] dip [ keep and ] curry iterate-directory ; inline : find-all-files ( path quot -- paths/f ) - [ f ] dip pusher + [ f ] dip selector [ [ f ] compose iterate-directory drop ] dip ; inline ERROR: file-not-found path bfs? quot ; diff --git a/basis/io/directories/unix/linux/linux.factor b/basis/io/directories/unix/linux/linux.factor index 3af4c09f28..932cbe230b 100644 --- a/basis/io/directories/unix/linux/linux.factor +++ b/basis/io/directories/unix/linux/linux.factor @@ -1,11 +1,11 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: alien.c-types io.directories.unix kernel system unix -classes.struct ; +classes.struct unix.ffi ; IN: io.directories.unix.linux M: unix find-next-file ( DIR* -- dirent ) dirent f - [ readdir64_r 0 = [ (io-error) ] unless ] 2keep + [ [ readdir64_r ] unix-system-call 0 = [ (io-error) ] unless ] 2keep *void* [ drop f ] unless ; diff --git a/basis/io/directories/unix/unix.factor b/basis/io/directories/unix/unix.factor index 06ba73bb46..77d7f2d1b2 100644 --- a/basis/io/directories/unix/unix.factor +++ b/basis/io/directories/unix/unix.factor @@ -4,7 +4,7 @@ USING: accessors alien.c-types alien.strings combinators continuations destructors fry io io.backend io.backend.unix io.directories io.encodings.binary io.encodings.utf8 io.files io.pathnames io.files.types kernel math.bitwise sequences system -unix unix.stat vocabs.loader classes.struct ; +unix unix.stat vocabs.loader classes.struct unix.ffi ; IN: io.directories.unix : touch-mode ( -- n ) @@ -17,15 +17,15 @@ M: unix touch-file ( path -- ) ] if ; M: unix move-file ( from to -- ) - [ normalize-path ] bi@ rename io-error ; + [ normalize-path ] bi@ [ rename ] unix-system-call drop ; M: unix delete-file ( path -- ) normalize-path unlink-file ; M: unix make-directory ( path -- ) - normalize-path OCT: 777 mkdir io-error ; + normalize-path OCT: 777 [ mkdir ] unix-system-call drop ; M: unix delete-directory ( path -- ) - normalize-path rmdir io-error ; + normalize-path [ rmdir ] unix-system-call drop ; M: unix copy-file ( from to -- ) [ normalize-path ] bi@ call-next-method ; diff --git a/basis/io/files/info/info.factor b/basis/io/files/info/info.factor index 60a9308f38..500fd62cd3 100644 --- a/basis/io/files/info/info.factor +++ b/basis/io/files/info/info.factor @@ -26,7 +26,7 @@ available-space free-space used-space total-space ; HOOK: file-system-info os ( path -- file-system-info ) { - { [ os unix? ] [ "io.files.info.unix." os name>> append ] } + { [ os unix? ] [ "io.files.info" ] } { [ os windows? ] [ "io.files.info.windows" ] } } cond require diff --git a/basis/io/files/info/unix/unix.factor b/basis/io/files/info/unix/unix.factor index eedf8de47a..3b85467964 100644 --- a/basis/io/files/info/unix/unix.factor +++ b/basis/io/files/info/unix/unix.factor @@ -1,13 +1,13 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors kernel system math math.bitwise strings arrays -sequences combinators combinators.short-circuit alien.c-types -vocabs.loader calendar calendar.unix io.files.info -io.files.types io.backend io.directories unix unix.stat -unix.time unix.users unix.groups classes.struct -specialized-arrays literals ; -SPECIALIZED-ARRAY: timeval +USING: accessors alien.c-types arrays calendar calendar.unix +classes.struct combinators combinators.short-circuit io.backend +io.directories io.files.info io.files.types kernel literals +math math.bitwise sequences specialized-arrays strings system +unix unix.ffi unix.groups unix.stat unix.time unix.users +vocabs.loader ; IN: io.files.info.unix +SPECIALIZED-ARRAY: timeval TUPLE: unix-file-system-info < file-system-info block-size preferred-block-size @@ -109,7 +109,7 @@ M: unix stat>type ( stat -- type ) : chmod-set-bit ( path mask ? -- ) [ dup stat-mode ] 2dip - [ bitor ] [ unmask ] if chmod io-error ; + [ bitor ] [ unmask ] if [ chmod ] unix-system-call drop ; GENERIC# file-mode? 1 ( obj mask -- ? ) @@ -174,7 +174,7 @@ CONSTANT: ALL-EXECUTE OCT: 0000111 : set-other-execute ( path ? -- ) OTHER-EXECUTE swap chmod-set-bit ; : set-file-permissions ( path n -- ) - [ normalize-path ] dip chmod io-error ; + [ normalize-path ] dip [ chmod ] unix-system-call drop ; : file-permissions ( path -- n ) normalize-path file-info permissions>> ; @@ -202,7 +202,7 @@ PRIVATE> : set-file-times ( path timestamps -- ) #! set access, write [ normalize-path ] dip - timestamps>byte-array utimes io-error ; + timestamps>byte-array [ utimes ] unix-system-call drop ; : set-file-access-time ( path timestamp -- ) f 2array set-file-times ; @@ -211,7 +211,8 @@ PRIVATE> f swap 2array set-file-times ; : set-file-ids ( path uid gid -- ) - [ normalize-path ] 2dip [ -1 or ] bi@ chown io-error ; + [ normalize-path ] 2dip [ -1 or ] bi@ + [ chown ] unix-system-call drop ; GENERIC: set-file-user ( path string/id -- ) @@ -285,3 +286,5 @@ PRIVATE> { +regular-file+ [ file-type>executable ] } [ drop file-type>executable ] } case ; + +"io.files.info.unix." os name>> append require diff --git a/basis/io/files/links/unix/unix.factor b/basis/io/files/links/unix/unix.factor index f41adfa731..3f67bb453f 100644 --- a/basis/io/files/links/unix/unix.factor +++ b/basis/io/files/links/unix/unix.factor @@ -1,14 +1,14 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: io.backend io.files.links system unix io.pathnames kernel -io.files sequences ; +USING: io.backend io.files io.files.links io.pathnames kernel +sequences system unix unix.ffi ; IN: io.files.links.unix M: unix make-link ( path1 path2 -- ) - normalize-path symlink io-error ; + normalize-path [ symlink ] unix-system-call drop ; M: unix make-hard-link ( path1 path2 -- ) - normalize-path link io-error ; + normalize-path [ link ] unix-system-call drop ; M: unix read-link ( path -- path' ) normalize-path read-symbolic-link ; diff --git a/basis/io/files/unique/unix/unix.factor b/basis/io/files/unique/unix/unix.factor index 9f35f440c7..ec72d9128b 100644 --- a/basis/io/files/unique/unix/unix.factor +++ b/basis/io/files/unique/unix/unix.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: kernel io.ports io.backend.unix math.bitwise -unix system io.files.unique ; +unix system io.files.unique unix.ffi ; IN: io.files.unique.unix : open-unique-flags ( -- flags ) diff --git a/basis/io/files/unix/unix.factor b/basis/io/files/unix/unix.factor index 9518d1c754..bf0a21f997 100644 --- a/basis/io/files/unix/unix.factor +++ b/basis/io/files/unix/unix.factor @@ -2,11 +2,12 @@ ! See http://factorcode.org/license.txt for BSD license. USING: unix byte-arrays kernel io.backend.unix math.bitwise io.ports io.files io.files.private io.pathnames environment -destructors system ; +destructors system unix.ffi ; IN: io.files.unix M: unix cwd ( -- path ) - MAXPATHLEN [ ] keep getcwd + MAXPATHLEN [ ] keep + [ getcwd ] unix-system-call [ (io-error) ] unless* ; M: unix cd ( path -- ) [ chdir ] unix-system-call drop ; @@ -33,7 +34,7 @@ M: unix (file-writer) ( path -- stream ) : open-append ( path -- fd ) [ append-flags file-mode open-file |dispose - dup 0 SEEK_END lseek io-error + dup 0 SEEK_END [ lseek ] unix-system-call drop ] with-destructors ; M: unix (file-appender) ( path -- stream ) diff --git a/basis/io/launcher/launcher.factor b/basis/io/launcher/launcher.factor old mode 100644 new mode 100755 index cb20f78a33..3999a026c0 --- a/basis/io/launcher/launcher.factor +++ b/basis/io/launcher/launcher.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2008 Slava Pestov. +! Copyright (C) 2008, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: system kernel namespaces strings hashtables sequences assocs combinators vocabs.loader init threads continuations math accessors @@ -127,16 +127,17 @@ M: process-was-killed error. "Launch descriptor:" print nl process>> . ; -: wait-for-process ( process -- status ) +: (wait-for-process) ( process -- status ) + dup handle>> [ - dup handle>> - [ - dup [ processes get at push ] curry - "process" suspend drop - ] when - dup killed>> - [ process-was-killed ] [ status>> ] if - ] with-timeout ; + dup [ processes get at push ] curry + "process" suspend drop + ] when + dup killed>> + [ process-was-killed ] [ status>> ] if ; + +: wait-for-process ( process -- status ) + [ (wait-for-process) ] with-timeout ; : run-detached ( desc -- process ) >process @@ -264,7 +265,7 @@ M: output-process-error error. +stdout+ >>stderr [ +closed+ or ] change-stdin utf8 - [ stream-contents ] [ dup wait-for-process ] bi* + [ [ stream-contents ] [ dup (wait-for-process) ] bi* ] with-timeout 0 = [ 2drop ] [ output-process-error ] if ; : notify-exit ( process status -- ) diff --git a/basis/io/launcher/unix/unix.factor b/basis/io/launcher/unix/unix.factor index a9e3324986..28c805a528 100644 --- a/basis/io/launcher/unix/unix.factor +++ b/basis/io/launcher/unix/unix.factor @@ -5,7 +5,7 @@ continuations environment io io.backend io.backend.unix io.files io.files.private io.files.unix io.launcher io.launcher.unix.parser io.pathnames io.ports kernel math namespaces sequences strings system threads unix -unix.process ; +unix.process unix.ffi ; IN: io.launcher.unix : get-arguments ( process -- seq ) diff --git a/basis/io/launcher/windows/nt/nt-tests.factor b/basis/io/launcher/windows/nt/nt-tests.factor old mode 100644 new mode 100755 index 85999a89f7..c97c411d2c --- a/basis/io/launcher/windows/nt/nt-tests.factor +++ b/basis/io/launcher/windows/nt/nt-tests.factor @@ -23,6 +23,20 @@ IN: io.launcher.windows.nt.tests [ f ] [ "notepad" get process-running? ] unit-test +[ + + "notepad" >>command + 1/2 seconds >>timeout + try-process +] must-fail + +[ + + "notepad" >>command + 1/2 seconds >>timeout + try-output-process +] must-fail + : console-vm ( -- path ) vm ".exe" ?tail [ ".com" append ] when ; diff --git a/basis/io/mmap/unix/unix.factor b/basis/io/mmap/unix/unix.factor index 559417d2b9..f426201b06 100644 --- a/basis/io/mmap/unix/unix.factor +++ b/basis/io/mmap/unix/unix.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2007 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: accessors destructors io.backend.unix io.mmap -io.mmap.private kernel locals math.bitwise system unix ; +io.mmap.private kernel locals math.bitwise system unix unix.ffi ; IN: io.mmap.unix :: mmap-open ( path length prot flags open-mode -- alien fd ) diff --git a/basis/io/pipes/unix/unix.factor b/basis/io/pipes/unix/unix.factor index 8493f14d26..7dbeb0a589 100644 --- a/basis/io/pipes/unix/unix.factor +++ b/basis/io/pipes/unix/unix.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: alien.c-types system kernel unix math sequences -io.backend.unix io.ports specialized-arrays accessors ; +io.backend.unix io.ports specialized-arrays accessors unix.ffi ; QUALIFIED: io.pipes SPECIALIZED-ARRAY: int IN: io.pipes.unix diff --git a/basis/io/sockets/secure/unix/unix.factor b/basis/io/sockets/secure/unix/unix.factor index b04d282530..8fe9facc0c 100644 --- a/basis/io/sockets/secure/unix/unix.factor +++ b/basis/io/sockets/secure/unix/unix.factor @@ -6,7 +6,8 @@ alien.strings libc continuations destructors openssl openssl.libcrypto openssl.libssl io io.files io.ports io.backend.unix io.sockets.unix io.encodings.ascii io.buffers io.sockets io.sockets.private io.sockets.secure -io.sockets.secure.openssl io.timeouts system summary fry ; +io.sockets.secure.openssl io.timeouts system summary fry +unix.ffi ; FROM: io.ports => shutdown ; IN: io.sockets.secure.unix diff --git a/basis/io/sockets/sockets-tests.factor b/basis/io/sockets/sockets-tests.factor index 0964cdc148..96ffbc5e18 100644 --- a/basis/io/sockets/sockets-tests.factor +++ b/basis/io/sockets/sockets-tests.factor @@ -49,6 +49,12 @@ io.streams.string ; [ "1:2:0:0:0:0:3:4" ] [ B{ 0 1 0 2 0 0 0 0 0 0 0 0 0 3 0 4 } T{ inet6 } inet-ntop ] unit-test +[ B{ 0 0 0 0 0 0 0 0 0 127 0 0 0 0 0 1 } ] +[ "::127.0.0.1" T{ inet6 } inet-pton ] unit-test + +[ B{ 0 2 0 0 0 0 0 9 0 127 0 0 0 0 0 1 } ] +[ "2::9:127.0.0.1" T{ inet6 } inet-pton ] unit-test + [ "2001:6f8:37a:5:0:0:0:1" ] [ "2001:6f8:37a:5::1" T{ inet6 } [ inet-pton ] [ inet-ntop ] bi ] unit-test diff --git a/basis/io/sockets/sockets.factor b/basis/io/sockets/sockets.factor index e45224fcc2..59d12f95bc 100644 --- a/basis/io/sockets/sockets.factor +++ b/basis/io/sockets/sockets.factor @@ -11,7 +11,7 @@ IN: io.sockets << { { [ os windows? ] [ "windows.winsock" ] } - { [ os unix? ] [ "unix" ] } + { [ os unix? ] [ "unix.ffi" ] } } cond use-vocab >> ! Addressing @@ -64,21 +64,25 @@ C: inet4 M: inet4 inet-ntop ( data addrspec -- str ) drop 4 memory>byte-array [ number>string ] { } map-as "." join ; +ERROR: malformed-inet4 sequence ; +ERROR: bad-inet4-component string ; + +: parse-inet4 ( string -- seq ) + "." split dup length 4 = [ + malformed-inet4 + ] unless + [ + string>number + [ "Dotted component not a number" throw ] unless* + ] B{ } map-as ; + ERROR: invalid-inet4 string reason ; M: invalid-inet4 summary drop "Invalid IPv4 address" ; M: inet4 inet-pton ( str addrspec -- data ) drop - [ - "." split dup length 4 = [ - "Must have four components" throw - ] unless - [ - string>number - [ "Dotted component not a number" throw ] unless* - ] B{ } map-as - ] [ invalid-inet4 ] recover ; + [ parse-inet4 ] [ invalid-inet4 ] recover ; M: inet4 address-size drop 4 ; @@ -112,11 +116,21 @@ M: invalid-inet6 summary drop "Invalid IPv6 address" ; [ nip ] [ bad-ipv6-component ] if* ] { } map-as ; + : parse-inet6 ( string -- seq ) [ f ] [ - ":" split [ - hex> [ "Component not a number" throw ] unless* - ] { } map-as + ":" split CHAR: . over last member? [ + unclip-last + [ parse-ipv6-component ] [ parse-inet4 ] bi* append + ] [ + parse-ipv6-component + ] if ] if-empty ; : pad-inet6 ( string1 string2 -- seq ) diff --git a/basis/io/sockets/unix/unix.factor b/basis/io/sockets/unix/unix.factor index cdf7e54408..cc0740500a 100644 --- a/basis/io/sockets/unix/unix.factor +++ b/basis/io/sockets/unix/unix.factor @@ -5,7 +5,7 @@ threads sequences byte-arrays io.binary io.backend.unix io.streams.duplex io.backend io.pathnames io.sockets.private io.files.private io.encodings.utf8 math.parser continuations libc combinators system accessors destructors unix locals init -classes.struct alien.data ; +classes.struct alien.data unix.ffi ; EXCLUDE: namespaces => bind ; EXCLUDE: io => read write ; @@ -59,10 +59,15 @@ M: object (get-remote-address) ( handle local -- sockaddr ) [ (io-error) ] } cond ; -M: object establish-connection ( client-out remote -- ) - [ drop ] [ [ handle>> handle-fd ] [ make-sockaddr/size ] bi* connect ] 2bi +M:: object establish-connection ( client-out remote -- ) + client-out remote + [ drop ] + [ + [ handle>> handle-fd ] [ make-sockaddr/size ] bi* connect + ] 2bi { { [ 0 = ] [ drop ] } + { [ errno EINTR = ] [ drop client-out remote establish-connection ] } { [ errno EINPROGRESS = ] [ [ +output+ wait-for-port ] [ wait-to-connect ] bi ] } @@ -70,7 +75,12 @@ M: object establish-connection ( client-out remote -- ) } cond ; : ?bind-client ( socket -- ) - bind-local-address get [ [ fd>> ] dip make-sockaddr/size bind io-error ] [ drop ] if* ; inline + bind-local-address get [ + [ fd>> ] dip make-sockaddr/size + [ bind ] unix-system-call drop + ] [ + drop + ] if* ; inline M: object ((client)) ( addrspec -- fd ) protocol-family SOCK_STREAM socket-fd @@ -83,12 +93,12 @@ M: object ((client)) ( addrspec -- fd ) : server-socket-fd ( addrspec type -- fd ) [ dup protocol-family ] dip socket-fd [ init-server-socket ] keep - [ handle-fd swap make-sockaddr/size bind io-error ] keep ; + [ handle-fd swap make-sockaddr/size [ bind ] unix-system-call drop ] keep ; M: object (server) ( addrspec -- handle ) [ SOCK_STREAM server-socket-fd - dup handle-fd 128 listen io-error + dup handle-fd 128 [ listen ] unix-system-call drop ] with-destructors ; : do-accept ( server addrspec -- fd sockaddr ) diff --git a/basis/listener/listener-docs.factor b/basis/listener/listener-docs.factor index a054067755..77bec12c1a 100644 --- a/basis/listener/listener-docs.factor +++ b/basis/listener/listener-docs.factor @@ -1,4 +1,4 @@ -USING: help.markup help.syntax kernel io system prettyprint continuations ; +USING: help.markup help.syntax kernel io system prettyprint continuations quotations ; IN: listener ARTICLE: "listener-watch" "Watching variables in the listener" @@ -21,6 +21,11 @@ HELP: only-use-vocabs { $values { "vocabs" "a sequence of vocabulary specifiers" } } { $description "Replaces the current manifest's vocabulary search path with the given set of vocabularies." } ; +HELP: with-interactive-vocabs +{ $values { "quot" quotation } } +{ $description "Calls the quotation in a scope with an initial vocabulary search path consisting of all vocabularies from " { $link interactive-vocabs } ", and with the current vocabulary for new definitions set to " { $vocab-link "scratchpad" } "." } +{ $notes "This is the same initial search path as used by the " { $link "listener" } " tool." } ; + HELP: show-var { $values { "var" "a variable name" } } { $description "Adds a variable to the watch list; its value will be printed by the listener after every expression." } ; diff --git a/basis/lists/lists.factor b/basis/lists/lists.factor index f3475f960b..29adcd47d6 100644 --- a/basis/lists/lists.factor +++ b/basis/lists/lists.factor @@ -88,7 +88,7 @@ PRIVATE> nil [ swons ] reduce ; : lmap>array ( list quot -- array ) - accumulator [ leach ] dip { } like ; inline + collector [ leach ] dip { } like ; inline : list>array ( list -- array ) [ ] lmap>array ; diff --git a/basis/locals/locals-docs.factor b/basis/locals/locals-docs.factor index f44b5177e1..d78905c0d7 100644 --- a/basis/locals/locals-docs.factor +++ b/basis/locals/locals-docs.factor @@ -4,7 +4,7 @@ IN: locals HELP: [| { $syntax "[| bindings... | body... ]" } -{ $description "A literal quotation with named variable bindings. When the quotation is " { $link call } "ed, it will take values off the datastack values and place them into the bindings from left to right. The body may then refer to these bindings. The quotation may also bind to named variables in an enclosing scope to create a closure." } +{ $description "A literal quotation with named variable bindings. When the quotation is " { $link call } "ed, it will take values off the datastack and place them into the bindings from left to right. The body may then refer to these bindings. The quotation may also bind to named variables in an enclosing scope to create a closure." } { $examples "See " { $link "locals-examples" } "." } ; HELP: [let @@ -20,7 +20,7 @@ $nl { $code ":> c :> b :> a" } { $code ":> ( a b c )" } $nl -"If any " { $snippet "var" } " name is followed by an exclamation point (" { $snippet "!" } "), that new variable is mutable. See " { $link "locals-mutable" } " for more information on mutable lexical variables." } +"If any " { $snippet "var" } " name is followed by an exclamation point (" { $snippet "!" } "), that new variable is mutable. See " { $link "locals-mutable" } " for more information." } { $notes "This syntax can only be used inside a lexical scope established by a " { $link POSTPONE: :: } " definition, " { $link POSTPONE: [let } " form, or " { $link POSTPONE: [| } " quotation. Normal quotations have their own lexical scope only if they are inside an outer scope. Definition forms such as " { $link POSTPONE: : } " do not establish a lexical scope by themselves unless documented otherwise, nor is there a lexical scope available at the top level of source files or in the listener. " { $link POSTPONE: [let } " can be used to create a lexical scope where one is not otherwise available." } { $examples "See " { $link "locals-examples" } "." } ; @@ -31,7 +31,7 @@ HELP: :: { $syntax ":: word ( vars... -- outputs... ) body... ;" } { $description "Defines a word with named inputs. The word binds its input values to lexical variables from left to right, then executes the body with those bindings in scope." $nl -"If any " { $snippet "var" } " name is followed by an exclamation point (" { $snippet "!" } "), the corresponding new variable is made mutable. See " { $link "locals-mutable" } " for more information on mutable lexical variables." } +"If any " { $snippet "var" } " name is followed by an exclamation point (" { $snippet "!" } "), the corresponding new variable is made mutable. See " { $link "locals-mutable" } " for more information." } { $notes "The names of the " { $snippet "outputs" } " do not affect the word's behavior. However, the compiler verifies that the stack effect accurately represents the number of outputs as with " { $link POSTPONE: : } " definitions." } { $examples "See " { $link "locals-examples" } "." } ; @@ -41,7 +41,7 @@ HELP: MACRO:: { $syntax "MACRO:: word ( vars... -- outputs... ) body... ;" } { $description "Defines a macro with named inputs. The macro binds its input variables to lexical variables from left to right, then executes the body with those bindings in scope." $nl -"If any " { $snippet "var" } " name is followed by an exclamation point (" { $snippet "!" } "), the corresponding new variable is made mutable. See " { $link "locals-mutable" } " for more information on mutable lexical variables." } +"If any " { $snippet "var" } " name is followed by an exclamation point (" { $snippet "!" } "), the corresponding new variable is made mutable. See " { $link "locals-mutable" } " for more information." } { $notes "The expansion of a macro cannot reference lexical variables bound in the outer scope. There are also limitations on passing arguments involving lexical variables into macros. See " { $link "locals-limitations" } " for details." } { $examples "See " { $link "locals-examples" } "." } ; @@ -51,7 +51,7 @@ HELP: MEMO:: { $syntax "MEMO:: word ( vars... -- outputs... ) body... ;" } { $description "Defines a memoized word with named inputs. The word binds its input values to lexical variables from left to right, then executes the body with those bindings in scope." $nl -"If any " { $snippet "var" } " name is followed by an exclamation point (" { $snippet "!" } "), the corresponding new variable is made mutable. See " { $link "locals-mutable" } " for more information on mutable lexical variables." } +"If any " { $snippet "var" } " name is followed by an exclamation point (" { $snippet "!" } "), the corresponding new variable is made mutable. See " { $link "locals-mutable" } " for more information." } { $examples "See " { $link "locals-examples" } "." } ; { POSTPONE: MEMO: POSTPONE: MEMO:: } related-words @@ -60,7 +60,7 @@ HELP: M:: { $syntax "M:: class generic ( vars... -- outputs... ) body... ;" } { $description "Defines a new method on " { $snippet "generic" } " for " { $snippet "class" } " with named inputs. The method binds its input values to lexical variables from left to right, then executes the body with those bindings in scope." $nl -"If any " { $snippet "var" } " name is followed by an exclamation point (" { $snippet "!" } "), the corresponding new variable is made mutable. See " { $link "locals-mutable" } " for more information on mutable lexical variables." } +"If any " { $snippet "var" } " name is followed by an exclamation point (" { $snippet "!" } "), the corresponding new variable is made mutable. See " { $link "locals-mutable" } " for more information." } { $notes "The names of the " { $snippet "outputs" } " do not affect the word's behavior. However, the compiler verifies that the stack effect accurately represents the number of outputs as with " { $link POSTPONE: M: } " definitions." } { $examples "See " { $link "locals-examples" } "." } ; @@ -209,7 +209,7 @@ $nl ARTICLE: "locals-mutable" "Mutable lexical variables" "When a lexical variable is bound using " { $link POSTPONE: :> } ", " { $link POSTPONE: :: } ", or " { $link POSTPONE: [| } ", the variable may be made mutable by suffixing its name with an exclamation point (" { $snippet "!" } "). A mutable variable's value is read by giving its name without the exclamation point as usual. To write to the variable, use its name with the " { $snippet "!" } " suffix." $nl -"Mutable bindings are implemented in a manner similar to the ML language; each mutable binding is actually an immutable binding of a mutable cell. Reading the binding automatically unboxes the value from the cell, and writing to the binding stores into it." +"Mutable bindings are implemented in a manner similar to that taken by the ML language. Each mutable binding is actually an immutable binding of a mutable cell. Reading the binding automatically unboxes the value from the cell, and writing to the binding stores into it." $nl "Writing to mutable variables from outer lexical scopes is fully supported and has full closure semantics. See " { $link "locals-examples" } " for examples of mutable lexical variables in action." ; diff --git a/basis/math/blas/config/config.factor b/basis/math/blas/config/config.factor index 09f736c036..bce6e663af 100644 --- a/basis/math/blas/config/config.factor +++ b/basis/math/blas/config/config.factor @@ -15,7 +15,6 @@ blas-fortran-abi [ { { [ os macosx? ] [ intel-unix-abi ] } { [ os windows? cpu x86.32? and ] [ f2c-abi ] } - { [ os netbsd? cpu x86.64? and ] [ g95-abi ] } { [ os windows? cpu x86.64? and ] [ gfortran-abi ] } { [ os freebsd? ] [ gfortran-abi ] } { [ os linux? ] [ gfortran-abi ] } diff --git a/basis/math/floats/env/env-tests.factor b/basis/math/floats/env/env-tests.factor index 3c21b0cf3e..89aa1bd394 100644 --- a/basis/math/floats/env/env-tests.factor +++ b/basis/math/floats/env/env-tests.factor @@ -1,7 +1,7 @@ USING: kernel math math.floats.env math.floats.env.private math.functions math.libm sequences tools.test locals -compiler.units kernel.private fry compiler math.private words -system ; +compiler.units kernel.private fry compiler.test math.private +words system ; IN: math.floats.env.tests : set-default-fp-env ( -- ) diff --git a/basis/math/vectors/conversion/conversion-tests.factor b/basis/math/vectors/conversion/conversion-tests.factor index c91bdb369e..d46f062d9c 100644 --- a/basis/math/vectors/conversion/conversion-tests.factor +++ b/basis/math/vectors/conversion/conversion-tests.factor @@ -1,5 +1,5 @@ ! (c)Joe Groff bsd license -USING: accessors arrays compiler continuations generalizations +USING: accessors arrays compiler.test continuations generalizations kernel kernel.private locals math.vectors.conversion math.vectors.simd sequences stack-checker tools.test ; FROM: alien.c-types => char uchar short ushort int uint longlong ulonglong float double ; diff --git a/basis/math/vectors/simd/simd-tests.factor b/basis/math/vectors/simd/simd-tests.factor index 342c565dce..1d19c76dc1 100644 --- a/basis/math/vectors/simd/simd-tests.factor +++ b/basis/math/vectors/simd/simd-tests.factor @@ -1,4 +1,4 @@ -USING: accessors arrays classes compiler compiler.tree.debugger +USING: accessors arrays classes compiler.test compiler.tree.debugger effects fry io kernel kernel.private math math.functions math.private math.vectors math.vectors.simd math.vectors.simd.private prettyprint random sequences system diff --git a/basis/prettyprint/stylesheet/stylesheet-docs.factor b/basis/prettyprint/stylesheet/stylesheet-docs.factor index 60014514af..12781a568b 100644 --- a/basis/prettyprint/stylesheet/stylesheet-docs.factor +++ b/basis/prettyprint/stylesheet/stylesheet-docs.factor @@ -8,33 +8,31 @@ HELP: effect-style { "effect" "an effect" } { "style" "a style assoc" } } -{ $description "The styling hook for stack effects" } ; +{ $description "The stylesheet for stack effects" } ; HELP: string-style { $values { "str" "a string" } { "style" "a style assoc" } } -{ $description "The styling hook for string literals" } ; +{ $description "The stylesheet for string literals" } ; HELP: vocab-style { $values { "vocab" "a vocabulary specifier" } { "style" "a style assoc" } } -{ $description "The styling hook for vocab names" } ; +{ $description "The stylesheet for vocab names" } ; HELP: word-style { $values { "word" "a word" } { "style" "a style assoc" } } -{ $description "The styling hook for word names" } ; +{ $description "The stylesheet for word names" } ; -ARTICLE: "prettyprint.stylesheet" "Prettyprinter Formatted Output" -{ $vocab-link "prettyprint.stylesheet" } -$nl -"Control the way that the prettyprinter formats output based on object type. These hooks form a basic \"syntax\" highlighting system." +ARTICLE: "prettyprint.stylesheet" "Prettyprinter stylesheet" +"The " { $vocab-link "prettyprint.stylesheet" } " vocabulary defines variables which control the way that the prettyprinter formats output based on object type." { $subsections word-style string-style diff --git a/basis/regexp/regexp.factor b/basis/regexp/regexp.factor index e9a86516ca..0b387acd2a 100644 --- a/basis/regexp/regexp.factor +++ b/basis/regexp/regexp.factor @@ -84,7 +84,7 @@ PRIVATE> [ prepare-match-iterator ] dip (each-match) ; inline : map-matches ( string regexp quot: ( start end string -- obj ) -- seq ) - accumulator [ each-match ] dip >array ; inline + collector [ each-match ] dip >array ; inline : all-matching-slices ( string regexp -- seq ) [ slice boa ] map-matches ; diff --git a/basis/sequences/deep/deep.factor b/basis/sequences/deep/deep.factor index 8e01025b94..c79d0b2002 100644 --- a/basis/sequences/deep/deep.factor +++ b/basis/sequences/deep/deep.factor @@ -21,7 +21,7 @@ M: object branch? drop f ; [ '[ _ deep-map ] map ] [ drop ] if ; inline recursive : deep-filter ( obj quot: ( elt -- ? ) -- seq ) - over [ pusher [ deep-each ] dip ] dip + over [ selector [ deep-each ] dip ] dip dup branch? [ like ] [ drop ] if ; inline recursive : (deep-find) ( obj quot: ( elt -- ? ) -- elt ? ) diff --git a/basis/sequences/generalizations/generalizations.factor b/basis/sequences/generalizations/generalizations.factor index 210b27f3f3..f49dc8a4e7 100644 --- a/basis/sequences/generalizations/generalizations.factor +++ b/basis/sequences/generalizations/generalizations.factor @@ -58,19 +58,19 @@ MACRO: (ncollect) ( n -- ) : mnmap ( m*seq quot m n -- result*n ) 2dup '[ [ _ npick ] dip swap _ dupn ] 2dip mnmap-as ; inline -: naccumulator-for ( quot ...exemplar n -- quot' vec... ) +: ncollector-for ( quot ...exemplar n -- quot' vec... ) 5 dupn '[ [ [ length ] keep new-resizable ] _ napply [ [ [ push ] _ apply-curry _ spread* ] _ ncurry compose ] _ nkeep ] call ; inline -: naccumulator ( quot n -- quot' vec... ) - [ V{ } swap dupn ] keep naccumulator-for ; inline +: ncollector ( quot n -- quot' vec... ) + [ V{ } swap dupn ] keep ncollector-for ; inline : nproduce-as ( pred quot ...exemplar n -- seq... ) 7 dupn '[ _ ndup - [ _ naccumulator-for [ while ] _ ndip ] + [ _ ncollector-for [ while ] _ ndip ] _ ncurry _ ndip [ like ] _ apply-curry _ spread* ] call ; inline diff --git a/basis/specialized-arrays/specialized-arrays-tests.factor b/basis/specialized-arrays/specialized-arrays-tests.factor index c7e1285689..c25f8ae3b1 100644 --- a/basis/specialized-arrays/specialized-arrays-tests.factor +++ b/basis/specialized-arrays/specialized-arrays-tests.factor @@ -4,7 +4,8 @@ specialized-arrays.private sequences alien.c-types accessors kernel arrays combinators compiler compiler.units classes.struct combinators.smart compiler.tree.debugger math libc destructors sequences.private multiline eval words vocabs namespaces -assocs prettyprint alien.data math.vectors definitions ; +assocs prettyprint alien.data math.vectors definitions +compiler.test ; FROM: alien.c-types => float ; SPECIALIZED-ARRAY: int diff --git a/basis/specialized-vectors/specialized-vectors.factor b/basis/specialized-vectors/specialized-vectors.factor index f71e308ad1..7fa47aa501 100644 --- a/basis/specialized-vectors/specialized-vectors.factor +++ b/basis/specialized-vectors/specialized-vectors.factor @@ -24,9 +24,9 @@ WHERE V A vectors.functor:define-vector -M: V contract 2drop ; +M: V contract 2drop ; inline -M: V byte-length underlying>> byte-length ; +M: V byte-length underlying>> byte-length ; inline M: V pprint-delims drop \ V{ \ } ; diff --git a/basis/stack-checker/known-words/known-words.factor b/basis/stack-checker/known-words/known-words.factor index 9bc61c6353..6ac668b031 100644 --- a/basis/stack-checker/known-words/known-words.factor +++ b/basis/stack-checker/known-words/known-words.factor @@ -516,9 +516,9 @@ M: bad-executable summary \ compact-gc { } { } define-primitive -\ (save-image) { byte-array } { } define-primitive +\ (save-image) { byte-array byte-array } { } define-primitive -\ (save-image-and-exit) { byte-array } { } define-primitive +\ (save-image-and-exit) { byte-array byte-array } { } define-primitive \ data-room { } { byte-array } define-primitive \ data-room make-flushable diff --git a/basis/tools/crossref/crossref.factor b/basis/tools/crossref/crossref.factor index 134395f1a8..daa30100a4 100644 --- a/basis/tools/crossref/crossref.factor +++ b/basis/tools/crossref/crossref.factor @@ -1,9 +1,10 @@ -! Copyright (C) 2005, 2009 Slava Pestov. +! Copyright (C) 2005, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: words assocs definitions io io.pathnames io.styles kernel -prettyprint sorting see sets sequences arrays hashtables help.crossref -help.topics help.markup quotations accessors source-files namespaces -graphs vocabs generic generic.single threads compiler.units init ; +prettyprint sorting see sets sequences arrays hashtables help +help.crossref help.topics help.markup quotations accessors +source-files namespaces graphs vocabs generic generic.single +threads compiler.units init combinators.smart ; IN: tools.crossref SYMBOL: crossref @@ -50,10 +51,16 @@ M: callable uses ( quot -- assoc ) M: word uses def>> uses ; -M: link uses { $subsection $subsections $link $see-also } article-links ; +M: link uses + [ { $subsection $subsections $link $see-also } article-links [ >link ] map ] + [ { $vocab-link } article-links [ >vocab-link ] map ] + bi append ; M: pathname uses string>> source-file top-level-form>> [ uses ] [ { } ] if* ; +! To make UI browser happy +M: vocab uses drop f ; + GENERIC: crossref-def ( defspec -- ) M: object crossref-def @@ -62,18 +69,23 @@ M: object crossref-def M: word crossref-def [ call-next-method ] [ subwords [ crossref-def ] each ] bi ; +: defs-to-crossref ( -- seq ) + [ + all-words + all-articles [ >link ] map + source-files get keys [ ] map + ] append-outputs ; + : build-crossref ( -- crossref ) "Computing usage index... " write flush yield - H{ } clone crossref [ - all-words - source-files get keys [ ] map - [ [ crossref-def ] each ] bi@ - crossref get - ] with-variable + H{ } clone [ + crossref set-global + defs-to-crossref [ crossref-def ] each + ] keep "done" print flush ; : get-crossref ( -- crossref ) - crossref global [ drop build-crossref ] cache ; + crossref get-global [ build-crossref ] unless* ; GENERIC: irrelevant? ( defspec -- ? ) diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor old mode 100644 new mode 100755 index 06009992ad..71191d0fe6 --- a/basis/tools/deploy/shaker/shaker.factor +++ b/basis/tools/deploy/shaker/shaker.factor @@ -545,6 +545,7 @@ SYMBOL: deploy-vocab [ strip-debugger? [ "debugger" require + "tools.errors" require "inspector" require deploy-ui? get [ "ui.debugger" require diff --git a/basis/tools/profiler/profiler-tests.factor b/basis/tools/profiler/profiler-tests.factor index 8f3260d649..1a8ff824d6 100644 --- a/basis/tools/profiler/profiler-tests.factor +++ b/basis/tools/profiler/profiler-tests.factor @@ -1,6 +1,6 @@ USING: accessors tools.profiler tools.test kernel memory math threads alien alien.c-types tools.profiler.private sequences -compiler compiler.units words ; +compiler.test compiler.units words ; IN: tools.profiler.tests [ t ] [ diff --git a/basis/tools/time/time-tests.factor b/basis/tools/time/time-tests.factor index 00c774663c..3df61cbd36 100644 --- a/basis/tools/time/time-tests.factor +++ b/basis/tools/time/time-tests.factor @@ -1,4 +1,4 @@ IN: tools.time.tests -USING: tools.time tools.test compiler ; +USING: tools.time tools.test compiler.test ; [ ] [ [ [ ] time ] compile-call ] unit-test diff --git a/basis/ui/gadgets/gadgets.factor b/basis/ui/gadgets/gadgets.factor index 8eb11a7753..7e47bf627b 100644 --- a/basis/ui/gadgets/gadgets.factor +++ b/basis/ui/gadgets/gadgets.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2005, 2009 Slava Pestov. +! Copyright (C) 2005, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays hashtables kernel math namespaces make sequences quotations math.vectors combinators sorting @@ -62,18 +62,19 @@ M: gadget children-on nip children>> ; ) - [ swap loc>> v- ] dip v. 0 <=> ; - -:: (fast-children-on) ( dim axis children -- i ) - children [ dim axis ((fast-children-on)) ] search drop ; +:: (fast-children-on) ( point axis children quot -- i ) + children [ + [ point ] dip + quot call( value -- loc ) v- + axis v. 0 <=> + ] search drop ; inline PRIVATE> -: fast-children-on ( rect axis children -- from to ) - [ [ loc>> ] 2dip (fast-children-on) 0 or ] - [ [ rect-bounds v+ ] 2dip (fast-children-on) ?1+ ] - 3bi ; +:: fast-children-on ( rect axis children quot -- slice ) + rect loc>> axis children quot (fast-children-on) 0 or + rect rect-bounds v+ axis children quot (fast-children-on) ?1+ + children ; inline M: gadget contains-rect? ( bounds gadget -- ? ) dup visible?>> [ call-next-method ] [ 2drop f ] if ; diff --git a/basis/ui/gadgets/grids/grids-tests.factor b/basis/ui/gadgets/grids/grids-tests.factor index b83f1a7003..3dc0e6b862 100644 --- a/basis/ui/gadgets/grids/grids-tests.factor +++ b/basis/ui/gadgets/grids/grids-tests.factor @@ -1,12 +1,14 @@ USING: ui.gadgets ui.gadgets.grids tools.test kernel arrays namespaces math.rectangles accessors ui.gadgets.grids.private -ui.gadgets.debug sequences ; +ui.gadgets.debug sequences classes ; IN: ui.gadgets.grids.tests [ { 0 0 } ] [ { } pref-dim ] unit-test : 100x100 ( -- gadget ) { 100 100 } >>dim ; +: 200x200 ( -- gadget ) { 200 200 } >>dim ; + [ { 100 100 } ] [ 100x100 1array 1array pref-dim @@ -81,4 +83,22 @@ IN: ui.gadgets.grids.tests "g" get dup layout children>> [ loc>> ] map -] unit-test \ No newline at end of file +] unit-test + +! children-on logic was insufficient +[ ] [ + 100x100 dup "a" set 200x200 2array + 100x100 dup "b" set 200x200 2array 2array f >>fill? "g" set +] unit-test + +[ ] [ "g" get prefer ] unit-test +[ ] [ "g" get layout ] unit-test + +[ { 0 50 } ] [ "a" get loc>> ] unit-test +[ { 0 250 } ] [ "b" get loc>> ] unit-test + +[ gadget { 200 200 } ] +[ { 120 20 } "g" get pick-up [ class ] [ dim>> ] bi ] unit-test + +[ gadget { 200 200 } ] +[ { 120 220 } "g" get pick-up [ class ] [ dim>> ] bi ] unit-test \ No newline at end of file diff --git a/basis/ui/gadgets/grids/grids.factor b/basis/ui/gadgets/grids/grids.factor index 9b5b737406..2e964b48b6 100644 --- a/basis/ui/gadgets/grids/grids.factor +++ b/basis/ui/gadgets/grids/grids.factor @@ -1,7 +1,8 @@ -! Copyright (C) 2006, 2009 Slava Pestov. +! Copyright (C) 2006, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: arrays kernel math math.order math.matrices namespaces make sequences words io -math.vectors ui.gadgets ui.baseline-alignment columns accessors strings.tables +USING: arrays kernel math math.order math.matrices namespaces +make sequences words io math.vectors ui.gadgets +ui.baseline-alignment columns accessors strings.tables math.rectangles fry ; IN: ui.gadgets.grids @@ -115,8 +116,10 @@ M: grid layout* [ grid>> ] [ ] bi grid-layout ; M: grid children-on ( rect gadget -- seq ) dup children>> empty? [ 2drop f ] [ - [ { 0 1 } ] dip grid>> - [ 0 fast-children-on ] [ concat ] bi + [ { 0 1 } ] dip + [ grid>> ] [ dim>> ] bi + '[ _ [ loc>> vmin ] reduce ] fast-children-on + concat ] if ; M: grid gadget-text* diff --git a/basis/ui/gadgets/packs/packs.factor b/basis/ui/gadgets/packs/packs.factor index f47b374aeb..5f21d74180 100644 --- a/basis/ui/gadgets/packs/packs.factor +++ b/basis/ui/gadgets/packs/packs.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2005, 2009 Slava Pestov. +! Copyright (C) 2005, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: sequences ui.gadgets ui.baseline-alignment ui.baseline-alignment.private kernel math math.functions math.vectors @@ -100,5 +100,4 @@ M: pack layout* dup children>> pref-dims pack-layout ; M: pack children-on ( rect gadget -- seq ) - [ orientation>> ] [ children>> ] bi - [ fast-children-on ] keep ; + [ orientation>> ] [ children>> ] bi [ loc>> ] fast-children-on ; diff --git a/basis/ui/gadgets/panes/panes.factor b/basis/ui/gadgets/panes/panes.factor index 50a609b897..8fec7e45ce 100644 --- a/basis/ui/gadgets/panes/panes.factor +++ b/basis/ui/gadgets/panes/panes.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2005, 2009 Slava Pestov. +! Copyright (C) 2005, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: arrays hashtables io kernel namespaces sequences strings quotations math opengl combinators memoize math.vectors @@ -352,7 +352,8 @@ M: paragraph stream-format GENERIC: sloppy-pick-up* ( loc gadget -- n ) M: pack sloppy-pick-up* ( loc gadget -- n ) - [ orientation>> ] [ children>> ] bi (fast-children-on) ; + [ orientation>> ] [ children>> ] bi + [ loc>> ] (fast-children-on) ; M: gadget sloppy-pick-up* children>> [ contains-point? ] with find-last drop ; diff --git a/basis/unicode/case/case.factor b/basis/unicode/case/case.factor index 79db087220..9726b6dd78 100644 --- a/basis/unicode/case/case.factor +++ b/basis/unicode/case/case.factor @@ -109,13 +109,13 @@ HINTS: >upper string ; lt? [ lithuanian>upper ] when [ title>> ] [ ch>title ] map-case ; inline -: title-word ( string -- title ) - unclip 1string [ >lower ] [ (>title) ] bi* prepend ; inline - PRIVATE> +: capitalize ( string -- title ) + unclip 1string [ >lower ] [ (>title) ] bi* prepend ; inline + : >title ( string -- title ) - final-sigma >words [ title-word ] map concat ; + final-sigma >words [ capitalize ] map concat ; HINTS: >title string ; diff --git a/basis/unix/bsd/netbsd/structs/structs.factor b/basis/unix/bsd/netbsd/structs/structs.factor deleted file mode 100644 index 1882fa830b..0000000000 --- a/basis/unix/bsd/netbsd/structs/structs.factor +++ /dev/null @@ -1,30 +0,0 @@ -! Copyright (C) 2008 Doug Coleman. -! See http://factorcode.org/license.txt for BSD license. -USING: alien.c-types alien.syntax unix.time unix.types -unix.types.netbsd classes.struct ; -IN: unix - -STRUCT: sockaddr_storage - { ss_len __uint8_t } - { ss_family sa_family_t } - { __ss_pad1 { char _SS_PAD1SIZE } } - { __ss_align __int64_t } - { __ss_pad2 { char _SS_PAD2SIZE } } ; - -STRUCT: exit_struct - { e_termination uint16_t } - { e_exit uint16_t } ; - -STRUCT: utmpx - { ut_user { char _UTX_USERSIZE } } - { ut_id { char _UTX_IDSIZE } } - { ut_line { char _UTX_LINESIZE } } - { ut_host { char _UTX_HOSTSIZE } } - { ut_session uint16_t } - { ut_type uint16_t } - { ut_pid pid_t } - { ut_exit exit_struct } - { ut_ss sockaddr_storage } - { ut_tv timeval } - { ut_pad { uint32_t 10 } } ; - diff --git a/basis/unix/debugger/debugger.factor b/basis/unix/debugger/debugger.factor index 4e276373e1..7a085731d1 100644 --- a/basis/unix/debugger/debugger.factor +++ b/basis/unix/debugger/debugger.factor @@ -1,7 +1,6 @@ -! Copyright (C) 2008 Slava Pestov. +! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: debugger prettyprint accessors unix kernel ; -FROM: io => write print nl ; +USING: accessors debugger io kernel prettyprint unix ; IN: unix.debugger M: unix-error error. diff --git a/basis/unix/ffi/authors.txt b/basis/unix/ffi/authors.txt new file mode 100644 index 0000000000..b4bd0e7b35 --- /dev/null +++ b/basis/unix/ffi/authors.txt @@ -0,0 +1 @@ +Doug Coleman \ No newline at end of file diff --git a/basis/unix/bsd/authors.txt b/basis/unix/ffi/bsd/authors.txt similarity index 100% rename from basis/unix/bsd/authors.txt rename to basis/unix/ffi/bsd/authors.txt diff --git a/basis/unix/bsd/bsd.factor b/basis/unix/ffi/bsd/bsd.factor similarity index 89% rename from basis/unix/bsd/bsd.factor rename to basis/unix/ffi/bsd/bsd.factor index 0825e42930..bda99422fc 100644 --- a/basis/unix/bsd/bsd.factor +++ b/basis/unix/ffi/bsd/bsd.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: alien.c-types alien.syntax classes.struct combinators system unix.types vocabs.loader ; -IN: unix +IN: unix.ffi CONSTANT: MAXPATHLEN 1024 @@ -85,8 +85,8 @@ CONSTANT: SEEK_CUR 1 CONSTANT: SEEK_END 2 os { - { macosx [ "unix.bsd.macosx" require ] } - { freebsd [ "unix.bsd.freebsd" require ] } - { openbsd [ "unix.bsd.openbsd" require ] } - { netbsd [ "unix.bsd.netbsd" require ] } + { macosx [ "unix.ffi.bsd.macosx" require ] } + { freebsd [ "unix.ffi.bsd.freebsd" require ] } + { openbsd [ "unix.ffi.bsd.openbsd" require ] } + { netbsd [ "unix.ffi.bsd.netbsd" require ] } } case diff --git a/basis/unix/bsd/freebsd/freebsd.factor b/basis/unix/ffi/bsd/freebsd/freebsd.factor similarity index 99% rename from basis/unix/bsd/freebsd/freebsd.factor rename to basis/unix/ffi/bsd/freebsd/freebsd.factor index e6a2070520..992d1c3ad0 100644 --- a/basis/unix/bsd/freebsd/freebsd.factor +++ b/basis/unix/ffi/bsd/freebsd/freebsd.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct unix.types ; -IN: unix +IN: unix.ffi CONSTANT: FD_SETSIZE 1024 diff --git a/basis/unix/bsd/freebsd/tags.txt b/basis/unix/ffi/bsd/freebsd/tags.txt similarity index 100% rename from basis/unix/bsd/freebsd/tags.txt rename to basis/unix/ffi/bsd/freebsd/tags.txt diff --git a/basis/unix/bsd/macosx/macosx.factor b/basis/unix/ffi/bsd/macosx/macosx.factor similarity index 95% rename from basis/unix/bsd/macosx/macosx.factor rename to basis/unix/ffi/bsd/macosx/macosx.factor index c263be7056..a2e75b6ca6 100644 --- a/basis/unix/bsd/macosx/macosx.factor +++ b/basis/unix/ffi/bsd/macosx/macosx.factor @@ -1,6 +1,7 @@ -USING: alien.c-types alien.syntax unix.time unix.types -unix.types.macosx classes.struct ; -IN: unix +USING: alien alien.c-types alien.libraries alien.syntax +classes.struct combinators kernel system unix unix.time +unix.types vocabs vocabs.loader ; +IN: unix.ffi CONSTANT: FD_SETSIZE 1024 diff --git a/basis/unix/bsd/macosx/tags.txt b/basis/unix/ffi/bsd/macosx/tags.txt similarity index 100% rename from basis/unix/bsd/macosx/tags.txt rename to basis/unix/ffi/bsd/macosx/tags.txt diff --git a/basis/unix/bsd/netbsd/netbsd.factor b/basis/unix/ffi/bsd/netbsd/netbsd.factor similarity index 80% rename from basis/unix/bsd/netbsd/netbsd.factor rename to basis/unix/ffi/bsd/netbsd/netbsd.factor index 6bef08abe3..d755caf874 100644 --- a/basis/unix/bsd/netbsd/netbsd.factor +++ b/basis/unix/ffi/bsd/netbsd/netbsd.factor @@ -1,6 +1,6 @@ USING: alien.syntax alien.c-types math vocabs.loader -classes.struct unix.types ; -IN: unix +classes.struct unix.types unix.time ; +IN: unix.ffi CONSTANT: FD_SETSIZE 256 @@ -127,6 +127,8 @@ CONSTANT: _UTX_LINESIZE 32 CONSTANT: _UTX_IDSIZE 4 CONSTANT: _UTX_HOSTSIZE 256 +<< + CONSTANT: _SS_MAXSIZE 128 : _SS_ALIGNSIZE ( -- n ) @@ -138,4 +140,28 @@ CONSTANT: _SS_MAXSIZE 128 : _SS_PAD2SIZE ( -- n ) _SS_MAXSIZE 2 - _SS_PAD1SIZE - _SS_ALIGNSIZE - ; inline -"unix.bsd.netbsd.structs" require +>> + +STRUCT: sockaddr_storage + { ss_len __uint8_t } + { ss_family sa_family_t } + { __ss_pad1 { char _SS_PAD1SIZE } } + { __ss_align __int64_t } + { __ss_pad2 { char _SS_PAD2SIZE } } ; + +STRUCT: exit_struct + { e_termination uint16_t } + { e_exit uint16_t } ; + +STRUCT: utmpx + { ut_user { char _UTX_USERSIZE } } + { ut_id { char _UTX_IDSIZE } } + { ut_line { char _UTX_LINESIZE } } + { ut_host { char _UTX_HOSTSIZE } } + { ut_session uint16_t } + { ut_type uint16_t } + { ut_pid pid_t } + { ut_exit exit_struct } + { ut_ss sockaddr_storage } + { ut_tv timeval } + { ut_pad { uint32_t 10 } } ; diff --git a/basis/unix/bsd/netbsd/structs/tags.txt b/basis/unix/ffi/bsd/netbsd/tags.txt similarity index 100% rename from basis/unix/bsd/netbsd/structs/tags.txt rename to basis/unix/ffi/bsd/netbsd/tags.txt diff --git a/basis/unix/bsd/openbsd/openbsd.factor b/basis/unix/ffi/bsd/openbsd/openbsd.factor similarity index 99% rename from basis/unix/bsd/openbsd/openbsd.factor rename to basis/unix/ffi/bsd/openbsd/openbsd.factor index f48b7c1ac4..076dbdfd24 100644 --- a/basis/unix/bsd/openbsd/openbsd.factor +++ b/basis/unix/ffi/bsd/openbsd/openbsd.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct unix.types ; -IN: unix +IN: unix.ffi CONSTANT: FD_SETSIZE 1024 diff --git a/basis/unix/bsd/netbsd/tags.txt b/basis/unix/ffi/bsd/openbsd/tags.txt similarity index 100% rename from basis/unix/bsd/netbsd/tags.txt rename to basis/unix/ffi/bsd/openbsd/tags.txt diff --git a/basis/unix/bsd/summary.txt b/basis/unix/ffi/bsd/summary.txt similarity index 100% rename from basis/unix/bsd/summary.txt rename to basis/unix/ffi/bsd/summary.txt diff --git a/basis/unix/bsd/openbsd/tags.txt b/basis/unix/ffi/bsd/tags.txt similarity index 100% rename from basis/unix/bsd/openbsd/tags.txt rename to basis/unix/ffi/bsd/tags.txt diff --git a/basis/unix/ffi/ffi.factor b/basis/unix/ffi/ffi.factor new file mode 100644 index 0000000000..3882f6fc80 --- /dev/null +++ b/basis/unix/ffi/ffi.factor @@ -0,0 +1,158 @@ +! Copyright (C) 2010 Doug Coleman. +! See http://factorcode.org/license.txt for BSD license. +USING: alien alien.c-types alien.libraries alien.syntax +classes.struct combinators kernel system unix.time unix.types +vocabs vocabs.loader ; +IN: unix.ffi + +<< + +{ + { [ os linux? ] [ "unix.ffi.linux" require ] } + { [ os bsd? ] [ "unix.ffi.bsd" require ] } + { [ os solaris? ] [ "unix.ffi.solaris" require ] } +} cond + +>> + +CONSTANT: PROT_NONE 0 +CONSTANT: PROT_READ 1 +CONSTANT: PROT_WRITE 2 +CONSTANT: PROT_EXEC 4 + +CONSTANT: MAP_FILE 0 +CONSTANT: MAP_SHARED 1 +CONSTANT: MAP_PRIVATE 2 + +CONSTANT: SEEK_SET 0 +CONSTANT: SEEK_CUR 1 +CONSTANT: SEEK_END 2 + +: MAP_FAILED ( -- alien ) -1 ; inline + +CONSTANT: NGROUPS_MAX 16 + +CONSTANT: DT_UNKNOWN 0 +CONSTANT: DT_FIFO 1 +CONSTANT: DT_CHR 2 +CONSTANT: DT_DIR 4 +CONSTANT: DT_BLK 6 +CONSTANT: DT_REG 8 +CONSTANT: DT_LNK 10 +CONSTANT: DT_SOCK 12 +CONSTANT: DT_WHT 14 + +LIBRARY: libc + +FUNCTION: char* strerror ( int errno ) ; + +STRUCT: group + { gr_name char* } + { gr_passwd char* } + { gr_gid int } + { gr_mem char** } ; + +FUNCTION: int accept ( int s, void* sockaddr, socklen_t* socklen ) ; +FUNCTION: int bind ( int s, void* name, socklen_t namelen ) ; +FUNCTION: int chdir ( char* path ) ; +FUNCTION: int chmod ( char* path, mode_t mode ) ; +FUNCTION: int fchmod ( int fd, mode_t mode ) ; +FUNCTION: int chown ( char* path, uid_t owner, gid_t group ) ; +FUNCTION: int chroot ( char* path ) ; +FUNCTION: int close ( int fd ) ; +FUNCTION: int closedir ( DIR* dirp ) ; +FUNCTION: int connect ( int s, void* name, socklen_t namelen ) ; +FUNCTION: int dup2 ( int oldd, int newd ) ; +FUNCTION: void endpwent ( ) ; +FUNCTION: int fchdir ( int fd ) ; +FUNCTION: int fchown ( int fd, uid_t owner, gid_t group ) ; +FUNCTION: int fcntl ( int fd, int cmd, int arg ) ; +FUNCTION: int flock ( int fd, int operation ) ; +FUNCTION: void freeaddrinfo ( addrinfo* ai ) ; +FUNCTION: int futimes ( int id, timeval[2] times ) ; +FUNCTION: char* gai_strerror ( int ecode ) ; +FUNCTION: int getaddrinfo ( char* hostname, char* servname, addrinfo* hints, addrinfo** res ) ; +FUNCTION: char* getcwd ( char* buf, size_t size ) ; +FUNCTION: pid_t getpid ; +FUNCTION: int getdtablesize ; +FUNCTION: gid_t getegid ; +FUNCTION: uid_t geteuid ; +FUNCTION: gid_t getgid ; +FUNCTION: char* getenv ( char* name ) ; + +FUNCTION: int getgrgid_r ( gid_t gid, group* grp, char* buffer, size_t bufsize, group** result ) ; +FUNCTION: int getgrnam_r ( char* name, group* grp, char* buffer, size_t bufsize, group** result ) ; +FUNCTION: passwd* getpwent ( ) ; +FUNCTION: passwd* getpwuid ( uid_t uid ) ; +FUNCTION: passwd* getpwnam ( char* login ) ; +FUNCTION: int getpwnam_r ( char* login, passwd* pwd, char* buffer, size_t bufsize, passwd** result ) ; +FUNCTION: int getgroups ( int gidsetlen, gid_t* gidset ) ; +FUNCTION: int getgrouplist ( char* name, int basegid, int* groups, int* ngroups ) ; +FUNCTION: int getrlimit ( int resource, rlimit* rlp ) ; +FUNCTION: int setrlimit ( int resource, rlimit* rlp ) ; +FUNCTION: int getpriority ( int which, id_t who ) ; +FUNCTION: int setpriority ( int which, id_t who, int prio ) ; +FUNCTION: int getrusage ( int who, rusage* r_usage ) ; +FUNCTION: group* getgrent ; +FUNCTION: int gethostname ( char* name, int len ) ; +FUNCTION: int getsockname ( int socket, sockaddr* address, socklen_t* address_len ) ; +FUNCTION: int getpeername ( int socket, sockaddr* address, socklen_t* address_len ) ; +FUNCTION: uid_t getuid ; +FUNCTION: uint htonl ( uint n ) ; +FUNCTION: ushort htons ( ushort n ) ; +! FUNCTION: int issetugid ; +FUNCTION: int ioctl ( int fd, ulong request, char* argp ) ; +FUNCTION: int lchown ( char* path, uid_t owner, gid_t group ) ; +FUNCTION: int listen ( int s, int backlog ) ; +FUNCTION: off_t lseek ( int fildes, off_t offset, int whence ) ; +FUNCTION: int mkdir ( char* path, mode_t mode ) ; +FUNCTION: void* mmap ( void* addr, size_t len, int prot, int flags, int fd, off_t offset ) ; +FUNCTION: int munmap ( void* addr, size_t len ) ; +FUNCTION: uint ntohl ( uint n ) ; +FUNCTION: ushort ntohs ( ushort n ) ; +FUNCTION: int shutdown ( int fd, int how ) ; +FUNCTION: int open ( char* path, int flags, int prot ) ; +FUNCTION: DIR* opendir ( char* path ) ; + +STRUCT: utimbuf + { actime time_t } + { modtime time_t } ; + +FUNCTION: int utime ( char* path, utimbuf* buf ) ; + +FUNCTION: int pclose ( void* file ) ; +FUNCTION: int pipe ( int* filedes ) ; +FUNCTION: void* popen ( char* command, char* type ) ; +FUNCTION: ssize_t read ( int fd, void* buf, size_t nbytes ) ; + +FUNCTION: dirent* readdir ( DIR* dirp ) ; +FUNCTION: int readdir_r ( void* dirp, dirent* entry, dirent** result ) ; +FUNCTION: ssize_t readlink ( char* path, char* buf, size_t bufsize ) ; + +CONSTANT: PATH_MAX 1024 + +FUNCTION: ssize_t recv ( int s, void* buf, size_t nbytes, int flags ) ; +FUNCTION: ssize_t recvfrom ( int s, void* buf, size_t nbytes, int flags, sockaddr-in* from, socklen_t* fromlen ) ; +FUNCTION: int rename ( char* from, char* to ) ; +FUNCTION: int rmdir ( char* path ) ; +FUNCTION: int select ( int nfds, void* readfds, void* writefds, void* exceptfds, timeval* timeout ) ; +FUNCTION: ssize_t sendto ( int s, void* buf, size_t len, int flags, sockaddr-in* to, socklen_t tolen ) ; +FUNCTION: int setenv ( char* name, char* value, int overwrite ) ; +FUNCTION: int unsetenv ( char* name ) ; +FUNCTION: int setegid ( gid_t egid ) ; +FUNCTION: int seteuid ( uid_t euid ) ; +FUNCTION: int setgid ( gid_t gid ) ; +FUNCTION: int setgroups ( int ngroups, gid_t* gidset ) ; +FUNCTION: int setregid ( gid_t rgid, gid_t egid ) ; +FUNCTION: int setreuid ( uid_t ruid, uid_t euid ) ; +FUNCTION: int setsockopt ( int s, int level, int optname, void* optval, socklen_t optlen ) ; +FUNCTION: int setuid ( uid_t uid ) ; +FUNCTION: int socket ( int domain, int type, int protocol ) ; +FUNCTION: int symlink ( char* path1, char* path2 ) ; +FUNCTION: int link ( char* path1, char* path2 ) ; +FUNCTION: int system ( char* command ) ; +FUNCTION: int unlink ( char* path ) ; +FUNCTION: int utimes ( char* path, timeval[2] times ) ; +FUNCTION: ssize_t write ( int fd, void* buf, size_t nbytes ) ; + +"librt" "librt.so" "cdecl" add-library diff --git a/basis/unix/ffi/linux/authors.txt b/basis/unix/ffi/linux/authors.txt new file mode 100644 index 0000000000..b4bd0e7b35 --- /dev/null +++ b/basis/unix/ffi/linux/authors.txt @@ -0,0 +1 @@ +Doug Coleman \ No newline at end of file diff --git a/basis/unix/ffi/linux/linux.factor b/basis/unix/ffi/linux/linux.factor new file mode 100644 index 0000000000..260796b5e4 --- /dev/null +++ b/basis/unix/ffi/linux/linux.factor @@ -0,0 +1,236 @@ +! Copyright (C) 2010 Doug Coleman. +! See http://factorcode.org/license.txt for BSD license. +USING: alien.c-types alien.syntax classes.struct unix.types ; +IN: unix.ffi + +CONSTANT: MAXPATHLEN 1024 + +CONSTANT: O_RDONLY HEX: 0000 +CONSTANT: O_WRONLY HEX: 0001 +CONSTANT: O_RDWR HEX: 0002 +CONSTANT: O_CREAT HEX: 0040 +CONSTANT: O_EXCL HEX: 0080 +CONSTANT: O_NOCTTY HEX: 0100 +CONSTANT: O_TRUNC HEX: 0200 +CONSTANT: O_APPEND HEX: 0400 +CONSTANT: O_NONBLOCK HEX: 0800 + +ALIAS: O_NDELAY O_NONBLOCK + +CONSTANT: SOL_SOCKET 1 + +CONSTANT: FD_SETSIZE 1024 + +CONSTANT: SO_REUSEADDR 2 +CONSTANT: SO_OOBINLINE 10 +CONSTANT: SO_SNDTIMEO HEX: 15 +CONSTANT: SO_RCVTIMEO HEX: 14 + +CONSTANT: F_SETFD 2 +CONSTANT: FD_CLOEXEC 1 + +CONSTANT: F_SETFL 4 + +STRUCT: addrinfo + { flags int } + { family int } + { socktype int } + { protocol int } + { addrlen socklen_t } + { addr void* } + { canonname char* } + { next addrinfo* } ; + +STRUCT: sockaddr-in + { family ushort } + { port ushort } + { addr in_addr_t } + { unused longlong } ; + +STRUCT: sockaddr-in6 + { family ushort } + { port ushort } + { flowinfo uint } + { addr uchar[16] } + { scopeid uint } ; + +CONSTANT: max-un-path 108 + +STRUCT: sockaddr-un + { family ushort } + { path { char max-un-path } } ; + +CONSTANT: SOCK_STREAM 1 +CONSTANT: SOCK_DGRAM 2 + +CONSTANT: AF_UNSPEC 0 +CONSTANT: AF_UNIX 1 +CONSTANT: AF_INET 2 +CONSTANT: AF_INET6 10 + +ALIAS: PF_UNSPEC AF_UNSPEC +ALIAS: PF_UNIX AF_UNIX +ALIAS: PF_INET AF_INET +ALIAS: PF_INET6 AF_INET6 + +CONSTANT: IPPROTO_TCP 6 +CONSTANT: IPPROTO_UDP 17 + +CONSTANT: AI_PASSIVE 1 + +CONSTANT: SEEK_SET 0 +CONSTANT: SEEK_CUR 1 +CONSTANT: SEEK_END 2 + +STRUCT: passwd + { pw_name char* } + { pw_passwd char* } + { pw_uid uid_t } + { pw_gid gid_t } + { pw_gecos char* } + { pw_dir char* } + { pw_shell char* } ; + +! dirent64 +STRUCT: dirent + { d_ino ulonglong } + { d_off longlong } + { d_reclen ushort } + { d_type uchar } + { d_name char[256] } ; + +FUNCTION: int open64 ( char* path, int flags, int prot ) ; +FUNCTION: dirent* readdir64 ( DIR* dirp ) ; +FUNCTION: int readdir64_r ( void* dirp, dirent* entry, dirent** result ) ; + +CONSTANT: EPERM 1 +CONSTANT: ENOENT 2 +CONSTANT: ESRCH 3 +CONSTANT: EINTR 4 +CONSTANT: EIO 5 +CONSTANT: ENXIO 6 +CONSTANT: E2BIG 7 +CONSTANT: ENOEXEC 8 +CONSTANT: EBADF 9 +CONSTANT: ECHILD 10 +CONSTANT: EAGAIN 11 +CONSTANT: ENOMEM 12 +CONSTANT: EACCES 13 +CONSTANT: EFAULT 14 +CONSTANT: ENOTBLK 15 +CONSTANT: EBUSY 16 +CONSTANT: EEXIST 17 +CONSTANT: EXDEV 18 +CONSTANT: ENODEV 19 +CONSTANT: ENOTDIR 20 +CONSTANT: EISDIR 21 +CONSTANT: EINVAL 22 +CONSTANT: ENFILE 23 +CONSTANT: EMFILE 24 +CONSTANT: ENOTTY 25 +CONSTANT: ETXTBSY 26 +CONSTANT: EFBIG 27 +CONSTANT: ENOSPC 28 +CONSTANT: ESPIPE 29 +CONSTANT: EROFS 30 +CONSTANT: EMLINK 31 +CONSTANT: EPIPE 32 +CONSTANT: EDOM 33 +CONSTANT: ERANGE 34 +CONSTANT: EDEADLK 35 +CONSTANT: ENAMETOOLONG 36 +CONSTANT: ENOLCK 37 +CONSTANT: ENOSYS 38 +CONSTANT: ENOTEMPTY 39 +CONSTANT: ELOOP 40 +ALIAS: EWOULDBLOCK EAGAIN +CONSTANT: ENOMSG 42 +CONSTANT: EIDRM 43 +CONSTANT: ECHRNG 44 +CONSTANT: EL2NSYNC 45 +CONSTANT: EL3HLT 46 +CONSTANT: EL3RST 47 +CONSTANT: ELNRNG 48 +CONSTANT: EUNATCH 49 +CONSTANT: ENOCSI 50 +CONSTANT: EL2HLT 51 +CONSTANT: EBADE 52 +CONSTANT: EBADR 53 +CONSTANT: EXFULL 54 +CONSTANT: ENOANO 55 +CONSTANT: EBADRQC 56 +CONSTANT: EBADSLT 57 +ALIAS: EDEADLOCK EDEADLK +CONSTANT: EBFONT 59 +CONSTANT: ENOSTR 60 +CONSTANT: ENODATA 61 +CONSTANT: ETIME 62 +CONSTANT: ENOSR 63 +CONSTANT: ENONET 64 +CONSTANT: ENOPKG 65 +CONSTANT: EREMOTE 66 +CONSTANT: ENOLINK 67 +CONSTANT: EADV 68 +CONSTANT: ESRMNT 69 +CONSTANT: ECOMM 70 +CONSTANT: EPROTO 71 +CONSTANT: EMULTIHOP 72 +CONSTANT: EDOTDOT 73 +CONSTANT: EBADMSG 74 +CONSTANT: EOVERFLOW 75 +CONSTANT: ENOTUNIQ 76 +CONSTANT: EBADFD 77 +CONSTANT: EREMCHG 78 +CONSTANT: ELIBACC 79 +CONSTANT: ELIBBAD 80 +CONSTANT: ELIBSCN 81 +CONSTANT: ELIBMAX 82 +CONSTANT: ELIBEXEC 83 +CONSTANT: EILSEQ 84 +CONSTANT: ERESTART 85 +CONSTANT: ESTRPIPE 86 +CONSTANT: EUSERS 87 +CONSTANT: ENOTSOCK 88 +CONSTANT: EDESTADDRREQ 89 +CONSTANT: EMSGSIZE 90 +CONSTANT: EPROTOTYPE 91 +CONSTANT: ENOPROTOOPT 92 +CONSTANT: EPROTONOSUPPORT 93 +CONSTANT: ESOCKTNOSUPPORT 94 +CONSTANT: EOPNOTSUPP 95 +CONSTANT: EPFNOSUPPORT 96 +CONSTANT: EAFNOSUPPORT 97 +CONSTANT: EADDRINUSE 98 +CONSTANT: EADDRNOTAVAIL 99 +CONSTANT: ENETDOWN 100 +CONSTANT: ENETUNREACH 101 +CONSTANT: ENETRESET 102 +CONSTANT: ECONNABORTED 103 +CONSTANT: ECONNRESET 104 +CONSTANT: ENOBUFS 105 +CONSTANT: EISCONN 106 +CONSTANT: ENOTCONN 107 +CONSTANT: ESHUTDOWN 108 +CONSTANT: ETOOMANYREFS 109 +CONSTANT: ETIMEDOUT 110 +CONSTANT: ECONNREFUSED 111 +CONSTANT: EHOSTDOWN 112 +CONSTANT: EHOSTUNREACH 113 +CONSTANT: EALREADY 114 +CONSTANT: EINPROGRESS 115 +CONSTANT: ESTALE 116 +CONSTANT: EUCLEAN 117 +CONSTANT: ENOTNAM 118 +CONSTANT: ENAVAIL 119 +CONSTANT: EISNAM 120 +CONSTANT: EREMOTEIO 121 +CONSTANT: EDQUOT 122 +CONSTANT: ENOMEDIUM 123 +CONSTANT: EMEDIUMTYPE 124 +CONSTANT: ECANCELED 125 +CONSTANT: ENOKEY 126 +CONSTANT: EKEYEXPIRED 127 +CONSTANT: EKEYREVOKED 128 +CONSTANT: EKEYREJECTED 129 +CONSTANT: EOWNERDEAD 130 +CONSTANT: ENOTRECOVERABLE 131 diff --git a/basis/unix/bsd/tags.txt b/basis/unix/ffi/linux/tags.txt similarity index 100% rename from basis/unix/bsd/tags.txt rename to basis/unix/ffi/linux/tags.txt diff --git a/basis/unix/solaris/authors.txt b/basis/unix/ffi/solaris/authors.txt similarity index 100% rename from basis/unix/solaris/authors.txt rename to basis/unix/ffi/solaris/authors.txt diff --git a/basis/unix/solaris/solaris.factor b/basis/unix/ffi/solaris/solaris.factor similarity index 97% rename from basis/unix/solaris/solaris.factor rename to basis/unix/ffi/solaris/solaris.factor index 1a1a7603f0..d641961a25 100644 --- a/basis/unix/solaris/solaris.factor +++ b/basis/unix/ffi/solaris/solaris.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2006 Patrick Mauritz. ! See http://factorcode.org/license.txt for BSD license. USING: alien.c-types alien.syntax system kernel layouts ; -IN: unix +IN: unix.ffi ! Solaris. @@ -52,7 +52,7 @@ STRUCT: sockaddr-in6 { addr uchar[16] } { scopeid uint } ; -: max-un-path 108 ; +CONSTANT: max-un-path 108 STRUCT: sockaddr-un { family ushort } diff --git a/basis/unix/solaris/tags.txt b/basis/unix/ffi/solaris/tags.txt similarity index 100% rename from basis/unix/solaris/tags.txt rename to basis/unix/ffi/solaris/tags.txt diff --git a/basis/unix/ffi/tags.txt b/basis/unix/ffi/tags.txt new file mode 100644 index 0000000000..6bf68304bb --- /dev/null +++ b/basis/unix/ffi/tags.txt @@ -0,0 +1 @@ +unportable diff --git a/basis/unix/groups/groups.factor b/basis/unix/groups/groups.factor index 02d9f37023..c34affb9c3 100644 --- a/basis/unix/groups/groups.factor +++ b/basis/unix/groups/groups.factor @@ -4,10 +4,10 @@ USING: alien alien.c-types alien.strings io.encodings.utf8 io.backend.unix kernel math sequences splitting strings combinators.short-circuit byte-arrays combinators accessors math.parser fry assocs namespaces continuations -unix.users unix.utilities classes.struct ; +unix.users unix.utilities classes.struct unix ; IN: unix.groups -QUALIFIED: unix +QUALIFIED: unix.ffi QUALIFIED: grouping @@ -23,17 +23,21 @@ GENERIC: group-struct ( obj -- group/f ) gr_mem>> utf8 alien>strings ; : (group-struct) ( id -- group-struct id group-struct byte-array length void* ) - [ \ unix:group ] dip over 4096 + [ \ unix.ffi:group ] dip over 4096 [ ] keep f ; : check-group-struct ( group-struct ptr -- group-struct/f ) *void* [ drop f ] unless ; M: integer group-struct ( id -- group/f ) - (group-struct) [ unix:getgrgid_r unix:io-error ] keep check-group-struct ; + (group-struct) + [ [ unix.ffi:getgrgid_r ] unix-system-call drop ] keep + check-group-struct ; M: string group-struct ( string -- group/f ) - (group-struct) [ unix:getgrnam_r unix:io-error ] keep check-group-struct ; + (group-struct) + [ [ unix.ffi:getgrnam_r ] unix-system-call drop ] keep + check-group-struct ; : group-struct>group ( group-struct -- group ) [ \ group new ] dip @@ -64,8 +68,8 @@ PRIVATE> : (user-groups) ( string -- seq ) #! first group is -1337, legacy unix code - -1337 unix:NGROUPS_MAX [ 4 * ] keep - [ unix:getgrouplist unix:io-error ] 2keep + -1337 unix.ffi:NGROUPS_MAX [ 4 * ] keep + [ [ unix.ffi:getgrouplist ] unix-system-call drop ] 2keep [ 4 tail-slice ] [ *int 1 - ] bi* >groups ; PRIVATE> @@ -79,7 +83,7 @@ M: integer user-groups ( id -- seq ) user-name (user-groups) ; : all-groups ( -- seq ) - [ unix:getgrent dup ] [ \ unix:group memory>struct group-struct>group ] produce nip ; + [ unix.ffi:getgrent dup ] [ \ unix.ffi:group memory>struct group-struct>group ] produce nip ; : ( -- assoc ) all-groups [ [ id>> ] keep ] H{ } map>assoc ; @@ -87,11 +91,11 @@ M: integer user-groups ( id -- seq ) : with-group-cache ( quot -- ) [ group-cache ] dip with-variable ; inline -: real-group-id ( -- id ) unix:getgid ; inline +: real-group-id ( -- id ) unix.ffi:getgid ; inline : real-group-name ( -- string ) real-group-id group-name ; inline -: effective-group-id ( -- string ) unix:getegid ; inline +: effective-group-id ( -- string ) unix.ffi:getegid ; inline : effective-group-name ( -- string ) effective-group-id group-name ; inline @@ -111,10 +115,10 @@ GENERIC: set-effective-group ( obj -- ) diff --git a/basis/unix/linux/linux.factor b/basis/unix/linux/linux.factor index 93bf621acd..10bf070e1a 100644 --- a/basis/unix/linux/linux.factor +++ b/basis/unix/linux/linux.factor @@ -1,241 +1,6 @@ ! Copyright (C) 2005, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.c-types alien.syntax alien system classes.struct -unix.types ; -IN: unix - -! Linux. - -CONSTANT: MAXPATHLEN 1024 - -CONSTANT: O_RDONLY HEX: 0000 -CONSTANT: O_WRONLY HEX: 0001 -CONSTANT: O_RDWR HEX: 0002 -CONSTANT: O_CREAT HEX: 0040 -CONSTANT: O_EXCL HEX: 0080 -CONSTANT: O_NOCTTY HEX: 0100 -CONSTANT: O_TRUNC HEX: 0200 -CONSTANT: O_APPEND HEX: 0400 -CONSTANT: O_NONBLOCK HEX: 0800 - -ALIAS: O_NDELAY O_NONBLOCK - -CONSTANT: SOL_SOCKET 1 - -CONSTANT: FD_SETSIZE 1024 - -CONSTANT: SO_REUSEADDR 2 -CONSTANT: SO_OOBINLINE 10 -CONSTANT: SO_SNDTIMEO HEX: 15 -CONSTANT: SO_RCVTIMEO HEX: 14 - -CONSTANT: F_SETFD 2 -CONSTANT: FD_CLOEXEC 1 - -CONSTANT: F_SETFL 4 - -STRUCT: addrinfo - { flags int } - { family int } - { socktype int } - { protocol int } - { addrlen socklen_t } - { addr void* } - { canonname char* } - { next addrinfo* } ; - -STRUCT: sockaddr-in - { family ushort } - { port ushort } - { addr in_addr_t } - { unused longlong } ; - -STRUCT: sockaddr-in6 - { family ushort } - { port ushort } - { flowinfo uint } - { addr uchar[16] } - { scopeid uint } ; - -CONSTANT: max-un-path 108 - -STRUCT: sockaddr-un - { family ushort } - { path { char max-un-path } } ; - -CONSTANT: SOCK_STREAM 1 -CONSTANT: SOCK_DGRAM 2 - -CONSTANT: AF_UNSPEC 0 -CONSTANT: AF_UNIX 1 -CONSTANT: AF_INET 2 -CONSTANT: AF_INET6 10 - -ALIAS: PF_UNSPEC AF_UNSPEC -ALIAS: PF_UNIX AF_UNIX -ALIAS: PF_INET AF_INET -ALIAS: PF_INET6 AF_INET6 - -CONSTANT: IPPROTO_TCP 6 -CONSTANT: IPPROTO_UDP 17 - -CONSTANT: AI_PASSIVE 1 - -CONSTANT: SEEK_SET 0 -CONSTANT: SEEK_CUR 1 -CONSTANT: SEEK_END 2 - -STRUCT: passwd - { pw_name char* } - { pw_passwd char* } - { pw_uid uid_t } - { pw_gid gid_t } - { pw_gecos char* } - { pw_dir char* } - { pw_shell char* } ; - -! dirent64 -STRUCT: dirent - { d_ino ulonglong } - { d_off longlong } - { d_reclen ushort } - { d_type uchar } - { d_name char[256] } ; - -FUNCTION: int open64 ( char* path, int flags, int prot ) ; -FUNCTION: dirent* readdir64 ( DIR* dirp ) ; -FUNCTION: int readdir64_r ( void* dirp, dirent* entry, dirent** result ) ; +USING: system unix unix.ffi unix.ffi.linux ; +IN: unix.linux M: linux open-file [ open64 ] unix-system-call ; - -CONSTANT: EPERM 1 -CONSTANT: ENOENT 2 -CONSTANT: ESRCH 3 -CONSTANT: EINTR 4 -CONSTANT: EIO 5 -CONSTANT: ENXIO 6 -CONSTANT: E2BIG 7 -CONSTANT: ENOEXEC 8 -CONSTANT: EBADF 9 -CONSTANT: ECHILD 10 -CONSTANT: EAGAIN 11 -CONSTANT: ENOMEM 12 -CONSTANT: EACCES 13 -CONSTANT: EFAULT 14 -CONSTANT: ENOTBLK 15 -CONSTANT: EBUSY 16 -CONSTANT: EEXIST 17 -CONSTANT: EXDEV 18 -CONSTANT: ENODEV 19 -CONSTANT: ENOTDIR 20 -CONSTANT: EISDIR 21 -CONSTANT: EINVAL 22 -CONSTANT: ENFILE 23 -CONSTANT: EMFILE 24 -CONSTANT: ENOTTY 25 -CONSTANT: ETXTBSY 26 -CONSTANT: EFBIG 27 -CONSTANT: ENOSPC 28 -CONSTANT: ESPIPE 29 -CONSTANT: EROFS 30 -CONSTANT: EMLINK 31 -CONSTANT: EPIPE 32 -CONSTANT: EDOM 33 -CONSTANT: ERANGE 34 -CONSTANT: EDEADLK 35 -CONSTANT: ENAMETOOLONG 36 -CONSTANT: ENOLCK 37 -CONSTANT: ENOSYS 38 -CONSTANT: ENOTEMPTY 39 -CONSTANT: ELOOP 40 -ALIAS: EWOULDBLOCK EAGAIN -CONSTANT: ENOMSG 42 -CONSTANT: EIDRM 43 -CONSTANT: ECHRNG 44 -CONSTANT: EL2NSYNC 45 -CONSTANT: EL3HLT 46 -CONSTANT: EL3RST 47 -CONSTANT: ELNRNG 48 -CONSTANT: EUNATCH 49 -CONSTANT: ENOCSI 50 -CONSTANT: EL2HLT 51 -CONSTANT: EBADE 52 -CONSTANT: EBADR 53 -CONSTANT: EXFULL 54 -CONSTANT: ENOANO 55 -CONSTANT: EBADRQC 56 -CONSTANT: EBADSLT 57 -ALIAS: EDEADLOCK EDEADLK -CONSTANT: EBFONT 59 -CONSTANT: ENOSTR 60 -CONSTANT: ENODATA 61 -CONSTANT: ETIME 62 -CONSTANT: ENOSR 63 -CONSTANT: ENONET 64 -CONSTANT: ENOPKG 65 -CONSTANT: EREMOTE 66 -CONSTANT: ENOLINK 67 -CONSTANT: EADV 68 -CONSTANT: ESRMNT 69 -CONSTANT: ECOMM 70 -CONSTANT: EPROTO 71 -CONSTANT: EMULTIHOP 72 -CONSTANT: EDOTDOT 73 -CONSTANT: EBADMSG 74 -CONSTANT: EOVERFLOW 75 -CONSTANT: ENOTUNIQ 76 -CONSTANT: EBADFD 77 -CONSTANT: EREMCHG 78 -CONSTANT: ELIBACC 79 -CONSTANT: ELIBBAD 80 -CONSTANT: ELIBSCN 81 -CONSTANT: ELIBMAX 82 -CONSTANT: ELIBEXEC 83 -CONSTANT: EILSEQ 84 -CONSTANT: ERESTART 85 -CONSTANT: ESTRPIPE 86 -CONSTANT: EUSERS 87 -CONSTANT: ENOTSOCK 88 -CONSTANT: EDESTADDRREQ 89 -CONSTANT: EMSGSIZE 90 -CONSTANT: EPROTOTYPE 91 -CONSTANT: ENOPROTOOPT 92 -CONSTANT: EPROTONOSUPPORT 93 -CONSTANT: ESOCKTNOSUPPORT 94 -CONSTANT: EOPNOTSUPP 95 -CONSTANT: EPFNOSUPPORT 96 -CONSTANT: EAFNOSUPPORT 97 -CONSTANT: EADDRINUSE 98 -CONSTANT: EADDRNOTAVAIL 99 -CONSTANT: ENETDOWN 100 -CONSTANT: ENETUNREACH 101 -CONSTANT: ENETRESET 102 -CONSTANT: ECONNABORTED 103 -CONSTANT: ECONNRESET 104 -CONSTANT: ENOBUFS 105 -CONSTANT: EISCONN 106 -CONSTANT: ENOTCONN 107 -CONSTANT: ESHUTDOWN 108 -CONSTANT: ETOOMANYREFS 109 -CONSTANT: ETIMEDOUT 110 -CONSTANT: ECONNREFUSED 111 -CONSTANT: EHOSTDOWN 112 -CONSTANT: EHOSTUNREACH 113 -CONSTANT: EALREADY 114 -CONSTANT: EINPROGRESS 115 -CONSTANT: ESTALE 116 -CONSTANT: EUCLEAN 117 -CONSTANT: ENOTNAM 118 -CONSTANT: ENAVAIL 119 -CONSTANT: EISNAM 120 -CONSTANT: EREMOTEIO 121 -CONSTANT: EDQUOT 122 -CONSTANT: ENOMEDIUM 123 -CONSTANT: EMEDIUMTYPE 124 -CONSTANT: ECANCELED 125 -CONSTANT: ENOKEY 126 -CONSTANT: EKEYEXPIRED 127 -CONSTANT: EKEYREVOKED 128 -CONSTANT: EKEYREJECTED 129 -CONSTANT: EOWNERDEAD 130 -CONSTANT: ENOTRECOVERABLE 131 diff --git a/basis/unix/stat/macosx/macosx.factor b/basis/unix/stat/macosx/macosx.factor index a2104dcb33..4e6b2dfb21 100644 --- a/basis/unix/stat/macosx/macosx.factor +++ b/basis/unix/stat/macosx/macosx.factor @@ -1,5 +1,5 @@ USING: alien.c-types arrays accessors combinators classes.struct -alien.syntax unix.time unix.types ; +alien.syntax unix.time unix.types unix.ffi ; IN: unix.stat ! Mac OS X diff --git a/basis/unix/statfs/macosx/macosx.factor b/basis/unix/statfs/macosx/macosx.factor index e83d2d40a0..56c8989895 100644 --- a/basis/unix/statfs/macosx/macosx.factor +++ b/basis/unix/statfs/macosx/macosx.factor @@ -3,7 +3,7 @@ USING: alien.c-types io.encodings.utf8 io.encodings.string kernel sequences unix.stat accessors unix combinators math grouping system alien.strings math.bitwise alien.syntax -unix.types classes.struct ; +unix.types classes.struct unix.ffi ; IN: unix.statfs.macosx CONSTANT: MNT_RDONLY HEX: 00000001 diff --git a/basis/unix/unix.factor b/basis/unix/unix.factor index e9cb9d5918..4e77a41713 100644 --- a/basis/unix/unix.factor +++ b/basis/unix/unix.factor @@ -1,44 +1,14 @@ ! Copyright (C) 2005, 2010 Slava Pestov. ! Copyright (C) 2008 Eduardo Cavazos. ! See http://factorcode.org/license.txt for BSD license. -USING: alien alien.c-types alien.syntax kernel libc sequences -continuations byte-arrays strings math namespaces system -combinators combinators.smart vocabs.loader accessors -stack-checker macros locals generalizations unix.types io vocabs -classes.struct unix.time alien.libraries ; +USING: accessors alien alien.c-types alien.libraries +alien.syntax byte-arrays classes.struct combinators +combinators.short-circuit combinators.smart continuations +generalizations io kernel libc locals macros math namespaces +sequences stack-checker strings system unix.time unix.types +vocabs vocabs.loader unix.ffi ; IN: unix -CONSTANT: PROT_NONE 0 -CONSTANT: PROT_READ 1 -CONSTANT: PROT_WRITE 2 -CONSTANT: PROT_EXEC 4 - -CONSTANT: MAP_FILE 0 -CONSTANT: MAP_SHARED 1 -CONSTANT: MAP_PRIVATE 2 - -CONSTANT: SEEK_SET 0 -CONSTANT: SEEK_CUR 1 -CONSTANT: SEEK_END 2 - -: MAP_FAILED ( -- alien ) -1 ; inline - -CONSTANT: NGROUPS_MAX 16 - -CONSTANT: DT_UNKNOWN 0 -CONSTANT: DT_FIFO 1 -CONSTANT: DT_CHR 2 -CONSTANT: DT_DIR 4 -CONSTANT: DT_BLK 6 -CONSTANT: DT_REG 8 -CONSTANT: DT_LNK 10 -CONSTANT: DT_SOCK 12 -CONSTANT: DT_WHT 14 - -LIBRARY: libc - -FUNCTION: char* strerror ( int errno ) ; - ERROR: unix-error errno message ; : (io-error) ( -- * ) errno dup strerror unix-error ; @@ -47,125 +17,45 @@ ERROR: unix-error errno message ; ERROR: unix-system-call-error args errno message word ; +: unix-call-failed? ( ret -- ? ) + { + [ { [ integer? ] [ 0 < ] } 1&& ] + [ not ] + } 1|| ; + MACRO:: unix-system-call ( quot -- ) quot inputs :> n quot first :> word + 0 :> ret! + f :> failed! [ - n ndup quot call dup 0 < [ - drop + [ + n ndup quot call ret! + ret { + [ unix-call-failed? dup failed! ] + [ drop errno EINTR = ] + } 1&& + ] loop + failed [ n narray errno dup strerror word unix-system-call-error ] [ - n nnip + n ndrop + ret ] if ] ; HOOK: open-file os ( path flags mode -- fd ) -<< - -{ - { [ os linux? ] [ "unix.linux" require ] } - { [ os bsd? ] [ "unix.bsd" require ] } - { [ os solaris? ] [ "unix.solaris" require ] } -} cond - -"debugger" vocab [ - "unix.debugger" require -] when - ->> - -STRUCT: group - { gr_name char* } - { gr_passwd char* } - { gr_gid int } - { gr_mem char** } ; - -FUNCTION: int accept ( int s, void* sockaddr, socklen_t* socklen ) ; -FUNCTION: int bind ( int s, void* name, socklen_t namelen ) ; -FUNCTION: int chdir ( char* path ) ; -FUNCTION: int chmod ( char* path, mode_t mode ) ; -FUNCTION: int fchmod ( int fd, mode_t mode ) ; -FUNCTION: int chown ( char* path, uid_t owner, gid_t group ) ; -FUNCTION: int chroot ( char* path ) ; - -FUNCTION: int close ( int fd ) ; -FUNCTION: int closedir ( DIR* dirp ) ; - : close-file ( fd -- ) [ close ] unix-system-call drop ; -FUNCTION: int connect ( int s, void* name, socklen_t namelen ) ; -FUNCTION: int dup2 ( int oldd, int newd ) ; -! FUNCTION: int dup ( int oldd ) ; : _exit ( status -- * ) #! We throw to give this a terminating stack effect. int f "_exit" { int } alien-invoke "Exit failed" throw ; -FUNCTION: void endpwent ( ) ; -FUNCTION: int fchdir ( int fd ) ; -FUNCTION: int fchown ( int fd, uid_t owner, gid_t group ) ; -FUNCTION: int fcntl ( int fd, int cmd, int arg ) ; -FUNCTION: int flock ( int fd, int operation ) ; -FUNCTION: void freeaddrinfo ( addrinfo* ai ) ; -FUNCTION: int futimes ( int id, timeval[2] times ) ; -FUNCTION: char* gai_strerror ( int ecode ) ; -FUNCTION: int getaddrinfo ( char* hostname, char* servname, addrinfo* hints, addrinfo** res ) ; -FUNCTION: char* getcwd ( char* buf, size_t size ) ; -FUNCTION: pid_t getpid ; -FUNCTION: int getdtablesize ; -FUNCTION: gid_t getegid ; -FUNCTION: uid_t geteuid ; -FUNCTION: gid_t getgid ; -FUNCTION: char* getenv ( char* name ) ; - -FUNCTION: int getgrgid_r ( gid_t gid, group* grp, char* buffer, size_t bufsize, group** result ) ; -FUNCTION: int getgrnam_r ( char* name, group* grp, char* buffer, size_t bufsize, group** result ) ; -FUNCTION: passwd* getpwent ( ) ; -FUNCTION: passwd* getpwuid ( uid_t uid ) ; -FUNCTION: passwd* getpwnam ( char* login ) ; -FUNCTION: int getpwnam_r ( char* login, passwd* pwd, char* buffer, size_t bufsize, passwd** result ) ; -FUNCTION: int getgroups ( int gidsetlen, gid_t* gidset ) ; -FUNCTION: int getgrouplist ( char* name, int basegid, int* groups, int* ngroups ) ; -FUNCTION: int getrlimit ( int resource, rlimit* rlp ) ; -FUNCTION: int setrlimit ( int resource, rlimit* rlp ) ; - -FUNCTION: int getpriority ( int which, id_t who ) ; -FUNCTION: int setpriority ( int which, id_t who, int prio ) ; - -FUNCTION: int getrusage ( int who, rusage* r_usage ) ; - -FUNCTION: group* getgrent ; -FUNCTION: int gethostname ( char* name, int len ) ; -FUNCTION: int getsockname ( int socket, sockaddr* address, socklen_t* address_len ) ; -FUNCTION: int getpeername ( int socket, sockaddr* address, socklen_t* address_len ) ; -FUNCTION: uid_t getuid ; -FUNCTION: uint htonl ( uint n ) ; -FUNCTION: ushort htons ( ushort n ) ; -! FUNCTION: int issetugid ; -FUNCTION: int ioctl ( int fd, ulong request, char* argp ) ; -FUNCTION: int lchown ( char* path, uid_t owner, gid_t group ) ; -FUNCTION: int listen ( int s, int backlog ) ; -FUNCTION: off_t lseek ( int fildes, off_t offset, int whence ) ; -FUNCTION: int mkdir ( char* path, mode_t mode ) ; -FUNCTION: void* mmap ( void* addr, size_t len, int prot, int flags, int fd, off_t offset ) ; -FUNCTION: int munmap ( void* addr, size_t len ) ; -FUNCTION: uint ntohl ( uint n ) ; -FUNCTION: ushort ntohs ( ushort n ) ; -FUNCTION: int shutdown ( int fd, int how ) ; - -FUNCTION: int open ( char* path, int flags, int prot ) ; M: unix open-file [ open ] unix-system-call ; -FUNCTION: DIR* opendir ( char* path ) ; - -STRUCT: utimbuf - { actime time_t } - { modtime time_t } ; - -FUNCTION: int utime ( char* path, utimbuf* buf ) ; - : touch ( filename -- ) f [ utime ] unix-system-call drop ; : change-file-times ( filename access modification -- ) @@ -174,50 +64,18 @@ FUNCTION: int utime ( char* path, utimbuf* buf ) ; swap >>actime [ utime ] unix-system-call drop ; -FUNCTION: int pclose ( void* file ) ; -FUNCTION: int pipe ( int* filedes ) ; -FUNCTION: void* popen ( char* command, char* type ) ; -FUNCTION: ssize_t read ( int fd, void* buf, size_t nbytes ) ; - -FUNCTION: dirent* readdir ( DIR* dirp ) ; -FUNCTION: int readdir_r ( void* dirp, dirent* entry, dirent** result ) ; -FUNCTION: ssize_t readlink ( char* path, char* buf, size_t bufsize ) ; - -CONSTANT: PATH_MAX 1024 - : read-symbolic-link ( path -- path ) PATH_MAX dup [ PATH_MAX [ readlink ] unix-system-call ] dip swap head-slice >string ; -FUNCTION: ssize_t recv ( int s, void* buf, size_t nbytes, int flags ) ; -FUNCTION: ssize_t recvfrom ( int s, void* buf, size_t nbytes, int flags, sockaddr-in* from, socklen_t* fromlen ) ; -FUNCTION: int rename ( char* from, char* to ) ; -FUNCTION: int rmdir ( char* path ) ; -FUNCTION: int select ( int nfds, void* readfds, void* writefds, void* exceptfds, timeval* timeout ) ; -FUNCTION: ssize_t sendto ( int s, void* buf, size_t len, int flags, sockaddr-in* to, socklen_t tolen ) ; -FUNCTION: int setenv ( char* name, char* value, int overwrite ) ; -FUNCTION: int unsetenv ( char* name ) ; -FUNCTION: int setegid ( gid_t egid ) ; -FUNCTION: int seteuid ( uid_t euid ) ; -FUNCTION: int setgid ( gid_t gid ) ; -FUNCTION: int setgroups ( int ngroups, gid_t* gidset ) ; -FUNCTION: int setregid ( gid_t rgid, gid_t egid ) ; -FUNCTION: int setreuid ( uid_t ruid, uid_t euid ) ; -FUNCTION: int setsockopt ( int s, int level, int optname, void* optval, socklen_t optlen ) ; -FUNCTION: int setuid ( uid_t uid ) ; -FUNCTION: int socket ( int domain, int type, int protocol ) ; -FUNCTION: int symlink ( char* path1, char* path2 ) ; -FUNCTION: int link ( char* path1, char* path2 ) ; -FUNCTION: int system ( char* command ) ; - -FUNCTION: int unlink ( char* path ) ; - : unlink-file ( path -- ) [ unlink ] unix-system-call drop ; -FUNCTION: int utimes ( char* path, timeval[2] times ) ; +<< -FUNCTION: ssize_t write ( int fd, void* buf, size_t nbytes ) ; +"debugger" vocab [ + "unix.debugger" require +] when -"librt" "librt.so" "cdecl" add-library +>> diff --git a/basis/unix/users/users.factor b/basis/unix/users/users.factor index 09119ff0cc..adf7f5ce4f 100644 --- a/basis/unix/users/users.factor +++ b/basis/unix/users/users.factor @@ -4,9 +4,9 @@ USING: alien alien.c-types alien.strings io.encodings.utf8 io.backend.unix kernel math sequences splitting strings combinators.short-circuit grouping byte-arrays combinators accessors math.parser fry assocs namespaces continuations -vocabs.loader system classes.struct ; +vocabs.loader system classes.struct unix ; IN: unix.users -QUALIFIED: unix +QUALIFIED: unix.ffi TUPLE: passwd user-name password uid gid gecos dir shell ; @@ -31,13 +31,13 @@ M: unix passwd>new-passwd ( passwd -- seq ) } cleave ; : with-pwent ( quot -- ) - [ unix:endpwent ] [ ] cleanup ; inline + [ unix.ffi:endpwent ] [ ] cleanup ; inline PRIVATE> : all-users ( -- seq ) [ - [ unix:getpwent dup ] [ unix:passwd memory>struct passwd>new-passwd ] produce nip + [ unix.ffi:getpwent dup ] [ unix.ffi:passwd memory>struct passwd>new-passwd ] produce nip ] with-pwent ; SYMBOL: user-cache @@ -52,10 +52,10 @@ GENERIC: user-passwd ( obj -- passwd/f ) M: integer user-passwd ( id -- passwd/f ) user-cache get - [ at ] [ unix:getpwuid [ unix:passwd memory>struct passwd>new-passwd ] [ f ] if* ] if* ; + [ at ] [ unix.ffi:getpwuid [ unix.ffi:passwd memory>struct passwd>new-passwd ] [ f ] if* ] if* ; M: string user-passwd ( string -- passwd/f ) - unix:getpwnam dup [ unix:passwd memory>struct passwd>new-passwd ] when ; + unix.ffi:getpwnam dup [ unix.ffi:passwd memory>struct passwd>new-passwd ] when ; : user-name ( id -- string ) dup user-passwd @@ -65,13 +65,13 @@ M: string user-passwd ( string -- passwd/f ) user-passwd uid>> ; : real-user-id ( -- id ) - unix:getuid ; inline + unix.ffi:getuid ; inline : real-user-name ( -- string ) real-user-id user-name ; inline : effective-user-id ( -- id ) - unix:geteuid ; inline + unix.ffi:geteuid ; inline : effective-user-name ( -- string ) effective-user-id user-name ; inline @@ -93,10 +93,10 @@ GENERIC: set-effective-user ( string/id -- ) diff --git a/basis/unix/utilities/tags.txt b/basis/unix/utilities/tags.txt new file mode 100644 index 0000000000..6bf68304bb --- /dev/null +++ b/basis/unix/utilities/tags.txt @@ -0,0 +1 @@ +unportable diff --git a/basis/vocabs/refresh/refresh-docs.factor b/basis/vocabs/refresh/refresh-docs.factor index b074a9e502..ee02a491e1 100644 --- a/basis/vocabs/refresh/refresh-docs.factor +++ b/basis/vocabs/refresh/refresh-docs.factor @@ -15,7 +15,13 @@ HELP: refresh-all { refresh refresh-all } related-words ARTICLE: "vocabs.refresh" "Runtime code reloading" -"Reloading source files changed on disk:" +"The " { $vocab-link "vocabs.refresh" } " vocabulary implements automatic reloading of changed source files." +$nl +"With the help of the " { $vocab-link "io.monitors" } " vocabulary, loaded source files across all vocabulary roots are monitored for changes on disk." +$nl +"If a change to a source file is detected, the next invocation of " { $link refresh-all } " will compare the file's checksum against its previous value, reloading the file if necessary. This takes advantage of the fact that the " { $vocab-link "source-files" } " vocabulary records CRC32 checksums of source files that have been parsed by " { $link "parser" } "." +$nl +"Words for reloading source files:" { $subsections refresh refresh-all diff --git a/basis/windows/directx/d2d1/d2d1.factor b/basis/windows/directx/d2d1/d2d1.factor index fad88787f3..cf9e5a3a98 100644 --- a/basis/windows/directx/d2d1/d2d1.factor +++ b/basis/windows/directx/d2d1/d2d1.factor @@ -1,5 +1,5 @@ USING: alien.c-types alien.syntax classes.struct windows.com -windows.com.syntax windows.directx.d3dbasetypes windows.directx.dcommon +windows.com.syntax windows.directx.d2dbasetypes windows.directx.dcommon windows.directx.dxgi windows.directx.dxgiformat windows.ole32 windows.types ; IN: windows.directx.d2d1 diff --git a/basis/windows/directx/d2dbasetypes/d2dbasetypes.factor b/basis/windows/directx/d2dbasetypes/d2dbasetypes.factor index 00f84e9750..3cdb0bbe32 100644 --- a/basis/windows/directx/d2dbasetypes/d2dbasetypes.factor +++ b/basis/windows/directx/d2dbasetypes/d2dbasetypes.factor @@ -1,5 +1,5 @@ USING: alien.syntax classes.struct windows.types ; -IN: windows.directx.d3dbasetypes +IN: windows.directx.d2dbasetypes STRUCT: D3DCOLORVALUE { r FLOAT } diff --git a/basis/windows/directx/d3d11shader/d3d11shader.factor b/basis/windows/directx/d3d11shader/d3d11shader.factor index beb5392e37..a0437e3e65 100644 --- a/basis/windows/directx/d3d11shader/d3d11shader.factor +++ b/basis/windows/directx/d3d11shader/d3d11shader.factor @@ -1,6 +1,7 @@ USING: alien.syntax alien.c-types classes.struct windows.types windows.directx.d3d10shader windows.directx.d3d10 -windows.directx.d3d11 windows.com windows.com.syntax ; +windows.directx.d3d11 windows.com windows.com.syntax +windows.directx.d3dcommon ; IN: windows.directx.d3d11shader LIBRARY: d3d11 diff --git a/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor b/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor index 13066dcdec..9eb563e60c 100644 --- a/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor +++ b/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor @@ -1,6 +1,6 @@ USING: alien.c-types alien.syntax classes.struct windows.com windows.com.syntax windows.directx.d3d10 -windows.directx.d3d10misc windows.types ; +windows.directx.d3d10misc windows.types windows.directx.d3dx10math ; IN: windows.directx.d3dx10mesh LIBRARY: d3dx10 diff --git a/core/assocs/assocs.factor b/core/assocs/assocs.factor index 7b50d7c443..5a727d6b3e 100644 --- a/core/assocs/assocs.factor +++ b/core/assocs/assocs.factor @@ -58,7 +58,7 @@ PRIVATE> (assoc-each) each ; inline : assoc>map ( assoc quot exemplar -- seq ) - [ accumulator [ assoc-each ] dip ] dip like ; inline + [ collector [ assoc-each ] dip ] dip like ; inline : assoc-map-as ( assoc quot exemplar -- newassoc ) [ [ 2array ] compose V{ } assoc>map ] dip assoc-like ; inline diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor index dde5463c0f..2288b89cf4 100644 --- a/core/bootstrap/primitives.factor +++ b/core/bootstrap/primitives.factor @@ -511,8 +511,8 @@ tuple { "gc" "memory" "primitive_full_gc" (( -- )) } { "minor-gc" "memory" "primitive_minor_gc" (( -- )) } { "size" "memory" "primitive_size" (( obj -- n )) } - { "(save-image)" "memory.private" "primitive_save_image" (( path -- )) } - { "(save-image-and-exit)" "memory.private" "primitive_save_image_and_exit" (( path -- )) } + { "(save-image)" "memory.private" "primitive_save_image" (( path1 path2 -- )) } + { "(save-image-and-exit)" "memory.private" "primitive_save_image_and_exit" (( path1 path2 -- )) } { "jit-compile" "quotations" "primitive_jit_compile" (( quot -- )) } { "quot-compiled?" "quotations" "primitive_quot_compiled_p" (( quot -- ? )) } { "quotation-code" "quotations" "primitive_quotation_code" (( quot -- start end )) } diff --git a/core/io/io.factor b/core/io/io.factor index c134ba2108..48d7f413b8 100644 --- a/core/io/io.factor +++ b/core/io/io.factor @@ -113,7 +113,7 @@ PRIVATE> input-stream get swap each-stream-line ; inline : stream-lines ( stream -- seq ) - [ [ ] accumulator [ each-stream-line ] dip { } like ] with-disposal ; + [ [ ] collector [ each-stream-line ] dip { } like ] with-disposal ; : lines ( -- seq ) input-stream get stream-lines ; inline diff --git a/core/make/make-docs.factor b/core/make/make-docs.factor index 881c36e3b6..3366357011 100644 --- a/core/make/make-docs.factor +++ b/core/make/make-docs.factor @@ -37,7 +37,7 @@ $nl { $code "'[ 2 _ + ]" } ; ARTICLE: "namespaces-make" "Making sequences with variables" -"The " { $vocab-link "make" } " vocabulary implements a facility for constructing sequences by holding an accumulator sequence in a variable. Storing the accumulator sequence in a variable rather than the stack may allow code to be written with less stack manipulation." +"The " { $vocab-link "make" } " vocabulary implements a facility for constructing sequences by holding an collector sequence in a variable. Storing the collector sequence in a variable rather than the stack may allow code to be written with less stack manipulation." $nl "Sequence construction is wrapped in a combinator:" { $subsections make } @@ -47,7 +47,7 @@ $nl % # } -"The accumulator sequence can be accessed directly from inside a " { $link make } ":" +"The collector sequence can be accessed directly from inside a " { $link make } ":" { $subsections building } { $example "USING: make math.parser ;" diff --git a/core/memory/memory.factor b/core/memory/memory.factor index 4ab68a1ef1..a1e977f553 100644 --- a/core/memory/memory.factor +++ b/core/memory/memory.factor @@ -1,16 +1,20 @@ ! Copyright (C) 2005, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel continuations sequences system -io.backend alien.strings memory.private ; +USING: alien.strings io.backend io.pathnames kernel +memory.private sequences system ; IN: memory : instances ( quot -- seq ) [ all-instances ] dip filter ; inline +: saving-path ( path -- saving-path path ) + [ ".saving" append ] keep + [ native-string>alien ] bi@ ; + : save-image ( path -- ) - normalize-path native-string>alien (save-image) ; + normalize-path saving-path (save-image) ; : save-image-and-exit ( path -- ) - normalize-path native-string>alien (save-image-and-exit) ; + normalize-path saving-path (save-image-and-exit) ; : save ( -- ) image save-image ; diff --git a/core/parser/parser-docs.factor b/core/parser/parser-docs.factor index 97dbab384e..42903a2cec 100644 --- a/core/parser/parser-docs.factor +++ b/core/parser/parser-docs.factor @@ -79,17 +79,6 @@ $nl "word-search-parsing" } ; -ARTICLE: "parser-files" "Parsing source files" -"The parser can run source files:" -{ $subsections - run-file - parse-file -} -"The parser cross-references source files and definitions. This allows it to keep track of removed definitions, and prevent forward references and accidental redefinitions." -$nl -"While the above words are useful for one-off experiments, real programs should be written to use the vocabulary system instead; see " { $link "vocabs.loader" } "." -{ $see-also "source-files" } ; - ARTICLE: "top-level-forms" "Top level forms" "Any code outside of a definition is known as a " { $emphasis "top-level form" } "; top-level forms are run after the entire source file has been parsed, regardless of their position in the file." $nl @@ -98,14 +87,19 @@ $nl "Also, top-level forms run in a new dynamic scope, so using " { $link set } " to store values is almost always wrong, since the values will be lost after the top-level form completes. To save values computed by a top-level form, either use " { $link set-global } " or define a new word with the value." ; ARTICLE: "parser" "The parser" -"This parser is a general facility for reading textual representations of objects and definitions. The parser is implemented in the " { $vocab-link "parser" } " and " { $vocab-link "syntax" } " vocabularies." +"The Factor parser reading textual representations of objects and definitions, with all syntax determined by " { $link "parsing-words" } ". The parser is implemented in the " { $vocab-link "parser" } " vocabulary, with standard syntax in the " { $vocab-link "syntax" } " vocabulary. See " { $link "syntax" } " for a description of standard syntax." $nl -"This section concerns itself with usage and extension of the parser. Standard syntax is described in " { $link "syntax" } "." -{ $subsections "parser-files" } -"The parser can be extended." -{ $subsections "parser-lexer" } -"The parser can be invoked reflectively;" -{ $subsections parse-stream } +"The parser cross-references " { $link "source-files" } " and " { $link "definitions" } ". This functionality is used for improved error checking, as well as tools such as " { $link "tools.crossref" } " and " { $link "editor" } "." +$nl +"The parser can be invoked reflectively, to run strings and source files." +{ $subsections + "eval" + run-file + parse-file +} +"If Factor is run from the command line with a script file supplied as an argument, the script is run using " { $link run-file } ". See " { $link "cli" } "." +$nl +"While " { $link run-file } " can be used interactively in the listener to load user code into the session, this should only be done for quick one-off scripts, and real programs should instead rely on the automatic " { $link "vocabs.loader" } "." { $see-also "parsing-words" "definitions" "definition-checking" } ; ABOUT: "parser" @@ -204,7 +198,7 @@ HELP: bootstrap-syntax HELP: with-file-vocabs { $values { "quot" quotation } } -{ $description "Calls the quotation in a scope with the initial the vocabulary search path for parsing a file. This consists of just the " { $snippet "syntax" } " vocabulary." } ; +{ $description "Calls the quotation in a scope with an initial vocabulary search path consisting of just the " { $snippet "syntax" } " vocabulary." } ; HELP: parse-fresh { $values { "lines" "a sequence of strings" } { "quot" quotation } } diff --git a/core/sequences/sequences-docs.factor b/core/sequences/sequences-docs.factor index 9f570f97d5..819b5b2115 100644 --- a/core/sequences/sequences-docs.factor +++ b/core/sequences/sequences-docs.factor @@ -993,16 +993,16 @@ HELP: count "50" } ; -HELP: pusher +HELP: selector { $values { "quot" "a predicate quotation" } { "quot" quotation } { "accum" vector } } -{ $description "Creates a new vector to accumulate the values which return true for a predicate. Returns a new quotation which accepts an object to be tested and stored in the accumulator if the test yields true. The accumulator is left on the stack for convenience." } +{ $description "Creates a new vector to accumulate the values which return true for a predicate. Returns a new quotation which accepts an object to be tested and stored in the collector if the test yields true. The collector is left on the stack for convenience." } { $example "! Find all the even numbers:" "USING: prettyprint sequences math kernel ;" - "10 iota [ even? ] pusher [ each ] dip ." + "10 iota [ even? ] selector [ each ] dip ." "V{ 0 2 4 6 8 }" } -{ $notes "Used to implement the " { $link filter } " word. Compare this word with " { $link accumulator } ", which is an unfiltering version." } ; +{ $notes "Used to implement the " { $link filter } " word. Compare this word with " { $link collector } ", which is an unfiltering version." } ; HELP: trim-head { $values @@ -1199,7 +1199,7 @@ HELP: 2map-reduce "1290" } } ; -HELP: 2pusher +HELP: 2selector { $values { "quot" quotation } { "quot" quotation } { "accum1" vector } { "accum2" vector } } @@ -1224,13 +1224,13 @@ HELP: 2unclip-slice "T{ slice { from 1 } { to 2 } { seq { 1 2 } } }\nT{ slice { from 1 } { to 2 } { seq { 3 4 } } }\n1\n3" } } ; -HELP: accumulator +HELP: collector { $values { "quot" quotation } { "quot'" quotation } { "vec" vector } } { $description "Creates a new quotation that pushes its result to a vector and outputs that vector on the stack." } { $examples { $example "USING: sequences prettyprint kernel math ;" - "{ 1 2 } [ 30 + ] accumulator [ each ] dip ." + "{ 1 2 } [ 30 + ] collector [ each ] dip ." "V{ 31 32 }" } } ; @@ -1680,14 +1680,14 @@ ARTICLE: "sequences-f" "The f object as a sequence" ARTICLE: "sequences-combinator-implementation" "Implementing sequence combinators" "Creating a new sequence unconditionally:" { $subsections - accumulator - accumulator-for + collector + collector-for } "Creating a new sequence conditionally:" { $subsections - pusher - pusher-for - 2pusher + selector + selector-for + 2selector } ; ARTICLE: "sequences" "Sequence operations" diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index b8a8d5f89d..d3a7aba1c3 100644 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -403,6 +403,9 @@ PRIVATE> [ 2drop f f ] if ; inline +: (accumulate) ( seq identity quot -- seq identity quot ) + [ swap ] dip [ curry keep ] curry ; inline + PRIVATE> : each ( seq quot -- ) @@ -429,9 +432,6 @@ PRIVATE> : map! ( seq quot -- seq ) over [ map-into ] keep ; inline -: (accumulate) ( seq identity quot -- seq identity quot ) - [ swap ] dip [ curry keep ] curry ; inline - : accumulate-as ( seq identity quot exemplar -- final newseq ) [ (accumulate) ] dip map-as ; inline @@ -486,14 +486,14 @@ PRIVATE> : push-if ( elt quot accum -- ) [ keep ] dip rot [ push ] [ 2drop ] if ; inline -: pusher-for ( quot exemplar -- quot accum ) +: selector-for ( quot exemplar -- quot accum ) [ length ] keep new-resizable [ [ push-if ] 2curry ] keep ; inline -: pusher ( quot -- quot accum ) - V{ } pusher-for ; inline +: selector ( quot -- quot accum ) + V{ } selector-for ; inline : filter-as ( seq quot exemplar -- subseq ) - dup [ pusher-for [ each ] dip ] curry dip like ; inline + dup [ selector-for [ each ] dip ] curry dip like ; inline : filter ( seq quot -- subseq ) over filter-as ; inline @@ -501,20 +501,20 @@ PRIVATE> : push-either ( elt quot accum1 accum2 -- ) [ keep swap ] 2dip ? push ; inline -: 2pusher ( quot -- quot accum1 accum2 ) +: 2selector ( quot -- quot accum1 accum2 ) V{ } clone V{ } clone [ [ push-either ] 3curry ] 2keep ; inline : partition ( seq quot -- trueseq falseseq ) - over [ 2pusher [ each ] 2dip ] dip [ like ] curry bi@ ; inline + over [ 2selector [ each ] 2dip ] dip [ like ] curry bi@ ; inline -: accumulator-for ( quot exemplar -- quot' vec ) +: collector-for ( quot exemplar -- quot' vec ) [ length ] keep new-resizable [ [ push ] curry compose ] keep ; inline -: accumulator ( quot -- quot' vec ) - V{ } accumulator-for ; inline +: collector ( quot -- quot' vec ) + V{ } collector-for ; inline : produce-as ( pred quot exemplar -- seq ) - dup [ accumulator-for [ while ] dip ] curry dip like ; inline + dup [ collector-for [ while ] dip ] curry dip like ; inline : produce ( pred quot -- seq ) { } produce-as ; inline @@ -603,12 +603,16 @@ ERROR: assert-sequence got expected ; : assert-sequence= ( a b -- ) 2dup sequence= [ 2drop ] [ assert-sequence ] if ; +fixnum swap [ [ -2 fixnum-shift-fast ] [ 5 fixnum-shift-fast ] bi fixnum+fast fixnum+fast ] keep fixnum-bitxor ; inline +PRIVATE> + : sequence-hashcode ( n seq -- x ) [ 0 ] 2dip [ hashcode* sequence-hashcode-step ] with each ; inline diff --git a/core/vocabs/loader/loader-docs.factor b/core/vocabs/loader/loader-docs.factor index 02a604ac32..f2da4a1383 100644 --- a/core/vocabs/loader/loader-docs.factor +++ b/core/vocabs/loader/loader-docs.factor @@ -28,38 +28,44 @@ ARTICLE: "vocabs.roots" "Vocabulary roots" { $subsections "add-vocab-roots" } ; ARTICLE: "vocabs.loader" "Vocabulary loader" -"The vocabulary loader is defined in the " { $vocab-link "vocabs.loader" } " vocabulary." +"The vocabulary loader combines the vocabulary system with " { $link "parser" } " in order to implement automatic loading of vocabulary source files. The vocabulary loader is implemented in the " { $vocab-link "vocabs.loader" } " vocabulary." $nl -"Vocabularies are searched for in vocabulary roots." +"When an attempt is made to use a vocabulary that has not been loaded into the image, the vocabulary loader is asked to locate the vocabulary's source files, and load them." +$nl +"The vocabulary loader searches for vocabularies in a set of directories known as vocabulary roots." { $subsections "vocabs.roots" } -"Vocabulary names map directly to source files. A vocabulary named " { $snippet "foo.bar" } " must be defined in a " { $snippet "bar" } " directory nested inside a " { $snippet "foo" } " directory of a vocabulary root. Any level of vocabulary nesting is permitted." +"Vocabulary names map directly to source files inside these roots. A vocabulary named " { $snippet "foo.bar" } " is defined in " { $snippet "foo/bar/bar.factor" } "; that is, a source file named " { $snippet "bar.factor" } " within a " { $snippet "bar" } " directory nested inside a " { $snippet "foo" } " directory of a vocabulary root. Any level of nesting, separated by dots, is permitted." $nl "The vocabulary directory - " { $snippet "bar" } " in our example - contains a source file:" { $list - { { $snippet "foo/bar/bar.factor" } " - the source file, must define words in the " { $snippet "foo.bar" } " vocabulary with an " { $snippet "IN: foo.bar" } " form" } + { { $snippet "foo/bar/bar.factor" } " - the source file must define words in the " { $snippet "foo.bar" } " vocabulary with an " { $snippet "IN: foo.bar" } " form" } } -"Two other Factor source files, storing documentation and tests, respectively, are optional:" +"Two other Factor source files, storing documentation and tests, respectively, may optionally be placed alongside the source file:" { $list { { $snippet "foo/bar/bar-docs.factor" } " - documentation, see " { $link "writing-help" } } { { $snippet "foo/bar/bar-tests.factor" } " - unit tests, see " { $link "tools.test" } } } -"Finally, three text files can contain meta-data:" +"Finally, optional three text files may contain meta-data:" { $list { { $snippet "foo/bar/authors.txt" } " - a series of lines, with one author name per line. These are listed under " { $link "vocab-authors" } } { { $snippet "foo/bar/summary.txt" } " - a one-line description" } { { $snippet "foo/bar/tags.txt" } " - a whitespace-separated list of tags which classify the vocabulary. Consult " { $link "vocab-tags" } " for a list of existing tags you can re-use" } } -"While " { $link POSTPONE: USE: } " and " { $link POSTPONE: USING: } " load vocabularies which have not been loaded before adding them to the search path, it is also possible to load a vocabulary without adding it to the search path:" +"The " { $link POSTPONE: USE: } " and " { $link POSTPONE: USING: } " words load vocabularies which have not been loaded yet, as needed." +$nl +"Vocabularies can also be loaded at run time, without altering the vocabulary search path. This is done by calling a word which loads a vocabulary if it is not in the image, doing nothing if it is:" { $subsections require } -"Forcing a reload of a vocabulary, even if it has already been loaded:" +"The above word will only ever load a vocabulary once in a given session. There is another word which unconditionally loads vocabulary from disk, regardless of whether or not is has already been loaded:" { $subsections reload } +"For interactive development in the listener, calling " { $link reload } " directly is usually not necessary, since a better facility exists for " { $link "vocabs.refresh" } "." +$nl "Application vocabularies can define a main entry point, giving the user a convenient way to run the application:" { $subsections POSTPONE: MAIN: run runnable-vocab } -{ $see-also "vocabularies" "parser-files" "source-files" } ; +{ $see-also "vocabularies" "parser" "source-files" } ; ABOUT: "vocabs.loader" diff --git a/core/vocabs/parser/parser-docs.factor b/core/vocabs/parser/parser-docs.factor index 6a7bd4d212..66900978a8 100644 --- a/core/vocabs/parser/parser-docs.factor +++ b/core/vocabs/parser/parser-docs.factor @@ -65,7 +65,7 @@ $nl } { $see-also "words" } ; -ARTICLE: "word-search-parsing" "Word lookup in parsing words" +ARTICLE: "word-search-parsing" "Reflection support for vocabulary search path" "The parsing words described in " { $link "word-search-syntax" } " are implemented using the below words, which you can also call from your own parsing words." $nl "The current state used for word search is stored in a " { $emphasis "manifest" } ":" diff --git a/extra/audio/audio-docs.factor b/extra/audio/audio-docs.factor new file mode 100644 index 0000000000..c08887e962 --- /dev/null +++ b/extra/audio/audio-docs.factor @@ -0,0 +1,43 @@ +! (c)2010 Joe Groff bsd license +USING: alien byte-arrays help.markup help.syntax kernel math +memory ; +IN: audio + +HELP: