X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgeneral-scheme.cc;h=1b3d531e1a304d590c9cb917720438ec439dbd99;hb=e0fce9de60caee831c581043e0c29fa7124d4ec2;hp=0cf2299b2ec6c9e0579d99846060ad69c196587b;hpb=3d8089a42af6304edb8dad56220e845c84832bb2;p=lilypond.git diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc index 0cf2299b2e..1b3d531e1a 100644 --- a/lily/general-scheme.cc +++ b/lily/general-scheme.cc @@ -1,10 +1,21 @@ /* - lily-guile.cc -- implement assorted Guile bindings + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1998--2009 Jan Nieuwenhuizen + Copyright (C) 1998--2009 Jan Nieuwenhuizen Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "config.hh" @@ -14,18 +25,19 @@ #include /* memset */ using namespace std; +#include "dimensions.hh" +#include "file-name.hh" +#include "file-path.hh" #include "international.hh" #include "libc-extension.hh" #include "lily-guile.hh" -#include "misc.hh" -#include "warn.hh" -#include "version.hh" -#include "dimensions.hh" #include "main.hh" -#include "file-path.hh" +#include "misc.hh" +#include "program-option.hh" #include "relocate.hh" -#include "file-name.hh" #include "string-convert.hh" +#include "version.hh" +#include "warn.hh" LY_DEFINE (ly_start_environment, "ly:start-environment", 0, 0, 0, (), @@ -77,7 +89,7 @@ LY_DEFINE (ly_gulp_file, "ly:gulp-file", LY_ASSERT_TYPE (scm_is_number, size, 2); sz = scm_to_int (size); } - + string contents = gulp_file_to_string (ly_scm2string (name), true, sz); return scm_from_locale_stringn (contents.c_str (), contents.length ()); } @@ -123,7 +135,12 @@ LY_DEFINE (ly_programming_error, "ly:programming-error", { LY_ASSERT_TYPE (scm_is_string, str, 1); str = scm_simple_format (SCM_BOOL_F, str, rest); - programming_error (ly_scm2string (str)); + + if (get_program_option ("warning-as-error")) + error (ly_scm2string (str)); + else + programming_error (ly_scm2string (str)); + return SCM_UNSPECIFIED; } @@ -134,7 +151,12 @@ LY_DEFINE (ly_warning, "ly:warning", { LY_ASSERT_TYPE (scm_is_string, str, 1); str = scm_simple_format (SCM_BOOL_F, str, rest); - warning (ly_scm2string (str)); + + if (get_program_option ("warning-as-error")) + error (ly_scm2string (str)); + else + warning (ly_scm2string (str)); + return SCM_UNSPECIFIED; } @@ -142,7 +164,7 @@ LY_DEFINE (ly_dir_p, "ly:dir?", 1, 0, 0, (SCM s), "Is @var{s} a direction? Valid directions are @code{-1}," " @code{0}, or@tie{}@code{1}, where @code{-1} represents" - " left or down, @code{1} represents right or up, and @code{0}" + " left or down, @code{1}@tie{}represents right or up, and @code{0}" " represents a neutral direction.") { if (scm_is_number (s)) @@ -154,20 +176,35 @@ LY_DEFINE (ly_dir_p, "ly:dir?", } LY_DEFINE (ly_assoc_get, "ly:assoc-get", - 2, 1, 0, - (SCM key, SCM alist, SCM default_value), - "Return value if @var{key} in @var{alist}, else @code{default-value}" - " (or @code{#f} if not specified).") + 2, 2, 0, + (SCM key, SCM alist, SCM default_value, SCM strict_checking), + "Return value if @var{key} in @var{alist}, else @var{default-value}" + " (or @code{#f} if not specified). If @var{strict-checking} is set" + " to @code{#t} and @var{key} is not in @var{alist}, a programming_error" + " is output.") { LY_ASSERT_TYPE(ly_cheap_is_list, alist, 2); - + SCM handle = scm_assoc (key, alist); if (scm_is_pair (handle)) return scm_cdr (handle); - + if (default_value == SCM_UNDEFINED) default_value = SCM_BOOL_F; + if (strict_checking == SCM_BOOL_T) + { + string key_string = ly_scm2string + (scm_object_to_string (key, SCM_UNDEFINED)); + string default_value_string = ly_scm2string + (scm_object_to_string (default_value, + SCM_UNDEFINED)); + programming_error ("Cannot find key `" + + key_string + + "' in alist, setting to `" + + default_value_string + "'."); + } + return default_value; } @@ -183,10 +220,10 @@ LY_DEFINE (ly_string_substitute, "ly:string-substitute", string ss = ly_scm2string (s); replace_all (&ss, ly_scm2string (a), ly_scm2string (b)); - + return ly_string2scm (ss); } - + LY_DEFINE (ly_number_2_string, "ly:number->string", 1, 0, 0, (SCM s), "Convert @var{num} to a string without generating many decimals.") @@ -312,10 +349,11 @@ LY_DEFINE (ly_effective_prefix, "ly:effective-prefix", } LY_DEFINE (ly_chain_assoc_get, "ly:chain-assoc-get", - 2, 1, 0, (SCM key, SCM achain, SCM val), + 2, 2, 0, (SCM key, SCM achain, SCM default_value, SCM strict_checking), "Return value for @var{key} from a list of alists @var{achain}." - " If no entry is found, return @var{val} or @code{#f} if" - " @var{val} is not specified.") + " If no entry is found, return @var{default-value} or @code{#f} if" + " @var{default-value} is not specified. With @var{strict-checking}" + " set to @code{#t}, a programming_error is output in such cases.") { if (scm_is_pair (achain)) { @@ -323,9 +361,23 @@ LY_DEFINE (ly_chain_assoc_get, "ly:chain-assoc-get", if (scm_is_pair (handle)) return scm_cdr (handle); else - return ly_chain_assoc_get (key, scm_cdr (achain), val); + return ly_chain_assoc_get (key, scm_cdr (achain), default_value); } - return val == SCM_UNDEFINED ? SCM_BOOL_F : val; + + if (strict_checking == SCM_BOOL_T) + { + string key_string = ly_scm2string + (scm_object_to_string (key, SCM_UNDEFINED)); + string default_value_string = ly_scm2string + (scm_object_to_string (default_value, + SCM_UNDEFINED)); + programming_error ("Cannot find key `" + + key_string + + "' in achain, setting to `" + + default_value_string + "'."); + } + + return default_value == SCM_UNDEFINED ? SCM_BOOL_F : default_value; } @@ -340,7 +392,7 @@ LY_DEFINE (ly_stderr_redirect, "ly:stderr-redirect", m = ly_scm2string (mode); /* dup2 and (fileno (current-error-port)) do not work with mingw'c gcc -mwindows. */ - fflush (stderr); + fflush (stderr); freopen (ly_scm2string (file_name).c_str (), m.c_str (), stderr); return SCM_UNSPECIFIED; } @@ -367,11 +419,11 @@ LY_DEFINE (ly_camel_case_2_lisp_identifier, "ly:camel-case->lisp-identifier", "Convert @code{FooBar_Bla} to @code{foo-bar-bla} style symbol.") { LY_ASSERT_TYPE (ly_is_symbol, name_sym, 1); - + /* TODO: should use strings instead? */ - + const string in = ly_symbol2string (name_sym); string result = camel_case_to_lisp_identifier (in); @@ -386,7 +438,7 @@ LY_DEFINE (ly_expand_environment, "ly:expand-environment", return ly_string2scm (expand_environment_variables (ly_scm2string (str))); } - + LY_DEFINE (ly_truncate_list_x, "ly:truncate-list!", 2, 0, 0, (SCM lst, SCM i), @@ -411,7 +463,7 @@ LY_DEFINE (ly_truncate_list_x, "ly:truncate-list!", } string -format_single_argument (SCM arg, int precision) +format_single_argument (SCM arg, int precision, bool escape = false) { if (scm_is_integer (arg) && scm_exact_p (arg) == SCM_BOOL_T) return (String_convert::int_string (scm_to_int (arg))); @@ -430,7 +482,20 @@ format_single_argument (SCM arg, int precision) return (String_convert::form_string ("%.*lf", precision, val)); } else if (scm_is_string (arg)) - return (ly_scm2string (arg)); + { + string s = ly_scm2string (arg); + if (escape) + { + // Escape backslashes and double quotes, wrap it in double quotes + replace_all (&s, "\\", "\\\\"); + replace_all (&s, "\"", "\\\""); + // don't replace percents, since the png backend uses %d as escape sequence + // replace_all (&s, "%", "\\%"); + replace_all (&s, "$", "\\$"); + s = "\"" + s + "\""; + } + return s; + } else if (scm_is_symbol (arg)) return (ly_symbol2string (arg)); else @@ -438,14 +503,15 @@ format_single_argument (SCM arg, int precision) ly_progress (scm_from_locale_string ("Unsupported SCM value for format: ~a"), scm_list_1 (arg)); } - - - return ""; + + + return ""; } LY_DEFINE (ly_format, "ly:format", 1, 0, 1, (SCM str, SCM rest), - "LilyPond specific format, supporting @code{~a} and @code{~[0-9]f}.") + "LilyPond specific format, supporting @code{~a} and @code{~[0-9]f}. " + "Basic support for @code{~s} is also provided.") { LY_ASSERT_TYPE (scm_is_string, str, 1); @@ -461,7 +527,7 @@ LY_DEFINE (ly_format, "ly:format", if (tilde == NPOS) break ; - + tilde ++; char spec = format.at (tilde ++); @@ -471,16 +537,16 @@ LY_DEFINE (ly_format, "ly:format", { if (!scm_is_pair (rest)) { - programming_error (string (__FUNCTION__) + programming_error (string (__FUNCTION__) + ": not enough arguments for format."); return ly_string2scm (""); } - + SCM arg = scm_car (rest); rest = scm_cdr (rest); int precision = 8; - + if (spec == '$') precision = 2; else if (isdigit (spec)) @@ -488,9 +554,11 @@ LY_DEFINE (ly_format, "ly:format", precision = spec - '0'; spec = format.at (tilde ++); } - + if (spec == 'a' || spec == 'A' || spec == 'f' || spec == '$') results.push_back (format_single_argument (arg, precision)); + else if (spec == 's' || spec == 'S') + results.push_back (format_single_argument (arg, precision, true)); else if (spec == 'l') { SCM s = arg; @@ -503,7 +571,7 @@ LY_DEFINE (ly_format, "ly:format", if (s != SCM_EOL) results.push_back (format_single_argument (s, precision)); - + } } @@ -517,7 +585,7 @@ LY_DEFINE (ly_format, "ly:format", vsize len = 0; for (vsize i = 0; i < results.size (); i++) len += results[i].size (); - + char *result = (char*) scm_malloc (len + 1); char *ptr = result; for (vsize i = 0; i < results.size (); i++) @@ -526,6 +594,6 @@ LY_DEFINE (ly_format, "ly:format", ptr += results[i].size (); } *ptr = '\0'; - + return scm_take_locale_stringn (result, len); }