guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, master, updated. release_1-9-8-71-gedd


From: Andy Wingo
Subject: [Guile-commits] GNU Guile branch, master, updated. release_1-9-8-71-geddd16d
Date: Thu, 04 Mar 2010 15:49:57 +0000

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=eddd16d782343fbc10818e4f2ee706774921f051

The branch, master has been updated
       via  eddd16d782343fbc10818e4f2ee706774921f051 (commit)
      from  2150e9a84a9e0e9f83fa7af2c08c274ebcd9b1c2 (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 eddd16d782343fbc10818e4f2ee706774921f051
Author: Andy Wingo <address@hidden>
Date:   Thu Mar 4 16:50:11 2010 +0100

    some with-fluid* -> with-fluids
    
    * module/ice-9/boot-9.scm (false-if-exception, load)
      (try-module-autoload):
    * module/language/tree-il/compile-glil.scm (compile-glil): Turn some
      with-fluid* invocations into with-fluids.

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

Summary of changes:
 module/ice-9/boot-9.scm                  |   38 ++++++++++++++---------------
 module/language/tree-il/compile-glil.scm |    9 +++----
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index 1c13d70..0b4f83c 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -570,8 +570,8 @@ If there is no handler at all, Guile prints an error and 
then exits."
   `(catch #t
      (lambda ()
        ;; avoid saving backtraces inside false-if-exception
-       (with-fluid* the-last-stack (fluid-ref the-last-stack)
-         (lambda () ,expr)))
+       (with-fluids ((the-last-stack (fluid-ref the-last-stack)))
+         ,expr))
      (lambda args #f)))
 
 
@@ -1100,15 +1100,14 @@ If there is no handler at all, Guile prints an error 
and then exits."
                 ";;; WARNING: compilation of ~a failed:\n;;; key ~a, 
throw_args ~s\n"
                 name k args)
         #f)))
-  (with-fluid* current-reader (and (pair? reader) (car reader))
-    (lambda ()
-      (let ((cfn (and=> (and=> (false-if-exception (canonicalize-path name))
-                               compiled-file-name)
-                        fresh-compiled-file-name)))
-        (if cfn
-            (load-compiled cfn)
-            (start-stack 'load-stack
-                         (primitive-load name)))))))
+  (with-fluids ((current-reader (and (pair? reader) (car reader))))
+    (let ((cfn (and=> (and=> (false-if-exception (canonicalize-path name))
+                             compiled-file-name)
+                      fresh-compiled-file-name)))
+      (if cfn
+          (load-compiled cfn)
+          (start-stack 'load-stack
+                       (primitive-load name))))))
 
 
 
@@ -2567,15 +2566,14 @@ module '(ice-9 q) '(make-q q-length))}."
            (dynamic-wind
             (lambda () (autoload-in-progress! dir-hint name))
             (lambda ()
-              (with-fluid* current-reader #f
-                (lambda ()
-                  (save-module-excursion
-                   (lambda () 
-                     (if version
-                         (load (find-versioned-module
-                                dir-hint name version %load-path))
-                         (primitive-load-path (in-vicinity dir-hint name) #f))
-                     (set! didit #t))))))
+              (with-fluids ((current-reader #f))
+                (save-module-excursion
+                 (lambda () 
+                   (if version
+                       (load (find-versioned-module
+                              dir-hint name version %load-path))
+                       (primitive-load-path (in-vicinity dir-hint name) #f))
+                   (set! didit #t)))))
             (lambda () (set-autoloaded! dir-hint name didit)))
            didit))))
 
diff --git a/module/language/tree-il/compile-glil.scm 
b/module/language/tree-il/compile-glil.scm
index 197daf2..b45423a 100644
--- a/module/language/tree-il/compile-glil.scm
+++ b/module/language/tree-il/compile-glil.scm
@@ -65,11 +65,10 @@
          (x (optimize! x e opts))
          (allocation (analyze-lexicals x)))
 
-    (with-fluid* *comp-module* e
-      (lambda ()
-        (values (flatten-lambda x #f allocation)
-                e
-                e)))))
+    (with-fluids ((*comp-module* e))
+      (values (flatten-lambda x #f allocation)
+              e
+              e))))
 
 
 


hooks/post-receive
-- 
GNU Guile




reply via email to

[Prev in Thread] Current Thread [Next in Thread]