X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=5af2ab0176f554ff6b0123e8150419f6bb96d3ca;hb=1753b1a73742a5b0893037116bb6f2febba277f3;hp=26c2a8a3001732a7ff94c2521813288dbbc52e11;hpb=8e25b11a9f3dbf7854e41d35e9dd6dd8a66986e4;p=lilypond.git diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 26c2a8a300..5af2ab0176 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -3,15 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2003 Jan Nieuwenhuizen */ #ifndef LILY_GUILE_HH #define LILY_GUILE_HH -#define SCM_VOIDP_TEST - -#include /* TODO: the GH interface is deprecated as of GUILE 1.6 @@ -20,25 +17,25 @@ */ #include -#include "config.h" -/* Guile 1.3.4 compatibility */ -#if GUILE_MINOR_VERSION < 4 +/* GUILE only includes version in headers (libguile/version.h) as of + 1.5.x. For some strange reason, they call it SCM.*VERSION. + Not including config.h here, saves a lot of unnecessary + recompiles. */ +#include -#ifndef SCM_CELL_TYPE -#define SCM_CELL_TYPE(X) SCM_CAR (X) +#ifndef GUILE_MAJOR_VERSION +#ifdef SCM_MAJOR_VERSION +#define GUILE_MAJOR_VERSION SCM_MAJOR_VERSION +#define GUILE_MINOR_VERSION SCM_MINOR_VERSION +#define GUILE_PATCH_LEVEL SCM_MICRO_VERSION +#else +#include "config.h" #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 +#include "drul-array.hh" /* Guile 1.4.x compatibility */ #if GUILE_MINOR_VERSION < 5 @@ -51,13 +48,17 @@ #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_int2num(x) scm_long2num (x) #define scm_current_module() (SCM)0 #define scm_set_current_module(x) (void)x #define scm_c_resolve_module(x) (SCM)0 +inline SCM scm_c_make_vector (int k, SCM val) { + return scm_make_vector (SCM_MAKINUM (k), val); +} #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_remember_upto_here_1(s) scm_remember (&s) #define scm_gc_protect_object scm_protect_object #define scm_gc_unprotect_object scm_unprotect_object #define scm_list_n scm_listify @@ -65,10 +66,22 @@ #define SCM_STRING_LENGTH SCM_LENGTH #define SCM_SYMBOL_CHARS SCM_CHARS #define SCM_SYMBOL_LENGTH SCM_LENGTH +#define SCM_VECTOR_LENGTH SCM_LENGTH + +#define SMOB_FREE_RETURN_VAL(CL) sizeof(CL) +#define scm_done_free(x) #endif +#ifndef SMOB_FREE_RETURN_VAL +#define SMOB_FREE_RETURN_VAL(CL) 0 +#endif +#if GUILE_MINOR_VERSION < 7 +#define scm_gc_unregister_collectable_memory(a,b,c) scm_done_free(b) +#define scm_gc_register_collectable_memory(a,b,c) scm_done_malloc(b) +#endif + #include "direction.hh" #include "flower-proto.hh" @@ -87,23 +100,27 @@ */ SCM ly_last (SCM list); -SCM ly_str02scm (char const*c); SCM ly_write2scm (SCM s); SCM ly_deep_copy (SCM); SCM ly_truncate_list (int k, SCM l ); -#define CACHE_SYMBOLS -#ifdef CACHE_SYMBOLS +/* + Unreliable on gcc2 + */ +// #define CACHE_SYMBOLS + +#if (__GNUC__ > 2) /* - We don't use gh_symbol2scm directly, since it has const-correctness - problems in GUILE 1.3.4 - + todo: should add check for x86 as well */ -SCM my_gh_symbol2scm (const char* x); +#define CACHE_SYMBOLS +#endif + + +#ifdef CACHE_SYMBOLS -// #warning: CACHE_SYMBOLS /* Using this trick we cache the value of gh_symbol2scm ("fooo") where @@ -118,7 +135,7 @@ SCM my_gh_symbol2scm (const char* x); 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)));\ + value = cached = scm_gc_protect_object (gh_symbol2scm((x)));\ } else\ value = gh_symbol2scm ((char*) (x)); \ value; }) @@ -135,16 +152,19 @@ 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); +Slice int_list_to_slice (SCM l); +SCM ly_interval2scm (Drul_array); + -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) ; +String print_scm_val (SCM val); SCM ly_number2string (SCM s); SCM parse_symbol_list (char const *); +SCM robust_list_ref(int i, SCM l); + inline SCM ly_cdr (SCM x) { return SCM_CDR (x); } inline SCM ly_car (SCM x) { return SCM_CAR (x); } @@ -160,10 +180,15 @@ inline SCM ly_assoc_front_x(SCM alist, SCM key, SCM val) { return scm_acons(key, val, scm_assoc_remove_x (alist, key)); } +#ifdef PARANOID +#define gh_pair_p ly_pair_p +bool ly_pair_p (SCM x); +#else inline bool ly_pair_p (SCM x) { return SCM_NFALSEP (scm_pair_p (x)); } +#endif 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)); } +inline bool ly_procedure_p (SCM x) { return SCM_NFALSEP (scm_procedure_p (x)); } /* display and print newline. @@ -175,12 +200,11 @@ void ly_display_scm (SCM s); #include "array.hh" void read_lily_scm_file (String); -void init_lily_guile (String dir); +void ly_init_guile (); -bool isdir_b (SCM s); -bool isaxis_b (SCM s); -bool ly_number_pair_p (SCM); -bool ly_axis_p (SCM); +bool is_direction (SCM s); +bool is_number_pair (SCM); +bool is_axis (SCM); /* these conversion functions also do a typecheck on the argument, and @@ -193,8 +217,15 @@ bool to_boolean (SCM s); void init_ly_protection (); unsigned int ly_scm_hash (SCM s); -SCM index_cell (SCM cellp, Direction d); -SCM index_set_cell (SCM cellp, Direction d, SCM val); +SCM index_get_cell (SCM cell, Direction d); +SCM index_set_cell (SCM cell, Direction d, SCM val); + + + +SCM ly_snoc (SCM s, SCM list); +SCM ly_split_list (SCM s, SCM list); +SCM ly_unique (SCM list); + /* @@ -209,10 +240,12 @@ typedef SCM (*Scheme_function_unknown) (); typedef SCM (*Scheme_function_0) (); typedef SCM (*Scheme_function_1) (SCM); typedef SCM (*Scheme_function_2) (SCM,SCM); +typedef SCM (*Scheme_function_3) (SCM,SCM, SCM); #else typedef SCM (*Scheme_function_0) (...); typedef SCM (*Scheme_function_1) (...); typedef SCM (*Scheme_function_2) (...); +typedef SCM (*Scheme_function_3) (...); #endif #define DECLARE_SCHEME_CALLBACK(NAME,ARGS) \ @@ -226,11 +259,16 @@ TYPE ## _ ## FUNC ## _init_functions () \ { \ TYPE :: FUNC ## _proc = gh_new_procedure ## ARGCOUNT ## _0 (#TYPE "::" #FUNC, \ ((Scheme_function_ ## ARGCOUNT)TYPE :: FUNC)); \ + scm_c_export (#TYPE "::" #FUNC, NULL);\ } \ \ ADD_SCM_INIT_FUNC (TYPE ## _ ## FUNC ## _callback, TYPE ## _ ## FUNC ## _init_functions); \ +void ly_add_function_documentation (SCM proc, char const * fname, + char const * varlist, + char const * doc); + #define ADD_SCM_INIT_FUNC(name, func)\ class name ## _scm_initter { \ public:\ @@ -241,4 +279,29 @@ public:\ } _ ## name ## _scm_initter; \ /* end define */ -#endif // LILY_GUILE_HH +#define LY_DEFINE_WITHOUT_DECL(INITPREFIX, FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) \ +SCM FNAME ## _proc;\ +void \ +INITPREFIX ## init ()\ +{\ + FNAME ## _proc \ + = scm_c_define_gsubr (PRIMNAME,REQ, OPT, VAR, (Scheme_function_unknown) FNAME);\ + ly_add_function_documentation ( FNAME ## _proc ,PRIMNAME, #ARGLIST, DOCSTRING);\ + scm_c_export (PRIMNAME,NULL);\ +}\ +ADD_SCM_INIT_FUNC (INITPREFIX ## init_unique_prefix, INITPREFIX ## init);\ +SCM \ +FNAME ARGLIST\ + + +#define LY_DEFINE(FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) \ +SCM FNAME ARGLIST ; \ +LY_DEFINE_WITHOUT_DECL(FNAME, FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) + + +#define LY_DEFINE_MEMBER_FUNCTION(CLASS, FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) \ +SCM FNAME ARGLIST ; \ +LY_DEFINE_WITHOUT_DECL(CLASS ## FNAME, CLASS::FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) + + +#endif /* LILY_GUILE_HH */