X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-ctors.cc;h=af33d78a2f006caed03ddf3b2d32e98cf6993734;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=000b01208616a0420db023cc74cd2c4e3470b159;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index 000b012086..af33d78a2f 100644
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -1,56 +1,122 @@
 /*
-  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--2003 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 "context.hh"
 #include "translator.hh"
-#include "dictionary.hh"
+#include "lily-imports.hh"
+#include "international.hh"
+#include "scm-hash.hh"
 #include "warn.hh"
+#include "protected-scm.hh"
 
-/*
-  should delete these after exit.
- */
+SCM
+Translator_creator::call (SCM ctx)
+{
+  return (allocate_ (LY_ASSERT_SMOB (Context, ctx, 1)))->unprotect ();
+}
 
-/*
-  UGH. Dictionary is deprecated
- */
-Dictionary<Translator*> *global_translator_dict=0;
+Protected_scm global_translator_dict;
+Protected_scm global_translator_dict_rev;
 
-LY_DEFINE(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.")
+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->begin()));
-       ci != global_translator_dict->end (); ci++)
-    {
-      l = scm_cons ((*ci).second->self_scm (), l);
-    }
+  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));
+
   return l;
 }
 
 void
-add_translator (Translator *t)
+add_translator_creator (SCM creator, SCM name, SCM description)
+{
+  Scheme_hash_table *dict = unsmob<Scheme_hash_table> (global_translator_dict);
+  if (!dict)
+    {
+      global_translator_dict = Scheme_hash_table::make_smob ();
+      global_translator_dict_rev =
+        scm_make_weak_key_hash_table (scm_from_int (119));
+      dict = unsmob<Scheme_hash_table> (global_translator_dict);
+    }
+  dict->set (name, creator);
+  scm_hashq_set_x (global_translator_dict_rev, creator, scm_cons (name, description));
+}
+
+LY_DEFINE (ly_translator_name, "ly:translator-name",
+           1, 0, 0, (SCM creator),
+           "Return the type name of the translator definition @var{creator}."
+           "  The name is a symbol.")
 {
-  if (!global_translator_dict)
-    global_translator_dict = new Dictionary<Translator*>;
+  SCM res = global_translator_dict_rev.is_bound ()
+    ? scm_hashq_ref (global_translator_dict_rev, creator, SCM_BOOL_F)
+    : SCM_BOOL_F;
+  SCM_ASSERT_TYPE (scm_is_pair (res),
+                   creator, SCM_ARG1, __FUNCTION__, "translator definition");
+  return scm_car (res);
+}
 
- (*global_translator_dict)[classname (t)] = t;
+LY_DEFINE (ly_translator_description, "ly:translator-description",
+           1, 0, 0, (SCM creator),
+           "Return an alist of properties of translator definition @var{creator}.")
+{
+  SCM res = global_translator_dict_rev.is_bound ()
+    ? scm_hashq_ref (global_translator_dict_rev, creator, SCM_BOOL_F)
+    : SCM_BOOL_F;
+  SCM_ASSERT_TYPE (scm_is_pair (res),
+                   creator, SCM_ARG1, __FUNCTION__, "translator definition");
+  return scm_cdr (res);
 }
 
-Translator*
-get_translator (String s)
+LY_DEFINE (ly_register_translator, "ly:register-translator",
+           2, 1, 0, (SCM creator, SCM name, SCM description),
+           "Register a translator @var{creator} (usually a descriptive"
+           " alist or a function/closure returning one when given a"
+           " context argument) with the given symbol @var{name} and"
+           " the given @var{description} alist.")
 {
-  if (global_translator_dict->elem_b (s))
+  SCM_ASSERT_TYPE (ly_is_procedure (creator) || scm_is_pair (creator),
+                   creator, SCM_ARG1, __FUNCTION__, "translator creator");
+  LY_ASSERT_TYPE (ly_is_symbol, name, 2);
+  if (SCM_UNBNDP (description))
+    description = SCM_EOL;
+  else
+    LY_ASSERT_TYPE (ly_is_list, description, 3);
+  add_translator_creator (creator, name, description);
+  return SCM_UNSPECIFIED;
+}
+
+SCM
+get_translator_creator (SCM sym)
+{
+  SCM v = SCM_BOOL_F;
+  Scheme_hash_table *dict = unsmob<Scheme_hash_table> (global_translator_dict);
+  if (dict)
+    dict->try_retrieve (sym, &v);
+
+  if (scm_is_false (v))
     {
-	Translator* t = (*global_translator_dict)[s];
-	return t;
+      warning (_f ("unknown translator: `%s'", ly_symbol2string (sym).c_str ()));
     }
 
-  error (_f ("unknown translator: `%s'", s));
-  return 0;
+  return v;
 }
-