[Guile-commits] GNU Guile branch, master, updated. v2.1.0-691-g5bc7c6d

[Mark H Weaver]

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=5bc7c6dbab302c8ac991dfd2c3b254ff3524ba65

The branch, master has been updated
       via  5bc7c6dbab302c8ac991dfd2c3b254ff3524ba65 (commit)
      from  9db57a19e1204d6c458675bd8347fdfc00ecc3e8 (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 5bc7c6dbab302c8ac991dfd2c3b254ff3524ba65
Author: Mark H Weaver <address@hidden>
Date:   Fri Feb 7 20:05:17 2014 -0500

    Avoid using 'eval-when' with 'expand' in (oop goops).
    
    * module/oop/goops.scm: Avoid using 'eval-when' with 'expand'.

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

Summary of changes:
 module/oop/goops.scm |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/module/oop/goops.scm b/module/oop/goops.scm
index a64e03b..0376d9e 100644
--- a/module/oop/goops.scm
+++ b/module/oop/goops.scm
@@ -134,11 +134,16 @@
 
 (define *goops-module* (current-module))
 
+;; XXX FIXME: figure out why the 'eval-when's in this file must use
+;; 'compile' and must avoid 'expand', but only in 2.2, and only when
+;; compiling something that imports goops, e.g. (ice-9 occam-channel),
+;; before (oop goops) itself has been compiled.
+
 ;; First initialize the builtin part of GOOPS
-(eval-when (expand load eval)
+(eval-when (compile load eval)
   (%init-goops-builtins))
 
-(eval-when (expand load eval)
+(eval-when (compile load eval)
   (use-modules ((language tree-il primitives) :select 
(add-interesting-primitive!)))
   (add-interesting-primitive! 'class-of))
 
@@ -149,7 +154,7 @@
 
 
 ;; FIXME: deprecate.
-(eval-when (expand load eval)
+(eval-when (compile load eval)
   (define min-fixnum (- (expt 2 29)))
   (define max-fixnum (- (expt 2 29) 1)))
 


hooks/post-receive
-- 
GNU Guile