X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-ctors.cc;h=67fa95a610b139608d94482ae54d6afb202221b3;hb=76efdcf765d2189ee79e390bf51cbb8fca3fb489;hp=86de42722413b928fca1e455e66d265484b3226c;hpb=106e5978fe2fa568bbc6649bc8fcf1134307373a;p=lilypond.git

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 86de427224..67fa95a610 100644
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -1,64 +1,75 @@
 /*
-  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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1998 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 "proto.hh"
-#include "plist.hh"
 #include "translator.hh"
-#include "dictionary.hh"
-#include "debug.hh"
+
+#include "international.hh"
+#include "scm-hash.hh"
+#include "warn.hh"
+#include "protected-scm.hh"
 
 /*
   should delete these after exit.
- */
+*/
 
-Dictionary<Translator*> *global_translator_dict_p=0;
+Protected_scm global_translator_dict;
 
-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*>;
+  Scheme_hash_table *dict = unsmob<Scheme_hash_table> (global_translator_dict);
+  SCM l = dict ? 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));
 
-  global_translator_dict_p->elem (t->name ()) = t;
+  return l;
 }
 
-Translator*
-get_translator_l (String s)
+void
+add_translator (Translator *t)
 {
-  if (global_translator_dict_p->elem_b (s))
+  Scheme_hash_table *dict = unsmob<Scheme_hash_table> (global_translator_dict);
+  if (!dict)
     {
-//      return (*global_translator_dict_p)[s];
-	Translator* t = (*global_translator_dict_p)[s];
-	return t;
+      global_translator_dict = Scheme_hash_table::make_smob ();
+      dict = unsmob<Scheme_hash_table> (global_translator_dict);
     }
 
-  error (_f ("unknown translator `%s\'", s));
-  return 0;
+  SCM k = ly_symbol2scm (t->class_name ());
+  dict->set (k, t->unprotect ());
 }
 
-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)
+Translator *
+get_translator (SCM sym)
 {
-  if (!ctor_global_static_arr_p_)
-    ctor_global_static_arr_p_ = new Array<Translator_ctor>;
-  ctor_global_static_arr_p_->push (c);
-}
+  SCM v = SCM_BOOL_F;
+  Scheme_hash_table *dict = unsmob<Scheme_hash_table> (global_translator_dict);
+  if (dict)
+    dict->try_retrieve (sym, &v);
 
-void
-call_constructors ()
-{
-  for (int i=0; i < ctor_global_static_arr_p_->size (); i++)
-    add_translator (ctor_global_static_arr_p_->elem (i) ());
+  if (scm_is_false (v))
+    {
+      warning (_f ("unknown translator: `%s'", ly_symbol2string (sym).c_str ()));
+      return 0;
+    }
+
+  return unsmob<Translator> (v);
 }