X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftranslator-ctors.cc;h=ab1a7db144faf370a56b45bacd1549b1354ea2e6;hb=840936be1b28526ef292b5dae8ae031b4fa587f9;hp=65f6528b833a2dd02c2d303af5ad8831fff986a6;hpb=675533acf58b9b863adc830f175696735ca6dc95;p=lilypond.git

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 65f6528b83..ab1a7db144 100644
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -3,54 +3,58 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator.hh"
-#include "dictionary.hh"
+
+#include "international.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 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_p->begin()));
-       ci != global_translator_dict_p->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;
 }
 
 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 (t->class_name ());
+  global_translator_dict->set (k, t->self_scm ());
+
+  t->unprotect ();
 }
 
-Translator*
-get_translator_l (String s)
+Translator *
+get_translator (SCM sym)
 {
-  if (global_translator_dict_p->elem_b (s))
+  SCM v = SCM_BOOL_F;
+  if (global_translator_dict)
+    global_translator_dict->try_retrieve (sym, &v);
+
+  if (v == SCM_BOOL_F)
     {
-	Translator* t = (*global_translator_dict_p)[s];
-	return t;
+      warning (_f ("unknown translator: `%s'", ly_symbol2string (sym).c_str ()));
+      return 0;
     }
 
-  error (_f ("unknown translator: `%s'", s));
-  return 0;
+  return unsmob_translator (v);
 }