X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=38709a14c541b2d55a02b4c7e2c32de1a7a32f3f;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=859131a1f09cf0f6c6c93162fb43a195c98feb9e;hpb=99dc90bbc369722cf4d3bb9f30b7288762f2167f;p=lilypond.git diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 859131a1f0..38709a14c5 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--2015 Jan Nieuwenhuizen - (c) 1998--2009 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 @@ -20,13 +31,14 @@ Hack for various MacOS incarnations. */ #ifndef GUILE_ELLIPSIS -#define GUILE_ELLIPSIS +#define GUILE_ELLIPSIS #endif #include "guile-compatibility.hh" #include "interval.hh" #include "lily-guile-macros.hh" #include "ly-module.hh" +#include "std-vector.hh" /** Conversion functions follow the GUILE naming convention, i.e. A ly_B2A (B b); */ @@ -38,11 +50,12 @@ 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); +string gulp_file_to_string (const string &fn, bool must_exist, int size); SCM ly_string2scm (string const &s); string ly_scm2string (SCM s); string ly_symbol2string (SCM); +string robust_symbol2string (SCM, const string&); Rational ly_scm2rational (SCM); SCM ly_rational2scm (Rational); SCM ly_offset2scm (Offset); @@ -55,19 +68,21 @@ 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); +vsize robust_scm2vsize (SCM, vsize); 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); +string robust_scm2string (SCM, const string&); Rational robust_scm2rational (SCM, Rational); +vector ly_scm2floatvector (SCM); +SCM ly_floatvector2scm (vector v); - SCM ly_quote_scm (SCM s); bool type_check_assignment (SCM val, SCM sym, SCM type_symbol); string print_scm_val (SCM val); @@ -82,13 +97,13 @@ 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_is_list (SCM x) { return scm_is_true (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)); } +inline bool ly_is_procedure (SCM x) { return scm_is_true (scm_procedure_p (x)); } +inline bool ly_is_port (SCM x) { return scm_is_true (scm_port_p (x)); } +bool ly_is_rational (SCM); /* want to take the address of this function; scm_is_symbol() is a macro. @@ -97,24 +112,24 @@ 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)); + return scm_is_true (scm_equal_p (x, y)); } -inline bool ly_scm2bool (SCM x) { return SCM_NFALSEP (x); } +inline bool ly_scm2bool (SCM x) { return scm_is_true (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_bool2scm (bool x) { return scm_from_bool (x); } inline SCM ly_append2 (SCM x1, SCM x2) { - return scm_append (scm_listify (x1, x2, SCM_UNDEFINED)); + return scm_append (scm_list_2 (x1, x2)); } inline SCM ly_append3 (SCM x1, SCM x2, SCM x3) { - return scm_append (scm_listify (x1, x2, x3, SCM_UNDEFINED)); + return scm_append (scm_list_3 (x1, x2, x3)); } inline SCM ly_append4 (SCM x1, SCM x2, SCM x3, SCM x4) { - return scm_append (scm_listify (x1, x2, x3, x4, SCM_UNDEFINED)); + return scm_append (scm_list_4 (x1, x2, x3, x4)); } /* @@ -155,7 +170,7 @@ SCM ly_output_formats (); /* snarfing. */ -void add_scm_init_func (void (*) ()); +void add_scm_init_func (void ( *) ()); extern "C" { typedef SCM (*Scheme_function_unknown) (GUILE_ELLIPSIS); @@ -173,7 +188,6 @@ typedef SCM (*Scheme_function_2) (GUILE_ELLIPSIS); typedef SCM (*Scheme_function_3) (GUILE_ELLIPSIS); #endif - /* Inline these for performance reasons. */ @@ -188,22 +202,19 @@ 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" +#include "std-vector.hh" template SCM -ly_cxx_vector_to_list (vector const &src) +ly_cxx_vector_to_list (vector const &src) { SCM l = SCM_EOL; - for (vsize i = src.size (); i --; ) + 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);