Issue 4997/2: Use Preinit class in Scheme_engraver

[lilypond.git] / lily / profile.cc

diff --git a/lily/profile.cc b/lily/profile.cc
index 4a1c0b08f9b834a2bde0a24be9f6fc5e07957c6d..025bea809bbcc83620771ae535aefbdd9c4f0b04 100644 (file)
--- 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--2011 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
@@ -26,24 +26,23 @@ SCM grob_property_lookup_table;
 SCM prob_property_lookup_table;
 
 LY_DEFINE (ly_property_lookup_stats, "ly:property-lookup-stats",
-          1, 0, 0, (SCM sym),
-          "Return hash table with a property access corresponding to"
-          " @var{sym}.  Choices are @code{prob}, @code{grob}, and"
-          " @code{context}.")
+           1, 0, 0, (SCM sym),
+           "Return hash table with a property access corresponding to"
+           " @var{sym}.  Choices are @code{prob}, @code{grob}, and"
+           " @code{context}.")
 {
-  if (sym == ly_symbol2scm ("context"))
+  if (scm_is_eq (sym, ly_symbol2scm ("context")))
     return context_property_lookup_table ? context_property_lookup_table
-      : scm_c_make_hash_table (1);
-  if (sym == ly_symbol2scm ("prob"))
+           : scm_c_make_hash_table (1);
+  if (scm_is_eq (sym, ly_symbol2scm ("prob")))
     return prob_property_lookup_table ? prob_property_lookup_table
-      : scm_c_make_hash_table (1);
-  if (sym == ly_symbol2scm ("grob"))
+           : scm_c_make_hash_table (1);
+  if (scm_is_eq (sym, ly_symbol2scm ("grob")))
     return grob_property_lookup_table ? grob_property_lookup_table
-      : scm_c_make_hash_table (1);
+           : scm_c_make_hash_table (1);
   return scm_c_make_hash_table (1);
 }
 
-
 void
 note_property_access (SCM *table, SCM sym)
 {
@@ -54,7 +53,7 @@ note_property_access (SCM *table, SCM sym)
     *table = scm_permanent_object (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);