diff options
author | Ian Price <ianprice90@googlemail.com> | 2012-09-19 17:33:29 +0100 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2012-10-18 00:08:13 -0400 |
commit | 591065954c340553214d49512cfb539177b58dcf (patch) | |
tree | 85812e00d1a3c33526301070a6b86bc4eff3df43 | |
parent | b3a2259ce3ffeb6a33093f5d02fa04aba15c633a (diff) | |
download | guile-591065954c340553214d49512cfb539177b58dcf.tar.gz |
Fix @@ usage in --listen option
* module/ice-9/command-line.scm (compile-shell-switches): Fix usage of
@@, which no longer supports arbitrary expressions, only identifiers.
-rw-r--r-- | module/ice-9/command-line.scm | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/module/ice-9/command-line.scm b/module/ice-9/command-line.scm index 62a2c9e4f..d60a6e36a 100644 --- a/module/ice-9/command-line.scm +++ b/module/ice-9/command-line.scm @@ -1,6 +1,6 @@ ;;; Parsing Guile's command-line -;;; Copyright (C) 1994-1998, 2000-2011 Free Software Foundation, Inc. +;;; Copyright (C) 1994-1998, 2000-2011, 2012 Free Software Foundation, Inc. ;;;; This library is free software; you can redistribute it and/or ;;;; modify it under the terms of the GNU Lesser General Public @@ -325,7 +325,7 @@ If FILE begins with `-' the -s switch is mandatory. ((string=? arg "--listen") ; start a repl server (parse args - (cons '(@@ (system repl server) (spawn-server)) out))) + (cons '((@@ (system repl server) spawn-server)) out))) ((string-prefix? "--listen=" arg) ; start a repl server (parse @@ -336,14 +336,12 @@ If FILE begins with `-' the -s switch is mandatory. ((string->number where) ; --listen=PORT => (lambda (port) (if (and (integer? port) (exact? port) (>= port 0)) - `(@@ (system repl server) - (spawn-server - (make-tcp-server-socket #:port ,port))) + `((@@ (system repl server) spawn-server) + ((@@ (system repl server) make-tcp-server-socket) #:port ,port)) (error "invalid port for --listen")))) ((string-prefix? "/" where) ; --listen=/PATH/TO/SOCKET - `(@@ (system repl server) - (spawn-server - (make-unix-domain-server-socket #:path ,where)))) + `((@@ (system repl server) spawn-server) + ((@@ (system repl server) make-unix-domain-server-socket) #:path ,where))) (else (error "unknown argument to --listen")))) out))) |