X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-ctors.cc;h=af33d78a2f006caed03ddf3b2d32e98cf6993734;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=d9b47995f486242d7811c4d7583cef930f8339a4;hpb=058370efc7e9710f149d0f444328bb1fcd7bdec1;p=lilypond.git

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index d9b47995f4..af33d78a2f 100644
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -17,23 +17,29 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "context.hh"
 #include "translator.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 ();
+}
 
-Scheme_hash_table *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 a list of all translator objects that may be"
            " instantiated.")
 {
-  SCM l = global_translator_dict ? global_translator_dict->to_alist () : SCM_EOL;
+  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));
@@ -42,30 +48,75 @@ LY_DEFINE (get_all_translators, "ly:get-all-translators", 0, 0, 0, (),
 }
 
 void
-add_translator (Translator *t)
+add_translator_creator (SCM creator, SCM name, SCM description)
 {
-  if (!global_translator_dict)
-    global_translator_dict = new Scheme_hash_table;
+  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));
+}
 
-  SCM k = ly_symbol2scm (t->class_name ());
-  global_translator_dict->set (k, t->self_scm ());
+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.")
+{
+  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);
+}
 
-  t->unprotect ();
+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 (SCM sym)
+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.")
+{
+  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;
-  if (global_translator_dict)
-    global_translator_dict->try_retrieve (sym, &v);
+  Scheme_hash_table *dict = unsmob<Scheme_hash_table> (global_translator_dict);
+  if (dict)
+    dict->try_retrieve (sym, &v);
 
-  if (v == SCM_BOOL_F)
+  if (scm_is_false (v))
     {
       warning (_f ("unknown translator: `%s'", ly_symbol2string (sym).c_str ()));
-      return 0;
     }
 
-  return unsmob_translator (v);
+  return v;
 }
-