source file of the GNU LilyPond music typesetter
- (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "scm-hash.hh"
#include <cstdio>
#include <algorithm>
+using namespace std;
#include "ly-smobs.icc"
-using namespace std;
-
/*
Return: number of objects.
*/
{
hash_tab_ = SCM_EOL;
smobify_self ();
- hash_tab_ = scm_make_vector (scm_int2num (119), SCM_EOL);
+ hash_tab_ = scm_make_vector (scm_from_int (119), SCM_EOL);
elt_count_ = 0;
}
elt_count_ = 0;
smobify_self ();
- hash_tab_ = scm_make_vector (scm_int2num (max ((int) src.elt_count_, 11)), SCM_EOL);
+ hash_tab_ = scm_make_vector (scm_from_int (max ((int) src.elt_count_, 11)), SCM_EOL);
elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
}
if (&src == this)
return;
- hash_tab_ = scm_make_vector (scm_int2num (max ((int) src.elt_count_, 11)), SCM_EOL);
+ hash_tab_ = scm_make_vector (scm_from_int (max ((int) src.elt_count_, 11)), SCM_EOL);
elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
}
}
bool
-Scheme_hash_table::try_retrieve (SCM k, SCM *v)
-{
+Scheme_hash_table::try_retrieve (SCM k, SCM *v){
+
SCM handle = scm_hashq_get_handle (hash_tab_, k);
if (scm_is_pair (handle))
{
*/
if (elt_count_ > 2 * scm_c_vector_length (hash_tab_))
{
- SCM nh = scm_make_vector (scm_int2num (3 * elt_count_ + 1), SCM_EOL);
+ SCM nh = scm_make_vector (scm_from_int (3 * elt_count_ + 1), SCM_EOL);
elt_count_ = copy_scm_hashes (nh, hash_tab_);
hash_tab_ = nh;
}
{
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);
+ for (SCM s = scm_vector_ref (hash_tab_, scm_from_int (i)); scm_is_pair (s);
s = scm_cdr (s))
lst = scm_acons (scm_caar (s), scm_cdar (s), lst);
return lst;