X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=c37eb33844389b293f174af367ff93626c2722d6;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=e5cdbc77f2732aef18d0e38794ccbf950e9aa710;hpb=cbb205d40a19c0d2d9801031a63607e108a18038;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index e5cdbc77f2..c37eb33844 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -1,10 +1,21 @@ /* - lily-guile.cc -- implement assorted SCM interface functions + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1998--2007 Jan Nieuwenhuizen + Copyright (C) 1998--2014 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 "lily-guile.hh" @@ -30,7 +41,6 @@ using namespace std; #include "version.hh" #include "warn.hh" - /* symbols/strings. */ @@ -38,9 +48,9 @@ string ly_scm_write_string (SCM s) { SCM port = scm_mkstrport (SCM_INUM0, - scm_make_string (SCM_INUM0, SCM_UNDEFINED), - SCM_OPN | SCM_WRTNG, - "ly_write2string"); + scm_make_string (SCM_INUM0, SCM_UNDEFINED), + SCM_OPN | SCM_WRTNG, + "ly_write2string"); // SCM write = scm_eval_3 (ly_symbol2scm ("write"), s, SCM_EOL); SCM write = scm_primitive_eval (ly_symbol2scm ("write")); @@ -52,7 +62,7 @@ ly_scm_write_string (SCM s) SCM ly_quote_scm (SCM s) { - return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED); + return scm_list_2 (ly_symbol2scm ("quote"), s); } string @@ -61,35 +71,38 @@ ly_symbol2string (SCM s) /* Ugh. this is not very efficient. */ - SCM str = scm_symbol_to_string (s); - return ly_scm2string (str); + return ly_scm2string (scm_symbol_to_string (s)); } string -gulp_file_to_string (string fn, bool must_exist, int size) +robust_symbol2string (SCM sym, const string &str) +{ + return scm_is_symbol (sym) ? ly_symbol2string (sym) : str; +} + +string +gulp_file_to_string (const string &fn, bool must_exist, int size) { string s = global_path.find (fn); if (s == "") { if (must_exist) - { - string e = _f ("cannot find file: `%s'", fn); - e += " "; - e += _f ("(load path: `%s')", global_path.to_string ()); - error (e); - /* unreachable */ - } + { + string e = _f ("cannot find file: `%s'", fn); + e += " "; + e += _f ("(load path: `%s')", global_path.to_string ()); + error (e); + /* unreachable */ + } return s; } - if (be_verbose_global) - progress_indication ("[" + s); + debug_output ("[" + s, true); vector chars = gulp_file (s, size); string result (&chars[0], chars.size ()); - if (be_verbose_global) - progress_indication ("]"); + debug_output ("]\n", false); return result; } @@ -111,45 +124,35 @@ string ly_scm2string (SCM str) { assert (scm_is_string (str)); - return string (scm_i_string_chars (str), - (int) scm_i_string_length (str)); + string result; + size_t len = scm_c_string_length (str); + if (len) + { + result.resize (len); + scm_to_locale_stringbuf (str, &result.at (0), len); + } + return result; } SCM ly_string2scm (string const &str) { return scm_from_locale_stringn (str.c_str (), - str.length ()); + str.length ()); } - char * -ly_scm2newstr (SCM str, size_t *lenp) +ly_scm2str0 (SCM str) { - LY_ASSERT_TYPE (scm_is_string, str, 1); - - size_t len = scm_i_string_length (str); - if (char *new_str = (char *) malloc ((len + 1) * sizeof (char))) - { - memcpy (new_str, scm_i_string_chars (str), len); - new_str[len] = '\0'; - - if (lenp) - *lenp = len; - - return new_str; - } - return 0; + return scm_to_locale_string (str); } - /* PAIRS */ SCM index_get_cell (SCM s, Direction d) { - assert (d); return (d == LEFT) ? scm_car (s) : scm_cdr (s); } @@ -168,21 +171,19 @@ bool is_number_pair (SCM p) { return scm_is_pair (p) - && scm_is_number (scm_car (p)) && scm_is_number (scm_cdr (p)); + && scm_is_number (scm_car (p)) && scm_is_number (scm_cdr (p)); } - unsigned int ly_scm_hash (SCM s) { return scm_ihashv (s, ~1u); } - bool is_axis (SCM s) { - if (scm_is_number (s)) + if (scm_is_integer (s)) { int i = scm_to_int (s); return i == 0 || i == 1; @@ -230,14 +231,15 @@ is_direction (SCM s) Interval ly_scm2interval (SCM p) { - return Interval (scm_to_double (scm_car (p)), scm_to_double (scm_cdr (p))); + return Interval (scm_to_double (scm_car (p)), + scm_to_double (scm_cdr (p))); } Drul_array ly_scm2realdrul (SCM p) { return Drul_array (scm_to_double (scm_car (p)), - scm_to_double (scm_cdr (p))); + scm_to_double (scm_cdr (p))); } SCM @@ -246,7 +248,6 @@ ly_interval2scm (Drul_array i) return scm_cons (scm_from_double (i[LEFT]), scm_from_double (i[RIGHT])); } - Interval robust_scm2interval (SCM k, Drul_array v) { @@ -290,7 +291,7 @@ Offset ly_scm2offset (SCM s) { return Offset (scm_to_double (scm_car (s)), - scm_to_double (scm_cdr (s))); + scm_to_double (scm_cdr (s))); } Offset @@ -322,31 +323,9 @@ ly_scm2offsets (SCM s) return os; } - - - /* ALIST */ - -bool -alist_equal_p (SCM a, SCM b) -{ - for (SCM s = a; - scm_is_pair (s); s = scm_cdr (s)) - { - SCM key = scm_caar (s); - SCM val = scm_cdar (s); - SCM l = scm_assoc (key, b); - - if (l == SCM_BOOL_F - || !ly_is_equal (scm_cdr (l), val)) - - return false; - } - return true; -} - SCM ly_alist_vals (SCM alist) { @@ -372,21 +351,36 @@ robust_list_ref (int i, SCM l) return scm_car (l); } - SCM ly_deep_copy (SCM src) { if (scm_is_pair (src)) - return scm_cons (ly_deep_copy (scm_car (src)), ly_deep_copy (scm_cdr (src))); - else if (scm_is_vector (src)) + { + SCM res = SCM_EOL; + do + { + res = scm_cons (ly_deep_copy (scm_car (src)), res); + src = scm_cdr (src); + } + while (scm_is_pair (src)); + // Oh, come on, GUILE. Why do you require the second argument + // of scm_reverse_x to be a proper list? That makes no sense. + // return scm_reverse_x (res, ly_deep_copy (src)); + SCM last_cons = res; + res = scm_reverse_x (res, SCM_EOL); + scm_set_cdr_x (last_cons, ly_deep_copy (src)); + return res; + } + if (scm_is_vector (src)) { int len = scm_c_vector_length (src); SCM nv = scm_c_make_vector (len, SCM_UNDEFINED); - for (int i = 0;i < len; i++) - { - SCM si = scm_from_int (i); - scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si))); - } + for (int i = 0; i < len; i++) + { + SCM si = scm_from_int (i); + scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si))); + } + return nv; } return src; } @@ -397,74 +391,62 @@ print_scm_val (SCM val) string realval = ly_scm_write_string (val); if (realval.length () > 200) realval = realval.substr (0, 100) - + "\n :\n :\n" - + realval.substr (realval.length () - 100); + + "\n :\n :\n" + + realval.substr (realval.length () - 100); return realval; } bool type_check_assignment (SCM sym, SCM val, SCM type_symbol) { - bool ok = true; - - /* - Always succeeds. - - - TODO: should remove #f from allowed vals? - */ - if (val == SCM_EOL || val == SCM_BOOL_F) - return ok; + // If undefined, some internal function caused it...should never happen. + assert (val != SCM_UNDEFINED); if (!scm_is_symbol (sym)) -#if 0 return false; -#else - /* - This is used for autoBeamSettings. - - TODO: deprecate the use of \override and \revert for - autoBeamSettings? - - or use a symbol autoBeamSettingS? - */ - return true; -#endif SCM type = scm_object_property (sym, type_symbol); if (type != SCM_EOL && !ly_is_procedure (type)) { warning (_f ("cannot find property type-check for `%s' (%s).", - ly_symbol2string (sym).c_str (), - ly_symbol2string (type_symbol).c_str ()) - + " " + _ ("perhaps a typing error?")); + ly_symbol2string (sym).c_str (), + ly_symbol2string (type_symbol).c_str ()) + + " " + _ ("perhaps a typing error?")); /* Be strict when being anal :) */ if (do_internal_type_checking_global) - scm_throw (ly_symbol2scm ("ly-file-failed"), scm_list_3 (ly_symbol2scm ("typecheck"), - sym, val)); + scm_throw (ly_symbol2scm ("ly-file-failed"), scm_list_3 (ly_symbol2scm ("typecheck"), + sym, val)); - warning (_ ("doing assignment anyway")); + warning (_ ("skipping assignment")); + return false; } - else + + /* + Always succeeds. + + + TODO: should remove #f from allowed vals? + */ + if (val == SCM_EOL || val == SCM_BOOL_F) + return true; + + if (val != SCM_EOL + && ly_is_procedure (type) + && scm_call_1 (type, val) == SCM_BOOL_F) { - if (val != SCM_EOL - && ly_is_procedure (type) - && scm_call_1 (type, val) == SCM_BOOL_F) - { - ok = false; - SCM typefunc = ly_lily_module_constant ("type-name"); - SCM type_name = scm_call_1 (typefunc, type); - - warning (_f ("type check for `%s' failed; value `%s' must be of type `%s'", - ly_symbol2string (sym).c_str (), - print_scm_val (val), - ly_scm2string (type_name).c_str ())); - progress_indication ("\n"); - } + SCM typefunc = ly_lily_module_constant ("type-name"); + SCM type_name = scm_call_1 (typefunc, type); + + warning (_f ("type check for `%s' failed; value `%s' must be of type `%s'", + ly_symbol2string (sym).c_str (), + print_scm_val (val), + ly_scm2string (type_name).c_str ())); + progress_indication ("\n"); + return false; } - return ok; + return true; } /* some SCM abbrevs @@ -480,13 +462,12 @@ ly_unique (SCM list) for (SCM i = list; scm_is_pair (i); i = scm_cdr (i)) { if (!scm_is_pair (scm_cdr (i)) - || !ly_is_equal (scm_car (i), scm_cadr (i))) - unique = scm_cons (scm_car (i), unique); + || !ly_is_equal (scm_car (i), scm_cadr (i))) + unique = scm_cons (scm_car (i), unique); } return scm_reverse_x (unique, SCM_EOL); } - /* Split list at member s, removing s. Return (BEFORE . AFTER) */ SCM @@ -499,7 +480,7 @@ ly_split_list (SCM s, SCM list) SCM i = scm_car (after); after = scm_cdr (after); if (ly_is_equal (i, s)) - break; + break; before = scm_cons (i, before); } return scm_cons (scm_reverse_x (before, SCM_EOL), after); @@ -550,12 +531,33 @@ robust_scm2double (SCM k, double x) return x; } +vector +ly_scm2floatvector (SCM l) +{ + vector floats; + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + floats.push_back (robust_scm2double (scm_car (s), 0.0)); + return floats; +} + +SCM +ly_floatvector2scm (vector v) +{ + SCM l = SCM_EOL; + SCM *tail = &l; + for (vsize i = 0; i < v.size (); i++) + { + *tail = scm_cons (scm_from_double (v[i]), SCM_EOL); + tail = SCM_CDRLOC (*tail); + } + return l; +} string -robust_scm2string (SCM k, string s) +robust_scm2string (SCM k, const string &s) { if (scm_is_string (k)) - s = ly_scm2string (k); + return ly_scm2string (k); return s; } @@ -567,30 +569,73 @@ robust_scm2int (SCM k, int o) return o; } +vsize +robust_scm2vsize (SCM k, vsize o) +{ + if (scm_integer_p (k) == SCM_BOOL_T) + { + int i = scm_to_int (k); + if (i >= 0) + return (vsize) i; + } + return o; +} SCM ly_rational2scm (Rational r) { - return scm_divide (scm_from_int (r.numerator ()), scm_from_int (r.denominator ())); -} + if (r.is_infinity ()) + { + if (r > Rational (0)) + return scm_inf (); + + return scm_difference (scm_inf (), SCM_UNDEFINED); + } + return scm_divide (scm_from_int64 (r.numerator ()), + scm_from_int64 (r.denominator ())); +} Rational ly_scm2rational (SCM r) { - return Rational (scm_to_int (scm_numerator (r)), - scm_to_int (scm_denominator (r))); + if (scm_is_true (scm_inf_p (r))) + { + if (scm_is_true (scm_positive_p (r))) + { + Rational r; + r.set_infinite (1); + return r; + } + else + { + Rational r; + r.set_infinite (-1); + return r; + } + } + + return Rational (scm_to_int64 (scm_numerator (r)), + scm_to_int64 (scm_denominator (r))); } Rational robust_scm2rational (SCM n, Rational rat) { - if (ly_is_fraction (n)) + if (ly_is_rational (n)) return ly_scm2rational (n); else return rat; } +bool +ly_is_rational (SCM n) +{ + return (scm_is_real (n) + && (scm_is_true (scm_exact_p (n)) + || scm_is_true (scm_inf_p (n)))); +} + SCM alist_to_hashq (SCM alist) { @@ -614,7 +659,6 @@ ly_hash2alist (SCM tab) return scm_call_1 (func, tab); } - /* C++ interfacing. */ @@ -634,22 +678,19 @@ mangle_cxx_identifier (string cxx_id) else if (cxx_id.substr (cxx_id.length () - 2) == "_x") cxx_id = cxx_id.replace (cxx_id.length () - 2, 2, "!"); - cxx_id = replace_all (cxx_id, "_less?", ""); - cxx_id = replace_all (cxx_id, "__", "::"); - cxx_id = replace_all (cxx_id, '_', '-'); - + replace_all (&cxx_id, "_less?", ""); + replace_all (&cxx_id, "__", "::"); + replace_all (&cxx_id, '_', '-'); return cxx_id; } - - SCM ly_string_array_to_scm (vector a) { SCM s = SCM_EOL; - for (vsize i = a.size (); i ; i--) + for (vsize i = a.size (); i; i--) s = scm_cons (ly_symbol2scm (a[i - 1].c_str ()), s); return s; } @@ -659,10 +700,11 @@ SCM parse_symbol_list (char const *symbols) { while (isspace (*symbols)) - *symbols++; + symbols++; string s = symbols; - replace_all (s, '\n', ' '); - replace_all (s, '\t', ' '); + replace_all (&s, '\n', ' '); + replace_all (&s, '\t', ' '); + replace_all (&s, " ", " "); return ly_string_array_to_scm (string_split (s, ' ')); }