X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=63e114a3fedf520d08c9df2cd2ecdff7067d70cb;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=0690b073dceb96c522c2ec274efbb7343a83704b;hpb=d199c2786d16e1fc00bd17fd9b1a54a8312e2079;p=lilypond.git diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 0690b073dc..63e114a3fe 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2011 Jan Nieuwenhuizen + Copyright (C) 1998--2014 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 @@ -50,12 +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, string); +string robust_symbol2string (SCM, const string&); Rational ly_scm2rational (SCM); SCM ly_rational2scm (Rational); SCM ly_offset2scm (Offset); @@ -78,7 +78,7 @@ 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); @@ -97,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_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_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.