X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscm-hash.cc;h=86af9a6d030bf7a95e7718991db58597bd37e836;hb=c2db0f999bdea83deae3f771709033d60bd73537;hp=1a49a39b549f4e4b75785e58efa594e7d2db52f3;hpb=de658c9789658317b265eb7f3fd34a87c7a8f953;p=lilypond.git diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index 1a49a39b54..86af9a6d03 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -1,42 +1,44 @@ -/* - scm-hash.cc -- implement Scheme_hash_table - +/* + scm-hash.cc -- implement Scheme_hash_table + source file of the GNU LilyPond music typesetter - - (c) 1999--2003 Han-Wen Nienhuys - - */ -#include + + (c) 1999--2005 Han-Wen Nienhuys +*/ #include "scm-hash.hh" + +#include +#include + #include "ly-smobs.icc" +using namespace std; + /* Return: number of objects. - */ +*/ int copy_scm_hashes (SCM dest, SCM src) { int k = 0; - for (int i = SCM_VECTOR_LENGTH (src); i--;) - for (SCM s = scm_vector_ref (src, SCM_MAKINUM (i)); ly_pair_p(s); s = ly_cdr (s)) + for (int i = scm_c_vector_length (src); i--;) + for (SCM s = scm_vector_ref (src, scm_from_int (i)); scm_is_pair (s); s = scm_cdr (s)) { - scm_hashq_set_x (dest, ly_caar (s), ly_cdar (s)); + scm_hashq_set_x (dest, scm_caar (s), scm_cdar (s)); k++; } - return k ; + return k; } - Scheme_hash_table::Scheme_hash_table () { hash_tab_ = SCM_EOL; smobify_self (); - hash_tab_ = scm_make_vector (gh_int2scm (119), SCM_EOL); + hash_tab_ = scm_make_vector (scm_int2num (119), SCM_EOL); elt_count_ = 0; } - Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src) { @@ -44,24 +46,28 @@ Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src) elt_count_ = 0; smobify_self (); - hash_tab_ = scm_make_vector (gh_int2scm (src.elt_count_ >? 11 ), SCM_EOL); + hash_tab_ = scm_make_vector (scm_int2num (max ((int) src.elt_count_, 11)), SCM_EOL); elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_); } void -Scheme_hash_table::operator = (Scheme_hash_table const & src) +Scheme_hash_table::operator = (Scheme_hash_table const &src) { if (&src == this) return; - - hash_tab_ = scm_make_vector (gh_int2scm (src.elt_count_ >? 11), SCM_EOL); + + hash_tab_ = scm_make_vector (scm_int2num (max ((int) src.elt_count_, 11)), SCM_EOL); elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_); } +Scheme_hash_table::~Scheme_hash_table () +{ +} + SCM Scheme_hash_table::mark_smob (SCM s) { - Scheme_hash_table *me = (Scheme_hash_table*) SCM_CELL_WORD_1 (s); + Scheme_hash_table *me = (Scheme_hash_table *) SCM_CELL_WORD_1 (s); scm_gc_mark (me->hash_tab_); return SCM_EOL; } @@ -70,11 +76,10 @@ int Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*) { assert (unsmob (s)); - char str[1000]; - sprintf (str, "#hash_tab_, p); - scm_puts ("> ",p); + scm_puts ("#hash_tab_, p); + scm_puts ("> ", p); return 1; } @@ -82,86 +87,70 @@ bool Scheme_hash_table::try_retrieve (SCM k, SCM *v) { SCM handle = scm_hashq_get_handle (hash_tab_, k); - if (ly_pair_p (handle)) + if (scm_is_pair (handle)) { - *v = ly_cdr (handle); + *v = scm_cdr (handle); return true; } else return false; - } bool -Scheme_hash_table::elem_b (SCM k) const +Scheme_hash_table::contains (SCM k) const { - return ly_pair_p (scm_hashq_get_handle (hash_tab_, k)); + return scm_is_pair (scm_hashq_get_handle (hash_tab_, k)); } void Scheme_hash_table::set (SCM k, SCM v) { - assert (gh_symbol_p (k)); + assert (scm_is_symbol (k)); SCM handle = scm_hashq_create_handle_x (hash_tab_, k, SCM_UNDEFINED); - if (ly_cdr (handle) == SCM_UNDEFINED) - { - elt_count_++; - } - - gh_set_cdr_x (handle, v); + if (scm_cdr (handle) == SCM_UNDEFINED) + elt_count_++; + + scm_set_cdr_x (handle, v); /* resize if getting too large. */ - if (elt_count_ > 2 * SCM_VECTOR_LENGTH (hash_tab_)) + if (elt_count_ > 2 * scm_c_vector_length (hash_tab_)) { - SCM nh = scm_make_vector (gh_int2scm (3* elt_count_+1), SCM_EOL); + SCM nh = scm_make_vector (scm_int2num (3 * elt_count_ + 1), SCM_EOL); elt_count_ = copy_scm_hashes (nh, hash_tab_); hash_tab_ = nh; } } -// UGH. +// UGH. SCM -Scheme_hash_table::get (SCM k)const +Scheme_hash_table::get (SCM k) const { /* 42 will stick out like a sore thumb, hopefully. - */ - return scm_hashq_ref (hash_tab_, k, SCM_MAKINUM(42)); + */ + return scm_hashq_ref (hash_tab_, k, scm_from_int (42)); } void Scheme_hash_table::remove (SCM k) { scm_hashq_remove_x (hash_tab_, k); - /* - don't decrease elt_count_ , as this may cause underflow. The exact - value of elt_count_ is not important. - */ -} - -Scheme_hash_table::~Scheme_hash_table () -{ + /* Do not decrease elt_count_ as this may cause underflow. The exact + value of elt_count_ is not important. */ } SCM Scheme_hash_table::to_alist () const { - SCM l = SCM_EOL; - for (int i = SCM_VECTOR_LENGTH (hash_tab_); i--;) - for (SCM s = scm_vector_ref (hash_tab_, gh_int2scm (i)); ly_pair_p(s); s = ly_cdr (s)) - { - l = scm_acons (ly_caar (s), ly_cdar (s), l); - } - return l; + SCM lst = SCM_EOL; + for (int i = scm_c_vector_length (hash_tab_); i--;) + for (SCM s = scm_vector_ref (hash_tab_, scm_int2num (i)); scm_is_pair (s); + s = scm_cdr (s)) + lst = scm_acons (scm_caar (s), scm_cdar (s), lst); + return lst; } - - - - IMPLEMENT_SMOBS (Scheme_hash_table); IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table); - -