/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1998--2014 Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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); */
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);
Drul_array<Real> ly_scm2realdrul (SCM);
Slice int_list_to_slice (SCM l);
SCM ly_interval2scm (Drul_array<Real>);
-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<Real> robust_scm2drul (SCM, Drul_array<Real>);
Drul_array<bool> robust_scm2booldrul (SCM, Drul_array<bool>);
Interval robust_scm2interval (SCM, Drul_array<Real>);
Offset robust_scm2offset (SCM, Offset);
-string robust_scm2string (SCM, string);
+string robust_scm2string (SCM, const string&);
Rational robust_scm2rational (SCM, Rational);
+vector<Real> ly_scm2floatvector (SCM);
+SCM ly_floatvector2scm (vector<Real> v);
-
SCM ly_quote_scm (SCM s);
bool type_check_assignment (SCM val, SCM sym, SCM type_symbol);
string print_scm_val (SCM val);
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.
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)
{
/*
snarfing.
*/
-void add_scm_init_func (void (*) ());
+void add_scm_init_func (void ( *) ());
extern "C" {
typedef SCM (*Scheme_function_unknown) (GUILE_ELLIPSIS);
typedef SCM (*Scheme_function_3) (GUILE_ELLIPSIS);
#endif
-
/*
Inline these for performance reasons.
*/
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<class T>
SCM
-ly_cxx_vector_to_list (vector<T> const &src)
+ly_cxx_vector_to_list (vector<T> 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<Offset> os);
vector<Offset> ly_scm2offsets (SCM s);