/*
- lily-guile.cc -- implement assorted guile functions
+ lily-guile.cc -- implement assorted SCM interface functions
source file of the GNU LilyPond music typesetter
- (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-
- Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h> /* isinf */
-#include <string.h> /* strdup, strchr */
-#include <ctype.h>
-
-#include "lily-proto.hh"
-
-/* macosx fix:
-
-
- source-file.hh includes cmath which undefines isinf and isnan
-*/
-inline int my_isinf (Real r) { return isinf (r); }
-inline int my_isnan (Real r) { return isnan (r); }
+#include <cstdio>
+#include <cstdlib>
+#include <cstring> /* strdup, strchr */
+#include <cctype>
+#include <libintl.h> // gettext on macos x
-
-
-#include "libc-extension.hh"
+#include "version.hh"
#include "lily-guile.hh"
+#include "libc-extension.hh"
#include "main.hh"
#include "file-path.hh"
#include "warn.hh"
#include "direction.hh"
#include "offset.hh"
-#include "interval.hh"
#include "pitch.hh"
#include "dimensions.hh"
#include "source-file.hh"
+#include "misc.hh"
// #define TEST_GC
SCM
-ly_last (SCM list)
+ly_to_symbol (SCM scm)
{
- return ly_car (scm_last_pair (list));
+ return scm_string_to_symbol (ly_to_string (scm));
}
+SCM
+ly_to_string (SCM scm)
+{
+ return scm_call_3 (ly_lily_module_constant ("format"), SCM_BOOL_F,
+ scm_makfrom0str ("~S"), scm);
+}
+
+SCM
+ly_last (SCM list)
+{
+ return scm_car (scm_last_pair (list));
+}
SCM
ly_write2scm (SCM s)
SCM write = scm_primitive_eval (ly_symbol2scm ("write"));
// scm_apply (write, port, SCM_EOL);
- gh_call2 (write, s, port);
+ scm_call_2 (write, s, port);
return scm_strport_to_string (port);
}
-
SCM
ly_quote_scm (SCM s)
{
String
ly_symbol2string (SCM s)
{
- assert (gh_symbol_p (s));
- return String ((Byte*)SCM_STRING_CHARS (s), (int) SCM_STRING_LENGTH (s));
+ /*
+ Ugh. this is not very efficient.
+ */
+ SCM str = scm_symbol_to_string (s);
+ return ly_scm2string (str);
}
String
-gulp_file_to_string (String fn)
+gulp_file_to_string (String fn, bool must_exist)
{
String s = global_path.find (fn);
if (s == "")
{
- String e = _f ("can't find file: `%s'", fn);
- e += " ";
- e += _f ("(load path: `%s')", global_path.to_string ());
- error (e);
+ if (must_exist)
+ {
+ String e = _f ("can't find file: `%s'", fn);
+ e += " ";
+ e += _f ("(load path: `%s')", global_path.to_string ());
+ error (e);
+ /* unreachable */
+ }
+ return s;
}
- else if (verbose_global_b)
+
+ if (be_verbose_global)
progress_indication ("[" + s);
int n;
- char * str = gulp_file (s, &n);
- String result (str);
+ char *str = gulp_file (s, &n);
+ String result ((Byte*) str, n);
delete[] str;
- if (verbose_global_b)
+ if (be_verbose_global)
progress_indication ("]");
return result;
}
-LY_DEFINE (ly_gulp_file, "ly:gulp-file",
- 1, 0, 0, (SCM name),
- "Read the file @var{name}, and return its contents in a string. "
- "The file is looked up using the search path.")
-{
- return scm_makfrom0str (gulp_file_to_string (ly_scm2string (name)).to_str0 ());
-}
extern "C" {
void
ly_display_scm (SCM s)
{
- gh_display (s);
- gh_newline ();
+ scm_display (s, scm_current_output_port ());
+ scm_newline (scm_current_output_port ());
}
};
String
-ly_scm2string (SCM s)
+ly_scm2string (SCM str)
{
- assert (gh_string_p (s));
+ assert (scm_is_string (str));
+ return String ((Byte*)scm_i_string_chars (str),
+ (int) scm_i_string_length (str));
+}
+
+char *
+ly_scm2newstr (SCM str, size_t *lenp)
+{
+ SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+
+ size_t len = SCM_STRING_LENGTH (str);
+ if (char *new_str = (char *) malloc ((len + 1) * sizeof (char)))
+ {
+ memcpy (new_str, scm_i_string_chars (str), len);
+ new_str[len] = '\0';
- char *p = SCM_STRING_CHARS (s);
- String r (p);
- return r;
+ if (lenp)
+ *lenp = len;
+
+ return new_str;
+ }
+ return 0;
}
SCM
{
assert (d);
- return (d == LEFT) ? ly_car (s) : ly_cdr (s);
+ return (d == LEFT) ? scm_car (s) : scm_cdr (s);
}
SCM
index_set_cell (SCM s, Direction d, SCM v)
{
if (d == LEFT)
- gh_set_car_x (s, v);
+ scm_set_car_x (s, v);
else if (d == RIGHT)
- gh_set_cdr_x (s, v);
+ scm_set_cdr_x (s, v);
return s;
}
-LY_DEFINE (ly_warning,"ly:warn", 1, 0, 0,
- (SCM str), "Scheme callable function to issue the warning @code{msg}.")
-{
- SCM_ASSERT_TYPE (gh_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
- progress_indication ("\n");
- warning ("lily-guile: " + ly_scm2string (str));
- return SCM_BOOL_T;
-}
-
-LY_DEFINE (ly_dir_p, "ly:dir?", 1,0, 0, (SCM s),
- "type predicate. A direction is @code{-1}, @code{0} or "
- "@code{1}, where @code{-1} represents "
- "left or down and @code{1} represents right or up.")
-{
- if (gh_number_p (s))
- {
- int i = gh_scm2int (s);
- return (i>= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F;
- }
- return SCM_BOOL_F;
-}
-
bool
is_number_pair (SCM p)
{
- return gh_pair_p (p) && gh_number_p (ly_car (p)) && gh_number_p (ly_cdr (p));
+ return scm_is_pair (p)
+ && scm_is_number (scm_car (p)) && scm_is_number (scm_cdr (p));
}
typedef void (*Void_fptr) ();
scm_init_funcs_->push (f);
}
-
void
ly_init_ly_module (void *)
{
- for (int i=scm_init_funcs_->size () ; i--;)
+ for (int i = scm_init_funcs_->size () ; i--;)
(scm_init_funcs_->elem (i)) ();
- if (verbose_global_b)
+ if (be_verbose_global)
progress_indication ("\n");
scm_primitive_load_path (scm_makfrom0str ("lily.scm"));
}
-
SCM global_lily_module;
void
-ly_init_guile ()
+ly_c_init_guile ()
{
global_lily_module = scm_c_define_module ("lily", ly_init_ly_module, 0);
scm_c_use_module ("lily");
}
-unsigned int ly_scm_hash (SCM s)
+unsigned int
+ly_scm_hash (SCM s)
{
return scm_ihashv (s, ~1u);
}
-
-
bool
is_direction (SCM s)
{
- if (gh_number_p (s))
+ if (scm_is_number (s))
{
- int i = gh_scm2int (s);
+ int i = scm_to_int (s);
return i>= -1 && i <= 1;
}
return false;
}
-
bool
is_axis (SCM s)
{
- if (gh_number_p (s))
+ if (scm_is_number (s))
{
- int i = gh_scm2int (s);
- return i== 0 || i == 1;
+ int i = scm_to_int (s);
+ return i == 0 || i == 1;
}
return false;
}
-
Direction
to_dir (SCM s)
{
- return SCM_INUMP (s) ? (Direction) gh_scm2int (s) : CENTER;
+ return scm_is_integer (s) ? (Direction) scm_to_int (s) : CENTER;
}
Interval
ly_scm2interval (SCM p)
{
- return Interval (gh_scm2double (ly_car (p)),
- gh_scm2double (ly_cdr (p)));
+ return Interval (scm_to_double (scm_car (p)), scm_to_double (scm_cdr (p)));
}
Drul_array<Real>
ly_scm2realdrul (SCM p)
{
- return Drul_array<Real> (gh_scm2double (ly_car (p)),
- gh_scm2double (ly_cdr (p)));
+ return Drul_array<Real> (scm_to_double (scm_car (p)),
+ scm_to_double (scm_cdr (p)));
}
SCM
ly_interval2scm (Drul_array<Real> i)
{
- return gh_cons (gh_double2scm (i[LEFT]),
- gh_double2scm (i[RIGHT]));
+ return scm_cons (scm_make_real (i[LEFT]), scm_make_real (i[RIGHT]));
}
-
-
-
bool
to_boolean (SCM s)
{
- return gh_boolean_p (s) && gh_scm2bool (s);
+ return scm_is_bool (s) && ly_scm2bool (s);
}
-/*
- Appendable list L: the cdr contains the list, the car the last cons
- in the list.
- */
+/* Appendable list L: the cdr contains the list, the car the last cons
+ in the list. */
SCM
appendable_list ()
{
- SCM s = gh_cons (SCM_EOL, SCM_EOL);
- gh_set_car_x (s, s);
+ SCM s = scm_cons (SCM_EOL, SCM_EOL);
+ scm_set_car_x (s, s);
return s;
}
void
appendable_list_append (SCM l, SCM elt)
{
- SCM newcons = gh_cons (elt, SCM_EOL);
+ SCM newcons = scm_cons (elt, SCM_EOL);
- gh_set_cdr_x (ly_car (l), newcons);
- gh_set_car_x (l, newcons);
+ scm_set_cdr_x (scm_car (l), newcons);
+ scm_set_car_x (l, newcons);
}
-
SCM
ly_offset2scm (Offset o)
{
- return gh_cons (gh_double2scm (o[X_AXIS]), gh_double2scm (o[Y_AXIS]));
+ return scm_cons (scm_make_real (o[X_AXIS]), scm_make_real (o[Y_AXIS]));
}
Offset
ly_scm2offset (SCM s)
{
- return Offset (gh_scm2double (ly_car (s)),
- gh_scm2double (ly_cdr (s)));
+ return Offset (scm_to_double (scm_car (s)),
+ scm_to_double (scm_cdr (s)));
}
-
-LY_DEFINE (ly_number2string, "ly:number->string",
- 1, 0, 0, (SCM s),
- "Convert @var{num} to a string without generating many decimals.")
+SCM
+ly_deep_copy (SCM src)
{
- SCM_ASSERT_TYPE (gh_number_p (s), s, SCM_ARG1, __FUNCTION__, "number");
-
- char str[400]; // ugh.
-
- if (scm_exact_p (s) == SCM_BOOL_F)
+ 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))
{
- Real r (gh_scm2double (s));
-
- if (my_isinf (r) || my_isnan (r))
+ int len = scm_c_vector_length (src);
+ SCM nv = scm_c_make_vector (len, SCM_UNDEFINED);
+ for (int i = 0 ;i < len ; i++)
{
- programming_error ("Infinity or NaN encountered while converting Real number; setting to zero.");
- r = 0.0;
+ SCM si = scm_int2num (i);
+ scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si)));
}
-
- sprintf (str, "%08.4f", r);
}
- else
- sprintf (str, "%d", gh_scm2int (s));
-
- return scm_makfrom0str (str);
-}
-
-/*
- Undef this to see if GUILE GC is causing too many swaps.
- */
-
-//#define TEST_GC
-
-#ifdef TEST_GC
-#include <libguile/gc.h>
-
-static void *
-greet_sweep (void *dummy1, void *dummy2, void *dummy3)
-{
- fprintf (stderr, "entering sweep\n");
-}
-
-static void *
-wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3)
-{
- fprintf (stderr, "leaving sweep\n");
-}
-#endif
-
-
-#include "version.hh"
-LY_DEFINE (ly_version, "ly:version", 0, 0, 0, (),
- "Return the current lilypond version as a list, e.g. @code{(1 3 127 uu1)}. ")
-{
- char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " " PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
-
- return gh_eval_str ((char*)vs);
-}
-
-LY_DEFINE (ly_unit, "ly:unit", 0, 0, 0, (),
- "Return the unit used for lengths as a string.")
-{
- return scm_makfrom0str (INTERNAL_UNIT);
-}
-
-
-
-LY_DEFINE (ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d),
- "Return @var{d} is a number. Used to distinguish length "
- "variables from normal numbers.")
-{
- return scm_number_p (d);
-}
-
-static void
-init_functions ()
-{
-#ifdef TEST_GC
- scm_c_hook_add (&scm_before_mark_c_hook, greet_sweep, 0, 0);
- scm_c_hook_add (&scm_before_sweep_c_hook, wave_sweep_goodbye, 0, 0);
-#endif
+ return src;
}
-ADD_SCM_INIT_FUNC (funcs, init_functions);
-
SCM
-ly_deep_copy (SCM src)
+ly_chain_assoc_get (SCM key, SCM achain, SCM dfault)
{
- if (gh_pair_p (src))
+ if (scm_is_pair (achain))
{
- return gh_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src)));
- }
- else if (gh_vector_p (src))
- {
- int l = SCM_VECTOR_LENGTH (src);
- SCM nv = scm_c_make_vector (l, SCM_UNDEFINED);
- for (int i =0 ; i< l ; i++)
- {
- SCM si = gh_int2scm (i);
- scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si)));
- }
+ SCM handle = scm_assoc (key, scm_car (achain));
+ if (scm_is_pair (handle))
+ return scm_cdr (handle);
+ else
+ return ly_chain_assoc (key, scm_cdr (achain));
}
else
- return src;
-
- return src;
+ return dfault;
}
-
-
-
SCM
-ly_assoc_chain (SCM key, SCM achain)
+ly_chain_assoc (SCM key, SCM achain)
{
- if (gh_pair_p (achain))
+ if (scm_is_pair (achain))
{
- SCM handle = scm_assoc (key, ly_car (achain));
- if (gh_pair_p (handle))
+ SCM handle = scm_assoc (key, scm_car (achain));
+ if (scm_is_pair (handle))
return handle;
else
- return ly_assoc_chain (key, ly_cdr (achain));
+ return ly_chain_assoc (key, scm_cdr (achain));
}
else
return SCM_BOOL_F;
SCM
ly_assoc_cdr (SCM key, SCM alist)
{
- if (gh_pair_p (alist)) {
- SCM trykey = ly_caar (alist);
- if (gh_pair_p (trykey) && to_boolean (scm_equal_p (key,ly_cdr (trykey))))
- return ly_car (alist);
- else
- return ly_assoc_cdr (key, ly_cdr (alist));
- }
- else
- return SCM_BOOL_F;
+ if (scm_is_pair (alist))
+ {
+ SCM trykey = scm_caar (alist);
+ if (scm_is_pair (trykey) && to_boolean (scm_equal_p (key, scm_cdr (trykey))))
+ return scm_car (alist);
+ else
+ return ly_assoc_cdr (key, scm_cdr (alist));
+ }
+ return SCM_BOOL_F;
}
-/*
- LIST has the form "sym1 sym2 sym3\nsym4\nsym5"
-
- i.e. \n and ' ' can be used interchangeably as separators.
- */
+/* LST has the form "sym1 sym2 sym3\nsym4\nsym5"
+ i.e. \n and ' ' can be used interchangeably as separators. */
SCM
-parse_symbol_list (const char * list)
+parse_symbol_list (char const *lst)
{
- char * s = strdup (list);
+ char *s = strdup (lst);
char *orig = s;
SCM create_list = SCM_EOL;
char * e = s + strlen (s) - 1;
while (e >= s && isspace (*e))
- *e -- = 0;
+ *e-- = 0;
for (char * p = s; *p; p++)
- {
- if (*p == '\n')
- *p = ' ' ;
- }
+ if (*p == '\n')
+ *p = ' ';
- if (!s[0] )
+ if (!s[0])
s = 0;
-
-
while (s)
{
if (next)
*next++ = 0;
- create_list = gh_cons (ly_symbol2scm (s), create_list);
+ create_list = scm_cons (ly_symbol2scm (s), create_list);
s = next;
}
return create_list;
}
-
SCM
-ly_truncate_list (int k, SCM l )
+ly_truncate_list (int k, SCM lst)
{
if (k == 0)
- {
- l = SCM_EOL;
- }
+ lst = SCM_EOL;
else
{
- SCM s = l;
+ SCM s = lst;
k--;
- for (; gh_pair_p (s) && k--; s = ly_cdr (s))
+ for (; scm_is_pair (s) && k--; s = scm_cdr (s))
;
- if (gh_pair_p (s))
- {
- gh_set_cdr_x (s, SCM_EOL);
- }
+ if (scm_is_pair (s))
+ scm_set_cdr_x (s, SCM_EOL);
}
- return l;
+ return lst;
}
-
String
print_scm_val (SCM val)
{
String realval = ly_scm2string (ly_write2scm (val));
if (realval.length () > 200)
- realval = realval.left_string (100) + "\n :\n :\n" + realval.right_string (100);
-
+ realval = realval.left_string (100)
+ + "\n :\n :\n"
+ + realval.right_string (100);
return realval;
}
if (val == SCM_EOL || val == SCM_BOOL_F)
return ok;
- if (!gh_symbol_p (sym))
+ if (!scm_is_symbol (sym))
#if 0
return false;
#else
SCM type = scm_object_property (sym, type_symbol);
- if (type != SCM_EOL && !gh_procedure_p (type))
+ if (type != SCM_EOL && !ly_c_procedure_p (type))
{
warning (_f ("Can't find property type-check for `%s' (%s).",
ly_symbol2string (sym).to_str0 (),
+ " " + _ ("Perhaps you made a typing error?"));
/* Be strict when being anal :) */
- if (internal_type_checking_global_b)
+ if (do_internal_type_checking_global)
abort ();
warning (_ ("Doing assignment anyway."));
else
{
if (val != SCM_EOL
- && gh_procedure_p (type)
- && gh_call1 (type, val) == SCM_BOOL_F)
+ && ly_c_procedure_p (type)
+ && scm_call_1 (type, val) == SCM_BOOL_F)
{
SCM errport = scm_current_error_port ();
ok = false;
- SCM typefunc = scm_primitive_eval (ly_symbol2scm ("type-name"));
- SCM type_name = gh_call1 (typefunc, type);
+ SCM typefunc = ly_lily_module_constant ("type-name");
+ SCM type_name = scm_call_1 (typefunc, type);
scm_puts (_f ("Type check for `%s' failed; value `%s' must be of type `%s'",
ly_unique (SCM list)
{
SCM unique = SCM_EOL;
- for (SCM i = list; gh_pair_p (i); i = ly_cdr (i))
+ for (SCM i = list; scm_is_pair (i); i = scm_cdr (i))
{
- if (!gh_pair_p (ly_cdr (i))
- || !gh_equal_p (ly_car (i), ly_cadr (i)))
- unique = gh_cons (ly_car (i), unique);
+ if (!scm_is_pair (scm_cdr (i))
+ || !ly_c_equal_p (scm_car (i), scm_cadr (i)))
+ unique = scm_cons (scm_car (i), unique);
}
return scm_reverse_x (unique, SCM_EOL);
}
+
+static int
+scm_default_compare (void const *a, void const *b)
+{
+ SCM pa = *(SCM*) a;
+ SCM pb = *(SCM*) b;
+ if (pa == pb)
+ return 0;
+ return pa < pb ? -1 : 1;
+}
+
+/* Modify LST in place: qsort it. */
+SCM
+ly_list_qsort_uniq_x (SCM lst)
+{
+ int len = scm_ilength (lst);
+ SCM *arr = new SCM[len];
+ int k = 0;
+ for (SCM s = lst; SCM_NNULLP (s); s = scm_cdr (s))
+ arr[k++] = scm_car (s);
+
+ assert (k == len);
+ qsort (arr, len, sizeof (SCM), &scm_default_compare);
+
+ SCM *tail = &lst;
+ for (int i = 0; i < len; i++)
+ if (!i || arr[i] != arr[i - 1])
+ {
+ SCM_SETCAR (*tail, arr[i]);
+ tail = SCM_CDRLOC (*tail);
+ }
+
+ *tail = SCM_EOL;
+ delete[] arr;
+
+ return lst;
+}
+
+
/* tail add */
SCM
ly_snoc (SCM s, SCM list)
{
- return gh_append2 (list, scm_list_n (s, SCM_UNDEFINED));
+ return ly_append2 (list, scm_list_n (s, SCM_UNDEFINED));
}
-
/* Split list at member s, removing s.
- Return (BEFORE . AFTER) */
+ Return (BEFORE . AFTER) */
SCM
ly_split_list (SCM s, SCM list)
{
SCM before = SCM_EOL;
SCM after = list;
- for (; gh_pair_p (after);)
+ for (; scm_is_pair (after);)
{
- SCM i = ly_car (after);
- after = ly_cdr (after);
- if (gh_equal_p (i, s))
+ SCM i = scm_car (after);
+ after = scm_cdr (after);
+ if (ly_c_equal_p (i, s))
break;
- before = gh_cons (i, before);
+ before = scm_cons (i, before);
}
- return gh_cons ( scm_reverse_x (before, SCM_EOL), after);
+ return scm_cons ( scm_reverse_x (before, SCM_EOL), after);
}
SCM p = scm_current_output_port ();
scm_puts ("(", p);
- for (; gh_pair_p (s); s =gh_cdr (s))
+ for (; scm_is_pair (s); s = scm_cdr (s))
{
- scm_display (gh_car (s), p);
+ scm_display (scm_car (s), p);
scm_puts (" ", p);
}
scm_puts (")", p);
{
Slice s;
s.set_empty ();
- for (; gh_pair_p (l); l = gh_cdr (l))
- {
- if (gh_number_p (gh_car (l)))
- s.add_point (gh_scm2int (gh_car (l)));
- }
-
+ for (; scm_is_pair (l); l = scm_cdr (l))
+ if (scm_is_number (scm_car (l)))
+ s.add_point (scm_to_int (scm_car (l)));
return s;
}
-
-/*
- Return I-th element, or last elt L. If I < 0, then we take the first
- element.
-
- PRE: length (L) > 0
- */
+/* Return I-th element, or last elt L. If I < 0, then we take the first
+ element.
+
+ PRE: length (L) > 0 */
SCM
robust_list_ref (int i, SCM l)
{
- while (i-- > 0 && gh_pair_p (gh_cdr (l)))
- l = gh_cdr (l);
-
- return gh_car (l);
+ while (i-- > 0 && scm_is_pair (scm_cdr (l)))
+ l = scm_cdr (l);
+ return scm_car (l);
}
-
-
Real
robust_scm2double (SCM k, double x)
{
- if (gh_number_p (k))
- x = gh_scm2double (k);
+ if (scm_is_number (k))
+ x = scm_to_double (k);
return x;
}
{
if (is_number_pair (k))
o = ly_scm2offset (k);
-
return o;
}
-
int
robust_scm2int (SCM k, int o)
{
if (scm_integer_p (k) == SCM_BOOL_T)
- o = gh_scm2int (k);
-
+ o = scm_to_int (k);
return o;
}
-
SCM
alist_to_hashq (SCM alist)
{
int i = scm_ilength (alist);
if (i < 0)
- return scm_make_vector (gh_int2scm (0), SCM_EOL);
+ return scm_c_make_hash_table (0);
- SCM tab = scm_make_vector (gh_int2scm (i), SCM_EOL);
- for (SCM s = alist; gh_pair_p (s); s = ly_cdr (s))
+ SCM tab = scm_c_make_hash_table (i);
+ for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
{
- SCM pt = ly_cdar (s);
- scm_hashq_set_x (tab, ly_caar (s), pt);
+ SCM pt = scm_cdar (s);
+ scm_hashq_set_x (tab, scm_caar (s), pt);
}
return tab;
}
-#if 1
-/*
- Debugging mem leaks:
- */
-LY_DEFINE (ly_protects, "ly:protects", 0, 0, 0, (),
- "Return hash of protected objects.")
+
+bool
+alist_equal_p (SCM a, SCM b)
{
- return scm_protects;
+ 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 (l == SCM_BOOL_F
+ || !ly_c_equal_p ( scm_cdr (l), val))
+
+ return false;
+ }
+ return true;
}
-#endif
projects / lilypond.git / blobdiff