X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=182ed7e02a2dc4f4792c46731f242ca26160a03f;hb=adaa7aecab8595596fc6505402b40a37a04716e6;hp=0bcc0956362bd658449547c56014db64e0c4b27e;hpb=8144751cb757612145b419a3ef53c972c1703747;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 0bcc095636..182ed7e02a 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -1,161 +1,163 @@ /* - 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--2004 Jan Nieuwenhuizen - Han-Wen Nienhuys + (c) 1998--2006 Jan Nieuwenhuizen + Han-Wen Nienhuys */ +#include "lily-guile.hh" -#include -#include -#include /* isinf */ -#include /* strdup, strchr */ -#include - -#include "lily-proto.hh" -#include "version.hh" - -/* MacOS S fix: - source-file.hh includes cmath which undefines isinf and isnan - - FIXME: #ifdef MACOS_X? -*/ -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" +#include "version.hh" +#include "warn.hh" -// #define TEST_GC +/* + symbols/strings. + */ SCM -ly_last (SCM list) +ly_to_symbol (SCM scm) { - return ly_car (scm_last_pair (list)); + return scm_string_to_symbol (ly_to_string (scm)); } +SCM +ly_to_string (SCM scm) +{ + return scm_call_3 (ly_lily_module_constant ("format"), SCM_BOOL_F, + + scm_makfrom0str ("~S"), scm); +} SCM ly_write2scm (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); scm_call_2 (write, s, port); return 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 (ly_c_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 ("can't 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 @var{name}, and return its contents in a string. " - "The file is looked up using the search path.") -{ - SCM_ASSERT_TYPE (ly_c_string_p (name), name, SCM_ARG1, __FUNCTION__, "string"); - return scm_makfrom0str (gulp_file_to_string (ly_scm2string (name)).to_str0 ()); -} - - 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 ()); -} + void + ly_display_scm (SCM s) + { + scm_display (s, scm_current_output_port ()); + scm_newline (scm_current_output_port ()); + } }; -String -ly_scm2string (SCM s) +/* + STRINGS + */ +string +ly_scm2string (SCM str) { - assert (ly_c_string_p (s)); - - char *p = SCM_STRING_CHARS (s); - String r (p); - return r; + assert (scm_is_string (str)); + return string (scm_i_string_chars (str), + (int) scm_i_string_length (str)); } char * ly_scm2newstr (SCM str, size_t *lenp) { - SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string"); + SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); - size_t len = SCM_STRING_LENGTH (str); + size_t len = scm_i_string_length (str); if (char *new_str = (char *) malloc ((len + 1) * sizeof (char))) { - memcpy (new_str, SCM_STRING_CHARS (str), len); + 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 @@ -167,72 +169,14 @@ index_set_cell (SCM s, Direction d, SCM v) scm_set_cdr_x (s, v); return s; } - -LY_DEFINE (ly_warn, "ly:warn", - 1, 0, 1, (SCM str, SCM rest), - "Scheme callable function to issue the warning @code{msg}. " - "The message is formatted with @code{format} and @code{rest}.") -{ - SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string"); - progress_indication ("\n"); - - str = scm_simple_format (SCM_BOOL_F, str, rest); - warning ("lily-guile: " + ly_scm2string (str)); - return SCM_UNSPECIFIED; -} - -LY_DEFINE (ly_dir_p, "ly:dir?", - 1, 0, 0, (SCM s), - "type predicate. A direction is @code{-1}, @code{0} or " - "@code{1}, where @code{-1} represents " - "left or down and @code{1} represents right or up.") -{ - if (ly_c_number_p (s)) - { - int i = ly_scm2int (s); - return (i>= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F; - } - return SCM_BOOL_F; -} bool is_number_pair (SCM p) { - return ly_c_pair_p (p) - && ly_c_number_p (ly_car (p)) && ly_c_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); -} - -void -ly_init_ly_module (void *) -{ - 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")); + return scm_is_pair (p) + && scm_is_number (scm_car (p)) && scm_is_number (scm_cdr (p)); } -SCM global_lily_module; - -void -ly_c_init_guile () -{ - global_lily_module = scm_c_define_module ("lily", ly_init_ly_module, 0); - scm_c_use_module ("lily"); -} unsigned int ly_scm_hash (SCM s) @@ -240,246 +184,251 @@ ly_scm_hash (SCM s) return scm_ihashv (s, ~1u); } + bool -is_direction (SCM s) +is_axis (SCM s) { - if (ly_c_number_p (s)) + if (scm_is_number (s)) { - int i = ly_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 (ly_c_number_p (s)) - { - int i = ly_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_is_integer (s) ? (Direction) ly_scm2int (s) : CENTER; + return scm_is_integer (s) ? (Direction) scm_to_int (s) : CENTER; +} + +Direction +robust_scm2dir (SCM d, Direction def) +{ + if (is_direction (d)) + def = to_dir (d); + return def; } +bool +is_direction (SCM s) +{ + if (scm_is_number (s)) + { + int i = scm_to_int (s); + return i >= -1 && i <= 1; + } + return false; +} + +/* + INTERVALS + */ Interval ly_scm2interval (SCM p) { - return Interval (ly_scm2double (ly_car (p)), ly_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 (ly_scm2double (ly_car (p)), - ly_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 scm_cons (scm_make_real (i[LEFT]), scm_make_real (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 ly_c_boolean_p (s) && ly_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 = scm_cons (SCM_EOL, SCM_EOL); - scm_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 = scm_cons (elt, SCM_EOL); - - scm_set_cdr_x (ly_car (l), newcons); - scm_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 scm_cons (scm_make_real (o[X_AXIS]), scm_make_real (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 (ly_scm2double (ly_car (s)), - ly_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), - "Convert @var{num} to a string without generating many decimals.") +Offset +robust_scm2offset (SCM k, Offset o) { - SCM_ASSERT_TYPE (ly_c_number_p (s), s, SCM_ARG1, __FUNCTION__, "number"); - - char str[400]; // ugh. - - if (scm_exact_p (s) == SCM_BOOL_F) + if (is_number_pair (k)) + o = ly_scm2offset (k); + return o; +} +SCM +ly_offsets2scm (vector os) +{ + SCM l = SCM_EOL; + SCM *tail = &l; + for (vsize i = 0; i < os.size (); i++) { - Real r (ly_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, "%08.4f", r); + *tail = scm_cons (ly_offset2scm (os[i]), SCM_EOL); + tail = SCM_CDRLOC(*tail); } - else - sprintf (str, "%d", ly_scm2int (s)); + return l; +} - return scm_makfrom0str (str); +vector +ly_scm2offsets (SCM s) +{ + vector os; + for (; scm_is_pair (s); s = scm_cdr (s)) + os.push_back (ly_scm2offset (scm_car (s))); + return os; } -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 scm_c_eval_string ((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); -} +/* + ALIST +*/ +/* 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) ) -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); -} + 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_deep_copy (SCM src) +ly_assoc_cdr (SCM key, SCM alist) { - if (ly_c_pair_p (src)) - return scm_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src))); - else if (ly_c_vector_p (src)) + if (scm_is_pair (alist)) { - int len = SCM_VECTOR_LENGTH (src); - SCM nv = scm_c_make_vector (len, SCM_UNDEFINED); - for (int i =0 ; i < len ; i++) - { - SCM si = scm_int2num (i); - scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si))); - } + SCM trykey = scm_caar (alist); + if (scm_is_pair (trykey) + && to_boolean (scm_equal_p (key, scm_cdr (trykey)))) + return scm_car (alist); + return ly_assoc_cdr (key, scm_cdr (alist)); } - return src; + return SCM_BOOL_F; } - - -SCM -ly_assoc_chain (SCM key, SCM achain) +bool +alist_equal_p (SCM a, SCM b) { - if (ly_c_pair_p (achain)) + for (SCM s = a; + scm_is_pair (s); s = scm_cdr (s)) { - SCM handle = scm_assoc (key, ly_car (achain)); - if (ly_c_pair_p (handle)) - return handle; - else - return ly_assoc_chain (key, ly_cdr (achain)); - } - else - return SCM_BOOL_F; -} + SCM key = scm_caar (s); + SCM val = scm_cdar (s); + SCM l = scm_assoc (key, b); -/* 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) ) + if (l == SCM_BOOL_F + || !ly_is_equal (scm_cdr (l), val)) -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 + return false; + } + return true; +} -(alloc (anything . key)) +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; +} +/* + LISTS + */ +/* Return I-th element, or last elt L. If I < 0, then we take the first + element. -*/ + PRE: length (L) > 0 */ SCM -ly_assoc_cdr (SCM key, SCM alist) +robust_list_ref (int i, SCM l) { - if (ly_c_pair_p (alist)) - { - SCM trykey = ly_caar (alist); - if (ly_c_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)); - } - return SCM_BOOL_F; + while (i-- > 0 && scm_is_pair (scm_cdr (l))) + l = scm_cdr (l); + return scm_car (l); } -/* LST has the form "sym1 sym2 sym3\nsym4\nsym5" - i.e. \n and ' ' can be used interchangeably as separators. */ + SCM -parse_symbol_list (char const *lst) -{ - char *s = strdup (lst); - 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) +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)) { - char *next = strchr (s, ' '); - if (next) - *next++ = 0; - - create_list = scm_cons (ly_symbol2scm (s), create_list); - s = next; + 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))); + } } - - free (orig); - return create_list; + return src; } + SCM ly_truncate_list (int k, SCM lst) { @@ -489,28 +438,52 @@ ly_truncate_list (int k, SCM lst) { SCM s = lst; k--; - for (; ly_c_pair_p (s) && k--; s = ly_cdr (s)) + for (; scm_is_pair (s) && k--; s = scm_cdr (s)) ; - if (ly_c_pair_p (s)) + if (scm_is_pair (s)) scm_set_cdr_x (s, SCM_EOL); } return lst; } -String + + + +/* Appendable list L: the cdr contains the list, the car the last cons + in the list. */ +SCM +appendable_list () +{ + SCM s = scm_cons (SCM_EOL, SCM_EOL); + scm_set_car_x (s, s); + + return s; +} + +void +appendable_list_append (SCM l, SCM elt) +{ + SCM newcons = scm_cons (elt, SCM_EOL); + + scm_set_cdr_x (scm_car (l), newcons); + scm_set_car_x (l, newcons); +} + + +string print_scm_val (SCM val) { - String realval = ly_scm2string (ly_write2scm (val)); + string realval = ly_scm2string (ly_write2scm (val)); if (realval.length () > 200) - realval = realval.left_string (100) + realval = realval.substr (0, 100) + "\n :\n :\n" - + realval.right_string (100); - return realval; + + 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; @@ -519,11 +492,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 (!ly_c_symbol_p (sym)) + if (!scm_is_symbol (sym)) #if 0 return false; #else @@ -533,66 +506,61 @@ 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 && !ly_c_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 ("can't 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) + abort (); + + warning (_ ("doing assignment anyway")); + } else { if (val != SCM_EOL - && ly_c_procedure_p (type) + && ly_is_procedure (type) && scm_call_1 (type, val) == SCM_BOOL_F) { - SCM errport = scm_current_error_port (); ok = false; - SCM typefunc = ly_scheme_function ("type-name"); + SCM typefunc = ly_lily_module_constant ("type-name"); SCM type_name = scm_call_1 (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); + 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; ly_c_pair_p (i); i = ly_cdr (i)) + for (SCM i = list; scm_is_pair (i); i = scm_cdr (i)) { - if (!ly_c_pair_p (ly_cdr (i)) - || !ly_c_equal_p (ly_car (i), ly_cadr (i))) - unique = scm_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); } @@ -601,22 +569,24 @@ ly_unique (SCM list) static int scm_default_compare (void const *a, void const *b) { - SCM pa = *(SCM*) a; - SCM pb = *(SCM*) b; + SCM pa = *(SCM *) a; + SCM pb = *(SCM *) b; if (pa == pb) return 0; return pa < pb ? -1 : 1; } -/* Modify LST in place: qsort it. */ +/* Modify LST in place: qsort it. + +FIXME: unused, junk? */ SCM ly_list_qsort_uniq_x (SCM lst) { int len = scm_ilength (lst); SCM *arr = new SCM[len]; int k = 0; - for (SCM s = lst; SCM_NNULLP (s); s = SCM_CDR (s)) - arr[k++] = SCM_CAR (s); + for (SCM s = lst; SCM_NNULLP (s); s = scm_cdr (s)) + arr[k++] = scm_car (s); assert (k == len); qsort (arr, len, sizeof (SCM), &scm_default_compare); @@ -632,15 +602,7 @@ ly_list_qsort_uniq_x (SCM lst) *tail = SCM_EOL; delete[] arr; - return lst; -} - - -/* tail add */ -SCM -ly_snoc (SCM s, SCM list) -{ - return ly_append2 (list, scm_list_n (s, SCM_UNDEFINED)); + return lst; } /* Split list at member s, removing s. @@ -650,40 +612,38 @@ ly_split_list (SCM s, SCM list) { SCM before = SCM_EOL; SCM after = list; - for (; ly_c_pair_p (after);) + for (; scm_is_pair (after);) { - SCM i = ly_car (after); - after = ly_cdr (after); - if (ly_c_equal_p (i, s)) + SCM i = scm_car (after); + after = scm_cdr (after); + if (ly_is_equal (i, s)) break; before = scm_cons (i, before); } - return scm_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_puts ("(", p); - for (; ly_c_pair_p (s); s =ly_cdr (s)) + for (; scm_is_pair (s); s = scm_cdr (s)) { - scm_display (ly_car (s), p); - scm_puts (" ", p); + scm_display (scm_car (s), p); + scm_puts (" ", p); } scm_puts (")", p); return SCM_UNSPECIFIED; @@ -694,107 +654,129 @@ int_list_to_slice (SCM l) { Slice s; s.set_empty (); - for (; ly_c_pair_p (l); l = ly_cdr (l)) - if (ly_c_number_p (ly_car (l))) - s.add_point (ly_scm2int (ly_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; } -/* Return I-th element, or last elt L. If I < 0, then we take the first - element. - - PRE: length (L) > 0 */ -SCM -robust_list_ref (int i, SCM l) -{ - while (i-- > 0 && ly_c_pair_p (ly_cdr (l))) - l = ly_cdr (l); - return ly_car (l); -} - Real robust_scm2double (SCM k, double x) { - if (ly_c_number_p (k)) - x = ly_scm2double (k); + if (scm_is_number (k)) + x = scm_to_double (k); return x; } -Interval -robust_scm2interval (SCM k, Drul_array v) + +string +robust_scm2string (SCM k, string s) { - Interval i; - i[LEFT]= v[LEFT]; - i[RIGHT]= v[RIGHT]; - if (is_number_pair (k)) - i = ly_scm2interval (k); - return i; + if (scm_is_string (k)) + s = ly_scm2string (k); + return s; } -Drul_array -robust_scm2drul (SCM k, Drul_array v) +int +robust_scm2int (SCM k, int o) { - if (is_number_pair (k)) - v = ly_scm2interval (k); - return v; + if (scm_integer_p (k) == SCM_BOOL_T) + o = scm_to_int (k); + return o; } -Offset -robust_scm2offset (SCM k, Offset o) + +SCM +ly_rational2scm (Rational r) { - if (is_number_pair (k)) - o = ly_scm2offset (k); - return o; + return scm_divide (scm_from_int (r.numerator ()), scm_from_int (r.denominator ())); } -int -robust_scm2int (SCM k, int o) + +Rational +ly_scm2rational (SCM r) { - if (scm_integer_p (k) == SCM_BOOL_T) - o = ly_scm2int (k); - return o; + return Rational (scm_to_int (scm_numerator (r)), + scm_to_int (scm_denominator (r))); } + 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; ly_c_pair_p (s); s = ly_cdr (s)) + 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) +{ + SCM func = ly_lily_module_constant ("hash-table->alist"); + return scm_call_1 (func, tab); +} + +int +procedure_arity (SCM proc) +{ + assert (ly_is_procedure (proc)); + SCM arity = scm_procedure_property (proc, + ly_symbol2scm ("arity")); + + SCM fixed = scm_car (arity); + return scm_to_int (fixed); } -#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; -} -#endif + 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, 1, "?"); + else if (cxx_id.substr (cxx_id.length () - 2) == "_x") + cxx_id = cxx_id.replace (cxx_id.length () - 2, 1, "!"); + cxx_id = replace_all (cxx_id, '_', '-'); + return cxx_id; +} -#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC -#include "pangofc-afm-decoder.hh" -LY_DEFINE (ly_pango_add_afm_decoder, "ly:pango-add-afm-decoder", - 1, 0, 0, (SCM font_family), - "Add pango afm decoder for FONT-FAMILY.") +SCM +ly_string_array_to_scm (vector a) { - SCM_ASSERT_TYPE (ly_c_string_p (font_family), font_family, SCM_ARG1, __FUNCTION__, "font_family"); - pango_fc_afm_add_decoder (ly_scm2newstr (font_family, 0)); - return SCM_UNSPECIFIED; + SCM s = SCM_EOL; + for (vsize i = a.size (); i ; i--) + s = scm_cons (ly_symbol2scm (a[i - 1].c_str ()), s); + return s; } -#endif +/* 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, ' ')); +}