X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgeneral-scheme.cc;h=1cb51a10ff27b34cea174434eee275511b1fa529;hb=c2ccda3e91d408453744bd03882c6b0584a9561a;hp=d21f8bf6aad02480eea440765f00693b6e6c4204;hpb=7952d4f6df5860b580c306039d4127c135a4ce7b;p=lilypond.git diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc index d21f8bf6aa..1cb51a10ff 100644 --- a/lily/general-scheme.cc +++ b/lily/general-scheme.cc @@ -3,25 +3,19 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2005 Jan Nieuwenhuizen - Han-Wen Nienhuys + (c) 1998--2006 Jan Nieuwenhuizen + Han-Wen Nienhuys */ #include "config.hh" -#include /* gettext on MacOS X */ -#include /* isinf */ -#include -#include /* memset */ -#if HAVE_UTF8_WCHAR_H -#include /* wcrtomb */ -#else -#include /* wcrtomb */ -#endif +#include +#include /* memset */ +using namespace std; +#include "international.hh" #include "libc-extension.hh" #include "lily-guile.hh" -#include "string.hh" #include "misc.hh" #include "warn.hh" #include "version.hh" @@ -29,14 +23,6 @@ #include "main.hh" #include "file-path.hh" -/* MacOS S fix: - source-file.hh includes cmath which undefines isinf and isnan -*/ -#ifdef __APPLE__ -inline int my_isinf (Real r) { return isinf (r); } -inline int my_isnan (Real r) { return isnan (r); } -#endif - LY_DEFINE (ly_find_file, "ly:find-file", 1, 0, 0, (SCM name), "Return the absolute file name of @var{name}, " @@ -44,12 +30,12 @@ LY_DEFINE (ly_find_file, "ly:find-file", { SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); - String nm = ly_scm2string (name); - String file_name = global_path.find (nm); - if (file_name.is_empty ()) + string nm = ly_scm2string (name); + string file_name = global_path.find (nm); + if (file_name.empty ()) return SCM_BOOL_F; - return scm_makfrom0str (file_name.to_str0 ()); + return scm_makfrom0str (file_name.c_str ()); } /* @@ -57,25 +43,52 @@ LY_DEFINE (ly_find_file, "ly:find-file", buffering.) */ LY_DEFINE (ly_gulp_file, "ly:gulp-file", - 1, 0, 0, (SCM name), + 1, 1, 0, (SCM name, SCM size), "Read the file @var{name}, and return its contents in a string. " - "The file is looked up using the search path.") + "The file is looked up using the search path. ") { SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); - String contents = gulp_file_to_string (ly_scm2string (name), true); - return scm_from_locale_stringn (contents.get_str0 (), contents.length ()); + int sz = INT_MAX; + if (size != SCM_UNDEFINED) + { + SCM_ASSERT_TYPE (scm_is_number (size), size, SCM_ARG2, __FUNCTION__, "number"); + 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 ()); } -LY_DEFINE (ly_warn, "ly:warn", +LY_DEFINE (ly_error, "ly:error", 1, 0, 1, (SCM str, SCM rest), - "Scheme callable function to issue the warning @code{msg}. " + "Scheme callable function to issue the error @code{msg}. " + "The error is formatted with @code{format} and @code{rest}.") +{ + SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); + str = scm_simple_format (SCM_BOOL_F, str, rest); + error (ly_scm2string (str)); + return SCM_UNSPECIFIED; +} + +LY_DEFINE (ly_message, "ly:message", + 1, 0, 1, (SCM str, SCM rest), + "Scheme callable function to issue the message @code{msg}. " "The message is formatted with @code{format} and @code{rest}.") { SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); - progress_indication ("\n"); + str = scm_simple_format (SCM_BOOL_F, str, rest); + message (ly_scm2string (str)); + return SCM_UNSPECIFIED; +} +LY_DEFINE (ly_progress, "ly:progress", + 1, 0, 1, (SCM str, SCM rest), + "Scheme callable function to print progress @code{str}. " + "The message is formatted with @code{format} and @code{rest}.") +{ + SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); str = scm_simple_format (SCM_BOOL_F, str, rest); - warning (ly_scm2string (str)); + progress_indication (ly_scm2string (str)); return SCM_UNSPECIFIED; } @@ -85,13 +98,22 @@ LY_DEFINE (ly_programming_error, "ly:programming-error", "The message is formatted with @code{format} and @code{rest}.") { SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); - progress_indication ("\n"); - str = scm_simple_format (SCM_BOOL_F, str, rest); programming_error (ly_scm2string (str)); return SCM_UNSPECIFIED; } +LY_DEFINE (ly_warning, "ly:warning", + 1, 0, 1, (SCM str, SCM rest), + "Scheme callable function to issue the warning @code{str}. " + "The message is formatted with @code{format} and @code{rest}.") +{ + SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); + str = scm_simple_format (SCM_BOOL_F, str, rest); + warning (ly_scm2string (str)); + return SCM_UNSPECIFIED; +} + LY_DEFINE (ly_dir_p, "ly:dir?", 1, 0, 0, (SCM s), "type predicate. A direction is @code{-1}, @code{0} or " @@ -119,8 +141,7 @@ LY_DEFINE (ly_assoc_get, "ly:assoc-get", if (scm_is_pair (handle)) return scm_cdr (handle); - else - return default_value; + return default_value; } LY_DEFINE (ly_number2string, "ly:number->string", @@ -134,20 +155,18 @@ LY_DEFINE (ly_number2string, "ly:number->string", if (scm_exact_p (s) == SCM_BOOL_F) { Real r (scm_to_double (s)); -#ifdef __APPLE__ - if (my_isinf (r) || my_isnan (r)) -#else if (isinf (r) || isnan (r)) -#endif { - programming_error ("Infinity or NaN encountered while converting Real number; setting to zero."); + programming_error (_ ("infinity or NaN encountered while converting Real number")); + programming_error (_ ("setting to zero")); + r = 0.0; } snprintf (str, sizeof (str), "%08.4f", r); } else - snprintf (str, sizeof (str), "%d", scm_to_int (s)); + snprintf (str, sizeof (str), "%d", int (scm_to_int (s))); return scm_makfrom0str (str); } @@ -189,14 +208,14 @@ LY_DEFINE (ly_gettext, "ly:gettext", { SCM_ASSERT_TYPE (scm_is_string (string), string, SCM_ARG1, __FUNCTION__, "string"); - return scm_makfrom0str (_ (scm_i_string_chars (string)).to_str0 ()); + return scm_makfrom0str (_ (scm_i_string_chars (string)).c_str ()); } LY_DEFINE (ly_output_backend, "ly:output-backend", 0, 0, 0, (), "Return name of output backend.") { - return scm_makfrom0str (output_backend_global.to_str0 ()); + return scm_makfrom0str (output_backend_global.c_str ()); } LY_DEFINE (ly_output_formats, "ly:output-formats", @@ -204,39 +223,119 @@ LY_DEFINE (ly_output_formats, "ly:output-formats", "Formats passed to --format as a list of strings, " "used for the output.") { - Array output_formats = split_string (output_format_global, ','); + vector output_formats = string_split (output_format_global, ','); SCM lst = SCM_EOL; int output_formats_count = output_formats.size (); - for (int i = 0; i < output_formats_count; i ++) - lst = scm_cons (scm_makfrom0str (output_formats[i].to_str0 ()), lst); + for (int i = 0; i < output_formats_count; i++) + lst = scm_cons (scm_makfrom0str (output_formats[i].c_str ()), lst); return lst; } LY_DEFINE (ly_wchar_to_utf_8, "ly:wide-char->utf-8", 1, 0, 0, (SCM wc), - "Encode the Unicode codepoint @var{wc} as UTF-8") + "Encode the Unicode codepoint @var{wc}, an integer, as UTF-8") { - char buf[100]; + char buf[5]; SCM_ASSERT_TYPE (scm_is_integer (wc), wc, SCM_ARG1, __FUNCTION__, "integer"); - wchar_t wide_char = (wchar_t) scm_to_int (wc); + unsigned wide_char = (unsigned) scm_to_int (wc); + char *p = buf; - mbstate_t state; - memset (&state, '\0', sizeof (state)); - memset (buf, '\0', sizeof (buf)); + if (wide_char < 0x0080) + *p++ = (char)wide_char; + else if (wide_char < 0x0800) + { + *p++ = (char) (((wide_char >> 6)) | 0xC0); + *p++ = (char) (((wide_char) & 0x3F) | 0x80); + } + else if (wide_char < 0x10000) + { + *p++ = (char) (((wide_char >> 12)) | 0xE0); + *p++ = (char) (((wide_char >> 6) & 0x3F) | 0x80); + *p++ = (char) (((wide_char) & 0x3F) | 0x80); + } + else + { + *p++ = (char) (((wide_char >> 18)) | 0xF0); + *p++ = (char) (((wide_char >> 12) & 0x3F) | 0x80); + *p++ = (char) (((wide_char >> 6) & 0x3F) | 0x80); + *p++ = (char) (((wide_char) & 0x3F) | 0x80); + } + *p = 0; - wcrtomb (buf, wide_char, &state); - return scm_makfrom0str (buf); } - + LY_DEFINE (ly_effective_prefix, "ly:effective-prefix", 0, 0, 0, (), "Return effective prefix.") { - return scm_makfrom0str (prefix_directory.to_str0 ()); + return scm_makfrom0str (prefix_directory.c_str ()); } +LY_DEFINE (ly_chain_assoc_get, "ly:chain-assoc-get", + 2, 1, 0, (SCM key, SCM achain, SCM dfault), + "Return value for @var{key} from a list of alists @var{achain}. " + "If no if no entry is found, return DFAULT, " + "or #f if no DFAULT not specified.") +{ + if (scm_is_pair (achain)) + { + SCM handle = scm_assoc (key, scm_car (achain)); + if (scm_is_pair (handle)) + return scm_cdr (handle); + else + return ly_chain_assoc_get (key, scm_cdr (achain), dfault); + } + return dfault == SCM_UNDEFINED ? SCM_BOOL_F : dfault; +} +LY_DEFINE (ly_stderr_redirect, "ly:stderr-redirect", + 1, 1, 0, (SCM file_name, SCM mode), + "Redirect stderr to FILE-NAME, opened with MODE.") +{ + SCM_ASSERT_TYPE (scm_is_string (file_name), file_name, SCM_ARG1, + __FUNCTION__, "file_name"); + char const *m = "w"; + if (mode != SCM_UNDEFINED && scm_string_p (mode)) + m = ly_scm2newstr (mode, 0); + /* dup2 and (fileno (current-error-port)) do not work with mingw'c + gcc -mwindows. */ + freopen (ly_scm2newstr (file_name, 0), m, stderr); + return SCM_UNSPECIFIED; +} + +static SCM +accumulate_symbol (void *closure, SCM key, SCM val, SCM result) +{ + (void) closure; + (void) val; + return scm_cons (key, result); +} + +LY_DEFINE(ly_hash_table_keys, "ly:hash-table-keys", + 1,0,0, (SCM tab), + "return a list of keys in @var{tab}") +{ + return scm_internal_hash_fold ((Hash_closure_function) & accumulate_symbol, + NULL, SCM_EOL, tab); +} + +LY_DEFINE (ly_camel_case_to_lisp_identifier, "ly:camel-case->lisp-identifier", + 1, 0, 0, (SCM name_sym), + "Convert FooBar_Bla to foo-bar-bla style symbol.") +{ + SCM_ASSERT_TYPE(scm_is_symbol (name_sym), name_sym, + SCM_ARG1, __FUNCTION__, "symbol"); + + /* + TODO: should use strings instead? + */ + + const string in = ly_symbol2string (name_sym); + string result = camel_case_to_lisp_identifier (in); + + return ly_symbol2scm (result.c_str ()); +}