X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=30288179980b59882737786f655b922c08d1948f;hb=5c55d2c95253397557c48cdc30b11d708a5a5582;hp=f6cb2c1482646f5c1a97070670aa141b0705cbe7;hpb=6c00542bf11cd4759b2e39537aeb3d9a533a3519;p=lilypond.git diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index f6cb2c1482..3028817998 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -3,37 +3,48 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2004 Jan Nieuwenhuizen + (c) 1998--2007 Jan Nieuwenhuizen */ #ifndef LILY_GUILE_HH #define LILY_GUILE_HH +#if __MINGW32__ +#include "mingw-compatibility.hh" +#endif + #include +#include + +/* + Hack for various MacOS incarnations. + */ +#ifndef GUILE_ELLIPSIS +#define GUILE_ELLIPSIS +#endif -#include "interval.hh" #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); */ SCM ly_last (SCM list); -SCM ly_write2scm (SCM s); +string ly_scm_write_string (SCM s); SCM ly_deep_copy (SCM); SCM ly_truncate_list (int k, SCM lst); -SCM ly_to_string (SCM scm); -SCM ly_to_symbol (SCM scm); - extern SCM global_lily_module; -String gulp_file_to_string (String fn, bool must_exist); +string gulp_file_to_string (string fn, bool must_exist, int size); -String ly_scm2string (SCM s); -String ly_symbol2string (SCM); +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_chain_assoc (SCM key, SCM achain); @@ -48,61 +59,72 @@ 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); -bool type_check_assignment (SCM val, SCM sym, SCM type_symbol) ; -String print_scm_val (SCM val); +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); +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)); } -/* inserts at front, removing dublicates */ -inline SCM ly_assoc_front_x(SCM alist, SCM key, SCM val) +/* + want to take the address of this function; scm_is_symbol() is a + macro. + */ +inline bool ly_is_symbol (SCM x) { return scm_is_symbol (x); } + +inline bool ly_is_equal (SCM x, SCM y) { - return scm_acons(key, val, scm_assoc_remove_x (alist, key)); -} -inline bool ly_c_char_p (SCM x) { return SCM_CHARP (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_equal_p (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 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 char ly_scm2char (SCM x) { return (char)SCM_CHAR (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); +void read_lily_scm_file (string); void ly_c_init_guile (); bool is_direction (SCM s); @@ -128,27 +150,62 @@ 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_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) (GUILE_ELLIPSIS); } #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) (...); -typedef SCM (*Scheme_function_2) (...); -typedef SCM (*Scheme_function_3) (...); +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 + +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 */