catch GUILE errors

[lilypond.git] / lily / translator-ctors.cc

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 0fb8c998a23d03dbac94cc01dd83755ea8fbda8c..e1fe319db76e888abda574e4774360cb1c455949 100644 (file)
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -3,40 +3,54 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "proto.hh"
 #include "translator.hh"
 #include "dictionary.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 /*
   should delete these after exit.
  */
 
-Dictionary<Translator*> *global_translator_dict_p=0;
+/*
+  UGH. Dictionary is deprecated
+ */
+Dictionary<Translator*> *global_translator_dict=0;
+
+LY_DEFINE(ly_get_all_translators,"ly-get-all-translators", 0, 0, 0,  (),
+         "Return an list of a all translator objects that may be instantiated
+during a lilypond run.")
+{
+  SCM l = SCM_EOL;
+  for (std::map<String,Translator*>::const_iterator (ci (global_translator_dict->begin()));
+       ci != global_translator_dict->end (); ci++)
+    {
+      l = scm_cons ((*ci).second->self_scm (), l);
+    }
+  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 Dictionary<Translator*>;
 
-  global_translator_dict_p->elem (classname (t)) = t;
+ (*global_translator_dict)[classname (t)] = t;
 }
 
 Translator*
-get_translator_l (String s)
+get_translator (String s)
 {
-  if (global_translator_dict_p->elem_b (s))
+  if (global_translator_dict->elem_b (s))
     {
-//      return (*global_translator_dict_p)[s];
-       Translator* t = (*global_translator_dict_p)[s];
+       Translator* t = (*global_translator_dict)[s];
        return t;
     }
 
-  error (_f ("unknown translator `%s\'", s));
+  error (_f ("unknown translator: `%s'", s));
   return 0;
 }