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

More modularization of core, heading towards being able to make smaller images

slava 2006-12-08 03:53:50 +00:00
parent e9d40ea7b4
commit e090916c71
56 changed files with 578 additions and 528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO.txt
View File

@ -2,6 +2,7 @@
- error popups obscure input area
- callback scheduling issue
- error window: ENTER hides it
+ 0.88:

3
core/bootstrap/boot-stage1.factor
View File

@ -14,9 +14,12 @@ prettyprint sequences vectors words ;
\ boot ,
"core" require
"core/help" require
"core/tools" require
"core/compiler" require
"core/io/buffer" require
"core/ui" require
"core/ui/tools" require
"core/compiler/" architecture get append require
"core/handbook" require

2
core/bootstrap/init.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license.
IN: kernel-internals
USING: assembler command-line errors io io-internals kernel math
namespaces parser threads words ;
namespaces parser words threads ;
: boot ( -- )
init-namespaces

6
core/collections/sequence-sort.factor
View File

@ -90,6 +90,12 @@ IN: sequences
: natural-sort ( seq -- sortedseq ) [ <=> ] sort ;
: sort-keys ( alist -- alist )
[ [ first ] 2apply <=> ] sort ;
: sort-values ( alist -- alist )
[ [ second ] 2apply <=> ] sort ;
: binsearch ( elt seq quot -- i )
swap dup empty?
[ 3drop -1 ] [ flatten-slice (binsearch) ] if ; inline

14
core/compiler/alien/prettyprint.factor Normal file
View File

@ -0,0 +1,14 @@
! Copyright (C) 2006 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
IN: prettyprint-internals
USING: alien kernel prettyprint math ;
M: alien pprint*
dup expired? [
drop "( alien expired )"
] [
\ ALIEN: pprint-word alien-address number>string
] if text ;
M: dll pprint*
dll-path alien>char-string "DLL\" " pprint-string ;

1
core/compiler/load.factor
View File

@ -31,6 +31,7 @@ PROVIDE: core/compiler
"alien/alien-invoke.factor"
"alien/alien-callback.factor"
"alien/alien-indirect.factor"
"alien/prettyprint.factor"
"alien/syntax.factor"
"alien/alien-callback.facts"

124
core/debugger.factor Normal file
View File

