X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=ff3f7064bf62d4666d8cc4c8193ea6b2cc8b33af;hb=f4dd6be9654769e883ac8697e8617761760d82ff;hp=a1a635961c02cc9e46bc4587ce32e1cc3ef76241;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index a1a635961c..ff3f7064bf 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--2011 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,23 +41,22 @@ using namespace std; #include "version.hh" #include "warn.hh" - /* symbols/strings. */ -SCM -ly_write2scm (SCM s) +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")); // scm_apply (write, port, SCM_EOL); scm_call_2 (write, s, port); - return scm_strport_to_string (port); + return ly_scm2string (scm_strport_to_string (port)); } SCM @@ -72,24 +82,22 @@ gulp_file_to_string (string fn, bool must_exist, int size) 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 +119,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 ()); + return scm_from_locale_stringn (str.c_str (), + str.length ()); } - char * -ly_scm2newstr (SCM str, size_t *lenp) +ly_scm2str0 (SCM str) { - SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); - - 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,17 +166,15 @@ 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) { @@ -237,7 +233,7 @@ 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 +242,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 +285,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 @@ -308,7 +303,7 @@ ly_offsets2scm (vector os) for (vsize i = 0; i < os.size (); i++) { *tail = scm_cons (ly_offset2scm (os[i]), SCM_EOL); - tail = SCM_CDRLOC(*tail); + tail = SCM_CDRLOC (*tail); } return l; } @@ -322,9 +317,6 @@ ly_scm2offsets (SCM s) return os; } - - - /* ALIST */ @@ -340,9 +332,9 @@ alist_equal_p (SCM a, SCM b) SCM l = scm_assoc (key, b); if (l == SCM_BOOL_F - || !ly_is_equal (scm_cdr (l), val)) + || !ly_is_equal (scm_cdr (l), val)) - return false; + return false; } return true; } @@ -372,7 +364,6 @@ robust_list_ref (int i, SCM l) return scm_car (l); } - SCM ly_deep_copy (SCM src) { @@ -382,11 +373,11 @@ ly_deep_copy (SCM 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 src; } @@ -394,11 +385,11 @@ ly_deep_copy (SCM src) string print_scm_val (SCM val) { - string realval = ly_scm2string (ly_write2scm (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; } @@ -420,15 +411,15 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) #if 0 return false; #else - /* - This is used for autoBeamSettings. + /* + This is used for autoBeamSettings. - TODO: deprecate the use of \override and \revert for - autoBeamSettings? + TODO: deprecate the use of \override and \revert for + autoBeamSettings? - or use a symbol autoBeamSettingS? - */ - return true; + or use a symbol autoBeamSettingS? + */ + return true; #endif SCM type = scm_object_property (sym, type_symbol); @@ -436,33 +427,33 @@ type_check_assignment (SCM sym, SCM val, SCM 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")); } else { 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"); - } + && 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"); + } } return ok; } @@ -480,13 +471,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 +489,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,7 +540,6 @@ robust_scm2double (SCM k, double x) return x; } - string robust_scm2string (SCM k, string s) { @@ -567,21 +556,28 @@ robust_scm2int (SCM k, int o) return o; } - SCM ly_rational2scm (Rational r) { - return scm_divide (scm_from_int (r.numerator ()), scm_from_int (r.denominator ())); + 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))); + 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)) + return ly_scm2rational (n); + else + return rat; +} SCM alist_to_hashq (SCM alist) @@ -606,7 +602,6 @@ ly_hash2alist (SCM tab) return scm_call_1 (func, tab); } - /* C++ interfacing. */ @@ -622,21 +617,23 @@ mangle_cxx_identifier (string cxx_id) cxx_id = "ly:" + cxx_id; } if (cxx_id.substr (cxx_id.length () - 2) == "_p") - cxx_id = cxx_id.replace (cxx_id.length () - 2, 1, "?"); + cxx_id = cxx_id.replace (cxx_id.length () - 2, 2, "?"); else if (cxx_id.substr (cxx_id.length () - 2) == "_x") - cxx_id = cxx_id.replace (cxx_id.length () - 2, 1, "!"); + cxx_id = cxx_id.replace (cxx_id.length () - 2, 2, "!"); + + replace_all (&cxx_id, "_less?", ""); + replace_all (&cxx_id, "__", "::"); + replace_all (&cxx_id, '_', '-'); - 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; } @@ -646,20 +643,15 @@ 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, ' ')); } - -bool -ly_is_fraction (SCM x) -{ - return SCM_FRACTIONP(x); -} - +/* GDB debugging. */ struct ly_t_double_cell { SCM a;