command-line.startup: adding version argument.
$ ./factor -version Factor 0.99clean-macosx-x86-64
parent
745840dfca
commit
83fd6b65e0
|
@ -1,14 +1,19 @@
|
||||||
! Copyright (C) 2011 Joe Groff.
|
! Copyright (C) 2011 Joe Groff.
|
||||||
! See http://factorcode.org/license.txt for BSD license.
|
! See http://factorcode.org/license.txt for BSD license.
|
||||||
USING: command-line eval io io.pathnames kernel namespaces
|
USING: combinators command-line eval io io.pathnames kernel
|
||||||
sequences system vocabs.loader ;
|
namespaces system vocabs.loader ;
|
||||||
IN: command-line.startup
|
IN: command-line.startup
|
||||||
|
|
||||||
: cli-usage ( -- )
|
: help? ( -- ? )
|
||||||
|
"help" get "h" get or
|
||||||
|
os windows? [ script get "/?" = or ] when ;
|
||||||
|
|
||||||
|
: help. ( -- )
|
||||||
"Usage: " write vm-path file-name write " [Factor arguments] [script] [script arguments]
|
"Usage: " write vm-path file-name write " [Factor arguments] [script] [script arguments]
|
||||||
|
|
||||||
Factor arguments:
|
Factor arguments:
|
||||||
-help print this message and exit
|
-help print this message and exit
|
||||||
|
-version print the Factor version and exit
|
||||||
-i=<image> load Factor image file <image> (default " write vm-path file-stem write ".image)
|
-i=<image> load Factor image file <image> (default " write vm-path file-stem write ".image)
|
||||||
-run=<vocab> run the MAIN: entry point of <vocab>
|
-run=<vocab> run the MAIN: entry point of <vocab>
|
||||||
-run=listener run terminal listener
|
-run=listener run terminal listener
|
||||||
|
@ -35,22 +40,25 @@ from within Factor for more information.
|
||||||
|
|
||||||
" write ;
|
" write ;
|
||||||
|
|
||||||
: help? ( -- ? )
|
: version? ( -- ? ) "version" get ;
|
||||||
"help" get "h" get or
|
|
||||||
os windows? [ script get "/?" = or ] when ;
|
: version. ( -- ) "Factor " write vm-version print ;
|
||||||
|
|
||||||
: command-line-startup ( -- )
|
: command-line-startup ( -- )
|
||||||
(command-line) parse-command-line
|
(command-line) parse-command-line {
|
||||||
help? [ cli-usage ] [
|
{ [ help? ] [ help. ] }
|
||||||
load-vocab-roots
|
{ [ version? ] [ version. ] }
|
||||||
run-user-init
|
[
|
||||||
"e" get script get or [
|
load-vocab-roots
|
||||||
"e" get [ eval( -- ) ] when*
|
run-user-init
|
||||||
script get [ run-script ] when*
|
"e" get script get or [
|
||||||
] [
|
"e" get [ eval( -- ) ] when*
|
||||||
"run" get run
|
script get [ run-script ] when*
|
||||||
] if
|
] [
|
||||||
] if
|
"run" get run
|
||||||
|
] if
|
||||||
|
]
|
||||||
|
} cond
|
||||||
|
|
||||||
output-stream get [ stream-flush ] when*
|
output-stream get [ stream-flush ] when*
|
||||||
0 exit ;
|
0 exit ;
|
||||||
|
|
Loading…
Reference in New Issue