X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-ctors.cc;h=654d90899bda3333e88bcafc43839b0aa179cfda;hb=37ec023ff30dca4f6850331fbd526940f8570939;hp=0fb8c998a23d03dbac94cc01dd83755ea8fbda8c;hpb=f3467e6b78be6d8497cf4d0a43ffd01656a33300;p=lilypond.git

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 0fb8c998a2..654d90899b 100644
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -3,40 +3,55 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "proto.hh"
 #include "translator.hh"
-#include "dictionary.hh"
-#include "debug.hh"
+#include "scm-hash.hh"
+#include "warn.hh"
 
 /*
   should delete these after exit.
- */
+*/
+
+Scheme_hash_table *global_translator_dict=0;
+
+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 = global_translator_dict ?  global_translator_dict->to_alist () : SCM_EOL;
+
+  for (SCM s =l; gh_pair_p (s); s = gh_cdr (s))
+    {
+      gh_set_car_x (s, gh_cdar (s));
+    }
 
-Dictionary<Translator*> *global_translator_dict_p=0;
+  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;
+
+  SCM k= ly_symbol2scm  (classname (t));
+  global_translator_dict->set (k, t->self_scm ());
 
-  global_translator_dict_p->elem (classname (t)) = t;
+  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))
-    {
-//      return (*global_translator_dict_p)[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);
 }