X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-ctors.cc;h=5998b4f234793bb9e958c6ec5c50f37e20e517fb;hb=712b6f387c98454e0fc8c5b6c7f0848acf4b29ec;hp=1541b32722e9adc12e73c0bd151e61c5b06dcdf4;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 1541b32722..5998b4f234 100644
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -3,62 +3,55 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "proto.hh"
-#include "plist.hh"
 #include "translator.hh"
-#include "dictionary.hh"
-#include "debug.hh"
+#include "scm-hash.hh"
+#include "warn.hh"
 
 /*
   should delete these after exit.
- */
+*/
 
-Dictionary<Translator*> *global_translator_dict_p=0;
+Scheme_hash_table *global_translator_dict=0;
 
-void
-add_translator (Translator *t)
+LY_DEFINE (get_all_translators,"ly:get-all-translators", 0, 0, 0,  (),
+	  "Return a list of all translator objects that may be instantiated. "
+	   )
 {
-  if (!global_translator_dict_p)
-    global_translator_dict_p = new Dictionary<Translator*>;
-
-  global_translator_dict_p->elem (t->name ()) = t;
-}
+  SCM l = global_translator_dict ?  global_translator_dict->to_alist () : SCM_EOL;
 
-Translator*
-get_translator_l (String s)
-{
-  if (global_translator_dict_p->elt_b (s))
+  for (SCM s =l; ly_c_pair_p (s); s = ly_cdr (s))
     {
-//      return (*global_translator_dict_p)[s];
-	Translator* t = (*global_translator_dict_p)[s];
-	return t;
+      scm_set_car_x (s, ly_cdar (s));
     }
 
-  error (_f ("unknown translator `%s\'", s));
-  return 0;
+  return l;
 }
 
-Array<Translator_ctor> *ctor_global_static_arr_p_;
-
-
-/*
-  Very special greetings go out to Steve Jobs for creating a system 
-  that doesn't handle global construction correctly.
- */
 void
-add_constructor (Translator_ctor c)
+add_translator (Translator *t)
 {
-  if (!ctor_global_static_arr_p_)
-    ctor_global_static_arr_p_ = new Array<Translator_ctor>;
-  ctor_global_static_arr_p_->push (c);
+  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 ());
+
+  scm_gc_unprotect_object (t->self_scm ());
 }
 
-void
-call_constructors ()
+Translator*
+get_translator (SCM sym)
 {
-  for (int i=0; i < ctor_global_static_arr_p_->size (); i++)
-    add_translator (ctor_global_static_arr_p_->elem (i) ());
+  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);
 }
+