artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mes: Support -e,--main option.

Browse source 
* module/mes/boot-0.scm: Support -e,--main option.
This commit is contained in:
Jan Nieuwenhuizen 2018-04-29 18:37:00 +02:00
parent 08d6c24263
commit 4ca4e9a6ff
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
module/mes/boot-0.scm
View file

@ -233,6 +233,7 @@
(mes-use-module (mes getopt-long)) (mes-use-module (mes getopt-long))
(define %main #f)
(primitive-load 0) (primitive-load 0)
(let ((tty? (isatty? 0))) (let ((tty? (isatty? 0)))
(define (parse-opts args) (define (parse-opts args)
@ -240,6 +241,7 @@
'((dump) '((dump)
(help (single-char #\h)) (help (single-char #\h))
(load) (load)
(main (single-char #\e) (value #t))
(source (single-char #\s) (value #t)) (source (single-char #\s) (value #t))
(version (single-char #\V))))) (version (single-char #\V)))))
(getopt-long args option-spec #:stop-at-first-non-option #t))) (getopt-long args option-spec #:stop-at-first-non-option #t)))
@ -248,11 +250,12 @@
(let* ((s-index (list-index source-arg? %argv)) (let* ((s-index (list-index source-arg? %argv))
(args (if s-index (list-head %argv (+ s-index 2)) %argv)) (args (if s-index (list-head %argv (+ s-index 2)) %argv))
(options (parse-opts args)) (options (parse-opts args))
(main (option-ref options 'main #f))
(source (option-ref options 'source #f)) (source (option-ref options 'source #f))
(files (if s-index (list-tail %argv (+ s-index 1)) (files (if s-index (list-tail %argv (+ s-index 1))
(option-ref options '() '()))) (option-ref options '() '())))
(help? (option-ref options 'help #f)) (help? (option-ref options 'help #f))
(usage? (and (not help?) (null? files) (not tty?))) (usage? (and (not help?) (null? files) (not tty?) (not main)))
(version? (option-ref options 'version #f))) (version? (option-ref options 'version #f)))
(or (or
(and version? (and version?
@ -269,12 +272,14 @@ The above switches stop argument processing, and pass all
remaining arguments as the value of (command-line). remaining arguments as the value of (command-line).
--dump dump binary program to stdout --dump dump binary program to stdout
-e,--main=MAIN after reading script, apply MAIN to command-line arguments
-h, --help display this help and exit -h, --help display this help and exit
--load load binary program [module/mes/boot-0.32-mo] --load load binary program [module/mes/boot-0.32-mo]
-v, --version display version information and exit -v, --version display version information and exit
" (or (and usage? (current-error-port)) (current-output-port))) " (or (and usage? (current-error-port)) (current-output-port)))
(exit (or (and usage? 2) 0))) (exit (or (and usage? 2) 0)))
options) options)
(if main (set! %main main))
(cond ((pair? files) (cond ((pair? files)
(let* ((file (car files)) (let* ((file (car files))
(port (if (equal? file "-") 0 (port (if (equal? file "-") 0
@ -288,3 +293,4 @@ remaining arguments as the value of (command-line).
(repl)) (repl))
(else #t)))) (else #t))))
(primitive-load 0) (primitive-load 0)
(primitive-load (open-input-string %main))