/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
#include "source-file.hh"
#include "version.hh"
#include "warn.hh"
+#include "lily-imports.hh"
/*
symbols/strings.
SCM
ly_quote_scm (SCM s)
{
- return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED);
+ return scm_list_2 (ly_symbol2scm ("quote"), s);
}
string
}
string
-robust_symbol2string (SCM sym, string str)
+robust_symbol2string (SCM sym, const string &str)
{
return scm_is_symbol (sym) ? ly_symbol2string (sym) : str;
}
string
-gulp_file_to_string (string fn, bool must_exist, int size)
+gulp_file_to_string (const string &fn, bool must_exist, int size)
{
string s = global_path.find (fn);
if (s == "")
char *
ly_scm2str0 (SCM str)
{
- return scm_to_locale_string (str);
+ return scm_to_utf8_string (str);
}
/*
/*
ALIST
*/
-
-// This one is used nowhere.
-bool
-ly_is_alist_equal (SCM a, SCM b)
-{
- if (!scm_is_pair (a) || !scm_is_pair (b))
- return false;
- for (SCM s = a; scm_is_pair (s); s = scm_cdr (s))
- {
- SCM key = scm_caar (s);
- SCM val = scm_cdar (s);
- SCM l = scm_assoc (key, b);
-
- if (scm_is_false (l) || !ly_is_equal (scm_cdr (l), val))
- return false;
- }
- return true;
-}
-
SCM
ly_alist_vals (SCM alist)
{
ly_deep_copy (SCM src)
{
if (scm_is_pair (src))
- return scm_cons (ly_deep_copy (scm_car (src)), ly_deep_copy (scm_cdr (src)));
- else if (scm_is_vector (src))
+ {
+ SCM res = SCM_EOL;
+ do
+ {
+ res = scm_cons (ly_deep_copy (scm_car (src)), res);
+ src = scm_cdr (src);
+ }
+ while (scm_is_pair (src));
+ // Oh, come on, GUILE. Why do you require the second argument
+ // of scm_reverse_x to be a proper list? That makes no sense.
+ // return scm_reverse_x (res, ly_deep_copy (src));
+ SCM last_cons = res;
+ res = scm_reverse_x (res, SCM_EOL);
+ scm_set_cdr_x (last_cons, ly_deep_copy (src));
+ return res;
+ }
+ if (scm_is_vector (src))
{
int len = scm_c_vector_length (src);
SCM nv = scm_c_make_vector (len, SCM_UNDEFINED);
SCM si = scm_from_int (i);
scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si)));
}
+ return nv;
}
return src;
}
bool
type_check_assignment (SCM sym, SCM val, SCM type_symbol)
{
- bool ok = true;
-
- /*
- Always succeeds.
-
-
- TODO: should remove #f from allowed vals?
- */
- if (val == SCM_EOL || val == SCM_BOOL_F)
- return ok;
+ // If undefined, some internal function caused it...should never happen.
+ assert (!SCM_UNBNDP (val));
if (!scm_is_symbol (sym))
-#if 0
return false;
-#else
- /*
- This is used for autoBeamSettings.
-
- TODO: deprecate the use of \override and \revert for
- autoBeamSettings?
-
- or use a symbol autoBeamSettingS?
- */
- return true;
-#endif
SCM type = scm_object_property (sym, type_symbol);
- if (type != SCM_EOL && !ly_is_procedure (type))
+ if (!scm_is_null (type) && !ly_is_procedure (type))
{
warning (_f ("cannot find property type-check for `%s' (%s).",
ly_symbol2string (sym).c_str (),
scm_throw (ly_symbol2scm ("ly-file-failed"), scm_list_3 (ly_symbol2scm ("typecheck"),
sym, val));
- warning (_ ("doing assignment anyway"));
+ warning (_ ("skipping assignment"));
+ return false;
}
- else
+
+ /*
+ Always succeeds.
+
+
+ TODO: should remove #f from allowed vals?
+ */
+ if (scm_is_null (val) || scm_is_false (val))
+ return true;
+
+ if (!scm_is_null (val)
+ && ly_is_procedure (type)
+ && scm_is_false (scm_call_1 (type, val)))
{
- if (val != SCM_EOL
- && ly_is_procedure (type)
- && scm_call_1 (type, val) == SCM_BOOL_F)
- {
- ok = false;
- SCM typefunc = ly_lily_module_constant ("type-name");
- SCM type_name = scm_call_1 (typefunc, type);
-
- warning (_f ("type check for `%s' failed; value `%s' must be of type `%s'",
- ly_symbol2string (sym).c_str (),
- print_scm_val (val),
- ly_scm2string (type_name).c_str ()));
- progress_indication ("\n");
- }
+ SCM type_name = Lily::type_name (type);
+
+ warning (_f ("type check for `%s' failed; value `%s' must be of type `%s'",
+ ly_symbol2string (sym).c_str (),
+ print_scm_val (val),
+ ly_scm2string (type_name).c_str ()));
+ progress_indication ("\n");
+ return false;
+ }
+ return true;
+}
+
+void
+ly_wrong_smob_arg (bool pred (SCM), SCM var, int number, const char *fun)
+{
+ string type = predicate_to_typename ((void *) pred);
+ if (pred (var))
+ {
+ // Uh oh. unsmob<T> delivered 0, yet
+ // unsmob<T> delivers true. This means that unsmob<T> is a
+ // matching check from a base class of T, but var is of an
+ // incompatible derived type.
+ type = string (_ ("Wrong kind of ")).append (type);
}
- return ok;
+ scm_wrong_type_arg_msg (mangle_cxx_identifier (fun).c_str (),
+ number, var, type.c_str ());
}
+
/* some SCM abbrevs
zijn deze nou handig?
return SCM_UNSPECIFIED;
}
+// Needed as complement to int_list_to_slice since scm_c_memq refuses
+// to work with dotted lists.
+
+SCM
+ly_memv (SCM v, SCM l)
+{
+ for (; scm_is_pair (l); l = scm_cdr (l))
+ if (scm_is_true (scm_eqv_p (v, scm_car (l))))
+ return l;
+ return SCM_BOOL_F;
+}
+
Slice
int_list_to_slice (SCM l)
{
return x;
}
+vector<Real>
+ly_scm2floatvector (SCM l)
+{
+ vector<Real> floats;
+ for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
+ floats.push_back (robust_scm2double (scm_car (s), 0.0));
+ return floats;
+}
+
+SCM
+ly_floatvector2scm (vector<Real> v)
+{
+ SCM l = SCM_EOL;
+ SCM *tail = &l;
+ for (vsize i = 0; i < v.size (); i++)
+ {
+ *tail = scm_cons (scm_from_double (v[i]), SCM_EOL);
+ tail = SCM_CDRLOC (*tail);
+ }
+ return l;
+}
+
string
-robust_scm2string (SCM k, string s)
+robust_scm2string (SCM k, const string &s)
{
if (scm_is_string (k))
- s = ly_scm2string (k);
+ return ly_scm2string (k);
return s;
}
int
robust_scm2int (SCM k, int o)
{
- if (scm_integer_p (k) == SCM_BOOL_T)
+ if (scm_is_integer (k))
o = scm_to_int (k);
return o;
}
+vsize
+robust_scm2vsize (SCM k, vsize o)
+{
+ if (scm_is_integer (k))
+ {
+ int i = scm_to_int (k);
+ if (i >= 0)
+ return (vsize) i;
+ }
+ return o;
+}
+
SCM
ly_rational2scm (Rational r)
{
+ if (r.is_infinity ())
+ {
+ if (r > Rational (0))
+ return scm_inf ();
+
+ return scm_difference (scm_inf (), SCM_UNDEFINED);
+ }
+
return scm_divide (scm_from_int64 (r.numerator ()),
scm_from_int64 (r.denominator ()));
}
Rational
ly_scm2rational (SCM r)
{
+ if (scm_is_true (scm_inf_p (r)))
+ {
+ if (scm_is_true (scm_positive_p (r)))
+ {
+ Rational r;
+ r.set_infinite (1);
+ return r;
+ }
+ else
+ {
+ Rational r;
+ r.set_infinite (-1);
+ return r;
+ }
+ }
+
return Rational (scm_to_int64 (scm_numerator (r)),
scm_to_int64 (scm_denominator (r)));
}
Rational
robust_scm2rational (SCM n, Rational rat)
{
- if (ly_is_fraction (n))
+ if (ly_is_rational (n))
return ly_scm2rational (n);
else
return rat;
}
+bool
+ly_is_rational (SCM n)
+{
+ return (scm_is_real (n)
+ && (scm_is_true (scm_exact_p (n))
+ || scm_is_true (scm_inf_p (n))));
+}
+
SCM
alist_to_hashq (SCM alist)
{
SCM
ly_hash2alist (SCM tab)
{
- SCM func = ly_lily_module_constant ("hash-table->alist");
- return scm_call_1 (func, tab);
+ return Lily::hash_table_to_alist (tab);
}
/*