Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / include / lily-guile-macros.hh

diff --git a/lily/include/lily-guile-macros.hh b/lily/include/lily-guile-macros.hh
index 3f72caddc4ddaf539833620663a24c6d03525278..555d65bfd3a6aa116923ec46456796184f582f37 100644 (file)
--- a/lily/include/lily-guile-macros.hh
+++ b/lily/include/lily-guile-macros.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LILY_GUILE_MACROS_HH
@@ -36,7 +36,10 @@ inline SCM
 scm_or_str2symbol (char const *c) { return scm_str2symbol (c); }
 
 inline SCM
-scm_or_str2symbol (SCM s) { return s; }
+scm_or_str2symbol (SCM s) {
+  assert (scm_is_symbol (s));
+  return s;
+}
 
 /* Using this trick we cache the value of scm_str2symbol ("fooo") where
    "fooo" is a constant string. This is done at the cost of one static
@@ -160,12 +163,17 @@ ly_add_function_documentation (SCM proc, char const *fname,
                          VAR, ARGLIST, DOCSTRING)
 
 #define get_property(x) internal_get_property (ly_symbol2scm (x))
+#define get_property_data(x) internal_get_property_data (ly_symbol2scm (x))
 #define get_object(x) internal_get_object (ly_symbol2scm (x))
 #define set_object(x, y) internal_set_object (ly_symbol2scm (x), y)
 #define del_property(x) internal_del_property (ly_symbol2scm (x))
 
 #ifndef NDEBUG
-#define set_property(x, y) internal_set_property (ly_symbol2scm (x), y, __FILE__, __LINE__, __FUNCTION__)
+/*
+  TODO: include modification callback support here, perhaps
+  through intermediate Grob::instrumented_set_property( .. __LINE__ ).
+ */
+#define set_property(x, y) internal_set_property (ly_symbol2scm (x), y)  
 #else
 #define set_property(x, y) internal_set_property (ly_symbol2scm (x), y)
 #endif