From e68434cb031f32ff89e80ff1e3f991e71360e077 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Fri, 23 Apr 2010 21:07:13 +0000 Subject: [PATCH] Bug #615168: Fix a number of scheme syntax errors This kind of error is detected "eagerly" in Guile 2.0. Patch by Andy Wingo. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19066 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/app-utils/config-var.scm | 2 +- src/app-utils/options.scm | 6 +++--- src/report/report-system/html-table.scm | 3 ++- src/report/standard-reports/balance-sheet.scm | 13 ++++--------- .../standard-reports/budget-balance-sheet.scm | 13 ++++--------- src/report/standard-reports/equity-statement.scm | 13 ++++--------- src/report/standard-reports/trial-balance.scm | 13 ++++--------- 7 files changed, 22 insertions(+), 41 deletions(-) diff --git a/src/app-utils/config-var.scm b/src/app-utils/config-var.scm index d33ae32ca7..4ee8e1b57f 100644 --- a/src/app-utils/config-var.scm +++ b/src/app-utils/config-var.scm @@ -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))))) diff --git a/src/app-utils/options.scm b/src/app-utils/options.scm index b2487395ab..7795a3f83b 100644 --- a/src/app-utils/options.scm +++ b/src/app-utils/options.scm @@ -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)))))) diff --git a/src/report/report-system/html-table.scm b/src/report/report-system/html-table.scm index 0d8c6255ff..5eb42991ab 100644 --- a/src/report/report-system/html-table.scm +++ b/src/report/report-system/html-table.scm @@ -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)) diff --git a/src/report/standard-reports/balance-sheet.scm b/src/report/standard-reports/balance-sheet.scm index 5e82b1bd5e..2a18bdea54 100644 --- a/src/report/standard-reports/balance-sheet.scm +++ b/src/report/standard-reports/balance-sheet.scm @@ -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) diff --git a/src/report/standard-reports/budget-balance-sheet.scm b/src/report/standard-reports/budget-balance-sheet.scm index e29a2ff64f..bca17e08e6 100644 --- a/src/report/standard-reports/budget-balance-sheet.scm +++ b/src/report/standard-reports/budget-balance-sheet.scm @@ -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) diff --git a/src/report/standard-reports/equity-statement.scm b/src/report/standard-reports/equity-statement.scm index dcba046aed..38612981b0 100644 --- a/src/report/standard-reports/equity-statement.scm +++ b/src/report/standard-reports/equity-statement.scm @@ -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) diff --git a/src/report/standard-reports/trial-balance.scm b/src/report/standard-reports/trial-balance.scm index e0b0fd7a30..e137713e2e 100644 --- a/src/report/standard-reports/trial-balance.scm +++ b/src/report/standard-reports/trial-balance.scm @@ -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)