[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.1-5-ge6efefa

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=e6efefad0811e975e6a501829a0871d030b0ab88

The branch, stable-2.0 has been updated
       via  e6efefad0811e975e6a501829a0871d030b0ab88 (commit)
       via  dac9812a2e02c680693ee6dfeb1a96f2b45151cb (commit)
       via  800690141ff7ce91014bfc1134a9bb0e358ce38f (commit)
      from  91956a94fe6363cf69d574b56397962ec6ef4468 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e6efefad0811e975e6a501829a0871d030b0ab88
Author: Andy Wingo <address@hidden>
Date:   Thu Apr 28 21:45:02 2011 +0200

    -x error message fix
    
    * module/ice-9/command-line.scm (compile-shell-switches): Fix error
      message for -x switch.

commit dac9812a2e02c680693ee6dfeb1a96f2b45151cb
Author: Andy Wingo <address@hidden>
Date:   Thu Apr 28 21:43:01 2011 +0200

    fix double-loading of script in -ds case
    
    * module/ice-9/command-line.scm (compile-shell-switches): In the -ds
      case, we were erroneously loading the script twice.  Fix that.

commit 800690141ff7ce91014bfc1134a9bb0e358ce38f
Author: Andy Wingo <address@hidden>
Date:   Thu Apr 28 21:33:12 2011 +0200

    fix break example
    
    * doc/ref/api-control.texi (while do): Fix a break example.

-----------------------------------------------------------------------

Summary of changes:
 doc/ref/api-control.texi      |    2 +-
 module/ice-9/command-line.scm |   28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/doc/ref/api-control.texi b/doc/ref/api-control.texi
index 1dde8ea..4e13527 100644
--- a/doc/ref/api-control.texi
+++ b/doc/ref/api-control.texi
@@ -290,7 +290,7 @@ expression, as multiple values.  Otherwise if it terminates 
by a call to
 @example
 (while #f (error "not reached")) @result{} #f
 (while #t (break)) @result{} #t
-(while #f (break 1 2 3)) @result{} 1 2 3
+(while #t (break 1 2 3)) @result{} 1 2 3
 @end example
 
 Each @code{while} form gets its own @code{break} and @code{continue}
diff --git a/module/ice-9/command-line.scm b/module/ice-9/command-line.scm
index a34c9a6..e94336a 100644
--- a/module/ice-9/command-line.scm
+++ b/module/ice-9/command-line.scm
@@ -197,26 +197,28 @@ If FILE begins with `-' the -s switch is mandatory.
               (args (cdr args)))
           (cond
            ((not (string-prefix? "-" arg)) ; foo
-            ;; If we specified the -ds option, do_script points to the
-            ;; cdr of an expression like (load #f) we replace the car
-            ;; (i.e., the #f) with the script name.
-            (if (pair? do-script)
-                (set-car! do-script arg))
+            ;; If we specified the -ds option, do-script is the cdr of
+            ;; an expression like (load #f).  We replace the car (i.e.,
+            ;; the #f) with the script name.
             (set! arg0 arg)
             (set! interactive? #f)
-            (finish args
-                    (cons `(load ,arg) out)))
+            (if (pair? do-script)
+                (begin
+                  (set-car! do-script arg0)
+                  (finish args out))
+                (finish args (cons `(load ,arg0) out))))
 
            ((string=? arg "-s")         ; foo
             (if (null? args)
                 (error "missing argument to `-s' switch"))
             (set! arg0 (car args))
-            (if (pair? do-script)
-                (set-car! do-script arg0))
             (set! interactive? #f)
-            (finish (cdr args)
-                    (cons `(load ,arg0) out)))
-
+            (if (pair? do-script)
+                (begin
+                  (set-car! do-script arg0)
+                  (finish (cdr args) out))
+                (finish (cdr args) (cons `(load ,arg0) out))))
+           
            ((string=? arg "-c")         ; evaluate expr
             (if (null? args)
                 (error "missing argument to `-c' switch"))
@@ -245,7 +247,7 @@ If FILE begins with `-' the -s switch is mandatory.
 
            ((string=? arg "-x")         ; add to %load-extensions
             (if (null? args)
-                (error "missing argument to `-L' switch"))
+                (error "missing argument to `-x' switch"))
             (set! user-extensions (cons (car args) user-extensions))
             (parse (cdr args)
                    out))


hooks/post-receive
-- 
GNU Guile