/*
- 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--2000 Jan Nieuwenhuizen <janneke@gnu.org>
-
+ (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "lily-guile.hh"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring> /* strdup, strchr */
+#include <cctype>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h> // isinf
+#include "config.hh"
+#include "dimensions.hh"
+#include "direction.hh"
+#include "file-path.hh"
+#include "international.hh"
#include "libc-extension.hh"
-#include "lily-guile.hh"
#include "main.hh"
-#include "simple-file-storage.hh"
-#include "file-path.hh"
-#include "debug.hh"
-#include "direction.hh"
+#include "misc.hh"
#include "offset.hh"
-#include "interval.hh"
+#include "pitch.hh"
+#include "string-convert.hh"
+#include "source-file.hh"
+#include "version.hh"
+#include "warn.hh"
+
+// #define TEST_GC
SCM
-ly_str02scm (char const*c)
+ly_to_symbol (SCM scm)
{
- // this all really sucks, guile should take char const* arguments!
- return gh_str02scm ((char*)c);
+ return scm_string_to_symbol (ly_to_string (scm));
}
-
-
-/*
- Pass string to scm parser, evaluate one expression.
- Return result value and #chars read.
-
- Thanks to Gary Houston <ghouston@freewire.co.uk>
-
- Need guile-1.3.4 (>1.3 anyway) for ftell on str ports -- jcn
-*/
SCM
-ly_parse_scm (char const* s, int* n)
+ly_to_string (SCM scm)
{
- SCM str = gh_str02scm ((char*)s);
- SCM port = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG,
- "scm_eval_0str");
- SCM from = scm_ftell (port);
-
- SCM form;
- SCM answer = SCM_UNSPECIFIED;
-
- /* Read expression from port */
- if (!SCM_EOF_OBJECT_P (form = scm_read (port)))
- answer = scm_eval_x (form);
-
- /*
- After parsing
-
- (begin (foo 1 2))
-
- all seems fine, but after parsing
-
- (foo 1 2)
-
- read_buf has been advanced to read_pos - 1,
- so that scm_ftell returns 1, instead of #parsed chars
- */
-
- /*
- urg: reset read_buf for scm_ftell
- shouldn't scm_read () do this for us?
- */
- scm_fill_input (port);
- SCM to = scm_ftell (port);
- *n = gh_scm2int (to) - gh_scm2int (from);
-
- /* Don't close the port here; if we re-enter this function via a
- continuation, then the next time we enter it, we'll get an error.
- It's a string port anyway, so there's no advantage to closing it
- early.
-
- scm_close_port (port);
- */
+ return scm_call_3 (ly_lily_module_constant ("format"), SCM_BOOL_F,
- return answer;
+ scm_makfrom0str ("~S"), scm);
}
SCM
-ly_quote_scm (SCM s)
+ly_last (SCM list)
{
- return gh_list (ly_symbol2scm ("quote"), s, SCM_UNDEFINED);
+ return scm_car (scm_last_pair (list));
}
+SCM
+ly_write2scm (SCM s)
+{
+ SCM port = scm_mkstrport (SCM_INUM0,
+ scm_make_string (SCM_INUM0, SCM_UNDEFINED),
+ SCM_OPN | SCM_WRTNG,
+ "ly_write2string");
+ // SCM write = scm_eval_3 (ly_symbol2scm ("write"), s, SCM_EOL);
+ SCM write = scm_primitive_eval (ly_symbol2scm ("write"));
+
+ // scm_apply (write, port, SCM_EOL);
+ scm_call_2 (write, s, port);
+ return scm_strport_to_string (port);
+}
SCM
-ly_symbol2scm(const char *s)
+ly_quote_scm (SCM s)
{
- return gh_symbol2scm ((char *)s);
+ return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED);
}
String
ly_symbol2string (SCM s)
{
- assert (gh_symbol_p (s));
- return String((Byte*)SCM_CHARS (s), (int) SCM_LENGTH(s));
+ /*
+ Ugh. this is not very efficient.
+ */
+ SCM str = scm_symbol_to_string (s);
+ return ly_scm2string (str);
}
-
-/**
- Read a file, and shove it down GUILE. GUILE also has file read
- functions, but you can't fiddle with the path of those.
- */
-void
-read_lily_scm_file (String fn)
+String
+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.str ());
- 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
- progress_indication ("[" + s);
+ if (be_verbose_global)
+ progress_indication ("[" + s);
- Simple_file_storage f(s);
-
- gh_eval_str ((char *) f.ch_C());
- progress_indication ("]");
-}
+ int n;
+ char *str = gulp_file (s, &n);
+ String result ((Byte *) str, n);
+ delete[] str;
+ if (be_verbose_global)
+ progress_indication ("]");
-SCM
-ly_gulp_file (SCM name)
-{
- String fn (ly_scm2string (name));
- 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.str ());
- error (e);
- }
- else
- progress_indication ("[" + s );
-
-
- Simple_file_storage f(s);
- SCM result = ly_str02scm (f.ch_C());
- progress_indication ("]");
return result;
}
-void
-ly_display_scm (SCM s)
+extern "C" {
+ // maybe gdb 5.0 becomes quicker if it doesn't do fancy C++ typing?
+ void
+ ly_display_scm (SCM s)
+ {
+ scm_display (s, scm_current_output_port ());
+ scm_newline (scm_current_output_port ());
+ }
+};
+
+String
+ly_scm2string (SCM str)
{
- gh_display (s);
- gh_newline ();
+ assert (scm_is_string (str));
+ return String ((Byte *)scm_i_string_chars (str),
+ (int) scm_i_string_length (str));
}
-String
-ly_scm2string (SCM s)
+char *
+ly_scm2newstr (SCM str, size_t *lenp)
{
- assert (gh_string_p (s));
- int len;
- char * p = gh_scm2newstr (s , &len);
-
- String r (p);
+ SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+
+ size_t len = scm_i_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';
+
+ if (lenp)
+ *lenp = len;
- free (p);
- return r;
+ return new_str;
+ }
+ return 0;
}
SCM
-index_cell (SCM s, Direction d)
+index_get_cell (SCM s, Direction d)
{
+
assert (d);
- return (d == LEFT) ? gh_car (s) : gh_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;
}
-
-SCM
-ly_warning (SCM str)
-{
- assert (gh_string_p (str));
- warning ("lily-guile: " + ly_scm2string (str));
- return SCM_BOOL_T;
-}
-SCM
-ly_isdir_p (SCM s)
+bool
+is_number_pair (SCM p)
{
- 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;
+ return scm_is_pair (p)
+ && scm_is_number (scm_car (p)) && scm_is_number (scm_cdr (p));
}
-
-
-typedef void (*Void_fptr)();
+typedef void (*Void_fptr) ();
Array<Void_fptr> *scm_init_funcs_;
-void add_scm_init_func (void (*f)())
+void add_scm_init_func (void (*f) ())
{
if (!scm_init_funcs_)
scm_init_funcs_ = new Array<Void_fptr>;
scm_init_funcs_->push (f);
}
+#if KPATHSEA
+extern "C" {
+ void initialize_kpathsea ();
+}
+#endif
+
void
-init_lily_guile ()
+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 (be_verbose_global)
+ progress_indication ("\n");
+
+#if KPATHSEA
+ if (is_TeX_format_global)
+ initialize_kpathsea ();
+#endif
+
+ scm_primitive_load_path (scm_makfrom0str ("lily.scm"));
}
-unsigned int ly_scm_hash (SCM s)
+SCM global_lily_module;
+
+void
+ly_c_init_guile ()
{
- return scm_ihashv (s, ~1u);
+ 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)
+{
+ return scm_ihashv (s, ~1u);
+}
+bool
+is_direction (SCM s)
+{
+ if (scm_is_number (s))
+ {
+ int i = scm_to_int (s);
+ return i >= -1 && i <= 1;
+ }
+ return false;
+}
bool
-isdir_b (SCM s)
+is_axis (SCM s)
{
- if (gh_number_p (s))
+ if (scm_is_number (s))
{
- int i = gh_scm2int (s);
- return i>= -1 && i <= 1;
+ int i = scm_to_int (s);
+ return i == 0 || i == 1;
}
return false;
}
Direction
to_dir (SCM s)
{
- return (Direction) gh_scm2int (s);
+ return scm_is_integer (s) ? (Direction) scm_to_int (s) : CENTER;
}
Interval
ly_scm2interval (SCM p)
{
- return Interval (gh_scm2double (gh_car (p)),
- gh_scm2double (gh_cdr (p)));
+ return Interval (scm_to_double (scm_car (p)), scm_to_double (scm_cdr (p)));
}
-SCM
-ly_interval2scm (Interval i)
+Drul_array<Real>
+ly_scm2realdrul (SCM p)
{
- return gh_cons (gh_double2scm (i[LEFT]),
- gh_double2scm (i[RIGHT]));
+ return Drul_array<Real> (scm_to_double (scm_car (p)),
+ scm_to_double (scm_cdr (p)));
}
+SCM
+ly_interval2scm (Drul_array<Real> i)
+{
+ return scm_cons (scm_from_double (i[LEFT]), scm_from_double (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);
-
- gh_set_cdr_x (gh_car (l), newcons);
- gh_set_car_x (l, newcons);
-}
+ SCM newcons = scm_cons (elt, SCM_EOL);
+ 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_from_double (o[X_AXIS]), scm_from_double (o[Y_AXIS]));
}
Offset
ly_scm2offset (SCM s)
{
- return Offset (gh_scm2double (gh_car (s)),
- gh_scm2double (gh_cdr (s)));
+ return Offset (scm_to_double (scm_car (s)),
+ scm_to_double (scm_cdr (s)));
}
SCM
-ly_type (SCM exp)
+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))
+ {
+ int len = scm_c_vector_length (src);
+ SCM nv = scm_c_make_vector (len, SCM_UNDEFINED);
+ for (int i = 0;i < len; i++)
+ {
+ SCM si = scm_from_int (i);
+ scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si)));
+ }
+ }
+ return src;
+}
+
+/* looks the key up in the cdrs of the alist-keys
+ - ignoring the car and ignoring non-pair keys.
+ Returns first match found, i.e.
+
+ alist = ((1 . 10)
+ ((1 . 2) . 11)
+ ((2 . 1) . 12)
+ ((3 . 0) . 13)
+ ((4 . 1) . 14) )
+
+ I would like (ly_assoc_cdr 1) to return 12 - because it's the first
+ element with the cdr of the key = 1. In other words (alloc_cdr key)
+ corresponds to call
+
+ (alloc (anything . key))
+*/
+SCM
+ly_assoc_cdr (SCM key, SCM alist)
{
- char const * cp = "unknown";
- if (gh_number_p (exp))
+ if (scm_is_pair (alist))
{
- cp = "number";
+ SCM trykey = scm_caar (alist);
+ if (scm_is_pair (trykey)
+ && to_boolean (scm_equal_p (key, scm_cdr (trykey))))
+ return scm_car (alist);
+ return ly_assoc_cdr (key, scm_cdr (alist));
}
- else if (gh_string_p (exp))
+ return SCM_BOOL_F;
+}
+
+SCM
+ly_string_array_to_scm (Array<String> a)
+{
+ SCM s = SCM_EOL;
+ for (int i = a.size () - 1; i >= 0; i--)
+ s = scm_cons (ly_symbol2scm (a[i].to_str0 ()), s);
+ return s;
+}
+
+/* SYMBOLS is a whitespace separated list. */
+SCM
+parse_symbol_list (char const *symbols)
+{
+ while (isspace (*symbols))
+ *symbols++;
+ String s = symbols;
+ s.substitute ('\n', ' ');
+ s.substitute ('\t', ' ');
+ return ly_string_array_to_scm (String_convert::split (s, ' '));
+}
+
+SCM
+ly_truncate_list (int k, SCM lst)
+{
+ if (k == 0)
+ lst = SCM_EOL;
+ else
{
- cp = "string";
+ SCM s = lst;
+ k--;
+ for (; scm_is_pair (s) && k--; s = scm_cdr (s))
+ ;
+
+ if (scm_is_pair (s))
+ scm_set_cdr_x (s, SCM_EOL);
}
- else if (gh_procedure_p (exp))
+ 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);
+ return realval;
+}
+
+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 (!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))
{
- cp = "procedure";
+ warning (_f ("can't find property type-check for `%s' (%s).",
+ ly_symbol2string (sym).to_str0 (),
+ ly_symbol2string (type_symbol).to_str0 ())
+ + " " + _ ("perhaps a typing error?"));
+
+ /* Be strict when being anal :) */
+ if (do_internal_type_checking_global)
+ abort ();
+
+ warning (_ ("doing assignment anyway"));
}
- else if (gh_boolean_p (exp))
+ else
{
- cp = "boolean";
+ 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);
+
+ message (_f ("type check for `%s' failed; value `%s' must be of type `%s'",
+ ly_symbol2string (sym).to_str0 (),
+ print_scm_val (val),
+ ly_scm2string (type_name).to_str0 ()));
+ progress_indication ("\n");
+ }
}
- else if (gh_pair_p (exp))
+ return ok;
+}
+
+/* some SCM abbrevs
+
+zijn deze nou handig?
+zijn ze er al in scheme, maar heten ze anders? */
+
+/* Remove doubles from (sorted) list */
+SCM
+ly_unique (SCM list)
+{
+ SCM unique = SCM_EOL;
+ for (SCM i = list; scm_is_pair (i); i = scm_cdr (i))
{
- cp = "list";
+ if (!scm_is_pair (scm_cdr (i))
+ || !ly_is_equal (scm_car (i), scm_cadr (i)))
+ unique = scm_cons (scm_car (i), unique);
}
+ return scm_reverse_x (unique, SCM_EOL);
+}
- return ly_str02scm (cp);
+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;
}
-/*
- convert without too many decimals, and leave a space at the end.
- */
-
-
+/* Modify LST in place: qsort it. */
SCM
-ly_number2string (SCM s)
+ly_list_qsort_uniq_x (SCM lst)
{
- assert (gh_number_p (s));
+ 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;
+}
- char str[100]; // ugh.
+/* tail add */
+SCM
+ly_snoc (SCM s, SCM list)
+{
+ return ly_append2 (list, scm_list_n (s, SCM_UNDEFINED));
+}
- if (scm_integer_p (s))
+/* Split list at member s, removing s.
+ Return (BEFORE . AFTER) */
+SCM
+ly_split_list (SCM s, SCM list)
+{
+ SCM before = SCM_EOL;
+ SCM after = list;
+ for (; scm_is_pair (after);)
{
- Real r (gh_scm2double (s));
+ SCM i = scm_car (after);
+ after = scm_cdr (after);
+ if (ly_is_equal (i, s))
+ break;
+ before = scm_cons (i, before);
+ }
+ return scm_cons (scm_reverse_x (before, SCM_EOL), after);
+}
- if (isinf (r) || isnan (r))
- {
- programming_error ("Infinity or NaN encountered while converting Real number; setting to zero.");
- r = 0.0;
- }
+void
+taint (SCM *)
+{
+ /*
+ nop.
+ */
+}
- sprintf (str, "%8.4f ", r);
- }
- else
+/*
+ display stuff without using stack
+*/
+SCM
+display_list (SCM s)
+{
+ SCM p = scm_current_output_port ();
+
+ scm_puts ("(", p);
+ for (; scm_is_pair (s); s = scm_cdr (s))
{
- sprintf (str, "%d ", gh_scm2int (s));
+ scm_display (scm_car (s), p);
+ scm_puts (" ", p);
}
+ scm_puts (")", p);
+ return SCM_UNSPECIFIED;
+}
- return gh_str02scm (str);
+Slice
+int_list_to_slice (SCM l)
+{
+ Slice s;
+ s.set_empty ();
+ 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;
}
-#define TEST_GC
+/* Return I-th element, or last elt L. If I < 0, then we take the first
+ element.
-#ifdef TEST_GC
-#include <libguile/gc.h>
+ PRE: length (L) > 0 */
+SCM
+robust_list_ref (int i, SCM l)
+{
+ while (i-- > 0 && scm_is_pair (scm_cdr (l)))
+ l = scm_cdr (l);
+ return scm_car (l);
+}
-static void *
-greet_sweep (void *dummy1, void *dummy2, void *dummy3)
+Real
+robust_scm2double (SCM k, double x)
{
- fprintf(stderr, "entering sweep\n");
+ if (scm_is_number (k))
+ x = scm_to_double (k);
+ return x;
}
-static void *
-wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3)
+Interval
+robust_scm2interval (SCM k, Drul_array<Real> v)
{
- fprintf(stderr, "leaving sweep\n");
+ Interval i;
+ i[LEFT] = v[LEFT];
+ i[RIGHT] = v[RIGHT];
+ if (is_number_pair (k))
+ i = ly_scm2interval (k);
+ return i;
}
-#endif
-static void
-init_functions ()
+Drul_array<Real>
+robust_scm2drul (SCM k, Drul_array<Real> v)
{
- scm_make_gsubr ("ly-warn", 1, 0, 0, (SCM(*)(...))ly_warning);
- scm_make_gsubr ("ly-gulp-file", 1,0, 0, (SCM(*)(...))ly_gulp_file);
- scm_make_gsubr ("dir?", 1,0, 0, (SCM(*)(...))ly_isdir_p);
- scm_make_gsubr ("ly-number->string", 1, 0,0, (SCM(*)(...)) ly_number2string);
+ if (is_number_pair (k))
+ v = ly_scm2interval (k);
+ return v;
+}
+Offset
+robust_scm2offset (SCM k, Offset o)
+{
+ if (is_number_pair (k))
+ o = ly_scm2offset (k);
+ return o;
+}
-#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
-
+int
+robust_scm2int (SCM k, int o)
+{
+ if (scm_integer_p (k) == SCM_BOOL_T)
+ o = scm_to_int (k);
+ return o;
+}
+
+SCM
+alist_to_hashq (SCM alist)
+{
+ int i = scm_ilength (alist);
+ if (i < 0)
+ return scm_c_make_hash_table (0);
+
+ SCM tab = scm_c_make_hash_table (i);
+ for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
+ {
+ SCM pt = scm_cdar (s);
+ scm_hashq_set_x (tab, scm_caar (s), pt);
+ }
+ return tab;
+}
+
+bool
+alist_equal_p (SCM a, SCM b)
+{
+ 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_is_equal (scm_cdr (l), val))
+
+ return false;
+ }
+ return true;
+}
+
+SCM
+ly_alist_vals (SCM alist)
+{
+ SCM x = SCM_EOL;
+ for (SCM p = alist; scm_is_pair (p); p = scm_cdr (p))
+ x = scm_cons (scm_cdar (p), x);
+ return x;
+}
+
+SCM
+ly_hash2alist (SCM tab)
+{
+ SCM func = ly_lily_module_constant ("hash-table->alist");
+ return scm_call_1 (func, tab);
}
-ADD_SCM_INIT_FUNC(funcs, init_functions);