/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <algorithm>
using namespace std;
-#include "ly-smobs.icc"
/*
Return: number of objects.
copy_scm_hashes (SCM dest, SCM src)
{
scm_internal_hash_for_each_handle ((scm_t_hash_handle_fn) ©_handle,
- dest, src);
+ dest, src);
}
Scheme_hash_table::Scheme_hash_table ()
}
Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
+ : Smob<Scheme_hash_table> ()
{
hash_tab_ = SCM_EOL;
smobify_self ();
if (&src == this)
return;
- hash_tab_ = scm_c_make_hash_table (SCM_HASHTABLE_N_ITEMS(src.hash_tab_));
+ hash_tab_ = scm_c_make_hash_table (SCM_HASHTABLE_N_ITEMS (src.hash_tab_));
copy_scm_hashes (hash_tab_, src.hash_tab_);
}
}
SCM
-Scheme_hash_table::mark_smob (SCM s)
+Scheme_hash_table::mark_smob () const
{
- Scheme_hash_table *me = (Scheme_hash_table *) SCM_CELL_WORD_1 (s);
- scm_gc_mark (me->hash_tab_);
+ scm_gc_mark (hash_tab_);
return SCM_EOL;
}
int
-Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
+Scheme_hash_table::print_smob (SCM p, scm_print_state *) const
{
- assert (unsmob (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_display (hash_tab_, 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))
static SCM
collect_handles (void * /* closure */,
- SCM key,
- SCM value,
- SCM result)
+ SCM key,
+ SCM value,
+ SCM result)
{
- return scm_acons(key, value, result);
+ return scm_acons (key, value, result);
}
SCM
Scheme_hash_table::to_alist () const
{
return scm_internal_hash_fold ((scm_t_hash_fold_fn) &collect_handles,
- NULL, SCM_EOL, hash_tab_);
+ NULL, SCM_EOL, hash_tab_);
}
-
-IMPLEMENT_SMOBS (Scheme_hash_table);
-IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);