X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=f37380f024fc4b65fc9b368564c26dd3dd4a3190;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=e8380324fbe40f84311c5592c4100046c99e7194;hpb=9cba6d0b05bd28e2fc73f091b09ace570c976182;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index e8380324fb..f37380f024 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--2012 Jan Nieuwenhuizen + Copyright (C) 1998--2015 Jan Nieuwenhuizen Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -40,6 +40,7 @@ using namespace std; #include "source-file.hh" #include "version.hh" #include "warn.hh" +#include "lily-imports.hh" /* symbols/strings. @@ -62,7 +63,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 +76,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 == "") @@ -144,7 +145,7 @@ ly_string2scm (string const &str) char * ly_scm2str0 (SCM str) { - return scm_to_locale_string (str); + return scm_to_utf8_string (str); } /* @@ -355,8 +356,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 +381,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,35 +400,15 @@ 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 (!SCM_UNBNDP (val)); 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)) + if (!scm_is_null (type) && !ly_is_procedure (type)) { warning (_f ("cannot find property type-check for `%s' (%s).", ly_symbol2string (sym).c_str (), @@ -423,28 +420,52 @@ 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 (scm_is_null (val) || scm_is_false (val)) + return true; + + if (!scm_is_null (val) + && ly_is_procedure (type) + && scm_is_false (scm_call_1 (type, val))) { - 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 type_name = Lily::type_name (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 true; +} + +void +ly_wrong_smob_arg (bool pred (SCM), SCM var, int number, const char *fun) +{ + string type = predicate_to_typename ((void *) pred); + if (pred (var)) + { + // Uh oh. unsmob delivered 0, yet + // unsmob delivers true. This means that unsmob is a + // matching check from a base class of T, but var is of an + // incompatible derived type. + type = string (_ ("Wrong kind of ")).append (type); } - return ok; + scm_wrong_type_arg_msg (mangle_cxx_identifier (fun).c_str (), + number, var, type.c_str ()); } + /* some SCM abbrevs zijn deze nou handig? @@ -508,6 +529,18 @@ display_list (SCM s) return SCM_UNSPECIFIED; } +// Needed as complement to int_list_to_slice since scm_c_memq refuses +// to work with dotted lists. + +SCM +ly_memv (SCM v, SCM l) +{ + for (; scm_is_pair (l); l = scm_cdr (l)) + if (scm_is_true (scm_eqv_p (v, scm_car (l)))) + return l; + return SCM_BOOL_F; +} + Slice int_list_to_slice (SCM l) { @@ -550,17 +583,17 @@ 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; } int robust_scm2int (SCM k, int o) { - if (scm_integer_p (k) == SCM_BOOL_T) + if (scm_is_integer (k)) o = scm_to_int (k); return o; } @@ -568,7 +601,7 @@ robust_scm2int (SCM k, int o) vsize robust_scm2vsize (SCM k, vsize o) { - if (scm_integer_p (k) == SCM_BOOL_T) + if (scm_is_integer (k)) { int i = scm_to_int (k); if (i >= 0) @@ -651,8 +684,7 @@ alist_to_hashq (SCM alist) SCM ly_hash2alist (SCM tab) { - SCM func = ly_lily_module_constant ("hash-table->alist"); - return scm_call_1 (func, tab); + return Lily::hash_table_to_alist (tab); } /*