X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=3b21744973b60f5943d6b0794cecb69b451cb834;hb=955a0a8fa4aa5a1539a4dd281bffb1eb8e614e90;hp=e821369ac2fe832903161feee7a0dee3855656c4;hpb=e7020dbb36a9e9c10bda48e5197213e8a3bacef6;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index e821369ac2..3b21744973 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -1,52 +1,52 @@ /* - 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 + Han-Wen Nienhuys */ -#include -#include -#include /* isinf */ -#include /* strdup, strchr */ -#include +#include +#include +#include /* strdup, strchr */ +#include +#include // gettext on macos x -#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 "libc-extension.hh" #include "lily-guile.hh" +#include "libc-extension.hh" #include "main.hh" #include "file-path.hh" #include "warn.hh" #include "direction.hh" #include "offset.hh" -#include "interval.hh" #include "pitch.hh" #include "dimensions.hh" #include "source-file.hh" +#include "misc.hh" // #define TEST_GC 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_last (SCM list) +{ + return scm_car (scm_last_pair (list)); +} SCM ly_write2scm (SCM s) @@ -63,7 +63,6 @@ ly_write2scm (SCM s) return scm_strport_to_string (port); } - SCM ly_quote_scm (SCM s) { @@ -73,43 +72,44 @@ ly_quote_scm (SCM s) 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) +gulp_file_to_string (String fn, bool must_exist) { 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); + char *str = gulp_file (s, &n); + String result ((Byte*) str, n); delete[] str; - if (verbose_global_b) + 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" { @@ -123,36 +123,30 @@ ly_display_scm (SCM s) }; String -ly_scm2string (SCM s) +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 ((Byte*)scm_i_string_chars (str), + (int) scm_i_string_length (str)); } char * ly_scm2newstr (SCM str, size_t *lenp) { - char *new_str; - size_t len; - - SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string"); - - len = SCM_STRING_LENGTH (str); - new_str = (char *) malloc ((len + 1) * sizeof (char)); - - if (new_str == NULL) - return NULL; + SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); - memcpy (new_str, SCM_STRING_CHARS (str), len); - new_str[len] = '\0'; - - if (lenp != NULL) - *lenp = len; + size_t len = SCM_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'; - return new_str; + if (lenp) + *lenp = len; + + return new_str; + } + return 0; } SCM @@ -160,7 +154,7 @@ 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 @@ -173,32 +167,11 @@ index_set_cell (SCM s, Direction d, SCM 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 (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string"); - progress_indication ("\n"); - 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 @code{-1}, @code{0} or " - "@code{1}, where @code{-1} represents " - "left or down and @code{1} represents right or up.") -{ - if (is_number (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) && is_number (ly_car (p)) && is_number (ly_cdr (p)); + return scm_is_pair (p) + && scm_is_number (scm_car (p)) && scm_is_number (scm_cdr (p)); } typedef void (*Void_fptr) (); @@ -212,14 +185,13 @@ void add_scm_init_func (void (*f) ()) scm_init_funcs_->push (f); } - void ly_init_ly_module (void *) { - for (int i=scm_init_funcs_->size () ; i--;) + for (int i = scm_init_funcs_->size () ; i--;) (scm_init_funcs_->elem (i)) (); - if (verbose_global_b) + if (be_verbose_global) progress_indication ("\n"); scm_primitive_load_path (scm_makfrom0str ("lily.scm")); @@ -234,32 +206,30 @@ ly_c_init_guile () 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) { - if (is_number (s)) + if (scm_is_number (s)) { - int i = ly_scm2int (s); + int i = scm_to_int (s); return i>= -1 && i <= 1; } return false; } - bool is_axis (SCM s) { - if (is_number (s)) + if (scm_is_number (s)) { - int i = ly_scm2int (s); - return i== 0 || i == 1; + int i = scm_to_int (s); + return i == 0 || i == 1; } return false; } @@ -267,20 +237,20 @@ is_axis (SCM s) Direction to_dir (SCM s) { - return SCM_INUMP (s) ? (Direction) ly_scm2int (s) : CENTER; + return scm_is_integer (s) ? (Direction) scm_to_int (s) : CENTER; } 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 @@ -292,7 +262,7 @@ ly_interval2scm (Drul_array i) bool to_boolean (SCM s) { - return ly_c_boolean_p (s) && ly_scm2bool (s); + return scm_is_bool (s) && ly_scm2bool (s); } /* Appendable list L: the cdr contains the list, the car the last cons @@ -311,11 +281,10 @@ appendable_list_append (SCM l, SCM elt) { SCM newcons = scm_cons (elt, SCM_EOL); - scm_set_cdr_x (ly_car (l), newcons); + scm_set_cdr_x (scm_car (l), newcons); scm_set_car_x (l, newcons); } - SCM ly_offset2scm (Offset o) { @@ -325,72 +294,20 @@ ly_offset2scm (Offset o) Offset ly_scm2offset (SCM s) { - return Offset (ly_scm2double (ly_car (s)), - ly_scm2double (ly_cdr (s))); -} - - -LY_DEFINE (ly_number2string, "ly:number->string", - 1, 0, 0, (SCM s), - "Convert @var{num} to a string without generating many decimals.") -{ - SCM_ASSERT_TYPE (is_number (s), s, SCM_ARG1, __FUNCTION__, "number"); - - char str[400]; // ugh. - - if (scm_exact_p (s) == SCM_BOOL_F) - { - 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); - } - else - sprintf (str, "%d", ly_scm2int (s)); - - return scm_makfrom0str (str); -} - - - -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); -} - - - -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); + return Offset (scm_to_double (scm_car (s)), + scm_to_double (scm_cdr (s))); } SCM ly_deep_copy (SCM src) { - if (ly_c_pair_p (src)) - return scm_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src))); + if (scm_is_pair (src)) + return scm_cons (ly_deep_copy (scm_car (src)), ly_deep_copy (scm_cdr (src))); else if (ly_c_vector_p (src)) { int len = SCM_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))); @@ -399,19 +316,31 @@ ly_deep_copy (SCM src) 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_assoc_chain (SCM key, SCM achain) +ly_chain_assoc (SCM key, SCM achain) { - if (ly_c_pair_p (achain)) + if (scm_is_pair (achain)) { - SCM handle = scm_assoc (key, ly_car (achain)); - if (ly_c_pair_p (handle)) + SCM handle = scm_assoc (key, scm_car (achain)); + if (scm_is_pair (handle)) return handle; else - return ly_assoc_chain (key, ly_cdr (achain)); + return ly_chain_assoc (key, scm_cdr (achain)); } else return SCM_BOOL_F; @@ -439,13 +368,13 @@ corresponds to call SCM ly_assoc_cdr (SCM key, SCM alist) { - if (ly_c_pair_p (alist)) + if (scm_is_pair (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); + 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, ly_cdr (alist)); + return ly_assoc_cdr (key, scm_cdr (alist)); } return SCM_BOOL_F; } @@ -493,10 +422,10 @@ 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; @@ -527,7 +456,7 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) 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 @@ -552,7 +481,7 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) + " " + _ ("Perhaps you made a typing error?")); /* Be strict when being anal :) */ - if (internal_type_checking_global_b) + if (do_internal_type_checking_global) abort (); warning (_ ("Doing assignment anyway.")); @@ -565,7 +494,7 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) { 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); @@ -592,11 +521,11 @@ 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_c_equal_p (scm_car (i), scm_cadr (i))) + unique = scm_cons (scm_car (i), unique); } return scm_reverse_x (unique, SCM_EOL); } @@ -619,8 +548,8 @@ 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); @@ -654,10 +583,10 @@ 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); + SCM i = scm_car (after); + after = scm_cdr (after); if (ly_c_equal_p (i, s)) break; before = scm_cons (i, before); @@ -684,9 +613,9 @@ 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_display (scm_car (s), p); scm_puts (" ", p); } scm_puts (")", p); @@ -698,9 +627,9 @@ int_list_to_slice (SCM l) { Slice s; s.set_empty (); - for (; ly_c_pair_p (l); l = ly_cdr (l)) - if (is_number (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; } @@ -711,16 +640,16 @@ int_list_to_slice (SCM l) 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); + while (i-- > 0 && scm_is_pair (scm_cdr (l))) + l = scm_cdr (l); + return scm_car (l); } Real robust_scm2double (SCM k, double x) { - if (is_number (k)) - x = ly_scm2double (k); + if (scm_is_number (k)) + x = scm_to_double (k); return x; } @@ -755,7 +684,7 @@ int robust_scm2int (SCM k, int o) { if (scm_integer_p (k) == SCM_BOOL_T) - o = ly_scm2int (k); + o = scm_to_int (k); return o; } @@ -764,24 +693,13 @@ alist_to_hashq (SCM alist) { int i = scm_ilength (alist); if (i < 0) - return scm_make_vector (scm_int2num (0), SCM_EOL); + return scm_c_make_hash_table (0); - SCM tab = scm_make_vector (scm_int2num (i), SCM_EOL); - for (SCM s = alist; ly_c_pair_p (s); s = ly_cdr (s)) + 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; } - -#if 1 -/* - Debugging mem leaks: - */ -LY_DEFINE (ly_protects, "ly:protects", 0, 0, 0, (), - "Return hash of protected objects.") -{ - return scm_protects; -} -#endif