add assert to

scm_or_str2symbol(SCM).

diff --git a/ChangeLog b/ChangeLog
index 98554552f6f893ad4065a8b944e477c2c76f899b..2a66fbae9971b7755917edddba6993c8a6a1942f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-03  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * lily/include/lily-guile-macros.hh: add assert to
+       scm_or_str2symbol(SCM).
+
        * VERSION (PATCH_LEVEL): bump version.
 
        * lily/spacing-spanner.cc (musical_column_spacing): handle

diff --git a/lily/include/lily-guile-macros.hh b/lily/include/lily-guile-macros.hh
index 3f72caddc4ddaf539833620663a24c6d03525278..87ceb88a7cd0b655fe6b4a9be6f8e43c4a3370c6 100644 (file)
--- a/lily/include/lily-guile-macros.hh
+++ b/lily/include/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