@ -0,0 +1,124 @@
! Copyright (C) 2004, 2006 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: arrays definitions generic hashtables tools io
kernel math namespaces parser prettyprint sequences
sequences-internals strings styles vectors words errors ;
IN: kernel-internals
: save-error ( error trace continuation -- )
error-continuation set-global
error-stack-trace set-global
dup error set-global
compute-restarts restarts set-global ;
: error-handler ( error trace -- )
dupd continuation save-error rethrow ;
: init-error-handler ( -- )
V{ } clone set-catchstack
! kernel calls on error
[ error-handler ] 5 setenv
\ kernel-error 12 setenv ;
: code-heap-start 17 getenv ;
: code-heap-end 18 getenv ;
: <xt-map> ( -- xtmap )
[
f code-heap-start 2array ,
all-words [ compiled? ] subset
[ dup word-xt 2array , ] each
f code-heap-end 2array ,
] { } make sort-values ;
: find-xt ( xt xtmap -- word )
[ second - ] binsearch* first ;
: symbolic-stack-trace ( seq -- seq )
<xt-map> swap [ dup pick find-xt 2array ] map nip ;
IN: errors
GENERIC: error. ( error -- )
GENERIC: error-help ( error -- topic )
M: object error. . ;
M: object error-help drop f ;
M: tuple error. describe ;
M: tuple error-help class ;
M: string error. print ;
: :s ( -- )
error-continuation get continuation-data stack. ;
: :r ( -- )
error-continuation get continuation-retain stack. ;
: xt. ( xt -- )
>hex cell 2 * CHAR: 0 pad-left write ;
: word-xt. ( xt word -- )
"Compiled: " write dup pprint bl
"(offset " write word-xt - >hex write ")" write ;
: bare-xt. ( xt -- )
"C code: " write xt. ;
: :trace
error-stack-trace get symbolic-stack-trace <reversed> [
first2 [ word-xt. ] [ bare-xt. ] if* terpri
] each ;
: :c ( -- )
error-continuation get continuation-call callstack. :trace ;
: :get ( variable -- value )
error-continuation get continuation-name hash-stack ;
: :res ( n -- )
restarts get-global nth f restarts set-global restart ;
: restart. ( restart n -- )
[ # " :res " % restart-name % ] "" make print ;
: restarts. ( -- )
restarts get dup empty? [
drop
] [
terpri
"The following restarts are available:" print
terpri
dup length [ restart. ] 2each
] if ;
: debug-help ( -- )
terpri
"Debugger commands:" print
terpri
":help - documentation for this error" print
":s - data stack at exception time" print
":r - retain stack at exception time" print
":c - call stack at exception time" print
error get [ parse-error? ] is? [
":edit - jump to source location" print
] when
":get ( var -- value ) accesses variables at time of the error" print
flush ;
: print-error ( error -- )
[
dup error.
] [
"Error in print-error!" print drop
] recover drop ;
SYMBOL: error-hook
[ print-error restarts. debug-help ] error-hook set-global
: try ( quot -- )
[ error-hook get call ] recover ;

99
core/debugger.facts Normal file
View File

@ -0,0 +1,99 @@
IN: errors
USING: alien arrays generic help kernel math memory
strings vectors ;
HELP: :s
{ $description "Prints the data stack at the time of the most recent error. Used for interactive debugging." } ;
HELP: :r
{ $description "Prints the retain stack at the time of the most recent error. Used for interactive debugging." } ;
HELP: :c
{ $description "Prints the call stack at the time of the most recent error. Used for interactive debugging." } ;
HELP: :get
{ $values { "variable" "an object" } { "value" "the value, or f" } }
{ $description "Looks up the value of a variable at the time of the most recent error." } ;
HELP: :res
{ $values { "n" "a non-negative integer" } }
{ $description "Continues executing the " { $snippet "n" } "th restart." } ;
HELP: error.
{ $values { "error" "an error" } }
{ $contract "Print an error to the default stream." } ;
HELP: error-help
{ $values { "error" "an error" } { "topic" "an article name or word" } }
{ $contract "Outputs a help article which explains the error." }
{ $see-also :help } ;
HELP: print-error
{ $values { "error" "an error" } }
{ $description "Print an error to the default stream. This word gets called by the listener and other tools which report caught errors to the user. You can define methods on this generic word for custom error reporting." } ;
HELP: try
{ $values { "quot" "a quotation" } }
{ $description "Calls the quotation. If it throws an error, logs the error to the default stream and restores the data stack." } ;
HELP: expired-error.
{ $error-description "Thrown by " { $link alien-address } " and " { $link alien-invoke } " if an " { $link alien } " object passed in as a parameter has expired. Alien objects expire if they are saved an image which is subsequently loaded; this prevents a certain class of programming errors, usually attempts to use uninitialized objects, since holding a C address is meaningless between sessions." }
{ $notes "You can check if an alien object has expired by calling " { $link expired? } "." } ;
HELP: io-error.
{ $error-description "Thrown by the C streams I/O primitives if an I/O error occurs." } ;
HELP: undefined-word-error.
{ $error-description "Thrown if an attempt is made to call a word which was defined by " { $link POSTPONE: DEFER: } "." } ;
HELP: type-check-error.
{ $error-description "Thrown by various primitives if one of the inputs does not have the expected type. Generic words throw " { $link no-method } " and " { $link no-math-method } " errors in such cases instead." } ;
HELP: signal-error.
{ $error-description
"Thrown by the runtime when a Unix signal is received. While signal numbers are system-specific, the following are relatively standard:"
{ $list
{ "4 - Illegal instruction. If you see this error, it is a bug in Factor's compiler and should be reported." }
{ "8 - Arithmetic exception. Most likely a divide by zero in " { $link /i } "." }
{ "10, 11 - Memory protection fault. This error suggests invalid values are being passed to C functions by an " { $link alien-invoke } ". Factor also uses memory protection to trap stack underflows and overflows, but usually these are reported as their own errors. Sometimes they'll show up as a generic signal 11, though." }
}
"The Windows equivalent of a signal 11 is a SEH fault. When one occurs, the runtime throws a singal error, even though it does not correspond to a Unix signal."
} ;
HELP: negative-array-size-error.
{ $error-description "Thrown by " { $link <array> } ", " { $link <string> } ", " { $link <vector> } " and " { $link <sbuf> } " if a negative capacity is specified." } ;
HELP: c-string-error.
{ $error-description "Thrown by " { $link alien-invoke } " and various primitives if a string containing null bytes, or characters with values higher than 255 is passed in where a C string is expected. See " { $link "c-strings" } "." } ;
HELP: ffi-error.
{ $error-description "Thrown by " { $link dlopen } " and " { $link dlsym } " if a problem occurs while loading a native library or looking up a symbol. See " { $link "alien" } "." } ;
HELP: heap-scan-error.
{ $error-description "Thrown if " { $link next-object } " is called outside of a " { $link begin-scan } "/" { $link end-scan } " pair." } ;
HELP: undefined-symbol-error.
{ $error-description "Thrown if a previously-compiled " { $link alien-invoke } " call refers to a native library symbol which no longer exists." } ;
HELP: user-interrupt.
{ $error-description "Thrown by the " { $snippet "t" } " command in the FEP." } ;
HELP: datastack-underflow.
{ $error-description "Thrown by the runtime if an attempt is made to pop elements from an empty data stack." }
{ $notes "You can use the stack effect tool to statically check stack effects of quotations. See " { $link "inference" } "." } ;
HELP: datastack-overflow.
{ $error-description "Thrown by the runtime if an attempt is made to push elements on a full data stack." }
{ $notes "This error usually indicates a run-away recursion, however if you legitimately need a data stack larger than the default, see " { $link "runtime-cli-args" } "." } ;
HELP: retainstack-underflow.
{ $error-description "Thrown by the runtime if " { $link r> } " is called while the retain stack is empty." }
{ $notes "You can use the stack effect tool to statically check stack effects of quotations. See " { $link "inference" } "." } ;
HELP: retainstack-overflow.
{ $error-description "Thrown by the runtime if " { $link >r } " is called when the retain stack is full." }
{ $notes "This error usually indicates a run-away recursion, however if you legitimately need a retain stack larger than the default, see " { $link "runtime-cli-args" } "." } ;
HELP: callstack-overflow.
{ $error-description "Thrown by the runtime if the call stack is full." }
{ $notes "This error usually indicates a run-away recursion, however if you legitimately need a call stack larger than the default, see " { $link "runtime-cli-args" } "." } ;

2
core/definitions.factor
View File

@ -10,3 +10,5 @@ GENERIC: where ( defspec -- loc )
GENERIC: subdefs ( defspec -- seq )
GENERIC: forget ( defspec -- )
GENERIC: synopsis* ( defspec -- )

77
core/documentation.factor Normal file
View File

@ -0,0 +1,77 @@
PROVIDE: core/documentation
{ +directory+ "core" }
{ +files+ {
"continuations.facts"
"definitions.facts"
"effects.facts"
"errors.facts"
"kernel.facts"
"modules.facts"
"quotations.facts"
"threads.facts"
"words.facts"
"listener.facts"
"bootstrap/init.facts"
"collections/growable.facts"
"collections/arrays.facts"
"collections/graphs.facts"
"collections/hashtables.facts"
"collections/namespaces.facts"
"collections/queues.facts"
"collections/sbuf.facts"
"collections/sequence-combinators.facts"
"collections/sequence-sort.facts"
"collections/sequences-epilogue.facts"
"collections/sequences.facts"
"collections/slicing.facts"
"collections/strings.facts"
"collections/flatten.facts"
"collections/vectors.facts"
"collections/virtual-sequences.facts"
"generic/early-generic.facts"
"generic/classes.facts"
"generic/generic.facts"
"generic/methods.facts"
"generic/math-combination.facts"
"generic/slots.facts"
"generic/standard-combination.facts"
"generic/tuple.facts"
"help/help.facts"
"help/markup.facts"
"help/syntax.facts"
"help/topics.facts"
"io/binary.facts"
"io/c-streams.facts"
"io/duplex-stream.facts"
"io/files.facts"
"io/lines.facts"
"io/nested-style.facts"
"io/plain-stream.facts"
"io/server.facts"
"io/stdio.facts"
"io/stream.facts"
"io/string-streams.facts"
"io/styles.facts"
"math/arc-trig-hyp.facts"
"math/complex.facts"
"math/constants.facts"
"math/float.facts"
"math/integer.facts"
"math/math.facts"
"math/parse-numbers.facts"
"math/pow.facts"
"math/random.facts"
"math/ratio.facts"
"math/trig-hyp.facts"
"math/vectors.facts"
"prettyprint/core.facts"
"prettyprint/sections.facts"
"prettyprint/backend.facts"
"prettyprint/frontend.facts"
"prettyprint/debugger.facts"
"prettyprint/describe.facts"
"syntax/early-parser.facts"
"syntax/parse-stream.facts"
"syntax/parser.facts"
"syntax/parse-syntax.facts"
} } ;

8
core/errors.factor
View File

@ -60,4 +60,12 @@ M: condition compute-restarts
PREDICATE: array kernel-error ( obj -- ? )
dup first \ kernel-error eq? swap second 0 18 between? and ;
TUPLE: assert got expect ;
: assert ( got expect -- * ) <assert> throw ;
: assert= ( a b -- ) 2dup = [ 2drop ] [ assert ] if ;
: assert-depth ( quot -- ) depth slip depth swap assert= ;
DEFER: try

10
core/errors.facts
View File

@ -71,3 +71,13 @@ HELP: compute-restarts
{ $description "Outputs a sequence of triples, where each triple consists of a human-readable string, an object, and a continuation. Resuming a continuation with the corresponding object restarts execution immediately after the corresponding call to " { $link condition } "."
$terpri
"This word recursively travels up the delegation chain to collate restarts from nested and wrapped conditions." } ;
HELP: assert
{ $values { "got" "the obtained value" } { "expect" "the expected value" } }
{ $description "Throws an " { $link assert } " error." }
{ $error-description "Thrown when a unit test or other assertion fails." }
{ $see-also assert-depth } ;
HELP: assert-depth
{ $values { "quot" "a quotation" } }
{ $description "Runs a quotation. Throws an error if the total number of elements on the stack is not the same before and after the quotation runs." } ;

7
core/help/help.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license.
IN: help
USING: arrays io kernel namespaces parser prettyprint sequences
words hashtables definitions ;
words hashtables definitions errors generic ;
M: word article-title
dup parsing? [
@ -85,8 +85,3 @@ M: word article-content
[ remove-word-help ] keep
[ swap "help" set-word-prop ] keep
xref-article ;
! Definition protocol
M: link forget link-name remove-article ;
M: word-link forget f "help" set-word-prop ;

2
core/help/help.facts
View File

@ -3,7 +3,7 @@ USING: definitions io prettyprint ;
HELP: $title
{ $values { "topic" "a help article name or a word" } }
{ $description "Prints a help article's title, or a word's " { $link synopsis } ", depending on the type of " { $snippet "topic" } "." } ;
{ $description "Prints a help article's title, or a word's " { $link summary } ", depending on the type of " { $snippet "topic" } "." } ;
HELP: (help)
{ $values { "topic" "an article name or a word" } }

11
core/help/load.factor Normal file
View File

@ -0,0 +1,11 @@
PROVIDE: core/help
{ +files+ {
"stylesheet.factor"
"topics.factor"
"markup.factor"
"help.factor"
"syntax.factor"
} }
{ +tests+ {
"test/topics.factor"
} } ;

12
core/help/markup.factor
View File

@ -242,7 +242,13 @@ M: f print-element drop ;
drop
"Throws an error if the I/O operation fails." $errors ;
: $prettyprinting-note
drop {
"This word should only be called from inside the "
{ $link with-pprint } " combinator."
} $notes ;
: sort-articles ( seq -- newseq )
[ [ article-title ] keep 2array ] map
[ [ first ] 2apply <=> ] sort
1 <column> ;
[ dup article-title 2array ] map
[ [ second ] 2apply <=> ] sort
0 <column> ;

0
core/test/help/search.factor → core/help/test/search.factor
View File

0
core/test/help/topics.factor → core/help/test/topics.factor
View File

24
core/help/topics.factor
View File

@ -73,27 +73,3 @@ DEFER: $subsection
: xref-help ( -- )
all-articles [ children ] parent-graph get build-graph ;
! Definition protocol
M: link where link-name article article-loc ;
M: link synopsis*
\ ARTICLE: pprint-word
dup link-name pprint*
article-title pprint* ;
M: link definition article-content t ;
M: link see (see) ;
PREDICATE: link word-link link-name word? ;
M: word-link where link-name "help-loc" word-prop ;
M: word-link synopsis*
\ HELP: pprint-word
link-name dup pprint-word
stack-effect effect>string comment. ;
M: word-link definition
link-name "help" word-prop t ;

0
core/tools/listener.factor → core/listener.factor
View File

0
core/tools/listener.facts → core/listener.facts
View File

112
core/load.factor
View File

@ -75,124 +75,25 @@ PROVIDE: core
"prettyprint/sections.factor"
"prettyprint/backend.factor"
"prettyprint/frontend.factor"
"prettyprint/describe.factor"
"syntax/parser.factor"
"syntax/parse-stream.factor"
"tools/definitions.factor"
"tools/describe.factor"
"tools/completion.factor"
"help/stylesheet.factor"
"help/topics.factor"
"help/markup.factor"
"help/help.factor"
"help/syntax.factor"
"tools/debugger.factor"
"debugger.factor"
"listener.factor"
"threads.factor"
"io/server.factor"
"tools/memory.factor"
"tools/listener.factor"
"tools/inspector.factor"
"tools/word-tools.factor"
"tools/test.factor"
"tools/interpreter.factor"
"cli.factor"
"modules.factor"
"syntax/parse-syntax.factor"
"tools/errors.factor"
"bootstrap/init.factor"
"bootstrap/image.factor"
"continuations.facts"
"definitions.facts"
"effects.facts"
"errors.facts"
"kernel.facts"
"modules.facts"
"quotations.facts"
"threads.facts"
"words.facts"
"bootstrap/image.facts"
"bootstrap/init.facts"
"collections/growable.facts"
"collections/arrays.facts"
"collections/graphs.facts"
"collections/hashtables.facts"
"collections/namespaces.facts"
"collections/queues.facts"
"collections/sbuf.facts"
"collections/sequence-combinators.facts"
"collections/sequence-sort.facts"
"collections/sequences-epilogue.facts"
"collections/sequences.facts"
"collections/slicing.facts"
"collections/strings.facts"
"collections/flatten.facts"
"collections/vectors.facts"
"collections/virtual-sequences.facts"
"generic/early-generic.facts"
"generic/classes.facts"
"generic/generic.facts"
"generic/methods.facts"
"generic/math-combination.facts"
"generic/slots.facts"
"generic/standard-combination.facts"
"generic/tuple.facts"
"help/help.facts"
"help/markup.facts"
"help/syntax.facts"
"help/topics.facts"
"io/binary.facts"
"io/c-streams.facts"
"io/duplex-stream.facts"
"io/files.facts"
"io/lines.facts"
"io/nested-style.facts"
"io/plain-stream.facts"
"io/server.facts"
"io/stdio.facts"
"io/stream.facts"
"io/string-streams.facts"
"io/styles.facts"
"math/arc-trig-hyp.facts"
"math/complex.facts"
"math/constants.facts"
"math/float.facts"
"math/integer.facts"
"math/math.facts"
"math/parse-numbers.facts"
"math/pow.facts"
"math/random.facts"
"math/ratio.facts"
"math/trig-hyp.facts"
"math/vectors.facts"
"prettyprint/core.facts"
"prettyprint/sections.facts"
"prettyprint/backend.facts"
"prettyprint/frontend.facts"
"syntax/early-parser.facts"
"syntax/parse-stream.facts"
"syntax/parser.facts"
"syntax/parse-syntax.facts"
"tools/definitions.facts"
"tools/word-tools.facts"
"tools/debugger.facts"
"tools/describe.facts"
"tools/inspector.facts"
"tools/listener.facts"
"tools/memory.facts"
"tools/test.facts"
} }
{ +tests+ {
"test/annotate.factor"
"test/binary.factor"
"test/collections/hashtables.factor"
"test/collections/namespaces.factor"
@ -205,10 +106,7 @@ PROVIDE: core
"test/continuations.factor"
"test/errors.factor"
"test/generic.factor"
"test/help/topics.factor"
"test/init.factor"
"test/inspector.factor"
"test/interpreter.factor"
"test/io/io.factor"
"test/io/nested-style.factor"
"test/kernel.factor"
@ -220,7 +118,6 @@ PROVIDE: core
"test/math/math-combinators.factor"
"test/math/random.factor"
"test/math/rational.factor"
"test/memory.factor"
"test/parse-number.factor"
"test/parser.factor"
"test/parsing-word.factor"
@ -231,5 +128,4 @@ PROVIDE: core
"test/threads.factor"
"test/tuple.factor"
"test/words.factor"
"test/tools.factor"
} } ;

