mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 06:41:13 +02:00
Code Activity

some with-fluid* -> with-fluids

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2010-03-04 16:50:11 +01:00
parent 2150e9a84a
commit eddd16d782
2 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

38
module/ice-9/boot-9.scm
View file

@ -570,8 +570,8 @@ If there is no handler at all, Guile prints an error and then exits."
`(catch #t `(catch #t
(lambda () (lambda ()
;; avoid saving backtraces inside false-if-exception ;; avoid saving backtraces inside false-if-exception
(with-fluid* the-last-stack (fluid-ref the-last-stack) (with-fluids ((the-last-stack (fluid-ref the-last-stack)))
(lambda () ,expr))) ,expr))
(lambda args #f))) (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" ";;; WARNING: compilation of ~a failed:\n;;; key ~a, throw_args ~s\n"
name k args) name k args)
#f))) #f)))
(with-fluid* current-reader (and (pair? reader) (car reader)) (with-fluids ((current-reader (and (pair? reader) (car reader))))
(lambda () (let ((cfn (and=> (and=> (false-if-exception (canonicalize-path name))
(let ((cfn (and=> (and=> (false-if-exception (canonicalize-path name)) compiled-file-name)
compiled-file-name) fresh-compiled-file-name)))
fresh-compiled-file-name))) (if cfn
(if cfn (load-compiled cfn)
(load-compiled cfn) (start-stack 'load-stack
(start-stack 'load-stack (primitive-load name))))))
(primitive-load name)))))))
@ -2567,15 +2566,14 @@ module '(ice-9 q) '(make-q q-length))}."
(dynamic-wind (dynamic-wind
(lambda () (autoload-in-progress! dir-hint name)) (lambda () (autoload-in-progress! dir-hint name))
(lambda () (lambda ()
(with-fluid* current-reader #f (with-fluids ((current-reader #f))
(lambda () (save-module-excursion
(save-module-excursion (lambda ()
(lambda () (if version
(if version (load (find-versioned-module
(load (find-versioned-module dir-hint name version %load-path))
dir-hint name version %load-path)) (primitive-load-path (in-vicinity dir-hint name) #f))
(primitive-load-path (in-vicinity dir-hint name) #f)) (set! didit #t)))))
(set! didit #t))))))
(lambda () (set-autoloaded! dir-hint name didit))) (lambda () (set-autoloaded! dir-hint name didit)))
didit)))) didit))))

9
module/language/tree-il/compile-glil.scm
View file

@ -65,11 +65,10 @@
(x (optimize! x e opts)) (x (optimize! x e opts))
(allocation (analyze-lexicals x))) (allocation (analyze-lexicals x)))
(with-fluid* *comp-module* e (with-fluids ((*comp-module* e))
(lambda () (values (flatten-lambda x #f allocation)
(values (flatten-lambda x #f allocation) e
e e))))
e)))))