/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1998--2012 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
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
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;
}
if (val == SCM_EOL || val == SCM_BOOL_F)
return ok;
+ // If undefined, some internal function caused it...should never happen.
+ assert (val != SCM_UNDEFINED);
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);
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)
{