X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=6896d43d7c2c9ed269d4fe6ff95d9bf5b2a7a686;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=6aa40f78048eb12c71012e39efdae3f46019bf95;hpb=466004b5bf67b03a76a135c14c88c222b3208457;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 6aa40f7804..6896d43d7c 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2011 Jan Nieuwenhuizen + Copyright (C) 1998--2015 Jan Nieuwenhuizen Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -62,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 @@ -75,13 +75,13 @@ ly_symbol2string (SCM s) } string -robust_symbol2string (SCM sym, string str) +robust_symbol2string (SCM sym, const string &str) { return scm_is_symbol (sym) ? ly_symbol2string (sym) : str; } string -gulp_file_to_string (string fn, bool must_exist, int size) +gulp_file_to_string (const string &fn, bool must_exist, int size) { string s = global_path.find (fn); if (s == "") @@ -355,8 +355,23 @@ 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); @@ -365,6 +380,7 @@ ly_deep_copy (SCM src) SCM si = scm_from_int (i); scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si))); } + return nv; } return src; } @@ -383,31 +399,11 @@ print_scm_val (SCM val) 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); @@ -423,26 +419,34 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) 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 @@ -550,10 +554,10 @@ ly_floatvector2scm (vector v) } 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; } @@ -565,9 +569,29 @@ 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) { + 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 ())); } @@ -575,6 +599,22 @@ ly_rational2scm (Rational r) Rational ly_scm2rational (SCM 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))); } @@ -582,12 +622,20 @@ ly_scm2rational (SCM 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) {