source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <stdio.h>
#include "scm-hash.hh"
-
+#include "ly-smobs.icc"
Scheme_hash_table::Scheme_hash_table ()
{
- self_scm_ = SCM_EOL;
smobify_self ();
}
-void
-Scheme_hash_table::operator =(Scheme_hash_table const & src)
+
+Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
+ : Scm_stl_map (src)
{
- Scm_stl_map::operator = (src);
-
- // we do not copy the self_scm_ field!
+ smobify_self ();
}
void
-Scheme_hash_table::do_smobify_self ()
+Scheme_hash_table::operator = (Scheme_hash_table const & src)
{
+ Scm_stl_map::operator = (src);
+
+ // we do not copy the self_scm () field!
}
-
SCM
Scheme_hash_table::mark_smob (SCM s)
{
can't typecheck naively, since GC bit lives in CAR of S
*/
- Scheme_hash_table *me = SMOB_TO_TYPE(Scheme_hash_table,s);
+ Scheme_hash_table *me = (Scheme_hash_table*) SCM_CELL_WORD_1 (s);
- for (Scm_stl_map::const_iterator i= me->begin (); i != me->end(); i++)
+ for (Scm_stl_map::const_iterator i= me->begin (); i != me->end (); i++)
{
scm_gc_mark ((*i).first);
scm_gc_mark ((*i).second);
return SCM_EOL;
}
-
-Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
- : Scm_stl_map (src)
-{
- self_scm_ = SCM_EOL;
- smobify_self ();
-}
-
int
Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
{
- assert (SMOB_IS_TYPE_B (Scheme_hash_table, s));
+ assert (unsmob (s));
char str[1000];
- sprintf (str, "#<Scheme_hash_table 0x%0x ", s);
+ sprintf (str, "#<Scheme_hash_table 0x%0x ", SCM_UNPACK (s));
scm_puts (str, p);
- Scheme_hash_table *me = SMOB_TO_TYPE(Scheme_hash_table,s);
- for (Scm_stl_map::const_iterator i = me->begin (); i != me->end(); i++)
+ Scheme_hash_table *me = unsmob (s);
+ for (Scm_stl_map::const_iterator i = me->begin (); i != me->end (); i++)
{
scm_display ((*i).first, p);
scm_puts (" = ",p);
void
Scheme_hash_table::set (SCM k, SCM v)
{
- (*this)[k] = v;
+ (*this)[k] = v;
}
// UGH.
SCM
Scheme_hash_table::get (SCM k)const
{
- return (*(Scheme_hash_table*)this)[k];
+ return (* (Scheme_hash_table*)this)[k];
}
+void
+Scheme_hash_table::remove (SCM k)
+{
+ Scm_stl_map::erase (k);
+}
-Scheme_hash_table::~Scheme_hash_table( )
+Scheme_hash_table::~Scheme_hash_table ()
{
- unsmobify_self ();
}
SCM
Scheme_hash_table::to_alist () const
{
SCM l = SCM_EOL;
- for (Scm_stl_map ::const_iterator i = begin (); i != end(); i++)
+ for (Scm_stl_map ::const_iterator i = begin (); i != end (); i++)
l = gh_cons (gh_cons ((*i).first, (*i).second), l);
return l;
}
-#include "ly-smobs.icc"
-IMPLEMENT_UNSMOB(Scheme_hash_table,scheme_hash);
-IMPLEMENT_SMOBS(Scheme_hash_table);
+
+IMPLEMENT_UNSMOB (Scheme_hash_table,scheme_hash);
+IMPLEMENT_SMOBS (Scheme_hash_table);
+IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);