suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

racketcs: fix command-line handling after non-flag argument

Browse Source
This commit is contained in:
Matthew Flatt 2018-11-29 12:14:37 -07:00
parent 1bf17f7743
commit f2fb2ebc55
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
racket/src/cs/main.sps
View File

@ -294,7 +294,7 @@
loads))
(no-init! saw)
(flags-loop rest-args (see saw 'non-config 'lib)))]
[("-u" "--script")
[("-u" "--require-script")
(let-values ([(file-name rest-args) (next-arg "file name" arg within-arg args)])
(set! loads
(cons
@ -302,7 +302,8 @@
(namespace-require+ `(file ,file-name)))
loads))
(no-init! saw)
(flags-loop rest-args (see saw 'non-config 'lib)))]
(set-run-file! (string->path file-name))
(flags-loop (cons "--" rest-args) (see saw 'non-config 'lib)))]
[("-f" "--load")
(let-values ([(file-name rest-args) (next-arg "file name" arg within-arg args)])
(set! loads
@ -311,6 +312,15 @@
(load file-name))
loads))
(flags-loop rest-args (see saw 'non-config)))]
[("-r" "--script")
(let-values ([(file-name rest-args) (next-arg "file name" arg within-arg args)])
(set! loads
(cons
(lambda ()
(load file-name))
loads))
(set-run-file! (string->path file-name))
(flags-loop (cons "--" rest-args) (see saw 'non-config)))]
[("-e" "--eval")
(let-values ([(expr rest-args) (next-arg "expression" arg within-arg args)])
(set! loads
@ -438,7 +448,8 @@
(loop (cons (cadr args) (cons (car args) (cddr args))))])]
[else
(cond
[(eqv? (string-ref arg 0) #\-)
[(and (eqv? (string-ref arg 0) #\-)
(> (string-length arg) 1))
(cond
[(and (> (string-length arg) 2)
(not (eqv? (string-ref arg 1) #\-)))