X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=19fe4b0132f9fa87f3837f822e05935b5d4cb6a9;hb=8347f6f06cd4c56d7a2d2ec482647afaaade1267;hp=9c1ca6306d83e3fb0dc3ab74d398a2021e6c47a4;hpb=0849262a1fd57ad3e68d879e7d129a3bf99273cd;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 9c1ca6306d..19fe4b0132 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -3,29 +3,34 @@ 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 /* strdup, strchr */ #include -#include // gettext on macos x -#include "version.hh" -#include "lily-guile.hh" +using namespace std; + +#include "config.hh" + +#include "dimensions.hh" +#include "direction.hh" +#include "file-path.hh" +#include "international.hh" #include "libc-extension.hh" #include "main.hh" -#include "file-path.hh" -#include "warn.hh" -#include "direction.hh" +#include "misc.hh" #include "offset.hh" #include "pitch.hh" -#include "dimensions.hh" +#include "string-convert.hh" #include "source-file.hh" -#include "misc.hh" +#include "version.hh" +#include "warn.hh" // #define TEST_GC @@ -39,6 +44,7 @@ SCM ly_to_string (SCM scm) { return scm_call_3 (ly_lily_module_constant ("format"), SCM_BOOL_F, + scm_makfrom0str ("~S"), scm); } @@ -51,13 +57,13 @@ ly_last (SCM list) 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); @@ -69,25 +75,25 @@ ly_quote_scm (SCM s) return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED); } -String +string ly_symbol2string (SCM 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, 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 ("can't find file: `%s'", fn); e += " "; e += _f ("(load path: `%s')", global_path.to_string ()); error (e); @@ -99,35 +105,33 @@ gulp_file_to_string (String fn, bool must_exist) if (be_verbose_global) progress_indication ("[" + s); - int n; + int n = size; char *str = gulp_file (s, &n); - String result ((Byte*) str, n); + string result (str, n); delete[] str; - + if (be_verbose_global) progress_indication ("]"); return result; } - - 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 +string ly_scm2string (SCM str) { assert (scm_is_string (str)); - return String ((Byte*)scm_i_string_chars (str), - (int) scm_i_string_length (str)); + return string (scm_i_string_chars (str), + (int) scm_i_string_length (str)); } char * @@ -135,7 +139,7 @@ ly_scm2newstr (SCM str, size_t *lenp) { 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_i_string_chars (str), len); @@ -143,7 +147,7 @@ ly_scm2newstr (SCM str, size_t *lenp) if (lenp) *lenp = len; - + return new_str; } return 0; @@ -152,7 +156,7 @@ ly_scm2newstr (SCM str, size_t *lenp) SCM index_get_cell (SCM s, Direction d) { - + assert (d); return (d == LEFT) ? scm_car (s) : scm_cdr (s); } @@ -166,7 +170,7 @@ index_set_cell (SCM s, Direction d, SCM v) scm_set_cdr_x (s, v); return s; } - + bool is_number_pair (SCM p) { @@ -175,25 +179,30 @@ is_number_pair (SCM p) } typedef void (*Void_fptr) (); -Array *scm_init_funcs_; +vector *scm_init_funcs_; void add_scm_init_func (void (*f) ()) { if (!scm_init_funcs_) - scm_init_funcs_ = new Array; + scm_init_funcs_ = new vector; - scm_init_funcs_->push (f); + scm_init_funcs_->push_back (f); } void ly_init_ly_module (void *) { - for (int i = scm_init_funcs_->size () ; i--;) - (scm_init_funcs_->elem (i)) (); + for (vsize i = scm_init_funcs_->size (); i--;) + (scm_init_funcs_->at (i)) (); if (be_verbose_global) - progress_indication ("\n"); - + { + progress_indication ("["); + scm_display (scm_c_eval_string ("(%search-load-path \"lily.scm\")"), + scm_current_error_port ()); + progress_indication ("]\n"); + } + scm_primitive_load_path (scm_makfrom0str ("lily.scm")); } @@ -218,7 +227,7 @@ is_direction (SCM s) if (scm_is_number (s)) { int i = scm_to_int (s); - return i>= -1 && i <= 1; + return i >= -1 && i <= 1; } return false; } @@ -256,7 +265,7 @@ 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 @@ -272,7 +281,7 @@ appendable_list () { SCM s = scm_cons (SCM_EOL, SCM_EOL); scm_set_car_x (s, s); - + return s; } @@ -280,15 +289,15 @@ 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_cdr_x (scm_car (l), newcons); scm_set_car_x (l, newcons); } 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 @@ -307,63 +316,30 @@ ly_deep_copy (SCM src) { int len = scm_c_vector_length (src); SCM nv = scm_c_make_vector (len, SCM_UNDEFINED); - for (int i = 0 ;i < len ; i++) + 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 si = scm_from_int (i); + scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si))); } } return src; } -SCM -ly_chain_assoc_get (SCM key, SCM achain, SCM dfault) -{ - if (scm_is_pair (achain)) - { - SCM handle = scm_assoc (key, scm_car (achain)); - if (scm_is_pair (handle)) - return scm_cdr (handle); - else - return ly_chain_assoc (key, scm_cdr (achain)); - } - else - return dfault; -} - -SCM -ly_chain_assoc (SCM key, SCM achain) -{ - if (scm_is_pair (achain)) - { - SCM handle = scm_assoc (key, scm_car (achain)); - if (scm_is_pair (handle)) - return handle; - else - return ly_chain_assoc (key, scm_cdr (achain)); - } - else - return SCM_BOOL_F; -} - /* 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)) - + ((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) @@ -371,46 +347,33 @@ ly_assoc_cdr (SCM key, SCM alist) if (scm_is_pair (alist)) { SCM trykey = scm_caar (alist); - if (scm_is_pair (trykey) && to_boolean (scm_equal_p (key, scm_cdr (trykey)))) + 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)); + return ly_assoc_cdr (key, scm_cdr (alist)); } return SCM_BOOL_F; } -/* 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; - - create_list = scm_cons (ly_symbol2scm (s), create_list); - s = next; - } +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; +} - free (orig); - return create_list; +/* 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 (split_string (s, ' ')); } SCM @@ -431,19 +394,19 @@ ly_truncate_list (int k, SCM lst) return lst; } -String +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; @@ -452,7 +415,7 @@ 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; @@ -466,55 +429,50 @@ 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 (do_internal_type_checking_global) - 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_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 @@ -524,18 +482,17 @@ 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; + SCM pa = *(SCM *) a; + SCM pb = *(SCM *) b; if (pa == pb) return 0; return pa < pb ? -1 : 1; @@ -565,10 +522,9 @@ ly_list_qsort_uniq_x (SCM lst) *tail = SCM_EOL; delete[] arr; - return lst; + return lst; } - /* tail add */ SCM ly_snoc (SCM s, SCM list) @@ -587,26 +543,24 @@ 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); } - 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) { @@ -616,7 +570,7 @@ display_list (SCM s) for (; scm_is_pair (s); s = scm_cdr (s)) { scm_display (scm_car (s), p); - scm_puts (" ", p); + scm_puts (" ", p); } scm_puts (")", p); return SCM_UNSPECIFIED; @@ -629,13 +583,13 @@ int_list_to_slice (SCM l) s.set_empty (); 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))); + 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) @@ -653,12 +607,20 @@ robust_scm2double (SCM k, double x) return x; } +Direction +robust_scm2dir (SCM d, Direction def) +{ + if (is_direction (d)) + def = to_dir (d); + return def; +} + Interval robust_scm2interval (SCM k, Drul_array v) { Interval i; - i[LEFT]= v[LEFT]; - i[RIGHT]= v[RIGHT]; + i[LEFT] = v[LEFT]; + i[RIGHT] = v[RIGHT]; if (is_number_pair (k)) i = ly_scm2interval (k); return i; @@ -672,6 +634,17 @@ robust_scm2drul (SCM k, Drul_array v) return v; } +Drul_array +robust_scm2booldrul (SCM k, Drul_array def) +{ + if (scm_is_pair (k)) + { + def[LEFT] = to_boolean (scm_car (k)); + def[RIGHT] = to_boolean (scm_cdr (k)); + } + return def; +} + Offset robust_scm2offset (SCM k, Offset o) { @@ -694,17 +667,16 @@ 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; + return tab; } - bool alist_equal_p (SCM a, SCM b) { @@ -716,9 +688,55 @@ alist_equal_p (SCM a, SCM b) SCM l = scm_assoc (key, b); if (l == SCM_BOOL_F - || !ly_c_equal_p ( scm_cdr (l), val)) + || !ly_is_equal (scm_cdr (l), val)) return false; } 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; +} + +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); +} + +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, 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; +}