X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=9da6823f194e89e91ab15a13c4ab751ed3b4d03e;hb=5ae46f750bfb3a947d4adc26044560da54c21e17;hp=5b80d8580b4ba4f27bd04b0c635cd4afdc6c53c2;hpb=d1ddb3de33c8811b914cccbafdf82549c4e76034;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 5b80d8580b..9da6823f19 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -3,8 +3,8 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2005 Jan Nieuwenhuizen - Han-Wen Nienhuys + (c) 1998--2007 Jan Nieuwenhuizen + Han-Wen Nienhuys */ #include "lily-guile.hh" @@ -14,7 +14,7 @@ #include /* strdup, strchr */ #include -#include "config.hh" +using namespace std; #include "dimensions.hh" #include "direction.hh" @@ -25,33 +25,17 @@ #include "misc.hh" #include "offset.hh" #include "pitch.hh" +#include "string-convert.hh" #include "source-file.hh" #include "version.hh" #include "warn.hh" -// #define TEST_GC -SCM -ly_to_symbol (SCM scm) -{ - 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_last (SCM list) -{ - return scm_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), @@ -62,7 +46,7 @@ ly_write2scm (SCM s) // scm_apply (write, port, SCM_EOL); scm_call_2 (write, s, port); - return scm_strport_to_string (port); + return ly_scm2string (scm_strport_to_string (port)); } SCM @@ -71,7 +55,7 @@ ly_quote_scm (SCM s) return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED); } -String +string ly_symbol2string (SCM s) { /* @@ -81,15 +65,15 @@ ly_symbol2string (SCM s) return ly_scm2string (str); } -String -gulp_file_to_string (String fn, bool must_exist) +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 == "") { if (must_exist) { - String e = _f ("can't find file: `%s'", fn); + string e = _f ("cannot find file: `%s'", fn); e += " "; e += _f ("(load path: `%s')", global_path.to_string ()); error (e); @@ -101,10 +85,8 @@ gulp_file_to_string (String fn, bool must_exist) if (be_verbose_global) progress_indication ("[" + s); - int n; - char *str = gulp_file (s, &n); - String result ((Byte *) str, n); - delete[] str; + vector chars = gulp_file (s, size); + string result (&chars[0], chars.size ()); if (be_verbose_global) progress_indication ("]"); @@ -122,18 +104,29 @@ extern "C" { } }; -String +/* + STRINGS + */ +string ly_scm2string (SCM str) { assert (scm_is_string (str)); - return String ((Byte *)scm_i_string_chars (str), + return string (scm_i_string_chars (str), (int) scm_i_string_length (str)); } +SCM +ly_string2scm (string const &str) +{ + return scm_from_locale_stringn (str.c_str (), + str.length ()); +} + + char * ly_scm2newstr (SCM str, size_t *lenp) { - SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); + LY_ASSERT_TYPE (scm_is_string, str, 1); size_t len = scm_i_string_length (str); if (char *new_str = (char *) malloc ((len + 1) * sizeof (char))) @@ -143,16 +136,20 @@ ly_scm2newstr (SCM str, size_t *lenp) if (lenp) *lenp = len; - + return new_str; } return 0; } + +/* + PAIRS +*/ SCM index_get_cell (SCM s, Direction d) { - + assert (d); return (d == LEFT) ? scm_car (s) : scm_cdr (s); } @@ -166,7 +163,7 @@ index_set_cell (SCM s, Direction d, SCM v) scm_set_cdr_x (s, v); return s; } - + bool is_number_pair (SCM p) { @@ -174,48 +171,6 @@ is_number_pair (SCM 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) ()) -{ - if (!scm_init_funcs_) - scm_init_funcs_ = new Array; - - scm_init_funcs_->push (f); -} - -#if KPATHSEA -extern "C" { - void initialize_kpathsea (); -} -#endif - -void -ly_init_ly_module (void *) -{ - for (int i = scm_init_funcs_->size (); i--;) - (scm_init_funcs_->elem (i)) (); - - if (be_verbose_global) - progress_indication ("\n"); - -#if KPATHSEA - if (is_TeX_format_global) - initialize_kpathsea (); -#endif - - scm_primitive_load_path (scm_makfrom0str ("lily.scm")); -} - -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) @@ -223,34 +178,55 @@ ly_scm_hash (SCM s) return scm_ihashv (s, ~1u); } + bool -is_direction (SCM s) +is_axis (SCM s) { if (scm_is_number (s)) { int i = scm_to_int (s); - return i >= -1 && i <= 1; + return i == 0 || i == 1; } return false; } bool -is_axis (SCM s) +to_boolean (SCM s) { - if (scm_is_number (s)) - { - int i = scm_to_int (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) 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) { @@ -267,39 +243,47 @@ ly_scm2realdrul (SCM 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 scm_is_bool (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 (scm_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 @@ -309,116 +293,112 @@ ly_scm2offset (SCM s) scm_to_double (scm_cdr (s))); } +Offset +robust_scm2offset (SCM k, Offset o) +{ + if (is_number_pair (k)) + o = ly_scm2offset (k); + return o; +} SCM -ly_deep_copy (SCM src) +ly_offsets2scm (vector os) { - 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 l = SCM_EOL; + SCM *tail = &l; + for (vsize i = 0; i < os.size (); i++) { - 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_int2num (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); } - return src; + return l; } +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; +} -/* 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) + +bool +alist_equal_p (SCM a, SCM b) { - if (scm_is_pair (alist)) + for (SCM s = a; + scm_is_pair (s); s = scm_cdr (s)) { - SCM trykey = scm_caar (alist); - if (scm_is_pair (trykey) && to_boolean (scm_equal_p (key, scm_cdr (trykey)))) - return scm_car (alist); - else - return ly_assoc_cdr (key, scm_cdr (alist)); + SCM key = scm_caar (s); + SCM val = scm_cdar (s); + SCM l = scm_assoc (key, b); + + if (l == SCM_BOOL_F + || !ly_is_equal (scm_cdr (l), val)) + + return false; } - return SCM_BOOL_F; + return true; } -/* 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) - { - char *next = strchr (s, ' '); - if (next) - *next++ = 0; +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; +} - create_list = scm_cons (ly_symbol2scm (s), create_list); - s = next; - } +/* + LISTS + */ + +/* 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 lst) +ly_deep_copy (SCM src) { - if (k == 0) - lst = SCM_EOL; - else + 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 s = lst; - k--; - for (; scm_is_pair (s) && k--; s = scm_cdr (s)) - ; - - if (scm_is_pair (s)) - scm_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 lst; + 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) + realval = realval.substr (0, 100) + "\n :\n :\n" - + realval.right_string (100); + + realval.substr (realval.length () - 100); return realval; } @@ -453,33 +433,34 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) SCM type = scm_object_property (sym, type_symbol); - if (type != SCM_EOL && !ly_c_procedure_p (type)) + if (type != SCM_EOL && !ly_is_procedure (type)) { - warning (_f ("can't find property type-check for `%s' (%s).", - ly_symbol2string (sym).to_str0 (), - ly_symbol2string (type_symbol).to_str0 ()) + 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) - abort (); + scm_throw (ly_symbol2scm ("ly-file-failed"), scm_list_3 (ly_symbol2scm ("typecheck"), + sym, val)); 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) { ok = false; SCM typefunc = ly_lily_module_constant ("type-name"); SCM type_name = scm_call_1 (typefunc, type); - message (_f ("type check for `%s' failed; value `%s' must be of type `%s'", - ly_symbol2string (sym).to_str0 (), + 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).to_str0 ())); + ly_scm2string (type_name).c_str ())); progress_indication ("\n"); } } @@ -499,55 +480,12 @@ ly_unique (SCM list) for (SCM i = list; scm_is_pair (i); i = scm_cdr (i)) { if (!scm_is_pair (scm_cdr (i)) - || !ly_c_equal_p (scm_car (i), scm_cadr (i))) + || !ly_is_equal (scm_car (i), scm_cadr (i))) unique = scm_cons (scm_car (i), unique); } return scm_reverse_x (unique, SCM_EOL); } -static int -scm_default_compare (void const *a, void const *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. */ -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); - - assert (k == len); - qsort (arr, len, sizeof (SCM), &scm_default_compare); - - SCM *tail = &lst; - for (int i = 0; i < len; i++) - if (!i || arr[i] != arr[i - 1]) - { - SCM_SETCAR (*tail, arr[i]); - tail = SCM_CDRLOC (*tail); - } - - *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)); -} /* Split list at member s, removing s. Return (BEFORE . AFTER) */ @@ -560,7 +498,7 @@ ly_split_list (SCM s, SCM list) { SCM i = scm_car (after); after = scm_cdr (after); - if (ly_c_equal_p (i, s)) + if (ly_is_equal (i, s)) break; before = scm_cons (i, before); } @@ -604,18 +542,6 @@ int_list_to_slice (SCM 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 && scm_is_pair (scm_cdr (l))) - l = scm_cdr (l); - return scm_car (l); -} - Real robust_scm2double (SCM k, double x) { @@ -624,31 +550,13 @@ robust_scm2double (SCM k, double x) return x; } -Interval -robust_scm2interval (SCM k, Drul_array v) -{ - Interval i; - i[LEFT] = v[LEFT]; - i[RIGHT] = v[RIGHT]; - if (is_number_pair (k)) - i = ly_scm2interval (k); - return i; -} - -Drul_array -robust_scm2drul (SCM k, Drul_array v) -{ - if (is_number_pair (k)) - v = ly_scm2interval (k); - return v; -} -Offset -robust_scm2offset (SCM k, Offset o) +string +robust_scm2string (SCM k, string s) { - if (is_number_pair (k)) - o = ly_scm2offset (k); - return o; + if (scm_is_string (k)) + s = ly_scm2string (k); + return s; } int @@ -659,6 +567,30 @@ robust_scm2int (SCM k, int o) return o; } + +SCM +ly_rational2scm (Rational r) +{ + return scm_divide (scm_from_int (r.numerator ()), scm_from_int (r.denominator ())); +} + + +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) { @@ -675,39 +607,78 @@ alist_to_hashq (SCM alist) return tab; } -bool -alist_equal_p (SCM a, SCM b) +SCM +ly_hash2alist (SCM tab) { - 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); + SCM func = ly_lily_module_constant ("hash-table->alist"); + return scm_call_1 (func, tab); +} - if (l == SCM_BOOL_F - || !ly_c_equal_p (scm_cdr (l), val)) - return false; +/* + 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; } - return true; + 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 -ly_alist_vals (SCM alist) +ly_string_array_to_scm (vector a) { - 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; + 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 -ly_hash2alist (SCM tab) +parse_symbol_list (char const *symbols) { - SCM func = ly_lily_module_constant ("hash-table->alist"); - return scm_call_1 (func, tab); + 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)); }