X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=7788833f4b19641dd9fa71d6f539fa59a9a641e8;hb=8dbb0048c1ac59125562d5adc1c68512eab8541b;hp=8c4cf5d1cd581fa05ffefd5d4df66dae18538763;hpb=c802622f935af83bb791ded58056428d6be31d0a;p=lilypond.git diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 8c4cf5d1cd..7788833f4b 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -3,17 +3,71 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ #ifndef LILY_GUILE_HH #define LILY_GUILE_HH -#include +#define SCM_VOIDP_TEST + #include +/* + TODO: the GH interface is deprecated as of GUILE 1.6 + + Remove all gh_XXX functions. + */ +#include + +#include "config.h" + +/* Guile 1.3.4 compatibility */ +#if GUILE_MINOR_VERSION < 4 + + +#ifndef SCM_CELL_TYPE +#define SCM_CELL_TYPE(X) SCM_CAR (X) +#endif + +#ifndef SCM_CELL_WORD_1 +#define SCM_CELL_WORD_1(X) SCM_CDR (X) +#endif + +#define scm_bits_t SCM + #define fix_guile_1_3_4_scm_puts(scm_data, port) scm_puts ((char*)scm_data, port) #define scm_puts(scm_data, port) fix_guile_1_3_4_scm_puts (scm_data, port) +#endif + +/* Guile 1.4.x compatibility */ +#if GUILE_MINOR_VERSION < 5 + +#define scm_t_bits scm_bits_t + +#define fix_guile_1_4_gh_scm2newstr(str, lenp) gh_scm2newstr (str, (int*)lenp) +#define gh_scm2newstr(str, lenp) fix_guile_1_4_gh_scm2newstr (str, lenp) + +#define fix_guile_1_4_scm_primitive_eval(form) scm_eval_3 (form, 1, SCM_EOL) +#define scm_primitive_eval(form) fix_guile_1_4_scm_primitive_eval (form) + +#define scm_current_module() (SCM)0 +#define scm_set_current_module(x) (void)x +#define scm_c_resolve_module(x) (SCM)0 + +#define scm_c_define_gsubr scm_make_gsubr +#define scm_c_eval_string(str) gh_eval_str ((char*)str) +#define scm_c_memq scm_sloppy_memq +#define scm_gc_protect_object scm_protect_object +#define scm_gc_unprotect_object scm_unprotect_object +#define scm_list_n scm_listify +#define SCM_STRING_CHARS SCM_CHARS +#define SCM_STRING_LENGTH SCM_LENGTH +#define SCM_SYMBOL_CHARS SCM_CHARS +#define SCM_SYMBOL_LENGTH SCM_LENGTH +#endif + + #include "direction.hh" #include "flower-proto.hh" @@ -31,20 +85,91 @@ A ly_B2A (B b); */ + +SCM ly_last (SCM list); SCM ly_str02scm (char const*c); +SCM ly_write2scm (SCM s); SCM ly_deep_copy (SCM); -SCM ly_symbol2scm (char const *); +SCM ly_truncate_list (int k, SCM l ); + + +#if (__GNUC__ > 2) +/* + todo: should add check for x86 as well + */ +#define CACHE_SYMBOLS +#endif + + +#ifdef CACHE_SYMBOLS + + +/* + We don't use gh_symbol2scm directly, since it has const-correctness + problems in GUILE 1.3.4 + + */ +SCM my_gh_symbol2scm (const char* x); + +/* + Using this trick we cache the value of gh_symbol2scm ("fooo") where + "fooo" is a constant string. This is done at the cost of one static + variable per ly_symbol2scm() use, and one boolean evaluation for + every call. + + The overall speedup of lily is about 5% on a run of wtk1-fugue2 + +*/ +#define ly_symbol2scm(x) ({ static SCM cached; \ + SCM value = cached; /* We store this one locally, since G++ -O2 fucks up else */ \ + if ( __builtin_constant_p ((x)))\ + { if (!cached)\ + value = cached = scm_gc_protect_object (my_gh_symbol2scm((x)));\ + } else\ + value = gh_symbol2scm ((char*) (x)); \ + value; }) +#else +inline SCM ly_symbol2scm(char const* x) { return gh_symbol2scm((x)); } +#endif + + + String ly_scm2string (SCM s); String ly_symbol2string (SCM); SCM ly_offset2scm (Offset); Offset ly_scm2offset (SCM); SCM ly_assoc_chain (SCM key, SCM achain); +SCM ly_assoc_cdr (SCM key, SCM alist); Interval ly_scm2interval (SCM); SCM ly_interval2scm (Interval); + SCM ly_parse_scm (char const* s, int* n); SCM ly_quote_scm (SCM s); SCM ly_type (SCM); +bool type_check_assignment (SCM val, SCM sym, SCM type_symbol) ; +SCM ly_number2string (SCM s); + +SCM parse_symbol_list (char const *); + +inline SCM ly_cdr (SCM x) { return SCM_CDR (x); } +inline SCM ly_car (SCM x) { return SCM_CAR (x); } +inline SCM ly_caar (SCM x) { return SCM_CAAR (x); } +inline SCM ly_cdar (SCM x) { return SCM_CDAR (x); } +inline SCM ly_cadr (SCM x) { return SCM_CADR (x); } +inline SCM ly_cddr (SCM x) { return SCM_CDDR (x); } +inline SCM ly_caddr (SCM x) { return SCM_CADDR (x); } +inline SCM ly_cdadr (SCM x) { return SCM_CDADR (x); } +inline SCM ly_caadr (SCM x) { return SCM_CAADR (x); } +/* inserts at front, removing dublicates */ +inline SCM ly_assoc_front_x(SCM alist, SCM key, SCM val) +{ + return scm_acons(key, val, scm_assoc_remove_x (alist, key)); +} +inline bool ly_pair_p (SCM x) { return SCM_NFALSEP (scm_pair_p (x)); } +inline bool ly_symbol_p (SCM x) { return SCM_SYMBOLP (x); } +inline bool ly_number_p (SCM x) { return SCM_NUMBERP (x); } +inline bool ly_procedure_p (SCM x) { return SCM_NFALSEP (scm_procedure_p(x)); } /* display and print newline. @@ -56,9 +181,12 @@ void ly_display_scm (SCM s); #include "array.hh" void read_lily_scm_file (String); -void init_lily_guile (); +void init_lily_guile (String dir); bool isdir_b (SCM s); +bool isaxis_b (SCM s); +bool ly_number_pair_p (SCM); +bool ly_axis_p (SCM); /* these conversion functions also do a typecheck on the argument, and @@ -78,19 +206,19 @@ SCM index_set_cell (SCM cellp, Direction d, SCM val); /* snarfing. */ -void add_scm_init_func (void (*)()); +void add_scm_init_func (void (*) ()); -typedef SCM(*Scheme_function_unknown)(); +typedef SCM (*Scheme_function_unknown) (); -#if __GNUC_MINOR__ >= 96 -typedef SCM(*Scheme_function_0)(); -typedef SCM(*Scheme_function_1)(SCM); -typedef SCM(*Scheme_function_2)(SCM,SCM); +#if __GNUC__ > 2 || __GNUC_MINOR__ >= 96 +typedef SCM (*Scheme_function_0) (); +typedef SCM (*Scheme_function_1) (SCM); +typedef SCM (*Scheme_function_2) (SCM,SCM); #else -typedef SCM(*Scheme_function_0)(...); -typedef SCM(*Scheme_function_1)(...); -typedef SCM(*Scheme_function_2)(...); +typedef SCM (*Scheme_function_0) (...); +typedef SCM (*Scheme_function_1) (...); +typedef SCM (*Scheme_function_2) (...); #endif #define DECLARE_SCHEME_CALLBACK(NAME,ARGS) \ @@ -103,10 +231,10 @@ void \ TYPE ## _ ## FUNC ## _init_functions () \ { \ TYPE :: FUNC ## _proc = gh_new_procedure ## ARGCOUNT ## _0 (#TYPE "::" #FUNC, \ - ((Scheme_function_ ## ARGCOUNT)TYPE :: FUNC)); \ + ((Scheme_function_ ## ARGCOUNT)TYPE :: FUNC)); \ } \ \ -ADD_SCM_INIT_FUNC(TYPE ## _ ## FUNC ## _callback, TYPE ## _ ## FUNC ## _init_functions); \ +ADD_SCM_INIT_FUNC (TYPE ## _ ## FUNC ## _callback, TYPE ## _ ## FUNC ## _init_functions); \ #define ADD_SCM_INIT_FUNC(name, func)\