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

Merge remote-tracking branch 'factorcode/master'

db4
John Benediktsson 2011-08-19 14:27:24 -07:00
parent 5e63f3b5d8 e829dcf125
commit 6c4e8ae969
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
basis/bootstrap/finish-bootstrap.factor
View File

@ -4,19 +4,5 @@ namespaces eval kernel vocabs.loader io ;
[ [
boot boot
do-startup-hooks do-startup-hooks
[ [ command-line-startup ] [ print-error 1 exit ] recover
(command-line) parse-command-line
load-vocab-roots
run-user-init
"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
] set-startup-quot ] set-startup-quot

38
basis/command-line/command-line.factor
View File

@ -3,7 +3,7 @@
USING: init continuations hashtables io io.encodings.utf8 USING: init continuations hashtables io io.encodings.utf8
io.files io.pathnames kernel kernel.private namespaces parser io.files io.pathnames kernel kernel.private namespaces parser
sequences source-files strings system splitting vocabs.loader sequences source-files strings system splitting vocabs.loader
alien.strings accessors ; alien.strings accessors eval ;
IN: command-line IN: command-line
SYMBOL: script SYMBOL: script
@ -71,3 +71,39 @@ SYMBOL: main-vocab-hook
] bind ; ] bind ;
[ default-cli-args ] "command-line" add-startup-hook [ default-cli-args ] "command-line" add-startup-hook
: cli-usage ( -- )
"""
Usage: """ write vm file-name write """ [Factor arguments] [script] [script arguments]
Common arguments:
-help print this message and exit
-i=<image> load Factor image file <image> (default """ write vm file-name write """.image)
-run=<vocab> run the MAIN: entry point of <vocab>
-e=<code> evaluate <code>
-quiet suppress "Loading vocab.factor" messages
-no-user-init suppress loading of .factor-rc
Enter
"command-line" help
from within Factor for more information.
""" write ;
: command-line-startup ( -- )
(command-line) parse-command-line
load-vocab-roots
run-user-init
"help" get "-help" get or "h" get or [ cli-usage ] [
"e" get script get or [
"e" get [ eval( -- ) ] when*
script get [ run-script ] when*
] [
"run" get run
] if
] if
output-stream get [ stream-flush ] when*
0 exit ;