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

mescc: Enhance POSIX command-line support, e.g. -DFOO=1.

Browse source 
* module/mescc.scm (unclump-single): New function.
(main): Use it to support -DFOO=bar, and equivalent.
This commit is contained in:
Jan Nieuwenhuizen 2018-12-26 14:14:02 +01:00
parent d52357cb71
commit 3e41363232
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
module/mescc.scm
View file

@ -17,6 +17,7 @@
;;; along with GNU Mes. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Mes. If not, see <http://www.gnu.org/licenses/>.
(define-module (mescc) (define-module (mescc)
#:use-module (srfi srfi-1)
#:use-module (ice-9 getopt-long) #:use-module (ice-9 getopt-long)
#:use-module (mes misc) #:use-module (mes misc)
#:use-module (mescc mescc) #:use-module (mescc mescc)
@ -40,6 +41,15 @@
(when (and=> (getenv "V") (lambda (v) (> (string->number v) 1))) (when (and=> (getenv "V") (lambda (v) (> (string->number v) 1)))
(format (current-error-port) "mescc[~a]...\n" %scheme)) (format (current-error-port) "mescc[~a]...\n" %scheme))
(define (unclump-single o)
(cond ((string-prefix? "--" o) (list o))
((and (string-prefix? "-" o)
(> (string-length o) 2)
(not (eq? (string-ref o 2) #\space)))
(list (substring o 0 2)
(substring o 2)))
(else (list o))))
(define (parse-opts args) (define (parse-opts args)
(let* ((option-spec (let* ((option-spec
'((align) '((align)
@ -62,11 +72,6 @@
(verbose (single-char #\v)) (verbose (single-char #\v))
(write (single-char #\w) (value #t)) (write (single-char #\w) (value #t))
(language (single-char #\x) (value #t)))) (language (single-char #\x) (value #t))))
(single-dash-options '("-dumpmachine" "-std"))
(args (map (lambda (o)
(if (member o single-dash-options) (string-append "-" o)
o))
args))
(options (getopt-long args option-spec)) (options (getopt-long args option-spec))
(help? (option-ref options 'help #f)) (help? (option-ref options 'help #f))
(files (option-ref options '() '())) (files (option-ref options '() '()))
@ -114,7 +119,13 @@ General help using GNU software: <http://gnu.org/gethelp/>
options)))) options))))
(define (mescc:main args) (define (mescc:main args)
(let* ((options (parse-opts args)) (let* ((single-dash-options '("-dumpmachine" "-std"))
(args (map (lambda (o)
(if (member o single-dash-options) (string-append "-" o)
o))
args))
(args (append-map unclump-single args))
(options (parse-opts args))
(options (acons 'prefix %prefix options)) (options (acons 'prefix %prefix options))
(preprocess? (option-ref options 'preprocess #f)) (preprocess? (option-ref options 'preprocess #f))
(compile? (option-ref options 'compile #f)) (compile? (option-ref options 'compile #f))