X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-ctors.cc;h=67fa95a610b139608d94482ae54d6afb202221b3;hb=6f5133448f7f6daf27191f12b411c70942751b50;hp=a41e7d434a399173af9ebcfe6f635fb3ad80db94;hpb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;p=lilypond.git

diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc
index a41e7d434a..67fa95a610 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
@@ -22,18 +22,20 @@
 #include "international.hh"
 #include "scm-hash.hh"
 #include "warn.hh"
+#include "protected-scm.hh"
 
 /*
   should delete these after exit.
 */
 
-Scheme_hash_table *global_translator_dict = 0;
+Protected_scm global_translator_dict;
 
 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));
@@ -44,28 +46,30 @@ LY_DEFINE (get_all_translators, "ly:get-all-translators", 0, 0, 0, (),
 void
 add_translator (Translator *t)
 {
-  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 ();
+      dict = unsmob<Scheme_hash_table> (global_translator_dict);
+    }
 
   SCM k = ly_symbol2scm (t->class_name ());
-  global_translator_dict->set (k, t->self_scm ());
-
-  t->unprotect ();
+  dict->set (k, t->unprotect ());
 }
 
 Translator *
 get_translator (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 Translator::unsmob (v);
+  return unsmob<Translator> (v);
 }
-