From: Han-Wen Nienhuys Date: Thu, 28 Dec 2006 16:00:17 +0000 (+0100) Subject: rename ly_assoc_front_x to ly_assoc_prepend_x, not inlined. X-Git-Tag: release/2.11.6-1~47 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=150f6212ddfc29d66265cf47fd843f428646035f;p=lilypond.git rename ly_assoc_front_x to ly_assoc_prepend_x, not inlined. --- diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 6aa25f828a..e94d8ef557 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -83,11 +83,7 @@ SCM ly_hash2alist (SCM tab); SCM ly_hash_table_keys (SCM tab); int procedure_arity (SCM); -/* inserts at front, removing dublicates */ -inline SCM ly_assoc_front_x (SCM alist, SCM key, SCM val) -{ - return scm_acons (key, val, scm_assoc_remove_x (alist, key)); -} +SCM ly_assoc_prepend_x (SCM alist, SCM key, SCM val); inline bool ly_is_list (SCM x) { return SCM_NFALSEP (scm_list_p (x)); } 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)); } diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index dd5080b367..8ba98a4a69 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -736,3 +736,10 @@ struct ly_t_double_cell SCM c; SCM d; }; + +/* inserts at front, removing duplicates */ +SCM ly_assoc_prepend_x (SCM alist, SCM key, SCM val) +{ + return scm_acons (key, val, scm_assoc_remove_x (alist, key)); +} +