summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Blandy <jimb@red-bean.com>1996-11-21 16:16:46 +0000
committerJim Blandy <jimb@red-bean.com>1996-11-21 16:16:46 +0000
commit31d50456c420d0945305e2eb10cda3a448116cdd (patch)
treeb516fd83025746206ab1212ebd5ee896f1c8c985
parent4b28e0b88b40020f8bb243336ee9f7326850071b (diff)
downloadguile-31d50456c420d0945305e2eb10cda3a448116cdd.tar.gz
It's an "eval closure", not an "eval thunk." A thunk is a
function of no arguments. * boot-9.scm (module-type): Rename module field. (make-module, eval-in-module, make-root-module, set-current-module): Uses changed. (module-eval-closure, set-module-eval-closure!, root-module-closure): Renamed from module-eval-thunk, set-module-eval-thunk!, root-module-thunk. (set-current-module): Change uses of *top-level-lookup-thunk* to *top-level-eval-closure*.
-rw-r--r--ice-9/boot-9.scm20
1 files changed, 10 insertions, 10 deletions
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index bcb44d81b..a08a6b871 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -1098,11 +1098,11 @@
;; A module is characterized by an obarray in which local symbols
;; are interned, a list of modules, "uses", from which non-local
;; bindings can be inherited, and an optional lazy-binder which
-;; is a (THUNK module symbol) which, as a last resort, can provide
+;; is a (CLOSURE module symbol) which, as a last resort, can provide
;; bindings that would otherwise not be found locally in the module.
;;
(define module-type
- (make-record-type 'module '(obarray uses binder eval-thunk name kind)
+ (make-record-type 'module '(obarray uses binder eval-closure name kind)
%print-module))
;; make-module &opt size uses binder
@@ -1140,7 +1140,7 @@
;; We can't pass this as an argument to module-constructor,
;; because we need it to close over a pointer to the module
;; itself.
- (set-module-eval-thunk! module
+ (set-module-eval-closure! module
(lambda (symbol define?)
(if define?
(module-make-local-var! module symbol)
@@ -1155,8 +1155,8 @@
(define set-module-uses! (record-modifier module-type 'uses))
(define module-binder (record-accessor module-type 'binder))
(define set-module-binder! (record-modifier module-type 'binder))
-(define module-eval-thunk (record-accessor module-type 'eval-thunk))
-(define set-module-eval-thunk! (record-modifier module-type 'eval-thunk))
+(define module-eval-closure (record-accessor module-type 'eval-closure))
+(define set-module-eval-closure! (record-modifier module-type 'eval-closure))
(define module-name (record-accessor module-type 'name))
(define set-module-name! (record-modifier module-type 'name))
(define module-kind (record-accessor module-type 'kind))
@@ -1165,7 +1165,7 @@
(define (eval-in-module exp module)
- (eval2 exp (module-eval-thunk module)))
+ (eval2 exp (module-eval-closure module)))
;;; {Module Searching in General}
@@ -1426,7 +1426,7 @@
;;
-(define (root-module-thunk m s define?)
+(define (root-module-closure m s define?)
(let ((bi (and (symbol-interned? #f s)
(builtin-variable s))))
(and bi
@@ -1436,7 +1436,7 @@
bi))))
(define (make-root-module)
- (make-module 1019 '() root-module-thunk))
+ (make-module 1019 '() root-module-closure))
;; make-scm-module
@@ -1473,8 +1473,8 @@
(define (set-current-module m)
(set! the-module m)
(if m
- (set! *top-level-lookup-thunk* (module-eval-thunk the-module))
- (set! *top-level-lookup-thunk* #f)))
+ (set! *top-level-lookup-closure* (module-eval-closure the-module))
+ (set! *top-level-lookup-closure* #f)))
;; current-module