X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgeneral-scheme.cc;h=f00d1938ab56746bc948f2cdc6ddb2f1172f55e5;hb=f0e148170da8ff23b8f5647e83a323bf4d62a918;hp=6d57d47769a31df6db0540c5755f77a66c9de236;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc index 6d57d47769..f00d1938ab 100644 --- a/lily/general-scheme.cc +++ b/lily/general-scheme.cc @@ -3,48 +3,61 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2005 Jan Nieuwenhuizen - Han-Wen Nienhuys + (c) 1998--2007 Jan Nieuwenhuizen + Han-Wen Nienhuys */ #include "config.hh" -#include /* isinf */ -#include -#include /* memset */ +#include +#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" #include "dimensions.hh" #include "main.hh" #include "file-path.hh" +#include "relocate.hh" +#include "file-name.hh" +#include "string-convert.hh" + +LY_DEFINE (ly_start_environment, "ly:start-environment", + 0, 0, 0, (), + "Return the environment, a list of strings, that was in effect at program start") +{ + SCM l = SCM_EOL; + SCM *tail = &l; + + for (vsize i = 0; i < start_environment_global.size (); i++) + { + *tail = scm_cons (ly_string2scm (start_environment_global[i]), + SCM_EOL); + tail = SCM_CDRLOC(*tail); + } + + return l; +} -/* 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}, " "or @code{#f} if not found.") { - SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string"); + LY_ASSERT_TYPE (scm_is_string, name, 1); - 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 ly_string2scm (file_name); } /* @@ -52,13 +65,20 @@ 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 ()); + LY_ASSERT_TYPE (scm_is_string, name, 1); + int sz = INT_MAX; + if (size != SCM_UNDEFINED) + { + 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 ()); } LY_DEFINE (ly_error, "ly:error", @@ -66,7 +86,7 @@ LY_DEFINE (ly_error, "ly:error", "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"); + LY_ASSERT_TYPE (scm_is_string, str, 1); str = scm_simple_format (SCM_BOOL_F, str, rest); error (ly_scm2string (str)); return SCM_UNSPECIFIED; @@ -77,7 +97,7 @@ LY_DEFINE (ly_message, "ly:message", "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"); + LY_ASSERT_TYPE (scm_is_string, str, 1); str = scm_simple_format (SCM_BOOL_F, str, rest); message (ly_scm2string (str)); return SCM_UNSPECIFIED; @@ -88,7 +108,7 @@ LY_DEFINE (ly_progress, "ly:progress", "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"); + LY_ASSERT_TYPE (scm_is_string, str, 1); str = scm_simple_format (SCM_BOOL_F, str, rest); progress_indication (ly_scm2string (str)); return SCM_UNSPECIFIED; @@ -99,7 +119,7 @@ LY_DEFINE (ly_programming_error, "ly:programming-error", "Scheme callable function to issue the warning @code{msg}. " "The message is formatted with @code{format} and @code{rest}.") { - SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); + LY_ASSERT_TYPE (scm_is_string, str, 1); str = scm_simple_format (SCM_BOOL_F, str, rest); programming_error (ly_scm2string (str)); return SCM_UNSPECIFIED; @@ -110,7 +130,7 @@ LY_DEFINE (ly_warning, "ly:warning", "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"); + LY_ASSERT_TYPE (scm_is_string, str, 1); str = scm_simple_format (SCM_BOOL_F, str, rest); warning (ly_scm2string (str)); return SCM_UNSPECIFIED; @@ -136,32 +156,44 @@ LY_DEFINE (ly_assoc_get, "ly:assoc-get", "Return value if KEY in ALIST, else DEFAULT-VALUE " "(or #f if not specified).") { + 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 (scm_is_pair (handle)) - return scm_cdr (handle); return default_value; } -LY_DEFINE (ly_number2string, "ly:number->string", +LY_DEFINE (ly_string_substitute, "ly:string-substitute", + 3, 0, 0, (SCM a, SCM b, SCM s), + "Replace string @var{a} by string @var{b} in string @var{s}.") +{ + LY_ASSERT_TYPE (scm_is_string, s, 1); + LY_ASSERT_TYPE (scm_is_string, b, 2); + LY_ASSERT_TYPE (scm_is_string, s, 3); + + string ss = ly_scm2string (s); + replace_all (ss, string (scm_i_string_chars (a)), + string (scm_i_string_chars (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.") { - SCM_ASSERT_TYPE (scm_is_number (s), s, SCM_ARG1, __FUNCTION__, "number"); + LY_ASSERT_TYPE (scm_is_number, s, 1); char str[400]; // ugh. 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")); programming_error (_ ("setting to zero")); @@ -169,12 +201,12 @@ LY_DEFINE (ly_number2string, "ly:number->string", r = 0.0; } - snprintf (str, sizeof (str), "%08.4f", r); + snprintf (str, sizeof (str), "%.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); + return scm_from_locale_string (str); } LY_DEFINE (ly_version, "ly:version", 0, 0, 0, (), @@ -188,7 +220,7 @@ LY_DEFINE (ly_version, "ly:version", 0, 0, 0, (), LY_DEFINE (ly_unit, "ly:unit", 0, 0, 0, (), "Return the unit used for lengths as a string.") { - return scm_makfrom0str (INTERNAL_UNIT); + return scm_from_locale_string (INTERNAL_UNIT); } LY_DEFINE (ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d), @@ -212,16 +244,8 @@ LY_DEFINE (ly_gettext, "ly:gettext", 1, 0, 0, (SCM string), "Gettext wrapper.") { - SCM_ASSERT_TYPE (scm_is_string (string), string, SCM_ARG1, - __FUNCTION__, "string"); - return scm_makfrom0str (_ (scm_i_string_chars (string)).to_str0 ()); -} - -LY_DEFINE (ly_output_backend, "ly:output-backend", - 0, 0, 0, (), - "Return name of output backend.") -{ - return scm_makfrom0str (output_backend_global.to_str0 ()); + LY_ASSERT_TYPE (scm_is_string, string, 1); + return ly_string2scm (_ (scm_i_string_chars (string))); } LY_DEFINE (ly_output_formats, "ly:output-formats", @@ -229,30 +253,28 @@ 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 (ly_string2scm (output_formats[i]), lst); return lst; } -LY_DEFINE (ly_wchar_to_utf_8, "ly:wide-char->utf-8", +LY_DEFINE (ly_wide_char_2_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[5]; - SCM_ASSERT_TYPE (scm_is_integer (wc), wc, SCM_ARG1, __FUNCTION__, "integer"); + LY_ASSERT_TYPE (scm_is_integer, wc, 1); unsigned wide_char = (unsigned) scm_to_int (wc); char *p = buf; if (wide_char < 0x0080) - { - *p++ = (char)wide_char; - } + *p++ = (char)wide_char; else if (wide_char < 0x0800) { *p++ = (char) (((wide_char >> 6)) | 0xC0); @@ -273,14 +295,14 @@ LY_DEFINE (ly_wchar_to_utf_8, "ly:wide-char->utf-8", } *p = 0; - return scm_makfrom0str (buf); + return scm_from_locale_string (buf); } LY_DEFINE (ly_effective_prefix, "ly:effective-prefix", 0, 0, 0, (), "Return effective prefix.") { - return scm_makfrom0str (prefix_directory.to_str0 ()); + return ly_string2scm (lilypond_datadir); } LY_DEFINE (ly_chain_assoc_get, "ly:chain-assoc-get", @@ -300,17 +322,203 @@ LY_DEFINE (ly_chain_assoc_get, "ly:chain-assoc-get", 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_string_p (file_name), file_name, SCM_ARG1, - __FUNCTION__, "file_name"); - char const *m = "w"; + LY_ASSERT_TYPE (scm_is_string, file_name, 1); + + string m = "w"; if (mode != SCM_UNDEFINED && scm_string_p (mode)) - m = ly_scm2newstr (mode, 0); + m = ly_scm2string (mode); /* dup2 and (fileno (current-error-port)) do not work with mingw'c gcc -mwindows. */ - freopen (ly_scm2newstr (file_name, 0), m, stderr); + fflush (stderr); + freopen (ly_scm2string (file_name).c_str (), m.c_str (), 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_2_lisp_identifier, "ly:camel-case->lisp-identifier", + 1, 0, 0, (SCM name_sym), + "Convert FooBar_Bla to 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); + + return ly_symbol2scm (result.c_str ()); +} + +LY_DEFINE (ly_expand_environment, "ly:expand-environment", + 1, 0, 0, (SCM str), + "Expand $VAR and $@{VAR@} in @var{str}.") +{ + LY_ASSERT_TYPE (scm_is_string, str, 1); + + 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), + "Take at most the first @var{i} of list @var{lst}") +{ + LY_ASSERT_TYPE (scm_is_integer, i, 1); + + int k = scm_to_int (i); + if (k == 0) + lst = SCM_EOL; + else + { + SCM s = lst; + k--; + for (; scm_is_pair (s) && k--; s = scm_cdr (s)) + ; + + if (scm_is_pair (s)) + scm_set_cdr_x (s, SCM_EOL); + } + return lst; +} + +string +format_single_argument (SCM arg, int precision) +{ + if (scm_is_integer (arg) && scm_exact_p (arg) == SCM_BOOL_T) + return (String_convert::int_string (scm_to_int (arg))); + else if (scm_is_number (arg)) + { + Real val = scm_to_double (arg); + + if (isnan (val) || isinf (val)) + { + warning (_ ("Found infinity or nan in output. Substituting 0.0")); + return ("0.0"); + if (strict_infinity_checking) + abort (); + } + else + return (String_convert::form_string ("%.*lf", precision, val)); + } + else if (scm_is_string (arg)) + return (ly_scm2string (arg)); + else if (scm_is_symbol (arg)) + return (ly_symbol2string (arg)); + else + { + ly_progress (scm_from_locale_string ("Unsupported SCM value for format: ~a"), + scm_list_1 (arg)); + } + + + return ""; +} + +LY_DEFINE (ly_format, "ly:format", + 1, 0, 1, (SCM str, SCM rest), + "LilyPond specific format, supporting ~a ~[0-9]f.") +{ + LY_ASSERT_TYPE (scm_is_string, str, 1); + + string format = ly_scm2string (str); + vector results; + + vsize i = 0; + while (i < format.size ()) + { + vsize tilde = format.find ('~', i); + + results.push_back (format.substr (i, (tilde-i))); + + if (tilde == NPOS) + break ; + + tilde ++; + + char spec = format.at (tilde ++); + if (spec == '~') + results.push_back ("~"); + else + { + if (!scm_is_pair (rest)) + { + 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)) + { + precision = spec - '0'; + spec = format.at (tilde ++); + } + + if (spec == 'a' || spec == 'f') + results.push_back (format_single_argument (arg, precision)); + else if (spec == 'l') + { + SCM s = arg; + for (; scm_is_pair (s); s = scm_cdr (s)) + { + results.push_back (format_single_argument (scm_car (s), precision)); + if (scm_cdr (s) != SCM_EOL) + results.push_back (" "); + } + + if (s != SCM_EOL) + results.push_back (format_single_argument (s, precision)); + + } + } + + i = tilde; + } + + if (scm_is_pair (rest)) + programming_error (string (__FUNCTION__) + + ": too many arguments"); + + 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++) + { + strncpy (ptr, results[i].c_str (), results[i].size ()); + ptr += results[i].size (); + } + *ptr = '\0'; + + return scm_take_locale_stringn (result, len); +}