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
This commit is contained in:
Christian Stimming 2010-04-23 21:07:13 +00:00
parent 89e88ac983
commit e68434cb03
7 changed files with 22 additions and 41 deletions

View File

@ -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)))))

View File

@ -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))))))

View File

@ -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))

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)