X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftranslator-ctors.cc;h=b190a927c7a0506963ce52a8e5e92bd4dbe3d0f8;hb=33fd36cc8b74a2a0e80e43a8dc9dbfcb7d1f7df1;hp=7a65215c810a41a0594d391833237b4c775848dd;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 7a65215c81..b190a927c7 100644
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -1,58 +1,71 @@
 /*
-  translator-ctors.cc -- implement Translator construction
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "proto.hh"
-#include "plist.hh"
 #include "translator.hh"
-#include "dictionary.hh"
-#include "debug.hh"
 
-Dictionary<Translator*> *global_translator_dict_p=0;
+#include "international.hh"
+#include "scm-hash.hh"
+#include "warn.hh"
 
-void
-add_translator (Translator *t)
-{
-  if (!global_translator_dict_p)
-    global_translator_dict_p = new Dictionary<Translator*>;
+/*
+  should delete these after exit.
+*/
 
-  global_translator_dict_p->elem (t->name ()) = t;
-}
+Scheme_hash_table *global_translator_dict = 0;
 
-Translator*
-get_translator_l (String s)
+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->elt_b (s))
-    {
-      return (*global_translator_dict_p)[s];
-    }
-
-  error (_("Unknown translator `") + s +"\'");
-  return 0;
-}
+  SCM l = global_translator_dict ? global_translator_dict->to_alist () : SCM_EOL;
 
-Array<Translator_ctor> *ctor_global_static_arr_p_;
+  for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
+    scm_set_car_x (s, scm_cdar (s));
 
+  return l;
+}
 
-/*
-  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 (t->class_name ());
+  global_translator_dict->set (k, t->self_scm ());
+
+  t->unprotect ();
 }
 
-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)
+    {
+      warning (_f ("unknown translator: `%s'", ly_symbol2string (sym).c_str ()));
+      return 0;
+    }
+
+  return unsmob_translator (v);
 }
+