r23460 - gnucash/trunk/src - Improve cond-expand/eval-when usage based on feedback from the guile developers

[Geert Janssens]

Author: gjanssens
Date: 2013-11-29 14:18:08 -0500 (Fri, 29 Nov 2013)
New Revision: 23460
Trac: http://svn.gnucash.org/trac/changeset/23460

Modified:
   gnucash/trunk/src/app-utils/app-utils.scm
   gnucash/trunk/src/core-utils/core-utils.scm
   gnucash/trunk/src/gnc-module/gnc-module.scm
   gnucash/trunk/src/import-export/qif-import/qif-import.scm
   gnucash/trunk/src/report/business-reports/balsheet-eg.scm
   gnucash/trunk/src/report/business-reports/business-reports.scm
   gnucash/trunk/src/report/business-reports/taxinvoice.scm
   gnucash/trunk/src/report/report-system/eguile-gnc.scm
   gnucash/trunk/src/report/standard-reports/test/test-standard-category-report.scm
   gnucash/trunk/src/report/standard-reports/test/test-standard-net-barchart.scm
   gnucash/trunk/src/report/standard-reports/test/test-standard-net-linechart.scm
Log:
Improve cond-expand/eval-when usage based on feedback from the guile developers

Basically two things:
- whenever eval-when is used, the expand keyword should be added (not yet documented)
- eval-when is not needed for use-modules, because use-modules is a macro that performs the eval-when by itself

Modified: gnucash/trunk/src/app-utils/app-utils.scm
===================================================================
--- gnucash/trunk/src/app-utils/app-utils.scm	2013-11-29 19:17:40 UTC (rev 23459)
+++ gnucash/trunk/src/app-utils/app-utils.scm	2013-11-29 19:18:08 UTC (rev 23460)
@@ -26,7 +26,7 @@
 (cond-expand
   (guile-2
     (eval-when
-      (compile load eval) 
+      (compile load eval expand)
       (gnc:module-load "gnucash/engine" 0)))
   (else
     (gnc:module-load "gnucash/engine" 0)))

Modified: gnucash/trunk/src/core-utils/core-utils.scm
===================================================================
--- gnucash/trunk/src/core-utils/core-utils.scm	2013-11-29 19:17:40 UTC (rev 23459)
+++ gnucash/trunk/src/core-utils/core-utils.scm	2013-11-29 19:18:08 UTC (rev 23460)
@@ -11,7 +11,7 @@
 (cond-expand
   (guile-2
     (eval-when
-      (compile load eval) 
+      (compile load eval expand)
       (load-extension "libgnc-core-utils" "scm_init_sw_core_utils_module")))
   (else
     (load-extension "libgnc-core-utils" "scm_init_sw_core_utils_module")))

Modified: gnucash/trunk/src/gnc-module/gnc-module.scm
===================================================================
--- gnucash/trunk/src/gnc-module/gnc-module.scm	2013-11-29 19:17:40 UTC (rev 23459)
+++ gnucash/trunk/src/gnc-module/gnc-module.scm	2013-11-29 19:18:08 UTC (rev 23460)
@@ -12,7 +12,7 @@
 (cond-expand
   (guile-2
     (eval-when
-      (compile load eval) 
+      (compile load eval expand)
       (load-extension "libgnc-module" "scm_init_sw_gnc_module_module")))
   (else
     (load-extension "libgnc-module" "scm_init_sw_gnc_module_module")))

Modified: gnucash/trunk/src/import-export/qif-import/qif-import.scm
===================================================================
--- gnucash/trunk/src/import-export/qif-import/qif-import.scm	2013-11-29 19:17:40 UTC (rev 23459)
+++ gnucash/trunk/src/import-export/qif-import/qif-import.scm	2013-11-29 19:18:08 UTC (rev 23460)
@@ -13,7 +13,7 @@
 (cond-expand
   (guile-2
     (eval-when
-      (compile load eval) 
+      (compile load eval expand)
       (load-extension "libgnc-gnome" "scm_init_sw_gnome_module")))
   (else
     (load-extension "libgnc-gnome" "scm_init_sw_gnome_module")))

Modified: gnucash/trunk/src/report/business-reports/balsheet-eg.scm
===================================================================
--- gnucash/trunk/src/report/business-reports/balsheet-eg.scm	2013-11-29 19:17:40 UTC (rev 23459)
+++ gnucash/trunk/src/report/business-reports/balsheet-eg.scm	2013-11-29 19:18:08 UTC (rev 23460)
@@ -41,9 +41,7 @@
 (use-modules (ice-9 regex))  ; for regular expressions
 (cond-expand
   (guile-2
-    (eval-when
-      (compile load eval) 
-      (use-modules (ice-9 local-eval))))  ; for the-environment
+      (use-modules (ice-9 local-eval)))  ; for the-environment
   (else ))
 (use-modules (srfi srfi-13)) ; for extra string functions
 

