/*
- scm-hash.cc -- implement Scheme_hash_table
+ scm-hash.cc -- implement Scheme_hash_table
source file of the GNU LilyPond music typesetter
- (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "scm-hash.hh"
#include <cstdio>
+#include <algorithm>
+using namespace std;
#include "ly-smobs.icc"
/*
Return: number of objects.
- */
+*/
int
copy_scm_hashes (SCM dest, SCM src)
{
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 (scm_int2num (119), SCM_EOL);
+ hash_tab_ = scm_make_vector (scm_from_int (119), SCM_EOL);
elt_count_ = 0;
}
-
Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
{
elt_count_ = 0;
smobify_self ();
- hash_tab_ = scm_make_vector (scm_int2num (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_);
}
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 (scm_int2num (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_);
}
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;
}
Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
{
assert (unsmob (s));
- char str[1000];
- sprintf (str, "#<Scheme_hash_table 0x%0lx ", SCM_UNPACK (s));
- Scheme_hash_table *me = (Scheme_hash_table*) SCM_CELL_WORD_1 (s);
+ scm_puts ("#<Scheme_hash_table ", p);
+ Scheme_hash_table *me = (Scheme_hash_table *) SCM_CELL_WORD_1 (s);
scm_display (me->hash_tab_, p);
- scm_puts ("> ",p);
+ scm_puts ("> ", p);
return 1;
}
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;
}
{
/*
42 will stick out like a sore thumb, hopefully.
- */
+ */
return scm_hashq_ref (hash_tab_, k, scm_from_int (42));
}
{
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;