typechecking tweaks.

diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc
index f210c6ef152a90433b846b0c40ae5851a519cb21..6c6e2eb7b667b2926e28322101d23dad269bc613 100644 (file)
--- a/lily/function-documentation.cc
+++ b/lily/function-documentation.cc
@@ -75,7 +75,10 @@ string
 predicate_to_typename (void *ptr)
 {
   if (type_names.find (ptr) == type_names.end ())
-    return "unknown type";
+    {
+      programming_error ("Unknown type predicate");
+      return "unknown type";
+    }
   else
     return type_names[ptr];
 }

diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index 6206011dda1ab72ff7b6c7265477950f56c39dbc..83111f670755cf74ae935c1ff5a938dcf4b9205e 100644 (file)
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -21,7 +21,6 @@ LY_DEFINE (ly_make_score, "ly:make-score",
           "Return score with @var{music} encapsulated in @var{score}.")
 {
   LY_ASSERT_SMOB (Music, music, 1);
-  Music *mus = unsmob_music (music);
 
   Score *score = new Score;
   score->set_music (music);

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 86a1381bb411312e28b337640fe814e5a1dfcbb6..55e7bb7ec4c09a81ed73185271ef0c00a3ab3ef3 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -26,7 +26,7 @@ Text_interface::interpret_string (SCM layout_smob,
                                  SCM markup)
 {
   LY_ASSERT_SMOB (Output_def, layout_smob, 1);
-  LY_ASSERT_TYPE (scm_is_string, props, 3);
+  LY_ASSERT_TYPE (scm_is_string, markup, 3);
 
   string str = ly_scm2string (markup);
   Output_def *layout = unsmob_output_def (layout_smob);