Modified: gnucash/trunk/src/report/business-reports/business-reports.scm
===================================================================
--- gnucash/trunk/src/report/business-reports/business-reports.scm	2013-11-29 19:17:40 UTC (rev 23459)
+++ gnucash/trunk/src/report/business-reports/business-reports.scm	2013-11-29 19:18:08 UTC (rev 23460)
@@ -35,7 +35,7 @@
 (cond-expand
   (guile-2
     (eval-when
-      (compile load eval) 
+      (compile load eval expand)
       (define gnc:menuname-business-reports (N_ "_Business"))))
   (else
     (define gnc:menuname-business-reports (N_ "_Business"))))

Modified: gnucash/trunk/src/report/business-reports/taxinvoice.scm
===================================================================
--- gnucash/trunk/src/report/business-reports/taxinvoice.scm	2013-11-29 19:17:40 UTC (rev 23459)
+++ gnucash/trunk/src/report/business-reports/taxinvoice.scm	2013-11-29 19:18:08 UTC (rev 23460)
@@ -26,9 +26,7 @@
 
 (cond-expand
   (guile-2
-    (eval-when
-      (compile load eval) 
-      (use-modules (ice-9 local-eval))))  ; for the-environment
+      (use-modules (ice-9 local-eval)))  ; for the-environment
   (else ))
 (use-modules (gnucash main))
 (use-modules (gnucash gnc-module))

Modified: gnucash/trunk/src/report/report-system/eguile-gnc.scm
===================================================================
--- gnucash/trunk/src/report/report-system/eguile-gnc.scm	2013-11-29 19:17:40 UTC (rev 23459)
+++ gnucash/trunk/src/report/report-system/eguile-gnc.scm	2013-11-29 19:18:08 UTC (rev 23460)
@@ -87,9 +87,7 @@
 (use-modules (ice-9 rdelim))      ; for read-line
 (cond-expand
   (guile-2
-    (eval-when
-      (compile load eval) 
-      (use-modules (ice-9 local-eval))))  ; for the-environment
+      (use-modules (ice-9 local-eval)))  ; for the-environment
   (else ))
 (use-modules (gnucash printf))
 (use-modules (gnucash app-utils)) ; for _

Modified: gnucash/trunk/src/report/standard-reports/test/test-standard-category-report.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/test-standard-category-report.scm	2013-11-29 19:17:40 UTC (rev 23459)
+++ gnucash/trunk/src/report/standard-reports/test/test-standard-category-report.scm	2013-11-29 19:18:08 UTC (rev 23460)
@@ -11,7 +11,7 @@
 (cond-expand
    (guile-2
     (define-syntax-rule (begin-for-syntax form ...)
-      (eval-when (load compile eval) (begin form ...))))
+      (eval-when (load compile eval expand) (begin form ...))))
    (else
     (define begin-for-syntax begin)))
 

Modified: gnucash/trunk/src/report/standard-reports/test/test-standard-net-barchart.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/test-standard-net-barchart.scm	2013-11-29 19:17:40 UTC (rev 23459)
+++ gnucash/trunk/src/report/standard-reports/test/test-standard-net-barchart.scm	2013-11-29 19:18:08 UTC (rev 23460)
@@ -10,7 +10,7 @@
 (cond-expand
    (guile-2
     (define-syntax-rule (begin-for-syntax form ...)
-      (eval-when (load compile eval) (begin form ...))))
+      (eval-when (load compile eval expand) (begin form ...))))
    (else
     (define begin-for-syntax begin)))
 

Modified: gnucash/trunk/src/report/standard-reports/test/test-standard-net-linechart.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/test-standard-net-linechart.scm	2013-11-29 19:17:40 UTC (rev 23459)
+++ gnucash/trunk/src/report/standard-reports/test/test-standard-net-linechart.scm	2013-11-29 19:18:08 UTC (rev 23460)
@@ -10,7 +10,7 @@
 (cond-expand
    (guile-2
     (define-syntax-rule (begin-for-syntax form ...)
-      (eval-when (load compile eval) (begin form ...))))
+      (eval-when (load compile eval expand) (begin form ...))))
    (else
     (define begin-for-syntax begin)))