#include <libguile.h>
#include <string.h>
+#include <vector>
/*
Hack for various MacOS incarnations.
*/
#ifndef GUILE_ELLIPSIS
-#define GUILE_ELLIPSIS
+#define GUILE_ELLIPSIS
#endif
#include "guile-compatibility.hh"
SCM ly_string2scm (string const &s);
string ly_scm2string (SCM s);
string ly_symbol2string (SCM);
+string robust_symbol2string (SCM, string);
Rational ly_scm2rational (SCM);
SCM ly_rational2scm (Rational);
SCM ly_offset2scm (Offset);
Offset robust_scm2offset (SCM, Offset);
string robust_scm2string (SCM, 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_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_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)); }
/*
want to take the address of this function; scm_is_symbol() is a
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);