source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "translator.hh"
-#include "dictionary.hh"
-#include "debug.hh"
+#include "scm-hash.hh"
+#include "warn.hh"
/*
should delete these after exit.
- */
+*/
-/*
- UGH. Dictionary is deprecated
- */
-Dictionary<Translator*> *global_translator_dict_p=0;
+Scheme_hash_table *global_translator_dict=0;
-LY_DEFINE(ly_get_all_translators,"ly-get-all-translators", 0, 0, 0, (),
- "Return an list of a all translator objects that may be instantiated
-during a lilypond run.")
+LY_DEFINE(get_all_translators,"ly:get-all-translators", 0, 0, 0, (),
+ "Return an list of a all translator objects that may be instantiated "
+ " during a lilypond run.")
{
- SCM l = SCM_EOL;
- for (std::map<String,Translator*>::const_iterator (ci (global_translator_dict_p->begin()));
- ci != global_translator_dict_p->end (); ci++)
+ SCM l = global_translator_dict ? global_translator_dict->to_alist () : SCM_EOL;
+
+ for (SCM s =l; gh_pair_p (s); s = gh_cdr (s))
{
- l = scm_cons ((*ci).second->self_scm (), l);
+ gh_set_car_x (s, gh_cdar (s));
}
+
return l;
}
void
add_translator (Translator *t)
{
- if (!global_translator_dict_p)
- global_translator_dict_p = new Dictionary<Translator*>;
+ if (!global_translator_dict)
+ global_translator_dict = new Scheme_hash_table;
- (*global_translator_dict_p)[classname (t)] = t;
+ SCM k= ly_symbol2scm (classname (t));
+ global_translator_dict->set (k, t->self_scm ());
+
+ scm_gc_unprotect_object (t->self_scm ());
}
Translator*
-get_translator_l (String s)
+get_translator (SCM sym)
{
- if (global_translator_dict_p->elem_b (s))
- {
- Translator* t = (*global_translator_dict_p)[s];
- return t;
- }
+ SCM v = SCM_BOOL_F;
+ if (global_translator_dict)
+ global_translator_dict->try_retrieve (sym, &v);
+
+ if (v == SCM_BOOL_F)
+ error (_f ("unknown translator: `%s'", ly_symbol2string (sym).to_str0 ()));
- error (_f ("unknown translator: `%s'", s));
- return 0;
+ return unsmob_translator (v);
}