X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=bde39214b39faff40af98548533a3ed7a6bb716b;hb=b416f10429d8d3881445d9000ff422dc67176df1;hp=773f072aa350ea52d1e24f651d17fdff1b5359f8;hpb=fb8e45789da5792f70866d3614691e0cbab7593b;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 773f072aa3..bde39214b3 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -1,691 +1,529 @@ /* - lily-guile.cc -- implement assorted guile functions + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2015 Jan Nieuwenhuizen + Han-Wen Nienhuys - (c) 1998--2004 Jan Nieuwenhuizen - - Han-Wen Nienhuys -*/ - - -#include -#include -#include /* isinf */ -#include /* strdup, strchr */ -#include - -#include "lily-proto.hh" - -/* macosx fix: + 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. - source-file.hh includes cmath which undefines isinf and isnan + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -inline int my_isinf(Real r) { return isinf(r); } -inline int my_isnan(Real r) { return isnan(r); } +#include "lily-guile.hh" + +#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" +#include "version.hh" +#include "warn.hh" +#include "lily-imports.hh" -// #define TEST_GC - -SCM -ly_last (SCM list) -{ - return ly_car (scm_last_pair (list)); -} - - -SCM -ly_write2scm (SCM s) +/* + symbols/strings. + */ +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 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); + return scm_list_2 (ly_symbol2scm ("quote"), s); } -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. + */ + return ly_scm2string (scm_symbol_to_string (s)); } -String -gulp_file_to_string (String fn) +string +robust_symbol2string (SCM sym, const string &str) { - String s = global_path.find (fn); + 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 == "") { - 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) - progress_indication ("[" + s); - int n; - char * str = gulp_file (s, &n); - String result (str); - delete[] str; - - if (verbose_global_b) - progress_indication ("]"); + debug_output ("[" + s, true); - return result; -} + vector chars = gulp_file (s, size); + string result (&chars[0], chars.size ()); -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.") -{ - return scm_makfrom0str (gulp_file_to_string (ly_scm2string (name)).to_str0 ()); -} + debug_output ("]\n", false); + return result; +} extern "C" { // maybe gdb 5.0 becomes quicker if it doesn't do fancy C++ typing? -void -ly_display_scm (SCM s) + 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) { - gh_display (s); - gh_newline (); + assert (scm_is_string (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; } -}; -String -ly_scm2string (SCM s) +SCM +ly_string2scm (string const &str) { - assert (gh_string_p (s)); + return scm_from_locale_stringn (str.c_str (), + str.length ()); +} - char *p = SCM_STRING_CHARS(s); - String r (p); - return r; +char * +ly_scm2str0 (SCM str) +{ + return scm_to_utf8_string (str); } +/* + 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)); + return scm_is_pair (p) + && scm_is_number (scm_car (p)) && scm_is_number (scm_cdr (p)); } -typedef void (*Void_fptr) (); -Array *scm_init_funcs_; - -void add_scm_init_func (void (*f) ()) +unsigned int +ly_scm_hash (SCM s) { - if (!scm_init_funcs_) - scm_init_funcs_ = new Array; - - scm_init_funcs_->push (f); + return scm_ihashv (s, ~1u); } - -void -ly_init_ly_module (void *) +bool +is_axis (SCM s) { - 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")); + if (scm_is_integer (s)) + { + int i = scm_to_int (s); + return i == 0 || i == 1; + } + return false; } - -SCM lily_module ; - -void -ly_init_guile () +bool +to_boolean (SCM s) { - lily_module = scm_c_define_module ("lily", ly_init_ly_module, 0); - scm_c_use_module ("lily"); + return scm_is_bool (s) && ly_scm2bool (s); } -unsigned int ly_scm_hash (SCM s) +/* + DIRECTIONS + */ +Direction +to_dir (SCM s) { - return scm_ihashv (s, ~1u); + return scm_is_integer (s) ? (Direction) scm_to_int (s) : CENTER; } - - -bool -is_direction (SCM s) +Direction +robust_scm2dir (SCM d, Direction def) { - if (gh_number_p (s)) - { - int i = gh_scm2int (s); - return i>= -1 && i <= 1; - } - return false; + if (is_direction (d)) + def = to_dir (d); + return def; } - bool -is_axis (SCM s) +is_direction (SCM s) { - if (gh_number_p (s)) + if (scm_is_number (s)) { - int i = gh_scm2int (s); - return i== 0 || i == 1; + int i = scm_to_int (s); + return i >= -1 && i <= 1; } return false; } - -Direction -to_dir (SCM s) -{ - return SCM_INUMP (s) ? (Direction) gh_scm2int (s) : CENTER; -} - +/* + INTERVALS + */ Interval ly_scm2interval (SCM p) { - return Interval (gh_scm2double (ly_car (p)), - gh_scm2double (ly_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 (gh_scm2double (ly_car (p)), - gh_scm2double (ly_cdr (p))); + return Drul_array (scm_to_double (scm_car (p)), + scm_to_double (scm_cdr (p))); } SCM ly_interval2scm (Drul_array i) { - return gh_cons (gh_double2scm (i[LEFT]), - gh_double2scm (i[RIGHT])); + return scm_cons (scm_from_double (i[LEFT]), scm_from_double (i[RIGHT])); } - - - -bool -to_boolean (SCM s) +Interval +robust_scm2interval (SCM k, Drul_array v) { - return gh_boolean_p (s) && gh_scm2bool (s); + Interval i; + i[LEFT] = v[LEFT]; + i[RIGHT] = v[RIGHT]; + if (is_number_pair (k)) + i = ly_scm2interval (k); + return i; } -/* - Appendable list L: the cdr contains the list, the car the last cons - in the list. - */ -SCM -appendable_list () +Drul_array +robust_scm2drul (SCM k, Drul_array v) { - SCM s = gh_cons (SCM_EOL, SCM_EOL); - gh_set_car_x (s, s); - - return s; + if (is_number_pair (k)) + v = ly_scm2interval (k); + return v; } -void -appendable_list_append (SCM l, SCM elt) +Drul_array +robust_scm2booldrul (SCM k, Drul_array def) { - SCM newcons = gh_cons (elt, SCM_EOL); - - gh_set_cdr_x (ly_car (l), newcons); - gh_set_car_x (l, newcons); + if (scm_is_pair (k)) + { + def[LEFT] = to_boolean (scm_car (k)); + def[RIGHT] = to_boolean (scm_cdr (k)); + } + return def; } - +/* + OFFSET +*/ SCM ly_offset2scm (Offset o) { - return gh_cons (gh_double2scm (o[X_AXIS]), gh_double2scm (o[Y_AXIS])); + return scm_cons (scm_from_double (o[X_AXIS]), scm_from_double (o[Y_AXIS])); } Offset ly_scm2offset (SCM s) { - return Offset (gh_scm2double (ly_car (s)), - gh_scm2double (ly_cdr (s))); + return Offset (scm_to_double (scm_car (s)), + scm_to_double (scm_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.") -{ - 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); -} - -/* - 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) -{ - fprintf (stderr, "entering sweep\n"); -} - -static void * -wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3) -{ - fprintf (stderr, "leaving sweep\n"); -} -#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)}. ") -{ - char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " " PATCH_LEVEL " " MY_PATCH_LEVEL ")" ; - - return gh_eval_str ((char*)vs); -} - -LY_DEFINE(ly_unit, "ly:unit", 0, 0, 0, (), - "Return the unit used for lengths as a string.") -{ - return scm_makfrom0str (INTERNAL_UNIT); -} - - - -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.") -{ - return scm_number_p (d); -} - -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)) + SCM l = SCM_EOL; + SCM *tail = &l; + for (vsize i = 0; i < os.size (); i++) { - return gh_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src))); + *tail = scm_cons (ly_offset2scm (os[i]), SCM_EOL); + tail = SCM_CDRLOC (*tail); } - else if (gh_vector_p (src)) - { - 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))); - } - } - 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)) - - - +/* + ALIST */ 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; +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; } /* - LIST has the form "sym1 sym2 sym3\nsym4\nsym5" - - i.e. \n and ' ' can be used interchangeably as separators. + LISTS */ -SCM -parse_symbol_list (const char * list) -{ - char * s = strdup (list); - char *orig = s; - SCM create_list = SCM_EOL; - - char * e = s + strlen (s) - 1; - while (e >= s && isspace (*e)) - *e -- = 0; - - for (char * p = s; *p; p++) - { - if (*p == '\n') - *p = ' ' ; - } - - if (!s[0] ) - s = 0; - - - while (s) - { - char *next = strchr (s, ' '); - if (next) - *next++ = 0; - - 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)) { - l = SCM_EOL; + 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; } - else + if (scm_is_vector (src)) { - SCM s = l; - k--; - for (; gh_pair_p (s) && k--; s = ly_cdr (s)) - ; - - if (gh_pair_p (s)) - { - gh_set_cdr_x (s, SCM_EOL); - } + 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))); + } + return nv; } - 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; - /* - Always succeeds. + // If undefined, some internal function caused it...should never happen. + assert (!SCM_UNBNDP (val)); + if (!scm_is_symbol (sym)) + return false; + SCM type = scm_object_property (sym, type_symbol); - TODO: should remove #f from allowed vals? - */ - if (val == SCM_EOL || val == SCM_BOOL_F) - return ok; + if (!scm_is_null (type) && !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 (_ ("skipping assignment")); + return false; + } - if (!gh_symbol_p (sym)) -#if 0 - return false; -#else /* - This is used for autoBeamSettings. + Always succeeds. - 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); + TODO: should remove #f from allowed vals? + */ + if (scm_is_null (val) || scm_is_false (val)) + return true; - 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.")); - } - else + if (!scm_is_null (val) + && ly_is_procedure (type) + && scm_is_false (scm_call_1 (type, val))) { - if (val != SCM_EOL - && gh_procedure_p (type) - && gh_call1 (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 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 ok; + 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); + } + scm_wrong_type_arg_msg (mangle_cxx_identifier (fun).c_str (), + number, var, type.c_str ()); +} -/* some SCM abbrevs - zijn deze nou handig? - zijn ze er al in scheme, maar heten ze anders? */ +/* some SCM abbrevs +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)) - break; - before = gh_cons (i, before); + SCM i = scm_car (after); + after = scm_cdr (after); + if (ly_is_equal (i, s)) + break; + 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; @@ -696,103 +534,208 @@ 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; +} -/* - Return I-th element, or last elt L. If I < 0, then we take the first - element. +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; +} - PRE: length (L) > 0 - */ SCM -robust_list_ref(int i, SCM l) +ly_floatvector2scm (vector v) { - while (i-- > 0 && gh_pair_p (gh_cdr(l))) - l = gh_cdr (l); - - return gh_car(l); + 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; } - - -Real -robust_scm2double (SCM k, double x) +string +robust_scm2string (SCM k, const string &s) { - if (gh_number_p (k)) - x = gh_scm2double (k); - return x; + if (scm_is_string (k)) + return ly_scm2string (k); + return s; } -Interval -robust_scm2interval (SCM k, Drul_array v) +int +robust_scm2int (SCM k, int o) { - Interval i; - i[LEFT]= v[LEFT]; - i[RIGHT]= v[RIGHT]; - if (is_number_pair (k)) - i = ly_scm2interval (k); - return i; + if (scm_is_integer (k)) + o = scm_to_int (k); + return o; } -Drul_array -robust_scm2drul (SCM k, Drul_array v) +vsize +robust_scm2vsize (SCM k, vsize o) { - if (is_number_pair (k)) - v = ly_scm2interval (k); - return v; + if (scm_is_integer (k)) + { + int i = scm_to_int (k); + if (i >= 0) + return (vsize) i; + } + return o; } -Offset -robust_scm2offset (SCM k, Offset o) +SCM +ly_rational2scm (Rational r) { - if (is_number_pair (k)) - o = ly_scm2offset (k); + if (r.is_infinity ()) + { + if (r > Rational (0)) + return scm_inf (); - return o; -} + return scm_difference (scm_inf (), SCM_UNDEFINED); + } + return scm_divide (scm_from_int64 (r.numerator ()), + scm_from_int64 (r.denominator ())); +} -int -robust_scm2int (SCM k, int o) +Rational +ly_scm2rational (SCM r) { - if (scm_integer_p (k) == SCM_BOOL_T) - o = gh_scm2int (k); + 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 o; + return Rational (scm_to_int64 (scm_numerator (r)), + scm_to_int64 (scm_denominator (r))); } +Rational +robust_scm2rational (SCM n, Rational rat) +{ + 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) { int i = scm_ilength (alist); if (i < 0) - return scm_make_vector (gh_int2scm (0), SCM_EOL); - - SCM tab = scm_make_vector (gh_int2scm (i), SCM_EOL); - for (SCM s = alist; gh_pair_p (s); s = ly_cdr (s)) + 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 = ly_cdar (s); - scm_hashq_set_x (tab, ly_caar (s), pt); + SCM pt = scm_cdar (s); + scm_hashq_set_x (tab, scm_caar (s), pt); } - return tab; + return tab; +} + +SCM +ly_hash2alist (SCM tab) +{ + return Lily::hash_table_to_alist (tab); } -#if 1 /* - Debugging mem leaks: + C++ interfacing. */ -LY_DEFINE(ly_protects, "ly:protects", 0, 0, 0, (), - "Return hash of protected objects.") + +string +mangle_cxx_identifier (string cxx_id) { - return scm_protects; + 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, "!"); + + 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--) + s = scm_cons (ly_symbol2scm (a[i - 1].c_str ()), s); + return s; +} + +/* 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', ' '); + replace_all (&s, " ", " "); + 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)); } -#endif +