mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-14 15:40:19 +02:00
Improve correctness and consistency of 'eval-when' usage.
* module/ice-9/boot-9.scm: * module/ice-9/i18n.scm: * module/ice-9/poll.scm: * module/ice-9/popen.scm: * module/ice-9/r6rs-libraries.scm: * module/oop/goops.scm: * module/oop/goops/compile.scm: * module/oop/goops/dispatch.scm: * module/srfi/srfi-88.scm: * module/system/foreign.scm: * module/texinfo/serialize.scm: Change most uses of 'compile' to 'expand', except where we must avoid it during initial bootstrap before the module system is loaded. Remove redundant uses of 'compile' where 'expand' is also given. Standardize on the "(expand load eval)" order of conditions.
This commit is contained in:
parent
fc1cb3fad4
commit
f6ddf827f8
11 changed files with 22 additions and 22 deletions
|
@ -77,10 +77,10 @@
|
|||
(define *goops-module* (current-module))
|
||||
|
||||
;; First initialize the builtin part of GOOPS
|
||||
(eval-when (eval load compile)
|
||||
(eval-when (expand load eval)
|
||||
(%init-goops-builtins))
|
||||
|
||||
(eval-when (eval load compile)
|
||||
(eval-when (expand load eval)
|
||||
(use-modules ((language tree-il primitives) :select (add-interesting-primitive!)))
|
||||
(add-interesting-primitive! 'class-of)
|
||||
(define (@slot-ref o n)
|
||||
|
@ -96,7 +96,7 @@
|
|||
(oop goops compile))
|
||||
|
||||
|
||||
(eval-when (eval load compile)
|
||||
(eval-when (expand load eval)
|
||||
(define min-fixnum (- (expt 2 29)))
|
||||
(define max-fixnum (- (expt 2 29) 1)))
|
||||
|
||||
|
@ -1123,7 +1123,7 @@
|
|||
;; the idea is to compile the index into the procedure, for fastest
|
||||
;; lookup. Also, @slot-ref and @slot-set! have their own bytecodes.
|
||||
|
||||
(eval-when (eval load compile)
|
||||
(eval-when (expand load eval)
|
||||
(define num-standard-pre-cache 20))
|
||||
|
||||
(define-macro (define-standard-accessor-method form . body)
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
;; There are circularities here; you can't import (oop goops compile)
|
||||
;; before (oop goops). So when compiling, make sure that things are
|
||||
;; kosher.
|
||||
(eval-when (compile) (resolve-module '(oop goops)))
|
||||
(eval-when (expand) (resolve-module '(oop goops)))
|
||||
|
||||
(define-module (oop goops compile)
|
||||
:use-module (oop goops)
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
;; There are circularities here; you can't import (oop goops compile)
|
||||
;; before (oop goops). So when compiling, make sure that things are
|
||||
;; kosher.
|
||||
(eval-when (compile) (resolve-module '(oop goops)))
|
||||
(eval-when (expand) (resolve-module '(oop goops)))
|
||||
|
||||
(define-module (oop goops dispatch)
|
||||
#:use-module (oop goops)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue