Nitpick run.

[lilypond.git] / lily / translator-ctors.cc

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 339454b86f594cd2c89f097deace4560f95fe292..728dd00271bb16e63f2e24ea5208661fb10e3cfc 100644 (file)
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -3,32 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator.hh"
-#include "dictionary.hh"
+#include "scm-hash.hh"
 #include "warn.hh"
 
 /*
   should delete these after exit.
- */
+*/
 
-/*
-  UGH. Dictionary is deprecated
- */
-Dictionary<Translator*> *global_translator_dict=0;
+Scheme_hash_table *global_translator_dict = 0;
 
-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.")
+LY_DEFINE (get_all_translators, "ly:get-all-translators", 0, 0, 0, (),
+          "Return a list of all translator objects that may be instantiated. ")
 {
-  SCM l = SCM_EOL;
-  for (std::map<String,Translator*>::const_iterator (ci (global_translator_dict->begin()));
-       ci != global_translator_dict->end (); ci++)
-    {
-      l = scm_cons ((*ci).second->self_scm (), l);
-    }
+  SCM l = global_translator_dict ? global_translator_dict->to_alist () : SCM_EOL;
+
+  for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
+    scm_set_car_x (s, scm_cdar (s));
+
   return l;
 }
 
@@ -36,21 +31,24 @@ void
 add_translator (Translator *t)
 {
   if (!global_translator_dict)
-    global_translator_dict = new Dictionary<Translator*>;
+    global_translator_dict = new Scheme_hash_table;
 
- (*global_translator_dict)[classname (t)] = t;
+  SCM k = ly_symbol2scm (classname (t));
+  global_translator_dict->set (k, t->self_scm ());
+
+  t->unprotect ();
 }
 
-Translator*
-get_translator (String s)
+Translator *
+get_translator (SCM sym)
 {
-  if (global_translator_dict->elem_b (s))
-    {
-       Translator* t = (*global_translator_dict)[s];
-       return t;
-    }
-
-  error (_f ("unknown translator: `%s'", s));
-  return 0;
+  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 ()));
+
+  return unsmob_translator (v);
 }