source file of the GNU LilyPond music typesetter
- (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include <stdio.h>
#include "scm-hash.hh"
-#include "hash-table-iter.hh"
+#include "ly-smobs.icc"
+
+/*
+ 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))
+ {
+ scm_hashq_set_x (dest, ly_caar (s), ly_cdar (s));
+ k++;
+ }
+ return k ;
+}
+
Scheme_hash_table::Scheme_hash_table ()
{
- hash_func_ = ly_scm_hash;
- self_scm_ = SCM_EOL;
+ hash_tab_ = SCM_EOL;
smobify_self ();
+ hash_tab_ = scm_make_vector (gh_int2scm (119), SCM_EOL);
+ elt_count_ = 0;
}
-void
-Scheme_hash_table::operator =(Scheme_hash_table const & src)
+
+Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
+
{
- Hash_table<SCM,SCM>::operator = (src);
-
- // we do not copy the self_scm_ field!
+ hash_tab_ = SCM_EOL;
+ elt_count_ = 0;
+ smobify_self ();
+
+ hash_tab_ = scm_make_vector (gh_int2scm (src.elt_count_ >? 11 ), SCM_EOL);
+ elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
}
void
-Scheme_hash_table::do_smobify_self ()
+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);
+ elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
}
-#include "ly-smobs.icc"
-IMPLEMENT_SMOBS(Scheme_hash_table);
-
SCM
Scheme_hash_table::mark_smob (SCM s)
{
- /*
- can't typecheck naively, since GC bit lives in CAR of S
- */
- //assert (SMOB_IS_TYPE_B (Scheme_hash_table, s));
-
- Scheme_hash_table *me = SMOB_TO_TYPE(Scheme_hash_table,s);
- for (Hash_table_iter<SCM,SCM> i (*me); i.ok(); i++)
- {
- scm_gc_mark (i.key());
- scm_gc_mark (i.val ());
- }
+ Scheme_hash_table *me = (Scheme_hash_table*) SCM_CELL_WORD_1 (s);
+ scm_gc_mark (me->hash_tab_);
return SCM_EOL;
}
-
-Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
- : Hash_table<SCM,SCM> (src)
+int
+Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
{
- hash_func_ = src.hash_func_;
- self_scm_ = SCM_EOL;
- smobify_self ();
+ 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_display (me->hash_tab_, p);
+ scm_puts ("> ",p);
+ return 1;
}
-int
-Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*ps)
+bool
+Scheme_hash_table::try_retrieve (SCM k, SCM *v)
{
- assert (SMOB_IS_TYPE_B (Scheme_hash_table, s));
- Scheme_hash_table *me = SMOB_TO_TYPE(Scheme_hash_table,s);
- for (Hash_table_iter<SCM,SCM> i (*me); i.ok(); i++)
+ SCM handle = scm_hashq_get_handle (hash_tab_, k);
+ if (ly_pair_p (handle))
{
- scm_display (i.key(), p);
- scm_puts (" = ",p);
- scm_display (i.val (), p);
- scm_puts ("\n",p);
+ *v = ly_cdr (handle);
+ return true;
}
- return 1;
+ else
+ return false;
+
}
+bool
+Scheme_hash_table::contains (SCM k) const
+{
+ return ly_pair_p (scm_hashq_get_handle (hash_tab_, k));
+}
+void
+Scheme_hash_table::set (SCM k, SCM v)
+{
+ assert (gh_symbol_p (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);
+ /*
+ resize if getting too large.
+ */
+ if (elt_count_ > 2 * SCM_VECTOR_LENGTH (hash_tab_))
+ {
+ SCM nh = scm_make_vector (gh_int2scm (3* elt_count_+1), SCM_EOL);
+ elt_count_ = copy_scm_hashes (nh, hash_tab_);
+ hash_tab_ = nh;
+ }
+}
-Scheme_hash_table::~Scheme_hash_table( )
+// UGH.
+SCM
+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));
+}
+
+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 ()
{
- unsmobify_self ();
}
SCM
Scheme_hash_table::to_alist () const
{
SCM l = SCM_EOL;
- for (Hash_table_iter<SCM,SCM> i (*this); i.ok(); i++)
- l = gh_cons (gh_cons (i.key (), i.val()), l);
+ 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;
}
+
+
+
+
+IMPLEMENT_SMOBS (Scheme_hash_table);
+IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);
+
+