88
core/modules.factor
View File

@ -2,17 +2,11 @@
! See http://factorcode.org/license.txt for BSD license.
IN: modules
USING: hashtables io kernel namespaces parser sequences
test words strings arrays math help prettyprint-internals
definitions styles ;
words strings arrays math help errors ;
SYMBOL: modules
TUPLE: module name loc files tests help main ;
! For presentations
TUPLE: module-link name ;
M: module-link module-name module-link-name ;
TUPLE: module name loc directory files tests help main ;
: module-def ( name -- path )
"resource:" over "/load.factor" append3
@ -31,7 +25,7 @@ M: module-link module-name module-link-name ;
[ path+ "resource:" swap append ] map-with ;
: module-files* ( module -- seq )
dup module-name swap module-files process-files ;
dup module-directory swap module-files process-files ;
: load-module ( name -- )
[
@ -46,24 +40,28 @@ M: module-link module-name module-link-name ;
module-files* [ source-modified? ] subset run-files
] if ;
: reload-modules ( -- )
modules get [ reload-module ] each do-parse-hook ;
: require ( name -- )
dup module
[ reload-module ] [ load-module ] ?if
do-parse-hook ;
: module-tests* ( module -- seq )
dup module-name swap module-tests process-files ;
: remove-module ( name -- )
module [ modules get delete ] when* ;
: alist>module ( name loc hash -- module )
alist>hash [
+files+ get +tests+ get +help+ get
+directory+ get [ over ] unless*
+files+ get
+tests+ get
+help+ get
] bind f <module> ;
: module>alist ( module -- hash )
[
+directory+ over module-directory 2array ,
+files+ over module-files 2array ,
+tests+ over module-tests 2array ,
+help+ swap module-help 2array ,
@ -74,67 +72,3 @@ M: module-link module-name module-link-name ;
alist>module
[ module-files* run-files ] keep
modules get push ;
: test-module ( name -- )
dup require
module module-tests* run-tests ;
: test-modules ( -- )
modules get [ module-tests* ] map concat run-tests ;
: reload-modules ( -- )
modules get [ reload-module ] each do-parse-hook ;
: run-module ( name -- )
dup require
dup module module-main [
assert-depth
] [
"The module " write write
" does not define an entry point." print
"To define one, see the documentation for the " write
\ MAIN: ($link) " word." print
] ?if ;
: modules-help ( -- seq )
modules get [ module-help ] map [ ] subset ;
M: module synopsis*
\ PROVIDE: pprint-word
[ module-name ] keep presented associate styled-text ;
M: module definition module>alist t ;
M: module where module-loc ;
: module-dir? ( path -- ? )
"load.factor" path+ resource-path exists? ;
: (available-modules) ( path -- )
dup resource-path directory [ path+ ] map-with
dup [ module-dir? ] subset %
[ (available-modules) ] each ;
: small-modules ( path -- seq )
dup resource-path directory [ path+ ] map-with
[ ".factor" tail? ] subset
[ ".factor" ?tail drop ] map ;
: available-modules ( -- seq )
[
"core" (available-modules)
"apps" (available-modules)
"apps" small-modules %
"libs" (available-modules)
"libs" small-modules %
"demos" (available-modules)
"demos" small-modules %
] { } make natural-sort
[ dup module [ ] [ <module-link> ] ?if ] map ;
: module-string ( obj -- str )
dup module-name swap module? [ " (loaded)" append ] when ;
: modules. ( -- )
available-modules
[ [ module-string ] keep write-object terpri ] each ;

15
core/modules.facts
View File

@ -31,17 +31,6 @@ HELP: provide
{ $values { "name" "a string" } { "hash" "a hashtable" } { "loc" "a pair holding a path name and line number" } }
{ $description "Registers a module definition and loads its source files. The possible hashtable keys are documented in the " { $link POSTPONE: PROVIDE: } " word. Usually instead of calling this word, module definitions use the parsing word " { $link POSTPONE: PROVIDE: } " instead." } ;
HELP: test-module
{ $values { "name" "a module name string" } }
{ $description "Runs the unit test files associated to the module by a previous call to " { $link provide } " or " { $link POSTPONE: PROVIDE: } "." } ;
HELP: test-modules
{ $description "Runs unit test files for all loaded modules." } ;
HELP: run-module
{ $values { "name" "a module name string" } }
{ $description "Runs the main entry point of the module, first loading the module if necessary using " { $link require } ". Entry points can be defined with the " { $link POSTPONE: MAIN: } " word." } ;
HELP: reload-module
{ $values { "module" "a " { $link module } " instance" } }
{ $description "Reloads any source files making up a module if they have been modified on disk since last being loaded. Most of the time " { $link reload-modules } " should be called instead." } ;
@ -49,7 +38,3 @@ HELP: reload-module
HELP: reload-modules
{ $description "Reloads all source files in all loaded modules which have been modified on disk since last being loaded." }
{ $notes "If modification times become invalid after moving sources or images between machines, and this word ends up trying to reload all library sources, call " { $link reset-modified } " from the listener." } ;
HELP: modules-help
{ $values { "seq" "a new sequence" } }
{ $description "Outputs a sequence of help articles which are the main entry points into the documentation of loaded modules. Modules can define documentation entry points with the " { $link +help+ } " key of the association list given in " { $link POSTPONE: PROVIDE: } "." } ;

12
core/prettyprint/backend.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2003, 2006 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
IN: prettyprint-internals
USING: alien arrays generic hashtables io kernel math
USING: arrays generic hashtables io kernel math
namespaces parser sequences strings styles vectors words
prettyprint ;
@ -31,13 +31,6 @@ M: real pprint* number>string text ;
M: f pprint* drop \ f pprint-word ;
M: alien pprint*
dup expired? [
drop "( alien expired )"
] [
\ ALIEN: pprint-word alien-address number>string
] if text ;
! Strings
: ch>ascii-escape ( ch -- str )
H{
@ -75,9 +68,6 @@ M: string pprint* "\"" pprint-string ;
M: sbuf pprint* "SBUF\" " pprint-string ;
M: dll pprint*
dll-path alien>char-string "DLL\" " pprint-string ;
! Sequences
: nesting-limit? ( -- ? )
nesting-limit get dup [ pprinter-stack get length < ] when ;

0
core/tools/describe.factor → core/prettyprint/describe.factor
View File

0
core/tools/describe.facts → core/prettyprint/describe.facts
View File

6
core/prettyprint/sections.facts
View File

@ -1,12 +1,6 @@
IN: help
USING: io kernel prettyprint prettyprint-internals words ;
: $prettyprinting-note
drop {
"This word should only be called from inside the "
{ $link with-pprint } " combinator."
} $notes ;
HELP: pprint-section
{ $values { "section" "a section" } }
{ $contract "Prettyprints an object delegating to an instance of " { $link section } ", performing wrapping and indentation using the formatting information in the section." } ;

1
core/syntax/parse-syntax.factor
View File

@ -93,3 +93,4 @@ DEFER: !PRIMITIVE: parsing
SYMBOL: !+files+
SYMBOL: !+tests+
SYMBOL: !+help+
SYMBOL: !+directory+

2
core/tools/completion.factor
View File

@ -50,7 +50,7 @@ USING: kernel arrays sequences math namespaces strings io ;
: rank-completions ( results -- newresults )
#! Discard results in the low 33%
[ [ first ] 2apply swap - ] sort
sort-keys <reversed>
[ 0 [ first max ] reduce 3 / ] keep
[ first < ] subset-with
[ second ] map ;

124
core/tools/debugger.factor
View File

@ -1,85 +1,10 @@
! Copyright (C) 2004, 2006 Slava Pestov.
! Copyright (C) 2006 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: arrays definitions generic hashtables help tools io
USING: arrays definitions generic hashtables tools io
kernel math namespaces parser prettyprint sequences
sequences-internals strings styles vectors words errors ;
IN: kernel-internals
: save-error ( error trace continuation -- )
error-continuation set-global
error-stack-trace set-global
dup error set-global
compute-restarts restarts set-global ;
: error-handler ( error trace -- )
dupd continuation save-error rethrow ;
: init-error-handler ( -- )
V{ } clone set-catchstack
! kernel calls on error
[ error-handler ] 5 setenv
\ kernel-error 12 setenv ;
: code-heap-start 17 getenv ;
: code-heap-end 18 getenv ;
: <xt-map> ( -- xtmap )
[
f code-heap-start 2array ,
all-words [ compiled? ] subset
[ dup word-xt 2array , ] each
f code-heap-end 2array ,
] { } make [ [ second ] 2apply - ] sort ;
: find-xt ( xt xtmap -- word )
[ second - ] binsearch* first ;
: symbolic-stack-trace ( seq -- seq )
<xt-map> swap [ dup pick find-xt 2array ] map nip ;
sequences-internals strings styles vectors words errors help ;
IN: errors
GENERIC: error. ( error -- )
GENERIC: error-help ( error -- topic )
M: object error. . ;
M: object error-help drop f ;
M: tuple error. describe ;
M: tuple error-help class ;
M: string error. print ;
: :s ( -- )
error-continuation get continuation-data stack. ;
: :r ( -- )
error-continuation get continuation-retain stack. ;
: xt. ( xt -- )
>hex cell 2 * CHAR: 0 pad-left write ;
: word-xt. ( xt word -- )
"Compiled: " write dup pprint bl
"(offset " write word-xt - >hex write ")" write ;
: bare-xt. ( xt -- )
"C code: " write xt. ;
: :trace
error-stack-trace get symbolic-stack-trace <reversed> [
first2 [ word-xt. ] [ bare-xt. ] if* terpri
] each ;
: :c ( -- )
error-continuation get continuation-call callstack. :trace ;
: :get ( variable -- value )
error-continuation get continuation-name hash-stack ;
: :res ( n -- )
restarts get-global nth f restarts set-global restart ;
: :edit ( -- )
error get delegates [ parse-error? ] find-last nip [
dup parse-error-file ?resource-path
@ -100,46 +25,3 @@ M: string error. print ;
{ [ dup length 1 = ] [ first help ] }
{ [ t ] [ (:help-multi) ] }
} cond ;
: restart. ( restart n -- )
[ # " :res " % restart-name % ] "" make print ;
: restarts. ( -- )
restarts get dup empty? [
drop
] [
terpri
"The following restarts are available:" print
terpri
dup length [ restart. ] 2each
] if ;
: debug-help ( -- )
terpri
"Debugger commands:" print
terpri
":help - documentation for this error" print
":s - data stack at exception time" print
":r - retain stack at exception time" print
":c - call stack at exception time" print
error get [ parse-error? ] is? [
":edit - jump to source location" print
] when
":get ( var -- value ) accesses variables at time of the error" print
flush ;
: print-error ( error -- )
[
dup error.
] [
"Error in print-error!" print drop
] recover drop ;
SYMBOL: error-hook
[ print-error restarts. debug-help ] error-hook set-global
: try ( quot -- )
[ error-hook get call ] recover ;

100
core/tools/debugger.facts
View File

@ -1,102 +1,8 @@
IN: errors
USING: alien arrays generic help kernel math memory
strings vectors ;
HELP: :s
{ $description "Prints the data stack at the time of the most recent error. Used for interactive debugging." } ;
HELP: :r
{ $description "Prints the retain stack at the time of the most recent error. Used for interactive debugging." } ;
HELP: :c
{ $description "Prints the call stack at the time of the most recent error. Used for interactive debugging." } ;
HELP: :get
{ $values { "variable" "an object" } { "value" "the value, or f" } }
{ $description "Looks up the value of a variable at the time of the most recent error." } ;
USING: help parser definitions ;
HELP: :help
{ $description "Displays documentation for the most recent error." } ;
HELP: :res
{ $values { "n" "a non-negative integer" } }
{ $description "Continues executing the " { $snippet "n" } "th restart." } ;
HELP: error.
{ $values { "error" "an error" } }
{ $contract "Print an error to the default stream." } ;
HELP: error-help
{ $values { "error" "an error" } { "topic" "an article name or word" } }
{ $contract "Outputs a help article which explains the error." }
{ $see-also :help } ;
HELP: print-error
{ $values { "error" "an error" } }
{ $description "Print an error to the default stream. This word gets called by the listener and other tools which report caught errors to the user. You can define methods on this generic word for custom error reporting." } ;
HELP: try
{ $values { "quot" "a quotation" } }
{ $description "Calls the quotation. If it throws an error, logs the error to the default stream and restores the data stack." } ;
HELP: expired-error.
{ $error-description "Thrown by " { $link alien-address } " and " { $link alien-invoke } " if an " { $link alien } " object passed in as a parameter has expired. Alien objects expire if they are saved an image which is subsequently loaded; this prevents a certain class of programming errors, usually attempts to use uninitialized objects, since holding a C address is meaningless between sessions." }
{ $notes "You can check if an alien object has expired by calling " { $link expired? } "." } ;
HELP: io-error.
{ $error-description "Thrown by the C streams I/O primitives if an I/O error occurs." } ;
HELP: undefined-word-error.
{ $error-description "Thrown if an attempt is made to call a word which was defined by " { $link POSTPONE: DEFER: } "." } ;
HELP: type-check-error.
{ $error-description "Thrown by various primitives if one of the inputs does not have the expected type. Generic words throw " { $link no-method } " and " { $link no-math-method } " errors in such cases instead." } ;
HELP: signal-error.
{ $error-description
"Thrown by the runtime when a Unix signal is received. While signal numbers are system-specific, the following are relatively standard:"
{ $list
{ "4 - Illegal instruction. If you see this error, it is a bug in Factor's compiler and should be reported." }
{ "8 - Arithmetic exception. Most likely a divide by zero in " { $link /i } "." }
{ "10, 11 - Memory protection fault. This error suggests invalid values are being passed to C functions by an " { $link alien-invoke } ". Factor also uses memory protection to trap stack underflows and overflows, but usually these are reported as their own errors. Sometimes they'll show up as a generic signal 11, though." }
}
"The Windows equivalent of a signal 11 is a SEH fault. When one occurs, the runtime throws a singal error, even though it does not correspond to a Unix signal."
} ;
HELP: negative-array-size-error.
{ $error-description "Thrown by " { $link <array> } ", " { $link <string> } ", " { $link <vector> } " and " { $link <sbuf> } " if a negative capacity is specified." } ;
HELP: c-string-error.
{ $error-description "Thrown by " { $link alien-invoke } " and various primitives if a string containing null bytes, or characters with values higher than 255 is passed in where a C string is expected. See " { $link "c-strings" } "." } ;
HELP: ffi-error.
{ $error-description "Thrown by " { $link dlopen } " and " { $link dlsym } " if a problem occurs while loading a native library or looking up a symbol. See " { $link "alien" } "." } ;
HELP: heap-scan-error.
{ $error-description "Thrown if " { $link next-object } " is called outside of a " { $link begin-scan } "/" { $link end-scan } " pair." } ;
HELP: undefined-symbol-error.
{ $error-description "Thrown if a previously-compiled " { $link alien-invoke } " call refers to a native library symbol which no longer exists." } ;
HELP: user-interrupt.
{ $error-description "Thrown by the " { $snippet "t" } " command in the FEP." } ;
HELP: datastack-underflow.
{ $error-description "Thrown by the runtime if an attempt is made to pop elements from an empty data stack." }
{ $notes "You can use the stack effect tool to statically check stack effects of quotations. See " { $link "inference" } "." } ;
HELP: datastack-overflow.
{ $error-description "Thrown by the runtime if an attempt is made to push elements on a full data stack." }
{ $notes "This error usually indicates a run-away recursion, however if you legitimately need a data stack larger than the default, see " { $link "runtime-cli-args" } "." } ;
HELP: retainstack-underflow.
{ $error-description "Thrown by the runtime if " { $link r> } " is called while the retain stack is empty." }
{ $notes "You can use the stack effect tool to statically check stack effects of quotations. See " { $link "inference" } "." } ;
HELP: retainstack-overflow.
{ $error-description "Thrown by the runtime if " { $link >r } " is called when the retain stack is full." }
{ $notes "This error usually indicates a run-away recursion, however if you legitimately need a retain stack larger than the default, see " { $link "runtime-cli-args" } "." } ;
HELP: callstack-overflow.
{ $error-description "Thrown by the runtime if the call stack is full." }
{ $notes "This error usually indicates a run-away recursion, however if you legitimately need a call stack larger than the default, see " { $link "runtime-cli-args" } "." } ;
HELP: :edit
{ $description "If the most recent error was a " { $link parse-error } " thrown while parsing a source file, opens the source file at the failing line in the default editor using " { $link edit-location } "." } ;

31
core/tools/definitions.factor
View File

@ -3,7 +3,7 @@
IN: definitions
USING: arrays errors generic hashtables io kernel math
namespaces parser prettyprint prettyprint-internals sequences
styles words ;
styles words help ;
: reload ( defspec -- )
where first [ run-file ] when* ;
@ -25,8 +25,6 @@ SYMBOL: edit-hook
"Not from a source file" throw
] if* ;
GENERIC: synopsis* ( defspec -- )
: write-vocab ( vocab -- )
dup <vocab-link> presented associate styled-text ;
@ -125,3 +123,30 @@ M: word see-class* drop ;
: see-subdefs ( word -- ) subdefs [ terpri see ] each ;
M: word see dup (see) dup see-class see-subdefs ;
M: link where link-name article article-loc ;
M: link synopsis*
\ ARTICLE: pprint-word
dup link-name pprint*
article-title pprint* ;
M: link definition article-content t ;
M: link see (see) ;
PREDICATE: link word-link link-name word? ;
M: word-link where link-name "help-loc" word-prop ;
M: word-link synopsis*
\ HELP: pprint-word
link-name dup pprint-word
stack-effect effect>string comment. ;
M: word-link definition
link-name "help" word-prop t ;
M: link forget link-name remove-article ;
M: word-link forget f "help" set-word-prop ;

0
core/bootstrap/image.factor → core/tools/image.factor
View File

0
core/bootstrap/image.facts → core/tools/image.facts
View File

30
core/tools/load.factor Normal file
View File

@ -0,0 +1,30 @@
PROVIDE: core/tools
{ +files+ {
"definitions.factor"
"completion.factor"
"memory.factor"
"inspector.factor"
"word-tools.factor"
"test.factor"
"modules.factor"
"image.factor"
"interpreter.factor"
"errors.factor"
"debugger.factor"
"image.facts"
"definitions.facts"
"word-tools.facts"
"inspector.facts"
"memory.facts"
"test.facts"
"modules.facts"
"image.facts"
"debugger.facts"
} }
{ +tests+ {
"test/annotate.factor"
"test/inspector.factor"
"test/interpreter.factor"
"test/memory.factor"
"test/tools.factor"
} } ;

74
core/tools/modules.factor Normal file
View File

@ -0,0 +1,74 @@
! Copyright (C) 2006 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
IN: modules
USING: hashtables io kernel namespaces parser sequences
words strings arrays math help errors prettyprint-internals styles test definitions ;
! For presentations
TUPLE: module-link name ;
M: module-link module-name module-link-name ;
: module-tests* ( module -- seq )
dup module-name swap module-tests process-files ;
: test-module ( name -- )
dup require
module module-tests* run-tests ;
: test-modules ( -- )
modules get [ module-tests* ] map concat run-tests ;
: run-module ( name -- )
dup require
dup module module-main [
assert-depth
] [
"The module " write write
" does not define an entry point." print
"To define one, see the documentation for the " write
\ MAIN: ($link) " word." print
] ?if ;
: modules-help ( -- seq )
modules get [ module-help ] map [ ] subset ;
M: module synopsis*
\ PROVIDE: pprint-word
[ module-name ] keep presented associate styled-text ;
M: module definition module>alist t ;
M: module where module-loc ;
: module-dir? ( path -- ? )
"load.factor" path+ resource-path exists? ;
: (available-modules) ( path -- )
dup resource-path directory [ path+ ] map-with
dup [ module-dir? ] subset %
[ (available-modules) ] each ;
: small-modules ( path -- seq )
dup resource-path directory [ path+ ] map-with
[ ".factor" tail? ] subset
[ ".factor" ?tail drop ] map ;
: available-modules ( -- seq )
[
"core" (available-modules)
"apps" (available-modules)
"apps" small-modules %
"libs" (available-modules)
"libs" small-modules %
"demos" (available-modules)
"demos" small-modules %
] { } make natural-sort
[ dup module [ ] [ <module-link> ] ?if ] map ;
: module-string ( obj -- str )
dup module-name swap module? [ " (loaded)" append ] when ;
: modules. ( -- )
available-modules
[ [ module-string ] keep write-object terpri ] each ;

17
core/tools/modules.facts Normal file
View File

@ -0,0 +1,17 @@
IN: modules
USING: help ;
HELP: test-module
{ $values { "name" "a module name string" } }
{ $description "Runs the unit test files associated to the module by a previous call to " { $link provide } " or " { $link POSTPONE: PROVIDE: } "." } ;
HELP: test-modules
{ $description "Runs unit test files for all loaded modules." } ;
HELP: run-module
{ $values { "name" "a module name string" } }
{ $description "Runs the main entry point of the module, first loading the module if necessary using " { $link require } ". Entry points can be defined with the " { $link POSTPONE: MAIN: } " word." } ;
HELP: modules-help
{ $values { "seq" "a new sequence" } }
{ $description "Outputs a sequence of help articles which are the main entry points into the documentation of loaded modules. Modules can define documentation entry points with the " { $link +help+ } " key of the association list given in " { $link POSTPONE: PROVIDE: } "." } ;

8
core/tools/test.factor
View File

@ -5,12 +5,6 @@ USING: arrays errors hashtables tools io kernel math
memory namespaces parser prettyprint sequences strings words
vectors ;
TUPLE: assert got expect ;
: assert ( got expect -- * ) <assert> throw ;
: assert= ( a b -- ) 2dup = [ 2drop ] [ assert ] if ;
: print-test ( input output -- )
"----> Quotation: " write .
"Expected output: " write . flush ;
@ -35,8 +29,6 @@ TUPLE: assert got expect ;
[ f ] swap [ [ call t ] [ 2drop f ] recover ]
curry unit-test ;
: assert-depth ( quot -- ) depth slip depth swap assert= ;
SYMBOL: failures
: failure failures [ ?push ] change ;

10
core/tools/test.facts
View File

@ -1,12 +1,6 @@
IN: test
USING: help kernel ;
HELP: assert
{ $values { "got" "the obtained value" } { "expect" "the expected value" } }
{ $description "Throws an " { $link assert } " error." }
{ $error-description "Thrown when a unit test or other assertion fails." }
{ $see-also unit-test unit-test-fails assert-depth } ;
HELP: benchmark
{ $values { "quot" "a quotation" } { "gctime" "an integer denoting milliseconds" } { "runtime" "an integer denoting milliseconds" } }
{ $description "Runs a quotation, measuring the total wall clock time and the total time spent in the garbage collector." }
@ -27,7 +21,3 @@ HELP: unit-test-fails
{ $values { "quot" "a quotation run with an empty stack" } }
{ $description "Runs a quotation with an empty stack, expecting it to throw an error. If the quotation throws an error, this word returns normally. If the quotation does not throw an error, this word " { $emphasis "does" } " raise an error." }
{ $notes "This word is used to test boundary conditions and fail-fast behavior." } ;
HELP: assert-depth
{ $values { "quot" "a quotation" } }
{ $description "Runs a quotation. Throws an error if the total number of elements on the stack is not the same before and after the quotation runs." } ;

0
core/test/annotate.factor → core/tools/test/annotate.factor
View File

0
core/test/inspector.factor → core/tools/test/inspector.factor
View File

0
core/test/interpreter.factor → core/tools/test/interpreter.factor
View File

0
core/test/memory.factor → core/tools/test/memory.factor
View File

0
core/test/tools.factor → core/tools/test/tools.factor
View File

2
core/ui/cocoa/load.factor
View File

@ -1,6 +1,6 @@
USING: compiler io parser sequences words ;
REQUIRES: core/compiler/alien/objc ;
REQUIRES: core/compiler/alien/objc core/ui/tools ;
PROVIDE: core/ui/cocoa
{ +files+ {

21
core/ui/debugger.factor
View File

@ -1,8 +1,5 @@
! Copyright (C) 2006 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
IN: gadgets-listener
DEFER: call-listener
IN: gadgets
USING: arrays errors gadgets gadgets-buttons
gadgets-labels gadgets-panes gadgets-presentations
@ -10,9 +7,6 @@ gadgets-scrolling gadgets-theme gadgets-viewports gadgets-lists
generic hashtables io kernel math models namespaces prettyprint
queues sequences test threads help sequences words timers ;
: <debugger-button>
[ call-listener drop ] curry <bevel-button> ;
: <restart-list> ( error restart-hook -- gadget )
[ restart-name ] rot compute-restarts <model> <list> ;
@ -21,7 +15,7 @@ TUPLE: debugger restarts ;
: <debugger-display> ( error restart-list -- gadget )
>r [ print-error ] make-pane r> 2array make-filled-pile ;
C: debugger ( error restart-hook -- gadget )
C: debugger ( error restarts restart-hook -- gadget )
{
{
[ gadget get { debugger } <toolbar> ]
@ -38,18 +32,9 @@ C: debugger ( error restart-hook -- gadget )
M: debugger focusable-child*
debugger-restarts ;
debugger "toolbar" {
{ "Data stack" T{ key-down f f "s" } [ :s ] }
{ "Retain stack" T{ key-down f f "r" } [ :r ] }
{ "Call stack" T{ key-down f f "c" } [ :c ] }
{ "Help" T{ key-down f f "h" } [ :help ] }
{ "Edit" T{ key-down f f "e" } [ :edit ] }
} [
first3 [ call-listener drop ] curry 3array
] map define-commands
: debugger-window ( error -- )
[ drop ] <debugger>
#! No restarts for the debugger window
f [ drop ] <debugger>
"Error" open-titled-window ;
: ui-try ( quot -- )

3
core/ui/gadgets/presentations.factor
View File

@ -1,8 +1,5 @@
! Copyright (C) 2005, 2006 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
IN: gadgets-listener
DEFER: call-listener
IN: gadgets-presentations
USING: arrays definitions gadgets gadgets-borders
gadgets-buttons gadgets-labels gadgets-outliner

11
core/ui/load.factor
View File

@ -42,16 +42,6 @@ PROVIDE: core/ui
"text/interactor.factor"
"debugger.factor"
"ui.factor"
"tools/tools.factor"
"tools/messages.factor"
"tools/listener.factor"
"tools/walker.factor"
"tools/browser.factor"
"tools/help.factor"
"tools/dataflow.factor"
"tools/workspace.factor"
"tools/search.factor"
"tools/operations.factor"
"text/editor.facts"
} }
{ +tests+ {
@ -59,7 +49,6 @@ PROVIDE: core/ui
"test/gadgets.factor"
"test/models.factor"
"test/document.factor"
"test/listener.factor"
"test/lists.factor"
"test/rectangles.factor"
"test/commands.factor"

10
core/ui/tools/listener.factor
View File

@ -131,3 +131,13 @@ listener-gadget "toolbar" {
}
{ "Send EOF" f [ listener-eof ] }
} define-commands
debugger "toolbar" {
{ "Data stack" T{ key-down f f "s" } [ :s ] }
{ "Retain stack" T{ key-down f f "r" } [ :r ] }
{ "Call stack" T{ key-down f f "c" } [ :c ] }
{ "Help" T{ key-down f f "h" } [ :help ] }
{ "Edit" T{ key-down f f "e" } [ :edit ] }
} [
first3 [ call-listener drop ] curry 3array
] map define-commands

18
core/ui/tools/load.factor Normal file
View File

@ -0,0 +1,18 @@
REQUIRES: core/ui ;
PROVIDE: core/ui/tools
{ +files+ {
"tools.factor"
"messages.factor"
"listener.factor"
"walker.factor"
"browser.factor"
"help.factor"
"dataflow.factor"
"workspace.factor"
"search.factor"
"operations.factor"
} }
{ +tests+ {
"test/listener.factor"
} } ;

3
core/ui/tools/search.factor
View File

@ -80,8 +80,7 @@ M: live-search focusable-child* live-search-field ;
[ first <link> ] map ;
: <help-search> ( string -- gadget )
all-articles [ dup article-title 2array ] map
[ [ second ] 2apply <=> ] sort
all-articles [ dup article-title 2array ] map sort-values
[ help-completions ]
[ article-title ]
<live-search> ;

0
core/ui/test/listener.factor → core/ui/tools/test/listener.factor
View File

1
core/ui/tools/workspace.factor
View File

@ -136,6 +136,7 @@ workspace "scrolling" {
workspace "tool-switch" {
{ "Hide popup" T{ key-down f f "ESCAPE" } [ hide-popup ] }
{ "Hide popup" T{ key-down f f "ENTER" } [ hide-popup ] }
{ "Listener" T{ key-down f f "F2" } [ listener-gadget select-tool ] }
{ "Messages" T{ key-down f f "F3" } [ messages select-tool ] }
{ "Definitions" T{ key-down f f "F4" } [ browser select-tool ] }

2
core/ui/windows/load.factor
View File

@ -1,4 +1,4 @@
REQUIRES: core/windows ;
REQUIRES: core/windows core/ui/tools ;
PROVIDE: core/ui/windows { +files+ {
"clipboard.factor"

2
core/ui/x11/load.factor
View File

@ -1,6 +1,8 @@
! Copyright (C) 2005, 2006 Eduardo Cavazos
! See http://factorcode.org/license.txt for BSD license.
REQUIRES: core/ui/tools ;
PROVIDE: core/ui/x11
{ +files+ {
"xlib.factor"