X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=e67293e06f89c3c4897097722899b1e692e53f41;hb=0817e0513d1016ff22a633b6fee20ddba2a062f2;hp=28cf68fa91959506904208e434b227e91f74fb07;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 28cf68fa91..e67293e06f 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -3,30 +3,157 @@ 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 "string.hh" +#define SCM_VOIDP_TEST -#include #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_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" + +#ifndef SCM_PACK +#define SCM_PACK(x) ((SCM) x) + +#endif +#ifndef SCM_UNPACK +#define SCM_UNPACK(x) ( x) +#endif + +/* + conversion functions follow the GUILE naming convention, i.e. + + A ly_B2A (B b); + */ +SCM ly_last (SCM list); SCM ly_str02scm (char const*c); -SCM ly_eval_str (String s); -SCM ly_symbol2scm (char const *); -String ly_symbol2string (SCM); +SCM ly_write2scm (SCM s); +SCM ly_deep_copy (SCM); +SCM ly_truncate_list (int k, SCM l ); + +#define CACHE_SYMBOLS +#ifdef CACHE_SYMBOLS + +SCM my_gh_symbol2scm (const char* x); + +// #warning: CACHE_SYMBOLS + +/* + 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. -SCM ly_offset2scm (Offset o); + 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((char*) (x)));\ + } else\ + value = gh_symbol2scm ((char*) (x)); \ + value; }) +#else +inline SCM ly_symbol2scm(char const* x) { return gh_symbol2scm((char*)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); +Interval ly_scm2interval (SCM); +SCM ly_interval2scm (Interval); -SCM ly_eval (SCM a); 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); } +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. + */ +extern "C" { void ly_display_scm (SCM s); -String ly_scm2string (SCM s); +} #include "array.hh" @@ -34,8 +161,16 @@ void read_lily_scm_file (String); void init_lily_guile (); bool isdir_b (SCM s); -Direction to_dir (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 + return a default value if S has the wrong type. +*/ + +Direction to_dir (SCM s); bool to_boolean (SCM s); void init_ly_protection (); @@ -44,20 +179,40 @@ unsigned int ly_scm_hash (SCM s); SCM index_cell (SCM cellp, Direction d); SCM index_set_cell (SCM cellp, Direction d, SCM val); -templateSCM array_to_scm (Array arr); -templatevoid scm_to_array (SCM s, Array* arr); - -//URG how templates suck! -SCM to_scm (int i); -int scm_to (SCM s, int* i); - -SCM to_scm (Real r); -Real scm_to (SCM s, Real* r); /* snarfing. */ -void add_scm_init_func (void (*)()); +void add_scm_init_func (void (*) ()); + + +typedef SCM (*Scheme_function_unknown) (); + +#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) (...); +#endif + +#define DECLARE_SCHEME_CALLBACK(NAME,ARGS) \ + static SCM NAME ARGS; \ + static SCM NAME ## _proc + +#define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGCOUNT) \ +SCM TYPE :: FUNC ## _proc;\ +void \ +TYPE ## _ ## FUNC ## _init_functions () \ +{ \ + TYPE :: FUNC ## _proc = gh_new_procedure ## ARGCOUNT ## _0 (#TYPE "::" #FUNC, \ + ((Scheme_function_ ## ARGCOUNT)TYPE :: FUNC)); \ +} \ + \ +ADD_SCM_INIT_FUNC (TYPE ## _ ## FUNC ## _callback, TYPE ## _ ## FUNC ## _init_functions); \ + #define ADD_SCM_INIT_FUNC(name, func)\ class name ## _scm_initter { \