X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprofile.cc;h=a109c4bf4feb9ecb06cb9a755cc6d3c3f089ee38;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=f51df87ef0d41194b0e88e7406d969b355a0782d;hpb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;p=lilypond.git

diff --git a/lily/profile.cc b/lily/profile.cc
index f51df87ef0..a109c4bf4f 100644
--- a/lily/profile.cc
+++ b/lily/profile.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--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
@@ -18,12 +18,11 @@
 */
 
 #include "profile.hh"
+#include "protected-scm.hh"
 
-void note_property_access (SCM *table, SCM sym);
-
-SCM context_property_lookup_table;
-SCM grob_property_lookup_table;
-SCM prob_property_lookup_table;
+Protected_scm context_property_lookup_table;
+Protected_scm grob_property_lookup_table;
+Protected_scm prob_property_lookup_table;
 
 LY_DEFINE (ly_property_lookup_stats, "ly:property-lookup-stats",
            1, 0, 0, (SCM sym),
@@ -31,29 +30,29 @@ LY_DEFINE (ly_property_lookup_stats, "ly:property-lookup-stats",
            " @var{sym}.  Choices are @code{prob}, @code{grob}, and"
            " @code{context}.")
 {
-  if (sym == ly_symbol2scm ("context"))
-    return context_property_lookup_table ? context_property_lookup_table
-           : scm_c_make_hash_table (1);
-  if (sym == ly_symbol2scm ("prob"))
-    return prob_property_lookup_table ? prob_property_lookup_table
-           : scm_c_make_hash_table (1);
-  if (sym == ly_symbol2scm ("grob"))
-    return grob_property_lookup_table ? grob_property_lookup_table
-           : scm_c_make_hash_table (1);
+  if (context_property_lookup_table.is_bound ()
+      && scm_is_eq (sym, ly_symbol2scm ("context")))
+    return context_property_lookup_table;
+  if (prob_property_lookup_table.is_bound ()
+      && scm_is_eq (sym, ly_symbol2scm ("prob")))
+    return prob_property_lookup_table;
+  if (grob_property_lookup_table.is_bound ()
+      && scm_is_eq (sym, ly_symbol2scm ("grob")))
+    return grob_property_lookup_table;
   return scm_c_make_hash_table (1);
 }
 
 void
-note_property_access (SCM *table, SCM sym)
+note_property_access (Protected_scm *table, SCM sym)
 {
   /*
     Statistics: which properties are looked up?
   */
-  if (!*table)
-    *table = scm_permanent_object (scm_c_make_hash_table (259));
+  if (!table->is_bound ())
+    *table = scm_c_make_hash_table (259);
 
   SCM hashhandle = scm_hashq_get_handle (*table, sym);
-  if (hashhandle == SCM_BOOL_F)
+  if (scm_is_false (hashhandle))
     {
       scm_hashq_set_x (*table, sym, scm_from_int (0));
       hashhandle = scm_hashq_get_handle (*table, sym);