X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=eaa638ee00aa1c5dbad34051245cb3e9540a3fba;hb=8245df4f448c4c740f8c2fab9c680dfc4f595d60;hp=4374d028c410adeeb29d76045ea5cefc9db1e129;hpb=769a7f1d6e9c51825936ae78faf6907f2c473f76;p=lilypond.git diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 4374d028c4..eaa638ee00 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -3,39 +3,22 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2004 Jan Nieuwenhuizen + (c) 1998--2005 Jan Nieuwenhuizen */ #ifndef LILY_GUILE_HH #define LILY_GUILE_HH -#include -#include "flower-proto.hh" - -#include "drul-array.hh" -#include "direction.hh" - -#if SCM_MINOR_VERSION < 7 -/* guile-1.6.x compatibility */ -#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) -#define SCM_VECTOR_REF(v,i) (SCM_VELTS ((v))[(i)]) -#define scm_from_int(x) SCM_MAKINUM (x) -#define scm_is_integer(x) SCM_INUMP (x) -#define scm_hash_table_p scm_vector_p -#endif /* SCM_MINOR_VERSION < 7 */ - -#ifndef SMOB_FREE_RETURN_VAL -#define SMOB_FREE_RETURN_VAL(CL) 0 +#if __MINGW32__ +#include "mingw-compatibility.hh" #endif -#ifndef SCM_PACK -#define SCM_PACK(x) ((SCM) x) -#endif +#include -#ifndef SCM_UNPACK -#define SCM_UNPACK(x) (x) -#endif +#include "guile-compatibility.hh" +#include "interval.hh" +#include "lily-guile-macros.hh" +#include "ly-module.hh" /** Conversion functions follow the GUILE naming convention, i.e. A ly_B2A (B b); */ @@ -45,66 +28,21 @@ SCM ly_write2scm (SCM s); SCM ly_deep_copy (SCM); SCM ly_truncate_list (int k, SCM lst); -#if (__GNUC__ > 2) -/* Unreliable with gcc-2.x - FIXME: should add check for x86 as well? */ -#define CACHE_SYMBOLS -#endif - -#ifdef CACHE_SYMBOLS - -/* Using this trick we cache the value of scm_str2symbol ("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; \ - /* We store this one locally, since G++ -O2 fucks up else */ \ - SCM value = cached; \ - if ( __builtin_constant_p ((x))) \ - { \ - if (!cached) \ - value = cached = scm_gc_protect_object (scm_str2symbol ((x))); \ - } \ - else \ - value = scm_str2symbol ((char*) (x)); \ - value; \ -}) -#else -inline SCM ly_symbol2scm(char const* x) { return scm_str2symbol ((x)); } -#endif +SCM ly_to_string (SCM scm); +SCM ly_to_symbol (SCM scm); extern SCM global_lily_module; -/* - TODO: rename me to ly_c_lily_module_eval - */ -#define ly_scheme_function(x) \ -({ \ - static SCM cached; \ - /* We store this one locally, since G++ -O2 fucks up else */ \ - SCM value = cached; \ - if ( __builtin_constant_p ((x))) \ - { \ - if (!cached) \ - value = cached = scm_gc_protect_object (scm_eval (scm_str2symbol (x), \ - global_lily_module)); \ - } \ - else \ - value = scm_eval (scm_str2symbol (x), global_lily_module); \ - value; \ -}) - +String gulp_file_to_string (String fn, bool must_exist); 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_chain_assoc (SCM key, SCM achain); +SCM ly_chain_assoc_get (SCM key, SCM achain, SCM dfault); SCM ly_assoc_cdr (SCM key, SCM alist); +SCM ly_assoc_get (SCM key, SCM alist, SCM def); Interval ly_scm2interval (SCM); Drul_array ly_scm2realdrul (SCM); Slice int_list_to_slice (SCM l); @@ -118,69 +56,57 @@ Interval robust_scm2interval (SCM, Drul_array); Offset robust_scm2offset (SCM, Offset); SCM ly_quote_scm (SCM s); -bool type_check_assignment (SCM val, SCM sym, SCM type_symbol) ; +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); +SCM robust_list_ref (int i, SCM l); SCM alist_to_hashq (SCM); -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 SCM ly_cadar (SCM x) { return SCM_CADAR (x); } +SCM ly_alist_vals (SCM alist); +SCM ly_hash2alist (SCM tab); + /* inserts at front, removing dublicates */ -inline SCM ly_assoc_front_x(SCM alist, SCM key, SCM val) +inline SCM ly_assoc_front_x (SCM alist, SCM key, SCM val) { - return scm_acons(key, val, scm_assoc_remove_x (alist, key)); + return scm_acons (key, val, scm_assoc_remove_x (alist, key)); } -inline bool ly_c_pair_p (SCM x) { return SCM_NFALSEP (scm_pair_p (x)); } -inline bool ly_c_symbol_p (SCM x) { return SCM_SYMBOLP (x); } -inline bool ly_c_boolean_p (SCM x) { return SCM_BOOLP (x); } -inline bool ly_c_char_p (SCM x) { return SCM_CHARP (x); } -inline bool ly_c_number_p (SCM x) { return SCM_NUMBERP (x); } -inline bool ly_c_string_p (SCM x) { return SCM_STRINGP (x); } -inline bool ly_c_vector_p (SCM x) { return SCM_VECTORP (x); } -inline bool ly_c_list_p (SCM x) { return SCM_NFALSEP (scm_list_p (x)); } -inline bool ly_c_procedure_p (SCM x) { return SCM_NFALSEP (scm_procedure_p (x)); } -inline bool ly_c_eq_p (SCM x, SCM y) { return SCM_EQ_P (x, y); } -inline bool ly_c_equal_p (SCM x, SCM y) { +inline bool ly_is_list (SCM x) { return SCM_NFALSEP (scm_list_p (x)); } +inline bool ly_is_procedure (SCM x) { return SCM_NFALSEP (scm_procedure_p (x)); } +inline bool ly_is_port (SCM x) { return SCM_NFALSEP (scm_port_p (x)); } + +inline bool ly_is_equal (SCM x, SCM y) +{ return SCM_NFALSEP (scm_equal_p (x, y)); } inline bool ly_scm2bool (SCM x) { return SCM_NFALSEP (x); } -inline char ly_scm2char (SCM x) { return SCM_CHAR(x); } -inline int ly_scm2int (SCM x) { return scm_num2int (x, 0, "ly_scm2int"); } -inline double ly_scm2double (SCM x) { return scm_num2dbl (x, "ly_scm2double"); } -inline unsigned long ly_length (SCM x) { +inline char ly_scm2char (SCM x) { return SCM_CHAR (x); } +inline unsigned long ly_length (SCM x) +{ return scm_num2ulong (scm_length (x), 0, "ly_length"); } -inline unsigned long ly_vector_length (SCM x) { return SCM_VECTOR_LENGTH (x); } - inline SCM ly_bool2scm (bool x) { return SCM_BOOL (x); } -inline SCM ly_append2 (SCM x1, SCM x2) { +inline SCM ly_append2 (SCM x1, SCM x2) +{ return scm_append (scm_listify (x1, x2, SCM_UNDEFINED)); } -inline SCM ly_append3 (SCM x1, SCM x2, SCM x3) { +inline SCM ly_append3 (SCM x1, SCM x2, SCM x3) +{ return scm_append (scm_listify (x1, x2, x3, SCM_UNDEFINED)); } -inline SCM ly_append4 (SCM x1, SCM x2, SCM x3, SCM x4) { +inline SCM ly_append4 (SCM x1, SCM x2, SCM x3, SCM x4) +{ return scm_append (scm_listify (x1, x2, x3, x4, SCM_UNDEFINED)); } /* display and print newline. - */ +*/ extern "C" { -void ly_display_scm (SCM s); + void ly_display_scm (SCM s); } void read_lily_scm_file (String); @@ -209,23 +135,23 @@ SCM ly_split_list (SCM s, SCM lst); SCM ly_unique (SCM lst); SCM ly_list_qsort_uniq_x (SCM lst); -SCM ly_output_formats(); -SCM ly_kpathsea_expand_path (SCM); +SCM ly_output_formats (); +SCM ly_kpathsea_find_file (SCM); /* snarfing. - */ +*/ void add_scm_init_func (void (*) ()); extern "C" { -typedef SCM (*Scheme_function_unknown) (); + 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); -typedef SCM (*Scheme_function_3) (SCM,SCM, 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) (...); @@ -233,78 +159,16 @@ typedef SCM (*Scheme_function_2) (...); typedef SCM (*Scheme_function_3) (...); #endif +#define scm_cdr ly_cdr +#define scm_car ly_car -/* - Adds the NAME as a Scheme function, and a variable to store the SCM - version of the function in the static variable NAME_proc - */ -#define DECLARE_SCHEME_CALLBACK(NAME, ARGS) \ - static SCM NAME ARGS; \ - static SCM NAME ## _proc +#ifndef scm_is_pair +#define scm_is_pair ly_is_pair +#endif + +inline SCM ly_car (SCM x) { return SCM_CAR (x); } +inline SCM ly_cdr (SCM x) { return SCM_CDR (x); } +inline bool ly_is_pair (SCM x) { return SCM_I_CONSP (x); } -/* - Make TYPE::FUNC available as a Scheme function. - */ -#define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGCOUNT) \ -SCM TYPE :: FUNC ## _proc; \ -void \ -TYPE ## _ ## FUNC ## _init_functions () \ -{ \ - TYPE :: FUNC ## _proc = scm_c_define_gsubr (#TYPE "::" #FUNC, \ - (ARGCOUNT), 0, 0, \ - (Scheme_function_unknown)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: \ - name ## _scm_initter () \ - { \ - add_scm_init_func (func); \ - } \ -} _ ## name ## _scm_initter; \ -/* end define */ - -#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) - -#define get_property(x) internal_get_property (ly_symbol2scm (x)) -#define set_property(x,y) internal_set_property (ly_symbol2scm (x), y) #endif /* LILY_GUILE_HH */