X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=4a6e26d5d1ae1077af7dd7cf815c849bbb4eafce;hb=8ecd09ad7514d57630fb611d38c161f3c3c708db;hp=b2017c27af3de9817b19fb7d86c22db0a54fa0fc;hpb=0cf97b5cdceecbba937f43ac827f4065aad5001e;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index b2017c27af..4a6e26d5d1 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--1999 Jan Nieuwenhuizen + (c) 1998--2000 Jan Nieuwenhuizen Han-Wen Nienhuys */ @@ -11,6 +11,7 @@ #include #include +#include // isinf #include "libc-extension.hh" #include "lily-guile.hh" @@ -18,118 +19,154 @@ #include "simple-file-storage.hh" #include "file-path.hh" #include "debug.hh" +#include "direction.hh" +#include "offset.hh" +#include "interval.hh" SCM -ly_ch_C_to_scm (char const*c) +ly_str02scm (char const*c) { // this all really sucks, guile should take char const* arguments! return gh_str02scm ((char*)c); } -SCM -ly_ch_C_eval_scm (char const*c) -{ - // this all really sucks, guile should take char const* arguments! - return gh_eval_str ((char*)c); -} + /* - scm_m_quote doesn't use any env, but needs one for a good signature in GUILE. + 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 = gh_str02scm ((char*)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_eval_3 (form, 1, SCM_EOL); // guh? + + /* + 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_m_quote (scm_cons2 (SCM_EOL, s, SCM_EOL) ,SCM_EOL); // apparently env arg is ignored. + return gh_list (ly_symbol2scm ("quote"), s, SCM_UNDEFINED); } -/* - See: libguile/symbols.c - SCM - scm_string_to_symbol(s) - -*/ SCM -ly_symbol (String name) +ly_symbol2scm(const char *s) { - return gh_car (scm_intern ((char*)name.ch_C(), name.length_i())); + return gh_symbol2scm ((char *)s); } + String -symbol_to_string (SCM s) +ly_symbol2string (SCM s) { + assert (gh_symbol_p (s)); return String((Byte*)SCM_CHARS (s), (int) SCM_LENGTH(s)); } -SCM -ly_set_scm (String name, SCM val) -{ - return scm_sysintern ((char*)name.ch_C(), val); - -} -/** - Read a file, and shove it down GUILE. GUILE also has file read - functions, but you can't fiddle with the path of those. - */ -void -read_lily_scm_file (String fn) +String +gulp_file_to_string (String fn) { String s = global_path.find (fn); if (s == "") { - 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.str ()); error (e); } - else - *mlog << '[' << s; + else if (verbose_global_b) + progress_indication ("[" + s ); Simple_file_storage f(s); - - ly_ch_C_eval_scm ((char *) f.ch_C()); - *mlog << "]" << flush; + String result (f.ch_C()); + if (verbose_global_b) + progress_indication ("]"); + return result; } - SCM -ly_gulp_file (SCM name) +ly_gulp_file (SCM fn) { - String fn (ly_scm2string (name)); - 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.str ()); - error (e); - } - else - *mlog << '[' << s; + return ly_str02scm (gulp_file_to_string (ly_scm2string (fn)).ch_C()); +} - Simple_file_storage f(s); - return ly_ch_C_to_scm (f.ch_C()); +/** + Read a file, and shove it down GUILE. GUILE also has file read + functions, but you can't fiddle with the path of those. + */ +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 ly_display_scm (SCM s) { gh_display (s); gh_newline (); } +}; String ly_scm2string (SCM s) { + assert (gh_string_p (s)); int len; char * p = gh_scm2newstr (s , &len); String r (p); - // delete p; + free (p); return r; } @@ -138,21 +175,19 @@ SCM index_cell (SCM s, Direction d) { assert (d); - return (d == LEFT) ? SCM_CAR (s) : SCM_CDR (s); + return (d == LEFT) ? gh_car (s) : gh_cdr (s); } - SCM -array_to_list (SCM *a , int l) +index_set_cell (SCM s, Direction d, SCM v) { - SCM list = SCM_EOL; - for (int i= l; i--; ) - { - list = gh_cons (a[i], list); - } - return list; + if (d == LEFT) + gh_set_car_x (s, v); + else if (d == RIGHT) + gh_set_cdr_x (s, v); + return s; } - + SCM ly_warning (SCM str) { @@ -161,18 +196,234 @@ ly_warning (SCM str) return SCM_BOOL_T; } -void -init_functions () +SCM +ly_isdir_p (SCM s) { - scm_make_gsubr ("ly-warn", 1, 0, 0, (SCM(*)(...))ly_warning); - scm_make_gsubr ("ly-gulp-file", 1,0, 0, (SCM(*)(...))ly_gulp_file); + if (gh_number_p (s)) + { + int i = gh_scm2int (s); + return (i>= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F; + } + return SCM_BOOL_F; } -extern void init_symbols (); + + +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); +} void init_lily_guile () { - init_symbols(); - init_functions (); + for (int i=scm_init_funcs_->size() ; i--;) + (scm_init_funcs_->elem (i)) (); +} + +unsigned int ly_scm_hash (SCM s) +{ + return scm_ihashv (s, ~1u); +} + + + +bool +isdir_b (SCM s) +{ + if (gh_number_p (s)) + { + int i = gh_scm2int (s); + return i>= -1 && i <= 1; + } + return false; +} + +Direction +to_dir (SCM s) +{ + return (Direction) gh_scm2int (s); } + +Interval +ly_scm2interval (SCM p) +{ + return Interval (gh_scm2double (gh_car (p)), + gh_scm2double (gh_cdr (p))); +} + +SCM +ly_interval2scm (Interval i) +{ + 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. + */ +SCM +appendable_list () +{ + SCM s = gh_cons (SCM_EOL, SCM_EOL); + gh_set_car_x (s, s); + + return s; +} + +void +appendable_list_append (SCM l, SCM elt) +{ + SCM newcons = gh_cons (elt, SCM_EOL); + + gh_set_cdr_x (gh_car (l), newcons); + gh_set_car_x (l, newcons); +} + + +SCM +ly_offset2scm (Offset o) +{ + return gh_cons (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS])); +} + +Offset +ly_scm2offset (SCM s) +{ + return Offset (gh_scm2double (gh_car (s)), + gh_scm2double (gh_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. + */ + + +SCM +ly_number2string (SCM s) +{ + assert (gh_number_p (s)); + + char str[400]; // ugh. + + if (scm_integer_p (s) == SCM_BOOL_F) + { + Real r (gh_scm2double (s)); + + if (isinf (r) || isnan (r)) + { + programming_error ("Infinity or NaN encountered while converting Real number; setting to zero."); + r = 0.0; + } + + sprintf (str, "%8.4f ", r); + } + else + { + sprintf (str, "%d ", gh_scm2int (s)); + } + + return gh_str02scm (str); +} + +/* + Undef this to see if GUILE GC is causing too many swaps. + */ + +// #define TEST_GC + +#ifdef TEST_GC +#include + +static void * +greet_sweep (void *dummy1, void *dummy2, void *dummy3) +{ + fprintf(stderr, "entering sweep\n"); +} + +static void * +wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3) +{ + fprintf(stderr, "leaving sweep\n"); +} +#endif + +SCM +undefd () +{ + return SCM_UNDEFINED; +} + + +static void +init_functions () +{ + scm_make_gsubr ("ly-warn", 1, 0, 0, (Scheme_function_unknown)ly_warning); + scm_make_gsubr ("ly-gulp-file", 1,0, 0, (Scheme_function_unknown)ly_gulp_file); + scm_make_gsubr ("dir?", 1,0, 0, (Scheme_function_unknown)ly_isdir_p); + scm_make_gsubr ("undefd", 0,0, 0, (Scheme_function_unknown)undefd); + scm_make_gsubr ("ly-number->string", 1, 0,0, (Scheme_function_unknown) ly_number2string); + + +#ifdef TEST_GC + scm_c_hook_add (&scm_before_mark_c_hook, greet_sweep, 0, 0); + scm_c_hook_add (&scm_before_sweep_c_hook, wave_sweep_goodbye, 0, 0); +#endif +} + +ADD_SCM_INIT_FUNC(funcs, init_functions); + +SCM +ly_deep_copy (SCM l) +{ + if (gh_pair_p (l)) + { + return gh_cons (ly_deep_copy (gh_car (l)), ly_deep_copy (gh_cdr (l))); + } + else + return l; +} + +