X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=dbd2a90a5688f0944637af12875f2e1f1d35be4e;hb=38655bc28e73a0b218ba1582bdb84bab0fdfec4b;hp=30ac299bf827fcffe1844d8739539b8019f02400;hpb=9651bafcd832c72a8f81ade4b602199583d61f37;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 30ac299bf8..dbd2a90a56 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--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen Han-Wen Nienhuys */ @@ -11,8 +11,8 @@ #include #include -#include // isinf - +#include /* isinf */ +#include /* strdup, strchr */ #include "libc-extension.hh" #include "lily-guile.hh" #include "main.hh" @@ -22,11 +22,35 @@ #include "direction.hh" #include "offset.hh" #include "interval.hh" +#include "pitch.hh" +#include "dimensions.hh" + +#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 gh_car (scm_last_pair (list)); + return ly_car (scm_last_pair (list)); } SCM @@ -45,7 +69,7 @@ ly_write2scm (SCM s) SCM_OPN | SCM_WRTNG, "ly_write2string"); // SCM write = scm_eval_3 (ly_symbol2scm ("write"), s, SCM_EOL); - SCM write = scm_eval2 (ly_symbol2scm ("write"), SCM_EOL); + SCM write = scm_primitive_eval (ly_symbol2scm ("write")); // scm_apply (write, port, SCM_EOL); gh_call2 (write, s, port); @@ -74,8 +98,8 @@ ly_parse_scm (char const* s, int* n) /* Read expression from port */ if (!SCM_EOF_OBJECT_P (form = scm_read (port))) - answer = scm_eval_3 (form, 1, SCM_EOL); // guh? - + answer = scm_primitive_eval (form); + /* After parsing @@ -111,22 +135,16 @@ ly_parse_scm (char const* s, int* n) SCM ly_quote_scm (SCM s) { - return gh_list (ly_symbol2scm ("quote"), s, SCM_UNDEFINED); + return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED); } -SCM -ly_symbol2scm (const char *s) -{ - return gh_symbol2scm ((char *)s); -} - String ly_symbol2string (SCM s) { assert (gh_symbol_p (s)); - return String ((Byte*)SCM_CHARS (s), (int) SCM_LENGTH (s)); + return String ((Byte*)SCM_STRING_CHARS (s), (int) SCM_STRING_LENGTH (s)); } @@ -152,17 +170,24 @@ gulp_file_to_string (String fn) return result; } -SCM -ly_gulp_file (SCM fn) +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. + +") { - return ly_str02scm (gulp_file_to_string (ly_scm2string (fn)).ch_C ()); + return ly_str02scm (gulp_file_to_string (ly_scm2string (name)).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. - */ + + + TODO: JUNKME. +*/ void read_lily_scm_file (String fn) { @@ -183,8 +208,9 @@ String ly_scm2string (SCM s) { assert (gh_string_p (s)); - int len; - char * p = gh_scm2newstr (s , &len); + + size_t len; + char *p = gh_scm2newstr (s , &len); String r (p); @@ -196,7 +222,7 @@ SCM index_cell (SCM s, Direction d) { assert (d); - return (d == LEFT) ? gh_car (s) : gh_cdr (s); + return (d == LEFT) ? ly_car (s) : ly_cdr (s); } SCM @@ -209,16 +235,19 @@ index_set_cell (SCM s, Direction d, SCM v) return s; } -SCM -ly_warning (SCM str) +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)); warning ("lily-guile: " + ly_scm2string (str)); return SCM_BOOL_T; } -SCM -ly_isdir_p (SCM s) +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. +") { if (gh_number_p (s)) { @@ -231,13 +260,7 @@ ly_isdir_p (SCM s) bool ly_number_pair_p (SCM p) { - return gh_pair_p (p) && gh_number_p (gh_car (p)) && gh_number_p (gh_cdr (p)); -} - -bool -ly_axis_p (SCM a) -{ - return gh_number_p (a) && (gh_scm2int (a) == 0 || gh_scm2int (a) == 1); + return gh_pair_p (p) && gh_number_p (ly_car (p)) && gh_number_p (ly_cdr (p)); } typedef void (*Void_fptr) (); @@ -250,14 +273,39 @@ void add_scm_init_func (void (*f) ()) scm_init_funcs_->push (f); } + extern void init_cxx_function_smobs (); void -init_lily_guile () +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 ) +{ + 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)) (); + (scm_init_funcs_->elem (i)) (); + + if (verbose_global_b) + progress_indication ("\n"); + read_lily_scm_file ("lily.scm"); + + scm_set_current_module (last_mod); } unsigned int ly_scm_hash (SCM s) @@ -268,7 +316,7 @@ unsigned int ly_scm_hash (SCM s) bool -isdir_b (SCM s) +ly_dir_p (SCM s) { if (gh_number_p (s)) { @@ -280,7 +328,7 @@ isdir_b (SCM s) bool -isaxis_b (SCM s) +ly_axis_p (SCM s) { if (gh_number_p (s)) { @@ -300,12 +348,12 @@ to_dir (SCM s) Interval ly_scm2interval (SCM p) { - return Interval (gh_scm2double (gh_car (p)), - gh_scm2double (gh_cdr (p))); + return Interval (gh_scm2double (ly_car (p)), + gh_scm2double (ly_cdr (p))); } SCM -ly_interval2scm (Interval i) +ly_interval2scm (Drul_array i) { return gh_cons (gh_double2scm (i[LEFT]), gh_double2scm (i[RIGHT])); @@ -338,7 +386,7 @@ appendable_list_append (SCM l, SCM elt) { SCM newcons = gh_cons (elt, SCM_EOL); - gh_set_cdr_x (gh_car (l), newcons); + gh_set_cdr_x (ly_car (l), newcons); gh_set_car_x (l, newcons); } @@ -352,8 +400,8 @@ ly_offset2scm (Offset o) Offset ly_scm2offset (SCM s) { - return Offset (gh_scm2double (gh_car (s)), - gh_scm2double (gh_cdr (s))); + return Offset (gh_scm2double (ly_car (s)), + gh_scm2double (ly_cdr (s))); } SCM @@ -389,14 +437,17 @@ ly_type (SCM exp) */ -SCM -ly_number2string (SCM s) +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. +") { assert (gh_number_p (s)); char str[400]; // ugh. - if (scm_integer_p (s) == SCM_BOOL_F) + if (scm_exact_p (s) == SCM_BOOL_F) { Real r (gh_scm2double (s)); @@ -440,26 +491,31 @@ wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3) #include "version.hh" -SCM -ly_version () +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 gh_eval_str ((char*)vs); } -static void -init_functions () +LY_DEFINE(ly_unit, "ly-unit", 0, 0, 0, (), + "Return the unit used for lengths as a string.") { - scm_make_gsubr ("ly-warn", 1, 0, 0, (Scheme_function_unknown)ly_warning); - scm_make_gsubr ("ly-version", 0, 0, 0, (Scheme_function_unknown)ly_version); - 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 ("ly-number->string", 1, 0,0, (Scheme_function_unknown) ly_number2string); + return ly_str02scm (INTERNAL_UNIT); +} +LY_DEFINE(ly_verbose, "ly-verbose", 0, 0, 0, (), + "Return whether lilypond is being run in verbose mode.") +{ + return gh_bool2scm (verbose_global_b); +} +static void +init_functions () +{ #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); @@ -473,7 +529,7 @@ 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))); + return gh_cons (ly_deep_copy (ly_car (l)), ly_deep_copy (ly_cdr (l))); } else return l; @@ -487,12 +543,220 @@ ly_assoc_chain (SCM key, SCM achain) { if (gh_pair_p (achain)) { - SCM handle = scm_assoc (key, gh_car (achain)); + SCM handle = scm_assoc (key, ly_car (achain)); if (gh_pair_p (handle)) return handle; else - return ly_assoc_chain (key, gh_cdr (achain)); + return ly_assoc_chain (key, ly_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)) + + + +*/ +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); + else + return ly_assoc_cdr (key, ly_cdr (alist)); + } + else + return SCM_BOOL_F; +} + +/* + LIST 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) +{ + char * s = strdup (list); + char *orig = s; + SCM create_list = SCM_EOL; + + 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 = gh_cons (ly_symbol2scm (s), create_list); + s = next; + } + + free (orig); + return create_list; +} + + +SCM +ly_truncate_list (int k, SCM l ) +{ + if (k == 0) + { + l = SCM_EOL; + } + else + { + SCM s = l; + k--; + for (; gh_pair_p (s) && k--; s = ly_cdr (s)) + ; + + if (gh_pair_p (s)) + { + gh_set_cdr_x (s, SCM_EOL); + } + } + return l; +} + +SCM my_gh_symbol2scm (const char* x) +{ + return gh_symbol2scm ((char*)x); +} + +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); + + return realval; +} + +bool +type_check_assignment (SCM sym, SCM val, SCM type_symbol) +{ + bool ok = true; + + /* + Always succeeds. + + + TODO: should remove #f from allowed vals? + */ + if (val == SCM_EOL || val == SCM_BOOL_F) + return ok; + + + SCM type_p = SCM_EOL; + + if (gh_symbol_p (sym)) + type_p = scm_object_property (sym, type_symbol); + + 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 () + + )); + } + else + { + if (val != SCM_EOL + && gh_procedure_p (type_p) + && gh_call1 (type_p, 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_puts (_f ("Type check for `%s' failed; value `%s' must be of type `%s'", + ly_symbol2string (sym).ch_C (), + print_scm_val (val), + ly_scm2string (type_name).ch_C ()).ch_C (), + errport); + scm_puts ("\n", errport); + } + } + return ok; +} + + +/* some SCM abbrevs + + zijn deze nou handig? + zijn ze er al in scheme, maar heten ze anders? */ + + +/* Remove doubles from (sorted) list */ +SCM +ly_unique (SCM list) +{ + SCM unique = SCM_EOL; + for (SCM i = list; gh_pair_p (i); i = ly_cdr (i)) + { + if (!gh_pair_p (ly_cdr (i)) + || !gh_equal_p (ly_car (i), ly_cadr (i))) + unique = gh_cons (ly_car (i), unique); + } + return scm_reverse_x (unique, SCM_EOL); +} + +/* tail add */ +SCM +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) */ +SCM +ly_split_list (SCM s, SCM list) +{ + SCM before = SCM_EOL; + SCM after = list; + for (; gh_pair_p (after);) + { + SCM i = ly_car (after); + after = ly_cdr (after); + if (gh_equal_p (i, s)) + break; + before = gh_cons (i, before); + } + return gh_cons ( scm_reverse_x (before, SCM_EOL), after); + +} +