X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=0a7c8362d6a2c139e5efd95bd862faff7574a052;hb=92918346012f79ef9109ef0c391947af2d3165ca;hp=fe940add8056026f07e327e95ae2dec08bbde758;hpb=d1514c75fb3f45f7a490ebe64a005e435a9e4493;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index fe940add80..1f67c00433 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -1,549 +1,409 @@ /* - lily-guile.cc -- implement assorted guile functions + lily-guile.cc -- implement assorted SCM interface functions source file of the GNU LilyPond music typesetter - (c) 1998--2003 Jan Nieuwenhuizen - - Han-Wen Nienhuys + (c) 1998--2007 Jan Nieuwenhuizen + Han-Wen Nienhuys */ +#include "lily-guile.hh" -#include -#include -#include /* isinf */ -#include /* strdup, strchr */ - - -#include "lily-proto.hh" - -/* macosx fix: - - - source-file.hh includes cmath which undefines isinf and isnan -*/ -inline int my_isinf(Real r) { return isinf(r); } -inline int my_isnan(Real r) { return isnan(r); } - +#include +#include +#include /* strdup, strchr */ +#include +using namespace std; +#include "dimensions.hh" +#include "direction.hh" +#include "file-path.hh" +#include "international.hh" #include "libc-extension.hh" -#include "lily-guile.hh" #include "main.hh" -#include "file-path.hh" -#include "warn.hh" -#include "direction.hh" +#include "misc.hh" #include "offset.hh" -#include "interval.hh" #include "pitch.hh" -#include "dimensions.hh" +#include "string-convert.hh" #include "source-file.hh" - -// #define TEST_GC - -SCM -ly_last (SCM list) -{ - return ly_car (scm_last_pair (list)); -} +#include "version.hh" +#include "warn.hh" -SCM -ly_write2scm (SCM s) +/* + symbols/strings. + */ +string +ly_scm_write_string (SCM s) { - SCM port = scm_mkstrport (SCM_INUM0, + SCM port = scm_mkstrport (SCM_INUM0, 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); - gh_call2 (write, s, port); - return scm_strport_to_string (port); + scm_call_2 (write, s, port); + return ly_scm2string (scm_strport_to_string (port)); } - SCM ly_quote_scm (SCM s) { return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED); } -String +string ly_symbol2string (SCM s) { - assert (gh_symbol_p (s)); - return String ((Byte*)SCM_STRING_CHARS (s), (int) SCM_STRING_LENGTH (s)); + /* + Ugh. this is not very efficient. + */ + SCM str = scm_symbol_to_string (s); + return ly_scm2string (str); } -String -gulp_file_to_string (String fn) +string +gulp_file_to_string (string fn, bool must_exist, int size) { - String s = global_path.find (fn); + string s = global_path.find (fn); if (s == "") { - String e = _f ("can't find file: `%s'", fn); - e += " "; - e += _f ("(load path: `%s')", global_path.to_string ()); - error (e); + if (must_exist) + { + string e = _f ("cannot find file: `%s'", fn); + e += " "; + e += _f ("(load path: `%s')", global_path.to_string ()); + error (e); + /* unreachable */ + } + return s; } - else if (verbose_global_b) + + if (be_verbose_global) progress_indication ("[" + s); - int n; - char * str = gulp_file (s, &n); - String result (str); - delete[] str; - - if (verbose_global_b) + vector chars = gulp_file (s, size); + string result (&chars[0], chars.size ()); + + if (be_verbose_global) progress_indication ("]"); return result; } -LY_DEFINE(ly_gulp_file, "ly:gulp-file", 1,0, 0, - (SCM name), - "Read the file named @var{name}, and return its contents in a string. The " -" file is looked up using the lilypond search path.") +extern "C" { + // maybe gdb 5.0 becomes quicker if it doesn't do fancy C++ typing? + void + ly_display_scm (SCM s) + { + scm_display (s, scm_current_output_port ()); + scm_newline (scm_current_output_port ()); + } +}; + +/* + STRINGS + */ +string +ly_scm2string (SCM str) { - return scm_makfrom0str (gulp_file_to_string (ly_scm2string (name)).to_str0 ()); + assert (scm_is_string (str)); + return string (scm_i_string_chars (str), + (int) scm_i_string_length (str)); } - -extern "C" { - // maybe gdb 5.0 becomes quicker if it doesn't do fancy C++ typing? -void -ly_display_scm (SCM s) +SCM +ly_string2scm (string const &str) { - gh_display (s); - gh_newline (); + return scm_from_locale_stringn (str.c_str(), + str.length ()); } -}; -String -ly_scm2string (SCM s) + +char * +ly_scm2newstr (SCM str, size_t *lenp) { - assert (gh_string_p (s)); + LY_ASSERT_FIRST_TYPE(scm_is_string, str); - char *p = SCM_STRING_CHARS(s); - String r (p); - return r; + 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; } + +/* + PAIRS +*/ SCM index_get_cell (SCM s, Direction d) { - + assert (d); - return (d == LEFT) ? ly_car (s) : ly_cdr (s); + return (d == LEFT) ? scm_car (s) : scm_cdr (s); } SCM index_set_cell (SCM s, Direction d, SCM v) { if (d == LEFT) - gh_set_car_x (s, v); + scm_set_car_x (s, v); else if (d == RIGHT) - gh_set_cdr_x (s, v); + scm_set_cdr_x (s, v); return s; } - -LY_DEFINE(ly_warning,"ly:warn", 1, 0, 0, - (SCM str),"Scheme callable function to issue the warning @code{msg}.") -{ - SCM_ASSERT_TYPE (gh_string_p (str), str, SCM_ARG1, __FUNCTION__, "string"); - warning ("lily-guile: " + ly_scm2string (str)); - return SCM_BOOL_T; -} - -LY_DEFINE(ly_dir_p, "ly:dir?", 1,0, 0, (SCM s), - "type predicate. A direction is a -1, 0 or 1, where -1 represents " - "left or down and 1 represents right or up. ") -{ - if (gh_number_p (s)) - { - int i = gh_scm2int (s); - return (i>= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F; - } - return SCM_BOOL_F; -} bool is_number_pair (SCM p) { - return gh_pair_p (p) && gh_number_p (ly_car (p)) && gh_number_p (ly_cdr (p)); -} - -typedef void (*Void_fptr) (); -Array *scm_init_funcs_; - -void add_scm_init_func (void (*f) ()) -{ - if (!scm_init_funcs_) - scm_init_funcs_ = new Array; - - scm_init_funcs_->push (f); + return scm_is_pair (p) + && scm_is_number (scm_car (p)) && scm_is_number (scm_cdr (p)); } -void -ly_init_ly_module (void *data) -{ - for (int i=scm_init_funcs_->size () ; i--;) - (scm_init_funcs_->elem (i)) (); - - if (verbose_global_b) - progress_indication ("\n"); - - scm_primitive_load_path (scm_makfrom0str ("lily.scm")); -} - - -SCM lily_module ; - -void -ly_init_guile () -{ - lily_module = scm_c_define_module ("lily", ly_init_ly_module, 0); - scm_c_use_module ("lily"); -} - -unsigned int ly_scm_hash (SCM s) +unsigned int +ly_scm_hash (SCM s) { return scm_ihashv (s, ~1u); } - bool -is_direction (SCM s) +is_axis (SCM s) { - if (gh_number_p (s)) + if (scm_is_number (s)) { - int i = gh_scm2int (s); - return i>= -1 && i <= 1; + int i = scm_to_int (s); + return i == 0 || i == 1; } return false; } - bool -is_axis (SCM s) +to_boolean (SCM s) { - if (gh_number_p (s)) - { - int i = gh_scm2int (s); - return i== 0 || i == 1; - } - return false; + return scm_is_bool (s) && ly_scm2bool (s); } - +/* + DIRECTIONS + */ Direction to_dir (SCM s) { - return SCM_INUMP (s) ? (Direction) gh_scm2int (s) : CENTER; + return scm_is_integer (s) ? (Direction) scm_to_int (s) : CENTER; } -Interval -ly_scm2interval (SCM p) -{ - return Interval (gh_scm2double (ly_car (p)), - gh_scm2double (ly_cdr (p))); -} - -SCM -ly_interval2scm (Drul_array i) +Direction +robust_scm2dir (SCM d, Direction def) { - return gh_cons (gh_double2scm (i[LEFT]), - gh_double2scm (i[RIGHT])); + if (is_direction (d)) + def = to_dir (d); + return def; } - - - bool -to_boolean (SCM s) +is_direction (SCM s) { - return gh_boolean_p (s) && gh_scm2bool (s); + if (scm_is_number (s)) + { + int i = scm_to_int (s); + return i >= -1 && i <= 1; + } + return false; } /* - Appendable list L: the cdr contains the list, the car the last cons - in the list. + INTERVALS */ -SCM -appendable_list () +Interval +ly_scm2interval (SCM p) { - SCM s = gh_cons (SCM_EOL, SCM_EOL); - gh_set_car_x (s, s); - - return s; + return Interval (scm_to_double (scm_car (p)), scm_to_double (scm_cdr (p))); } -void -appendable_list_append (SCM l, SCM elt) +Drul_array +ly_scm2realdrul (SCM p) { - SCM newcons = gh_cons (elt, SCM_EOL); - - gh_set_cdr_x (ly_car (l), newcons); - gh_set_car_x (l, newcons); + return Drul_array (scm_to_double (scm_car (p)), + scm_to_double (scm_cdr (p))); } - SCM -ly_offset2scm (Offset o) -{ - return gh_cons (gh_double2scm (o[X_AXIS]), gh_double2scm (o[Y_AXIS])); -} - -Offset -ly_scm2offset (SCM s) -{ - return Offset (gh_scm2double (ly_car (s)), - gh_scm2double (ly_cdr (s))); -} - - -LY_DEFINE(ly_number2string, "ly:number->string", 1, 0,0, - (SCM s), - " converts @var{num} to a string without generating many decimals. It " -"leaves a space at the end.") +ly_interval2scm (Drul_array i) { - SCM_ASSERT_TYPE (gh_number_p (s), s, SCM_ARG1, __FUNCTION__, "number"); - - char str[400]; // ugh. - - if (scm_exact_p (s) == SCM_BOOL_F) - { - Real r (gh_scm2double (s)); - - if (my_isinf (r) || my_isnan (r)) - { - programming_error ("Infinity or NaN encountered while converting Real number; setting to zero."); - r = 0.0; - } - - sprintf (str, "%8.4f ", r); - } - else - { - sprintf (str, "%d ", gh_scm2int (s)); - } - - return scm_makfrom0str (str); + return scm_cons (scm_from_double (i[LEFT]), scm_from_double (i[RIGHT])); } -/* - Undef this to see if GUILE GC is causing too many swaps. - */ - -//#define TEST_GC - -#ifdef TEST_GC -#include -static void * -greet_sweep (void *dummy1, void *dummy2, void *dummy3) +Interval +robust_scm2interval (SCM k, Drul_array v) { - fprintf (stderr, "entering sweep\n"); + Interval i; + i[LEFT] = v[LEFT]; + i[RIGHT] = v[RIGHT]; + if (is_number_pair (k)) + i = ly_scm2interval (k); + return i; } -static void * -wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3) +Drul_array +robust_scm2drul (SCM k, Drul_array v) { - fprintf (stderr, "leaving sweep\n"); + if (is_number_pair (k)) + v = ly_scm2interval (k); + return v; } -#endif - -#include "version.hh" -LY_DEFINE(ly_version, "ly:version", 0, 0, 0, (), - "Return the current lilypond version as a list, e.g. @code{(1 3 127 uu1)}. ") +Drul_array +robust_scm2booldrul (SCM k, Drul_array def) { - char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " " PATCH_LEVEL " " MY_PATCH_LEVEL ")" ; - - return gh_eval_str ((char*)vs); + if (scm_is_pair (k)) + { + def[LEFT] = to_boolean (scm_car (k)); + def[RIGHT] = to_boolean (scm_cdr (k)); + } + return def; } -LY_DEFINE(ly_unit, "ly:unit", 0, 0, 0, (), - "Return the unit used for lengths as a string.") +/* + OFFSET +*/ +SCM +ly_offset2scm (Offset o) { - return scm_makfrom0str (INTERNAL_UNIT); + return scm_cons (scm_from_double (o[X_AXIS]), scm_from_double (o[Y_AXIS])); } - - -LY_DEFINE(ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d), - "Return @var{d} is a number. Used to distinguish length " - "variables from normal numbers.") +Offset +ly_scm2offset (SCM s) { - return scm_number_p (d); + return Offset (scm_to_double (scm_car (s)), + scm_to_double (scm_cdr (s))); } -static void -init_functions () +Offset +robust_scm2offset (SCM k, Offset o) { -#ifdef TEST_GC - scm_c_hook_add (&scm_before_mark_c_hook, greet_sweep, 0, 0); - scm_c_hook_add (&scm_before_sweep_c_hook, wave_sweep_goodbye, 0, 0); -#endif + if (is_number_pair (k)) + o = ly_scm2offset (k); + return o; } - -ADD_SCM_INIT_FUNC (funcs, init_functions); - SCM -ly_deep_copy (SCM src) +ly_offsets2scm (vector os) { - if (gh_pair_p (src)) - { - return gh_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src))); - } - else if (gh_vector_p (src)) + SCM l = SCM_EOL; + SCM *tail = &l; + for (vsize i = 0; i < os.size (); i++) { - int l = SCM_VECTOR_LENGTH (src); - SCM nv = scm_c_make_vector (l, SCM_UNDEFINED); - for (int i =0 ; i< l ; i++) - { - SCM si = gh_int2scm (i); - scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si))); - } + *tail = scm_cons (ly_offset2scm (os[i]), SCM_EOL); + tail = SCM_CDRLOC(*tail); } - else - return src; - - return src; + return l; } - - - -SCM -ly_assoc_chain (SCM key, SCM achain) +vector +ly_scm2offsets (SCM s) { - if (gh_pair_p (achain)) - { - SCM handle = scm_assoc (key, ly_car (achain)); - if (gh_pair_p (handle)) - return handle; - else - return ly_assoc_chain (key, ly_cdr (achain)); - } - else - return SCM_BOOL_F; + vector os; + for (; scm_is_pair (s); s = scm_cdr (s)) + os.push_back (ly_scm2offset (scm_car (s))); + return os; } -/* looks the key up in the cdrs of the alist-keys - - ignoring the car and ignoring non-pair keys. - Returns first match found, i.e. - - alist = ((1 . 10) - ((1 . 2) . 11) - ((2 . 1) . 12) - ((3 . 0) . 13) - ((4 . 1) . 14) ) -I would like (ly_assoc_cdr 1) to return 12 - because it's the first -element with the cdr of the key = 1. In other words (alloc_cdr key) -corresponds to call -(alloc (anything . key)) - - - -*/ -SCM -ly_assoc_cdr (SCM key, SCM alist) -{ - if (gh_pair_p (alist)) { - SCM trykey = ly_caar(alist); - if(gh_pair_p(trykey) && to_boolean(scm_equal_p(key,ly_cdr(trykey)))) - return ly_car(alist); - else - return ly_assoc_cdr (key, ly_cdr (alist)); - } - else - return SCM_BOOL_F; -} /* - LIST has the form "sym1 sym2 sym3\nsym4\nsym5" + ALIST +*/ - i.e. \n and ' ' can be used interchangeably as separators. - */ -SCM -parse_symbol_list (const char * list) +bool +alist_equal_p (SCM a, SCM b) { - char * s = strdup (list); - char *orig = s; - SCM create_list = SCM_EOL; + 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); - char * e = s + strlen (s) - 1; - while (e >= s && isspace (*e)) - *e -- = 0; + if (l == SCM_BOOL_F + || !ly_is_equal (scm_cdr (l), val)) - for (char * p = s; *p; p++) - { - if (*p == '\n') - *p = ' ' ; + return false; } - - if (!s[0] ) - s = 0; + return true; +} +SCM +ly_alist_vals (SCM alist) +{ + SCM x = SCM_EOL; + for (SCM p = alist; scm_is_pair (p); p = scm_cdr (p)) + x = scm_cons (scm_cdar (p), x); + return x; +} - - while (s) - { - char *next = strchr (s, ' '); - if (next) - *next++ = 0; +/* + LISTS + */ - create_list = gh_cons (ly_symbol2scm (s), create_list); - s = next; - } +/* Return I-th element, or last elt L. If I < 0, then we take the first + element. - free (orig); - return create_list; + PRE: length (L) > 0 */ +SCM +robust_list_ref (int i, SCM l) +{ + while (i-- > 0 && scm_is_pair (scm_cdr (l))) + l = scm_cdr (l); + return scm_car (l); } SCM -ly_truncate_list (int k, SCM l ) +ly_deep_copy (SCM src) { - if (k == 0) + 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)) { - l = SCM_EOL; - } - else - { - SCM s = l; - k--; - for (; gh_pair_p (s) && k--; s = ly_cdr (s)) - ; - - if (gh_pair_p (s)) + int len = scm_c_vector_length (src); + SCM nv = scm_c_make_vector (len, SCM_UNDEFINED); + for (int i = 0;i < len; i++) { - gh_set_cdr_x (s, SCM_EOL); + SCM si = scm_from_int (i); + scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si))); } } - return l; + return src; } - -String +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.left_string (100) + "\n :\n :\n" + realval.right_string (100); - - return realval; + realval = realval.substr (0, 100) + + "\n :\n :\n" + + realval.substr (realval.length () - 100); + return realval; } bool -type_check_assignment (SCM sym, SCM val, SCM type_symbol) +type_check_assignment (SCM sym, SCM val, SCM type_symbol) { bool ok = true; @@ -552,11 +412,11 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) TODO: should remove #f from allowed vals? - */ + */ if (val == SCM_EOL || val == SCM_BOOL_F) return ok; - if (!gh_symbol_p (sym)) + if (!scm_is_symbol (sym)) #if 0 return false; #else @@ -566,119 +426,106 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) 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); - if (type != SCM_EOL && !gh_procedure_p (type)) - { - warning (_f ("Can't find property type-check for `%s' (%s).", - ly_symbol2string (sym).to_str0 (), - ly_symbol2string (type_symbol).to_str0 ()) - + " " + _ ("Perhaps you made a typing error?")); - - /* Be strict when being anal :) */ - if (internal_type_checking_global_b) - abort (); - - warning (_ ("Doing assignment anyway.")); - } + 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?")); + + /* 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)); + + warning (_ ("doing assignment anyway")); + } else { if (val != SCM_EOL - && gh_procedure_p (type) - && gh_call1 (type, val) == SCM_BOOL_F) + && ly_is_procedure (type) + && scm_call_1 (type, val) == SCM_BOOL_F) { - SCM errport = scm_current_error_port (); ok = false; - SCM typefunc = scm_primitive_eval (ly_symbol2scm ("type-name")); - SCM type_name = gh_call1 (typefunc, type); - - - scm_puts (_f ("Type check for `%s' failed; value `%s' must be of type `%s'", - ly_symbol2string (sym).to_str0 (), - print_scm_val (val), - ly_scm2string (type_name).to_str0 ()).to_str0 (), - errport); - scm_puts ("\n", errport); + 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; } - /* some SCM abbrevs - zijn deze nou handig? - zijn ze er al in scheme, maar heten ze anders? */ - +zijn deze nou handig? +zijn ze er al in scheme, maar heten ze anders? */ /* Remove doubles from (sorted) list */ SCM ly_unique (SCM list) { SCM unique = SCM_EOL; - for (SCM i = list; gh_pair_p (i); i = ly_cdr (i)) + for (SCM i = list; scm_is_pair (i); i = scm_cdr (i)) { - if (!gh_pair_p (ly_cdr (i)) - || !gh_equal_p (ly_car (i), ly_cadr (i))) - unique = gh_cons (ly_car (i), unique); + if (!scm_is_pair (scm_cdr (i)) + || !ly_is_equal (scm_car (i), scm_cadr (i))) + unique = scm_cons (scm_car (i), unique); } return scm_reverse_x (unique, SCM_EOL); } -/* tail add */ -SCM -ly_snoc (SCM s, SCM list) -{ - return gh_append2 (list, scm_list_n (s, SCM_UNDEFINED)); -} - /* Split list at member s, removing s. - Return (BEFORE . AFTER) */ + Return (BEFORE . AFTER) */ SCM ly_split_list (SCM s, SCM list) { SCM before = SCM_EOL; SCM after = list; - for (; gh_pair_p (after);) + for (; scm_is_pair (after);) { - SCM i = ly_car (after); - after = ly_cdr (after); - if (gh_equal_p (i, s)) + SCM i = scm_car (after); + after = scm_cdr (after); + if (ly_is_equal (i, s)) break; - before = gh_cons (i, before); + before = scm_cons (i, before); } - return gh_cons ( scm_reverse_x (before, SCM_EOL), after); - + return scm_cons (scm_reverse_x (before, SCM_EOL), after); } - void taint (SCM *) { /* nop. - */ + */ } /* display stuff without using stack - */ +*/ SCM display_list (SCM s) { - SCM p = scm_current_output_port(); + SCM p = scm_current_output_port (); scm_puts ("(", p); - for (; gh_pair_p(s); s =gh_cdr(s)) + for (; scm_is_pair (s); s = scm_cdr (s)) { - scm_display (gh_car(s), p); - scm_puts (" ", p); + scm_display (scm_car (s), p); + scm_puts (" ", p); } scm_puts (")", p); return SCM_UNSPECIFIED; @@ -689,30 +536,148 @@ int_list_to_slice (SCM l) { Slice s; s.set_empty (); - for (; gh_pair_p (l); l = gh_cdr (l)) - { - if (gh_number_p (gh_car (l))) - s.add_point (gh_scm2int (gh_car (l))); - } + for (; scm_is_pair (l); l = scm_cdr (l)) + if (scm_is_number (scm_car (l))) + s.add_point (scm_to_int (scm_car (l))); + return s; +} +Real +robust_scm2double (SCM k, double x) +{ + if (scm_is_number (k)) + x = scm_to_double (k); + return x; +} + + +string +robust_scm2string (SCM k, string s) +{ + if (scm_is_string (k)) + s = ly_scm2string (k); return s; } +int +robust_scm2int (SCM k, int o) +{ + if (scm_integer_p (k) == SCM_BOOL_T) + o = scm_to_int (k); + return o; +} +SCM +ly_rational2scm (Rational r) +{ + return scm_divide (scm_from_int (r.numerator ()), scm_from_int (r.denominator ())); +} -/* - Return I-th element, or last elt L. If I < 0, then we take the first - element. - PRE: length (L) > 0 +Rational +ly_scm2rational (SCM r) +{ + return Rational (scm_to_int (scm_numerator (r)), + scm_to_int (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) +{ + int i = scm_ilength (alist); + if (i < 0) + return scm_c_make_hash_table (0); + + SCM tab = scm_c_make_hash_table (i); + for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s)) + { + SCM pt = scm_cdar (s); + scm_hashq_set_x (tab, scm_caar (s), pt); + } + return tab; +} + +SCM +ly_hash2alist (SCM tab) +{ + SCM func = ly_lily_module_constant ("hash-table->alist"); + return scm_call_1 (func, tab); +} + + +/* + C++ interfacing. */ + +string +mangle_cxx_identifier (string cxx_id) +{ + if (cxx_id.substr (0, 3) == "ly_") + cxx_id = cxx_id.replace (0, 3, "ly:"); + else + { + cxx_id = String_convert::to_lower (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, 2, "?"); + 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, '_', '-'); + + + return cxx_id; +} + + + SCM -robust_list_ref(int i, SCM l) +ly_string_array_to_scm (vector a) { - while (i-- > 0 && gh_pair_p (gh_cdr(l))) - l = gh_cdr (l); + SCM s = SCM_EOL; + for (vsize i = a.size (); i ; i--) + s = scm_cons (ly_symbol2scm (a[i - 1].c_str ()), s); + return s; +} - return gh_car(l); +/* SYMBOLS is a whitespace separated list. */ +SCM +parse_symbol_list (char const *symbols) +{ + while (isspace (*symbols)) + *symbols++; + string s = symbols; + replace_all (s, '\n', ' '); + replace_all (s, '\t', ' '); + return ly_string_array_to_scm (string_split (s, ' ')); +} + +/* GDB debugging. */ +struct ly_t_double_cell +{ + SCM a; + SCM b; + SCM c; + SCM d; +}; + +/* inserts at front, removing duplicates */ +SCM ly_assoc_prepend_x (SCM alist, SCM key, SCM val) +{ + return scm_acons (key, val, scm_assoc_remove_x (alist, key)); }