command-line: move some stuff to command-line.startup so that deployed images don't pull in prettyprinter and debugger

db4
Slava Pestov 2011-09-01 20:32:33 -07:00
parent 91e043de68
commit 65837e742d
4 changed files with 46 additions and 41 deletions

View File

@ -1,5 +1,4 @@
USING: init command-line debugger system continuations
namespaces eval kernel vocabs.loader io ;
USING: init command-line.startup debugger system continuations ;
[
boot

View File

@ -3,7 +3,7 @@
USING: init continuations hashtables io io.encodings.utf8
io.files io.pathnames kernel kernel.private namespaces parser
sequences source-files strings system splitting vocabs.loader
alien.strings accessors eval ;
alien.strings accessors ;
IN: command-line
SYMBOL: script
@ -71,41 +71,3 @@ SYMBOL: main-vocab-hook
] bind ;
[ 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
"help" get "-help" get or "h" get or [ cli-usage ] [
"e" get script get or "quiet" [
load-vocab-roots
run-user-init
"e" get script get or [
"e" get [ eval( -- ) ] when*
script get [ run-script ] when*
] [
"run" get run
] if
] with-variable
] if
output-stream get [ stream-flush ] when*
0 exit ;

View File

@ -0,0 +1 @@
Slava Pestov

View File

@ -0,0 +1,43 @@
! Copyright (C) 2011 Joe Groff.
! See http://factorcode.org/license.txt for BSD license.
USING: command-line eval io io.pathnames kernel namespaces
system vocabs.loader ;
IN: command-line.startup
: 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
"help" get "-help" get or "h" get or [ cli-usage ] [
"e" get script get or "quiet" [
load-vocab-roots
run-user-init
"e" get script get or [
"e" get [ eval( -- ) ] when*
script get [ run-script ] when*
] [
"run" get run
] if
] with-variable
] if
output-stream get [ stream-flush ] when*
0 exit ;