r19066 - gnucash/trunk/src - Bug #615168: Fix a number of scheme syntax errors

[Christian Stimming]

Author: cstim
Date: 2010-04-23 17:07:13 -0400 (Fri, 23 Apr 2010)
New Revision: 19066
Trac: http://svn.gnucash.org/trac/changeset/19066

Modified:
   gnucash/trunk/src/app-utils/config-var.scm
   gnucash/trunk/src/app-utils/options.scm
   gnucash/trunk/src/report/report-system/html-table.scm
   gnucash/trunk/src/report/standard-reports/balance-sheet.scm
   gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm
   gnucash/trunk/src/report/standard-reports/equity-statement.scm
   gnucash/trunk/src/report/standard-reports/trial-balance.scm
Log:
Bug #615168: Fix a number of scheme syntax errors

This kind of error is detected "eagerly" in Guile 2.0.

Patch by Andy Wingo.

Modified: gnucash/trunk/src/app-utils/config-var.scm
===================================================================
--- gnucash/trunk/src/app-utils/config-var.scm	2010-04-23 21:02:30 UTC (rev 19065)
+++ gnucash/trunk/src/app-utils/config-var.scm	2010-04-23 21:07:13 UTC (rev 19066)
@@ -68,7 +68,7 @@
 (define (gnc:config-var-value-is-default? var)
   (if (not (gnc:config-var-modified? var))
       #t
-      (let (equal-values? gnc:config-var-equality-func-get var)
+      (let ((equal-values? (gnc:config-var-equality-func-get var)))
         (equal-values? 
          (gnc:config-var-default-value-get var)
          (gnc:config-var-value-get var)))))

Modified: gnucash/trunk/src/app-utils/options.scm
===================================================================
--- gnucash/trunk/src/app-utils/options.scm	2010-04-23 21:02:30 UTC (rev 19065)
+++ gnucash/trunk/src/app-utils/options.scm	2010-04-23 21:07:13 UTC (rev 19066)
@@ -841,7 +841,7 @@
 
   (define (multichoice-strings p-vals)
     (if (null? p-vals)
-        ()
+        '()
         (cons (vector-ref (car p-vals) 1)
               (cons (vector-ref (car p-vals) 2)
                     (multichoice-strings (cdr p-vals))))))
@@ -927,7 +927,7 @@
 
   (define (radiobutton-strings p-vals)
     (if (null? p-vals)
-        ()
+        '()
         (cons (vector-ref (car p-vals) 1)
               (cons (vector-ref (car p-vals) 2)
                     (radiobutton-strings (cdr p-vals))))))
@@ -992,7 +992,7 @@
 
   (define (list-strings p-vals)
     (if (null? p-vals)
-        ()
+        '()
         (cons (vector-ref (car p-vals) 1)
               (cons (vector-ref (car p-vals) 2)
                     (list-strings (cdr p-vals))))))

Modified: gnucash/trunk/src/report/report-system/html-table.scm
===================================================================
--- gnucash/trunk/src/report/report-system/html-table.scm	2010-04-23 21:02:30 UTC (rev 19065)
+++ gnucash/trunk/src/report/report-system/html-table.scm	2010-04-23 21:07:13 UTC (rev 19066)
@@ -567,7 +567,8 @@
   ;; returns a pair, the car of which is the prepending of newcol
   ;; and existing-data, and the cdr is the remaining elements of newcol
   (define (prepend-to-element newcol existing-data length-to-append)
-    (if (= length-to-append 0) ('() . newcol)
+    (if (= length-to-append 0)
+        (cons '() newcol)
         (let* 
             ((current-new (car newcol))
              (current-existing (car existing-data))

Modified: gnucash/trunk/src/report/standard-reports/balance-sheet.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/balance-sheet.scm	2010-04-23 21:02:30 UTC (rev 19065)
+++ gnucash/trunk/src/report/standard-reports/balance-sheet.scm	2010-04-23 21:07:13 UTC (rev 19066)
@@ -715,15 +715,10 @@
 	  ;; however, this still doesn't seem to get around the
 	  ;; colspan bug... cf. gnc:colspans-are-working-right
 	  (if filename
-	      (let* ((port (open-output-file filename))
-		     (gnc:display-report-list-item
-		      (list doc) port " balance-sheet.scm ")
-		     (close-output-port port)
-		     )
-		)
-	      )
-	  )
-	)
+	      (let* ((port (open-output-file filename)))
+                (gnc:display-report-list-item
+                 (list doc) port " balance-sheet.scm ")
+                (close-output-port port)))))
     
     (gnc:report-finished)
     

Modified: gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm	2010-04-23 21:02:30 UTC (rev 19065)
+++ gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm	2010-04-23 21:07:13 UTC (rev 19066)
@@ -908,15 +908,10 @@
 	  ;; however, this still doesn't seem to get around the
 	  ;; colspan bug... cf. gnc:colspans-are-working-right
 	  (if filename
-	      (let* ((port (open-output-file filename))
-		     (gnc:display-report-list-item
-		      (list doc) port " budget-balance-sheet.scm ")
-		     (close-output-port port)
-		     )
-		)
-	      )
-	  )
-	))) ;; end cond
+	      (let* ((port (open-output-file filename)))
+                (gnc:display-report-list-item
+                 (list doc) port " budget-balance-sheet.scm ")
+                (close-output-port port)))))))
     
     (gnc:report-finished)
     

Modified: gnucash/trunk/src/report/standard-reports/equity-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/equity-statement.scm	2010-04-23 21:02:30 UTC (rev 19065)
+++ gnucash/trunk/src/report/standard-reports/equity-statement.scm	2010-04-23 21:07:13 UTC (rev 19066)
@@ -674,15 +674,10 @@
 	  ;; however, this still doesn't seem to get around the
 	  ;; colspan bug... cf. gnc:colspans-are-working-right
 	  (if filename
-	      (let* ((port (open-output-file filename))
-		     (gnc:display-report-list-item
-		      (list doc) port " equity-statement.scm ")
-		     (close-output-port port)
-		     )
-		)
-	      )
-	  )
-	)
+	      (let* ((port (open-output-file filename)))
+                (gnc:display-report-list-item
+                 (list doc) port " equity-statement.scm ")
+                (close-output-port port)))))
     
     (gnc:report-finished)
     

Modified: gnucash/trunk/src/report/standard-reports/trial-balance.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/trial-balance.scm	2010-04-23 21:02:30 UTC (rev 19065)
+++ gnucash/trunk/src/report/standard-reports/trial-balance.scm	2010-04-23 21:07:13 UTC (rev 19066)
@@ -1127,15 +1127,10 @@
 	  ;; however, this still doesn't seem to get around the
 	  ;; colspan bug... cf. gnc:colspans-are-working-right
 	  (if filename
-	      (let* ((port (open-output-file filename))
-		     (gnc:display-report-list-item
-		      (list doc) port " trial-balance.scm ")
-		     (close-output-port port)
-		     )
-		)
-	      )
-	  )
-	)
+	      (let* ((port (open-output-file filename)))
+                (gnc:display-report-list-item
+                 (list doc) port " trial-balance.scm ")
+                (close-output-port port)))))
     
     (gnc:report-finished)