X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=d2b9eec3205c7fc803e8ed9c06e53a2634be21e5;hb=b5b249fde31cff02afe9e776986a39bd73dde0be;hp=69990c82b1015e7253c3c2623afd3fc9d4e3c08a;hpb=bc30d5ab67f4cf1e2c5cd953f6ea27867ae2fc05;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 69990c82b1..d2b9eec320 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen Han-Wen Nienhuys */ @@ -13,10 +13,23 @@ #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 "libc-extension.hh" #include "lily-guile.hh" #include "main.hh" -#include "simple-file-storage.hh" #include "file-path.hh" #include "warn.hh" #include "direction.hh" @@ -24,45 +37,16 @@ #include "interval.hh" #include "pitch.hh" #include "dimensions.hh" - +#include "source-file.hh" // #define TEST_GC -#ifdef PARANOID -#include -#undef gh_pair_p -bool -ly_pair_p (SCM x) -{ -#if 0 - assert (!SCM_CONSP (x) || (*(scm_t_bits*) SCM2PTR (SCM_CAR (x))) != scm_tc_free_cell); - assert (!SCM_CONSP (x) || (*(scm_t_bits*) SCM2PTR (SCM_CDR (x))) != scm_tc_free_cell); -#elif GUILE_MINOR_VERSION < 5 - assert (!SCM_CONSP (x) || !SCM_FREEP (SCM_CAR (x))); - assert (!SCM_CONSP (x) || !SCM_FREEP (SCM_CDR (x))); -#else - assert (!SCM_CONSP (x) || !SCM_FREE_CELL_P (SCM_CAR (x))); - assert (!SCM_CONSP (x) || !SCM_FREE_CELL_P (SCM_CDR (x))); -#endif - //return SCM_NFALSEP (scm_pair_p (x)); - return gh_pair_p (x); -} -#define gh_pair_p ly_pair_p -#endif - SCM ly_last (SCM list) { return ly_car (scm_last_pair (list)); } -SCM -ly_str02scm (char const*c) -{ - // this all really sucks, guile should take char const* arguments! - return gh_str02scm ((char*)c); -} - SCM ly_write2scm (SCM s) @@ -80,69 +64,12 @@ ly_write2scm (SCM s) } -/* - Pass string to scm parser, evaluate one expression. - Return result value and #chars read. - - Thanks to Gary Houston - - Need guile-1.3.4 (>1.3 anyway) for ftell on str ports -- jcn -*/ -SCM -ly_parse_scm (char const* s, int* n) -{ - SCM str = ly_str02scm (s); - SCM port = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG, - "ly_eval_scm_0str"); - SCM from = scm_ftell (port); - - SCM form; - SCM answer = SCM_UNSPECIFIED; - - /* Read expression from port */ - if (!SCM_EOF_OBJECT_P (form = scm_read (port))) - answer = scm_primitive_eval (form); - - /* - After parsing - - (begin (foo 1 2)) - - all seems fine, but after parsing - - (foo 1 2) - - read_buf has been advanced to read_pos - 1, - so that scm_ftell returns 1, instead of #parsed chars - */ - - /* - urg: reset read_buf for scm_ftell - shouldn't scm_read () do this for us? - */ - scm_fill_input (port); - SCM to = scm_ftell (port); - *n = gh_scm2int (to) - gh_scm2int (from); - - /* Don't close the port here; if we re-enter this function via a - continuation, then the next time we enter it, we'll get an error. - It's a string port anyway, so there's no advantage to closing it - early. - - scm_close_port (port); - */ - - return answer; -} - SCM ly_quote_scm (SCM s) { return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED); } - - String ly_symbol2string (SCM s) { @@ -150,7 +77,6 @@ ly_symbol2string (SCM s) return String ((Byte*)SCM_STRING_CHARS (s), (int) SCM_STRING_LENGTH (s)); } - String gulp_file_to_string (String fn) { @@ -159,44 +85,33 @@ gulp_file_to_string (String fn) { String e = _f ("can't find file: `%s'", fn); e += " "; - e += _f ("(load path: `%s')", global_path.str ()); + e += _f ("(load path: `%s')", global_path.to_string ()); error (e); } else if (verbose_global_b) progress_indication ("[" + s); - - Simple_file_storage f (s); - String result (f.ch_C ()); + int n; + char * str = gulp_file (s, &n); + String result (str); + delete[] str; + if (verbose_global_b) progress_indication ("]"); + return result; } -LY_DEFINE(ly_gulp_file, "ly-gulp-file", 1,0, 0, - (SCM name), - "Read the file named @var{name}, and return its contents in a string. The -file is looked up using the lilypond search path. - -") +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.") { - return ly_str02scm (gulp_file_to_string (ly_scm2string (name)).ch_C ()); + SCM_ASSERT_TYPE (gh_string_p (name), name, SCM_ARG1, __FUNCTION__, "string"); + return scm_makfrom0str (gulp_file_to_string (ly_scm2string (name)).to_str0 ()); } -/** - Read a file, and shove it down GUILE. GUILE also has file read - functions, but you can't fiddle with the path of those. - - - TODO: JUNKME. -*/ -void -read_lily_scm_file (String fn) -{ - gh_eval_str ((char *) gulp_file_to_string (fn).ch_C ()); -} - extern "C" { // maybe gdb 5.0 becomes quicker if it doesn't do fancy C++ typing? void @@ -212,7 +127,7 @@ ly_scm2string (SCM s) { assert (gh_string_p (s)); - char *p = SCM_STRING_CHARS(s); + char *p = SCM_STRING_CHARS (s); String r (p); return r; } @@ -220,6 +135,7 @@ ly_scm2string (SCM s) SCM index_get_cell (SCM s, Direction d) { + assert (d); return (d == LEFT) ? ly_car (s) : ly_cdr (s); } @@ -234,19 +150,19 @@ 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}. -") +LY_DEFINE (ly_warning,"ly:warn", 1, 0, 0, + (SCM str), "Scheme callable function to issue the warning @code{msg}.") { - assert (gh_string_p (str)); + SCM_ASSERT_TYPE (gh_string_p (str), str, SCM_ARG1, __FUNCTION__, "string"); + progress_indication ("\n"); warning ("lily-guile: " + ly_scm2string (str)); return SCM_BOOL_T; } -LY_DEFINE(ly_isdir_p, "dir?", 1,0, 0, (SCM s), - "type predicate. A direction is a -1, 0 or 1, where -1 represents left or -down and 1 represents right or up. -") +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 (gh_number_p (s)) { @@ -257,7 +173,7 @@ down and 1 represents right or up. } bool -ly_number_pair_p (SCM p) +is_number_pair (SCM p) { return gh_pair_p (p) && gh_number_p (ly_car (p)) && gh_number_p (ly_cdr (p)); } @@ -273,38 +189,27 @@ void add_scm_init_func (void (*f) ()) scm_init_funcs_->push (f); } -extern void init_cxx_function_smobs (); - -void -prepend_load_path (String p ) -{ - char s[1024]; - sprintf (s, - "(set! %%load-path (cons \"%s\" %%load-path))", p.ch_C()); - - scm_c_eval_string (s); -} void -init_lily_guile (String p ) +ly_init_ly_module (void *) { - prepend_load_path (p); - - // todo: junk this. We should make real modules iso. just loading files. - prepend_load_path (p + "/scm/"); - - SCM last_mod = scm_current_module (); - scm_set_current_module (scm_c_resolve_module ("guile")); - - init_cxx_function_smobs (); for (int i=scm_init_funcs_->size () ; i--;) (scm_init_funcs_->elem (i)) (); if (verbose_global_b) progress_indication ("\n"); - read_lily_scm_file ("lily.scm"); + + scm_primitive_load_path (scm_makfrom0str ("lily.scm")); +} + - scm_set_current_module (last_mod); +SCM global_lily_module; + +void +ly_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) @@ -315,7 +220,7 @@ unsigned int ly_scm_hash (SCM s) bool -ly_dir_p (SCM s) +is_direction (SCM s) { if (gh_number_p (s)) { @@ -327,7 +232,7 @@ ly_dir_p (SCM s) bool -ly_axis_p (SCM s) +is_axis (SCM s) { if (gh_number_p (s)) { @@ -337,40 +242,39 @@ ly_axis_p (SCM s) return false; } - Direction to_dir (SCM s) { - return (Direction) gh_scm2int (s); + return SCM_INUMP (s) ? (Direction) gh_scm2int (s) : CENTER; } Interval ly_scm2interval (SCM p) { - return Interval (gh_scm2double (ly_car (p)), - gh_scm2double (ly_cdr (p))); + return Interval (gh_scm2double (ly_car (p)), gh_scm2double (ly_cdr (p))); +} + +Drul_array +ly_scm2realdrul (SCM p) +{ + return Drul_array (gh_scm2double (ly_car (p)), + gh_scm2double (ly_cdr (p))); } SCM ly_interval2scm (Drul_array i) { - return gh_cons (gh_double2scm (i[LEFT]), - gh_double2scm (i[RIGHT])); + return gh_cons (gh_double2scm (i[LEFT]), gh_double2scm (i[RIGHT])); } - - - bool to_boolean (SCM s) { return gh_boolean_p (s) && gh_scm2bool (s); } -/* - Appendable list L: the cdr contains the list, the car the last cons - in the list. - */ +/* Appendable list L: the cdr contains the list, the car the last cons + in the list. */ SCM appendable_list () { @@ -403,46 +307,12 @@ ly_scm2offset (SCM s) gh_scm2double (ly_cdr (s))); } -SCM -ly_type (SCM exp) -{ - char const * cp = "unknown"; - if (gh_number_p (exp)) - { - cp = "number"; - } - else if (gh_string_p (exp)) - { - cp = "string"; - } - else if (gh_procedure_p (exp)) - { - cp = "procedure"; - } - else if (gh_boolean_p (exp)) - { - cp = "boolean"; - } - else if (gh_pair_p (exp)) - { - cp = "list"; - } - - return ly_str02scm (cp); -} - -/* - convert without too many decimals, and leave a space at the end. - */ - -LY_DEFINE(ly_number2string, "ly-number->string", 1, 0,0, - (SCM s), - " converts @var{num} to a string without generating many decimals. It -leaves a space at the end. -") +LY_DEFINE (ly_number2string, "ly:number->string", + 1, 0, 0, (SCM s), + "Convert @var{num} to a string without generating many decimals.") { - assert (gh_number_p (s)); + SCM_ASSERT_TYPE (gh_number_p (s), s, SCM_ARG1, __FUNCTION__, "number"); char str[400]; // ugh. @@ -450,27 +320,25 @@ leaves a space at the end. { Real r (gh_scm2double (s)); - if (isinf (r) || isnan (r)) + 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, "%8.4f ", r); + sprintf (str, "%08.4f", r); } else - { - sprintf (str, "%d ", gh_scm2int (s)); - } + sprintf (str, "%d", gh_scm2int (s)); - return ly_str02scm (str); + return scm_makfrom0str (str); } /* Undef this to see if GUILE GC is causing too many swaps. */ -// #define TEST_GC +//#define TEST_GC #ifdef TEST_GC #include @@ -478,38 +346,38 @@ leaves a space at the end. static void * greet_sweep (void *dummy1, void *dummy2, void *dummy3) { - fprintf (stderr, "entering sweep\n"); + fprintf (stderr, "entering sweep\n"); } static void * wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3) { - fprintf (stderr, "leaving sweep\n"); + fprintf (stderr, "leaving sweep\n"); } #endif -#include "version.hh" -LY_DEFINE(ly_version, "ly-version", 0, 0, 0, (), - "Return the current lilypond version as a list, e.g. -@code{(1 3 127 uu1)}. -") +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 ")" ; + char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " " PATCH_LEVEL " " MY_PATCH_LEVEL ")" ; return gh_eval_str ((char*)vs); } -LY_DEFINE(ly_unit, "ly-unit", 0, 0, 0, (), +LY_DEFINE (ly_unit, "ly:unit", 0, 0, 0, (), "Return the unit used for lengths as a string.") { - return ly_str02scm (INTERNAL_UNIT); + return scm_makfrom0str (INTERNAL_UNIT); } -LY_DEFINE(ly_verbose, "ly-verbose", 0, 0, 0, (), - "Return whether lilypond is being run in verbose mode.") + + +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 gh_bool2scm (verbose_global_b); + return scm_number_p (d); } static void @@ -527,22 +395,17 @@ SCM ly_deep_copy (SCM src) { if (gh_pair_p (src)) - { - return gh_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src))); - } + return gh_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src))); else if (gh_vector_p (src)) { - int l = SCM_VECTOR_LENGTH (src); - SCM nv = scm_c_make_vector (l, SCM_UNDEFINED); - for (int i =0 ; i< l ; i++) + int len = SCM_VECTOR_LENGTH (src); + SCM nv = scm_c_make_vector (len, SCM_UNDEFINED); + for (int i =0 ; i < len ; i++) { SCM si = gh_int2scm (i); scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si))); } } - else - return src; - return src; } @@ -586,39 +449,36 @@ corresponds to call SCM ly_assoc_cdr (SCM key, SCM alist) { - if (gh_pair_p (alist)) { - SCM trykey = ly_caar(alist); - if(gh_pair_p(trykey) && to_boolean(scm_equal_p(key,ly_cdr(trykey)))) - return ly_car(alist); + if (gh_pair_p (alist)) + { + SCM trykey = ly_caar (alist); + if (gh_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 ly_assoc_cdr (key, ly_cdr (alist)); } - else - return SCM_BOOL_F; + return SCM_BOOL_F; } -/* - LIST has the form "sym1 sym2 sym3\nsym4\nsym5" - - i.e. \n and ' ' can be used interchangeably as separators. - */ +/* LST has the form "sym1 sym2 sym3\nsym4\nsym5" + i.e. \n and ' ' can be used interchangeably as separators. */ SCM -parse_symbol_list (const char * list) +parse_symbol_list (char const *lst) { - char * s = strdup (list); + 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 (*p == '\n') + *p = ' '; - if (!s[0] ) + if (!s[0]) s = 0; - - while (s) { @@ -634,41 +494,32 @@ parse_symbol_list (const char * list) return create_list; } - SCM -ly_truncate_list (int k, SCM l ) +ly_truncate_list (int k, SCM lst) { if (k == 0) - { - l = SCM_EOL; - } + lst = SCM_EOL; else { - SCM s = l; + SCM s = lst; k--; for (; gh_pair_p (s) && k--; s = ly_cdr (s)) ; if (gh_pair_p (s)) - { - gh_set_cdr_x (s, SCM_EOL); - } + gh_set_cdr_x (s, SCM_EOL); } - return l; -} - -SCM my_gh_symbol2scm (const char* x) -{ - return gh_symbol2scm ((char*)x); + return lst; } String print_scm_val (SCM val) { String realval = ly_scm2string (ly_write2scm (val)); - if (realval.length_i () > 200) - realval = realval.left_str (100) + "\n :\n :\n" + realval.right_str (100); - + if (realval.length () > 200) + realval = realval.left_string (100) + + "\n :\n :\n" + + realval.right_string (100); return realval; } @@ -686,36 +537,52 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) if (val == SCM_EOL || val == SCM_BOOL_F) return ok; - - SCM type_p = SCM_EOL; + if (!gh_symbol_p (sym)) +#if 0 + return false; +#else + /* + This is used for autoBeamSettings. - if (gh_symbol_p (sym)) - type_p = scm_object_property (sym, type_symbol); + TODO: deprecate the use of \override and \revert for + autoBeamSettings? - if (type_p != SCM_EOL && !gh_procedure_p (type_p)) - { - warning (_f ("Can't find property type-check for `%s' (%s). Perhaps you made a typing error? Doing assignment anyway.", - ly_symbol2string (sym).ch_C (), - ly_symbol2string (type_symbol).ch_C () + or use a symbol autoBeamSettingS? + */ + return true; +#endif + + SCM type = scm_object_property (sym, type_symbol); - )); + if (type != SCM_EOL && !gh_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.")); } else { if (val != SCM_EOL - && gh_procedure_p (type_p) - && gh_call1 (type_p, val) == SCM_BOOL_F) + && gh_procedure_p (type) + && gh_call1 (type, val) == SCM_BOOL_F) { SCM errport = scm_current_error_port (); ok = false; - SCM typefunc = scm_primitive_eval (ly_symbol2scm ("type-name")); - SCM type_name = gh_call1 (typefunc, type_p); + SCM typefunc = ly_scheme_function ("type-name"); + SCM type_name = gh_call1 (typefunc, type); scm_puts (_f ("Type check for `%s' failed; value `%s' must be of type `%s'", - ly_symbol2string (sym).ch_C (), + ly_symbol2string (sym).to_str0 (), print_scm_val (val), - ly_scm2string (type_name).ch_C ()).ch_C (), + ly_scm2string (type_name).to_str0 ()).to_str0 (), errport); scm_puts ("\n", errport); } @@ -751,9 +618,8 @@ ly_snoc (SCM s, SCM list) return gh_append2 (list, scm_list_n (s, SCM_UNDEFINED)); } - /* Split list at member s, removing s. - Return (BEFORE . AFTER) */ + Return (BEFORE . AFTER) */ SCM ly_split_list (SCM s, SCM list) { @@ -773,7 +639,7 @@ ly_split_list (SCM s, SCM list) void -taint (SCM * foo) +taint (SCM *) { /* nop. @@ -786,12 +652,12 @@ taint (SCM * foo) SCM display_list (SCM s) { - SCM p = scm_current_output_port(); + SCM p = scm_current_output_port (); scm_puts ("(", p); - for (; gh_pair_p(s); s =gh_cdr(s)) + for (; gh_pair_p (s); s =gh_cdr (s)) { - scm_display (gh_car(s), p); + scm_display (gh_car (s), p); scm_puts (" ", p); } scm_puts (")", p); @@ -804,11 +670,89 @@ int_list_to_slice (SCM l) Slice s; s.set_empty (); for (; gh_pair_p (l); l = gh_cdr (l)) + if (gh_number_p (gh_car (l))) + s.add_point (gh_scm2int (gh_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 && gh_pair_p (gh_cdr (l))) + l = gh_cdr (l); + return gh_car (l); +} + +Real +robust_scm2double (SCM k, double x) +{ + if (gh_number_p (k)) + x = gh_scm2double (k); + 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) +{ + if (is_number_pair (k)) + o = ly_scm2offset (k); + return o; +} + +int +robust_scm2int (SCM k, int o) +{ + if (scm_integer_p (k) == SCM_BOOL_T) + o = gh_scm2int (k); + return o; +} + +SCM +alist_to_hashq (SCM alist) +{ + int i = scm_ilength (alist); + if (i < 0) + return scm_make_vector (gh_int2scm (0), SCM_EOL); + + SCM tab = scm_make_vector (gh_int2scm (i), SCM_EOL); + for (SCM s = alist; gh_pair_p (s); s = ly_cdr (s)) { - if (gh_number_p (gh_car (l))) - s.add_point (gh_scm2int (gh_car (l))); + SCM pt = ly_cdar (s); + scm_hashq_set_x (tab, ly_caar (s), pt); } - - return s; + 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