X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=797d22d0a58550a50c86b7274fcccc1914fe4a6a;hb=789d65a45b89c1fe7ec8ee4e80cca8a687274ea7;hp=a14c160839880c273a84be3b7beaab8690051ad8;hpb=2a0f240bdfac5cec93adc010d3c5eff4986746e5;p=lilypond.git diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index a14c160839..797d22d0a5 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -3,68 +3,134 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2009 Jan Nieuwenhuizen */ #ifndef LILY_GUILE_HH #define LILY_GUILE_HH -#include -#include - -#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) - -#include "direction.hh" -#include "flower-proto.hh" +#if __MINGW32__ +#include "mingw-compatibility.hh" +#endif -#ifndef SCM_PACK -#define SCM_PACK(x) ((SCM) x) +#include +#include -#endif -#ifndef SCM_UNPACK -#define SCM_UNPACK(x) ( x) +/* + Hack for various MacOS incarnations. + */ +#ifndef GUILE_ELLIPSIS +#define GUILE_ELLIPSIS #endif -/* - conversion functions follow the GUILE naming convention, i.e. +#include "guile-compatibility.hh" +#include "interval.hh" +#include "lily-guile-macros.hh" +#include "ly-module.hh" - A ly_B2A (B b); - */ +/** 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_write2scm (SCM s); +string ly_scm_write_string (SCM s); SCM ly_deep_copy (SCM); -SCM ly_symbol2scm (char const *); -String ly_scm2string (SCM s); -String ly_symbol2string (SCM); +SCM ly_truncate_list (int k, SCM lst); + +extern SCM global_lily_module; + +string gulp_file_to_string (string fn, bool must_exist, int size); + +SCM ly_string2scm (string const &s); +string ly_scm2string (SCM s); +string ly_symbol2string (SCM); +Rational ly_scm2rational (SCM); +SCM ly_rational2scm (Rational); 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); -SCM ly_interval2scm (Interval); - -SCM ly_parse_scm (char const* s, int* n); +Drul_array ly_scm2realdrul (SCM); +Slice int_list_to_slice (SCM l); +SCM ly_interval2scm (Drul_array); +char *ly_scm2newstr (SCM str, size_t *lenp); + +Real robust_scm2double (SCM, double); +int robust_scm2int (SCM, int); +Direction robust_scm2dir (SCM, Direction); +Drul_array robust_scm2drul (SCM, Drul_array); +Drul_array robust_scm2booldrul (SCM, Drul_array); +Interval robust_scm2interval (SCM, Drul_array); +Offset robust_scm2offset (SCM, Offset); +string robust_scm2string (SCM, string); +Rational robust_scm2rational (SCM, Rational); + + SCM ly_quote_scm (SCM s); -SCM ly_type (SCM); -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 alist_to_hashq (SCM); + +SCM ly_alist_vals (SCM alist); +SCM ly_hash2alist (SCM tab); +SCM ly_hash_table_keys (SCM tab); + +SCM ly_assoc_prepend_x (SCM alist, SCM key, SCM val); +inline bool ly_is_fraction (SCM x) { return SCM_FRACTIONP(x) || scm_is_integer (x); } + +inline bool ly_is_list (SCM x) { return SCM_NFALSEP (scm_list_p (x)); } +inline bool ly_cheap_is_list (SCM x) { return scm_is_pair (x) || x == SCM_EOL; } +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)); } + /* - display and print newline. + want to take the address of this function; scm_is_symbol() is a + macro. */ -extern "C" { -void ly_display_scm (SCM s); +inline bool ly_is_symbol (SCM x) { return scm_is_symbol (x); } + +inline bool ly_is_equal (SCM x, SCM y) +{ + return SCM_NFALSEP (scm_equal_p (x, y)); } -#include "array.hh" +inline bool ly_scm2bool (SCM x) { return SCM_NFALSEP (x); } +inline char ly_scm2char (SCM x) { return (char)SCM_CHAR (x); } +inline SCM ly_bool2scm (bool x) { return SCM_BOOL (x); } -void read_lily_scm_file (String); -void init_lily_guile (); +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) +{ + return scm_append (scm_listify (x1, x2, x3, SCM_UNDEFINED)); +} +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 read_lily_scm_file (string); +void ly_c_init_guile (); + +bool is_direction (SCM s); +bool is_number_pair (SCM); +bool is_axis (SCM); -bool isdir_b (SCM s); -bool isaxis_b (SCM s); /* these conversion functions also do a typecheck on the argument, and return a default value if S has the wrong type. @@ -76,52 +142,69 @@ 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 lst); +SCM ly_unique (SCM lst); +SCM ly_list_qsort_uniq_x (SCM lst); +SCM ly_output_formats (); /* snarfing. - */ +*/ void add_scm_init_func (void (*) ()); +extern "C" { + typedef SCM (*Scheme_function_unknown) (GUILE_ELLIPSIS); +} -typedef SCM (*Scheme_function_unknown) (); - -#if __GNUC_MINOR__ >= 96 +#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_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_0) (GUILE_ELLIPSIS); +typedef SCM (*Scheme_function_1) (GUILE_ELLIPSIS); +typedef SCM (*Scheme_function_2) (GUILE_ELLIPSIS); +typedef SCM (*Scheme_function_3) (GUILE_ELLIPSIS); +#endif + + +/* + Inline these for performance reasons. + */ +#define scm_cdr ly_cdr +#define scm_car ly_car + +#ifndef scm_is_pair +#define scm_is_pair ly_is_pair #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 { \ -public:\ - name ## _scm_initter () \ - { \ - add_scm_init_func (func); \ - } \ -} _ ## name ## _scm_initter; \ -/* end define */ - -#endif // LILY_GUILE_HH +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); } + + + +#include "std-vector.hh" + +template +SCM +ly_cxx_vector_to_list (vector const &src) +{ + SCM l = SCM_EOL; + for (vsize i = src.size (); i --; ) + l = scm_cons (src[i]->self_scm (), l); + + return l; +} + + +SCM ly_offsets2scm (vector os); +vector ly_scm2offsets (SCM s); + +#endif /* LILY_GUILE_HH */