X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=3fefd5dc3c35bf0d34d3886757f2a13282bb10c6;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=dd28743ccfcc5bdad32ba9e90f1452a555dedcbd;hpb=6c0a242bac0f7b3538adce970b5543cc415b46c4;p=lilypond.git diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index dd28743ccf..3fefd5dc3c 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -1,9 +1,20 @@ /* - lily-guile.hh encapsulate guile + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2011 Jan Nieuwenhuizen - (c) 1998--2005 Jan Nieuwenhuizen + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #ifndef LILY_GUILE_HH @@ -14,6 +25,14 @@ #endif #include +#include + +/* + Hack for various MacOS incarnations. + */ +#ifndef GUILE_ELLIPSIS +#define GUILE_ELLIPSIS +#endif #include "guile-compatibility.hh" #include "interval.hh" @@ -24,40 +43,45 @@ 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); -SCM ly_chain_assoc_get (SCM key, SCM achain, SCM dfault); +SCM ly_chain_assoc_get (SCM key, SCM achain, SCM default_value, SCM strict_checking = SCM_BOOL_F); SCM ly_assoc_cdr (SCM key, SCM alist); -SCM ly_assoc_get (SCM key, SCM alist, SCM def); +SCM ly_assoc_get (SCM key, SCM alist, SCM default_value, SCM strict_checking = SCM_BOOL_F); Interval ly_scm2interval (SCM); 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); +char *ly_scm2str0 (SCM str); 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); +string print_scm_val (SCM val); SCM ly_number2string (SCM s); SCM parse_symbol_list (char const *); @@ -66,25 +90,29 @@ SCM alist_to_hashq (SCM); SCM ly_alist_vals (SCM alist); SCM ly_hash2alist (SCM tab); +SCM ly_hash_table_keys (SCM tab); -/* inserts at front, removing dublicates */ -inline SCM ly_assoc_front_x (SCM alist, SCM key, SCM val) -{ - return scm_acons (key, val, scm_assoc_remove_x (alist, key)); -} -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) +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)); } + +/* + 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_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 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) @@ -107,7 +135,7 @@ extern "C" { 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); @@ -134,7 +162,6 @@ SCM ly_unique (SCM lst); SCM ly_list_qsort_uniq_x (SCM lst); SCM ly_output_formats (); -SCM ly_kpathsea_find_file (SCM); /* snarfing. @@ -142,7 +169,7 @@ SCM ly_kpathsea_find_file (SCM); 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 @@ -151,9 +178,44 @@ 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) (...); +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 */