From 721b84a22f7da5cb3eea8a5fbe82995cc43b0807 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sat, 11 May 2013 14:46:43 +0200 Subject: [PATCH] Issue 3352: Don't let eval-carefully bomb out on scalar non-symbols This caused a programming error on invalid paper sizes. --- scm/lily-library.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/scm/lily-library.scm b/scm/lily-library.scm index d87bca208a..939e5caa88 100644 --- a/scm/lily-library.scm +++ b/scm/lily-library.scm @@ -932,13 +932,10 @@ in module @var{module}. In that case evaluate, otherwise print a warning and set an optional @var{default}." (let* ((unavailable? (lambda (sym) (not (module-defined? module sym)))) - (sym-unavailable (if (pair? symbol) - (filter - unavailable? - (filter symbol? (flatten-list symbol))) - (if (unavailable? symbol) - #t - '())))) + (sym-unavailable + (filter + unavailable? + (filter symbol? (flatten-list symbol))))) (if (null? sym-unavailable) (eval symbol module) (let* ((def (and (pair? default) (car default)))) -- 2.39.5