X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=2ebc9beee68be121b3f48410a2cd8cdd95324018;hb=1402d6d957bee7d47e0bddf4c57dd89912182b26;hp=24882faef24afaaabc062a761a7dba471f4eeb9c;hpb=ac93c7dd01e0b6661c360acf89721ce9d32e4e4c;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 24882faef2..2ebc9beee6 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -1,69 +1,71 @@ /* - 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--2005 Jan Nieuwenhuizen + Han-Wen Nienhuys */ +#include "lily-guile.hh" -#include -#include -#include // gettext on macos x -#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 +#include "config.hh" +#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 "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) { - 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) { @@ -75,60 +77,57 @@ 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) +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 (scm_is_string (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 str) { - return String ((Byte*)scm_i_string_chars (str), + assert (scm_is_string (str)); + return String ((Byte *)scm_i_string_chars (str), (int) scm_i_string_length (str)); } @@ -137,7 +136,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); @@ -169,46 +168,6 @@ index_set_cell (SCM s, Direction d, SCM 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 (scm_is_string (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_programming_error, "ly:programming-error", - 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 (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string"); - progress_indication ("\n"); - - str = scm_simple_format (SCM_BOOL_F, str, rest); - programming_error (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 (scm_is_number (s)) - { - int i = scm_to_int (s); - return (i>= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F; - } - return SCM_BOOL_F; -} - bool is_number_pair (SCM p) { @@ -227,15 +186,26 @@ void add_scm_init_func (void (*f) ()) 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--;) + for (int i = scm_init_funcs_->size (); i--;) (scm_init_funcs_->elem (i)) (); - if (verbose_global_b) + 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")); } @@ -260,34 +230,18 @@ 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; } -LY_DEFINE(ly_assoc_get, "ly:assoc-get", - 2, 1, 0, - (SCM key, SCM alist, SCM default_value), - "Return value if KEY in ALIST, else DEFAULT-VALUE (or #f if not specified).") -{ - SCM handle = scm_assoc (key, alist); - - if (default_value == SCM_UNDEFINED) - default_value = SCM_BOOL_F; - - if (scm_is_pair (handle)) - return scm_cdr (handle); - else - return default_value; -} - bool is_axis (SCM s) { if (scm_is_number (s)) { int i = scm_to_int (s); - return i== 0 || i == 1; + return i == 0 || i == 1; } return false; } @@ -330,7 +284,7 @@ appendable_list () { SCM s = scm_cons (SCM_EOL, SCM_EOL); scm_set_car_x (s, s); - + return s; } @@ -338,8 +292,8 @@ 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); } @@ -356,70 +310,19 @@ ly_scm2offset (SCM 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.") -{ - SCM_ASSERT_TYPE (scm_is_number (s), s, SCM_ARG1, __FUNCTION__, "number"); - - char str[400]; // ugh. - - if (scm_exact_p (s) == SCM_BOOL_F) - { - Real r (scm_to_double (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", scm_to_int (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); -} - SCM 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 (ly_c_vector_p (src)) + else if (scm_is_vector (src)) { - int len = SCM_VECTOR_LENGTH (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_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si))); } } return src; @@ -427,40 +330,21 @@ ly_deep_copy (SCM src) - -SCM -ly_assoc_chain (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_assoc_chain (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) @@ -485,11 +369,11 @@ parse_symbol_list (char const *lst) char *orig = s; SCM create_list = SCM_EOL; - char * e = s + strlen (s) - 1; + char *e = s + strlen (s) - 1; while (e >= s && isspace (*e)) *e-- = 0; - for (char * p = s; *p; p++) + for (char *p = s; *p; p++) if (*p == '\n') *p = ' '; @@ -536,11 +420,11 @@ print_scm_val (SCM val) realval = realval.left_string (100) + "\n :\n :\n" + realval.right_string (100); - return realval; + 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; @@ -549,7 +433,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; @@ -563,55 +447,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 (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).to_str0 (), + ly_symbol2string (type_symbol).to_str0 ()) + + " " + _ ("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); + message (_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 ())); + 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 @@ -621,18 +500,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; @@ -662,10 +540,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) @@ -684,36 +561,34 @@ 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) { SCM p = scm_current_output_port (); scm_puts ("(", p); - for (; scm_is_pair (s); s =scm_cdr (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; @@ -726,13 +601,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) @@ -754,8 +629,8 @@ 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; @@ -791,51 +666,49 @@ 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; } -#if 1 -/* - Debugging mem leaks: - */ -LY_DEFINE (ly_protects, "ly:protects", - 0, 0, 0, (), - "Return hash of protected objects.") +bool +alist_equal_p (SCM a, SCM b) { - return scm_protects; -} -#endif - + 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); -#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC + if (l == SCM_BOOL_F + || !ly_is_equal (scm_cdr (l), val)) -#include "pangofc-afm-decoder.hh" + return false; + } + return true; +} -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_alist_vals (SCM alist) { - SCM_ASSERT_TYPE (scm_is_string (font_family), font_family, SCM_ARG1, - __FUNCTION__, "font_family"); - pango_fc_afm_add_decoder (ly_scm2newstr (font_family, 0)); - return SCM_UNSPECIFIED; + 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; } -#endif - -LY_DEFINE (ly_gettext, "ly:gettext", - 1, 0, 0, (SCM string), - "Gettext wrapper.") +SCM +ly_hash2alist (SCM tab) { - SCM_ASSERT_TYPE (scm_is_string (string), string, SCM_ARG1, - __FUNCTION__, "string"); - return scm_makfrom0str (gettext (scm_i_string_chars (string))); + SCM func = ly_lily_module_constant ("hash-table->alist"); + return scm_call_1 (func, tab); }