X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-ctors.cc;h=a41e7d434a399173af9ebcfe6f635fb3ad80db94;hb=155f287175f1ab04c0f4d84e6e472b22f9c2b6c4;hp=0f4116910665466976a5a058e9554ae56389a4c1;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 0f41169106..a41e7d434a 100644
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -1,64 +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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.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 "translator.hh"
-#include "dictionary.hh"
-#include "debug.hh"
 
-/*
-  should delete these after exit.
- */
+#include "international.hh"
+#include "scm-hash.hh"
+#include "warn.hh"
 
 /*
-  UGH. Dictionary is deprecated
- */
-Dictionary<Translator*> *global_translator_dict_p=0;
+  should delete these after exit.
+*/
 
+Scheme_hash_table *global_translator_dict = 0;
 
-SCM
-ly_get_all_translators ()
+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);
-    }
-  return l;
-}
+  SCM l = global_translator_dict ? global_translator_dict->to_alist () : SCM_EOL;
 
-static void
-all_trans_init()
-{
-  scm_c_define_gsubr ("ly-get-all-translators", 0, 0, 0, (Scheme_function_unknown) ly_get_all_translators);
-}
+  for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
+    scm_set_car_x (s, scm_cdar (s));
 
-ADD_SCM_INIT_FUNC(all_trans_init,all_trans_init);
+  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 Translator::unsmob (v);
 }