X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fgrob-interface-scheme.cc;h=e8e9e9200c558f5dad211a3f9fbb33d5faa60c85;hb=d5e69ed8a1d37f6c43395c33b1481ded35afd4f9;hp=466c4bbcbb7c984b4077f8b7093ef03bb9caa39e;hpb=6c00542bf11cd4759b2e39537aeb3d9a533a3519;p=lilypond.git

diff --git a/lily/grob-interface-scheme.cc b/lily/grob-interface-scheme.cc
index 466c4bbcbb..e8e9e9200c 100644
--- a/lily/grob-interface-scheme.cc
+++ b/lily/grob-interface-scheme.cc
@@ -1,25 +1,30 @@
 /*
-  lily/grob-interface-scheme.cc --  implement
+  grob-interface-scheme.cc -- implement grob interface bindings.
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lily-guile.hh"
+#include "std-string.hh"
 
-Protected_scm all_ifaces;
+static SCM all_ifaces;
 
-LY_DEFINE (ly_add_interface, "ly:add-interface", 3,0,0, (SCM a, SCM b, SCM c),
-	  "Add an interface description.")
+LY_DEFINE (ly_add_interface, "ly:add-interface",
+	   3, 0, 0, (SCM a, SCM b, SCM c),
+	   "Add an interface description.")
 {
   SCM_ASSERT_TYPE (scm_is_symbol (a), a, SCM_ARG1, __FUNCTION__, "symbol");
-  SCM_ASSERT_TYPE (scm_is_string (b), b, SCM_ARG2, __FUNCTION__, "string");  
-  SCM_ASSERT_TYPE (ly_c_list_p (c), c, SCM_ARG3, __FUNCTION__, "list of syms");    
-  if (!ly_c_vector_p (all_ifaces))
-    all_ifaces = scm_make_vector (scm_int2num (40), SCM_EOL);
-
+  SCM_ASSERT_TYPE (scm_is_string (b), b, SCM_ARG2, __FUNCTION__, "string");
+  SCM_ASSERT_TYPE (ly_is_list (c), c, SCM_ARG3, __FUNCTION__, "list of syms");
+  if (!all_ifaces)
+    {
+      SCM tab = scm_c_make_hash_table (59);
+      all_ifaces = tab;
+      scm_permanent_object (tab);
+    }
+  
   SCM entry = scm_list_n (a, b, c, SCM_UNDEFINED);
 
   scm_hashq_set_x (all_ifaces, a, entry);
@@ -27,10 +32,9 @@ LY_DEFINE (ly_add_interface, "ly:add-interface", 3,0,0, (SCM a, SCM b, SCM c),
   return SCM_UNSPECIFIED;
 }
 
-
 LY_DEFINE (ly_all_grob_interfaces, "ly:all-grob-interfaces",
-	  0,0,0, (),
-	  "Get a hash table with all interface descriptions.")
+	   0, 0, 0, (),
+	   "Get a hash table with all interface descriptions.")
 {
   return all_ifaces;
 }