X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flily-guile.cc;h=bde39214b39faff40af98548533a3ed7a6bb716b;hb=24107d843c902a8101fbb696f47bf7538dd4493a;hp=d8d8d10edba05276889af19161e3a25b205e837b;hpb=b882256ddb159e7169a30052f0c9fb2999f83b7a;p=lilypond.git

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index d8d8d10edb..bde39214b3 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -40,6 +40,7 @@ using namespace std;
 #include "source-file.hh"
 #include "version.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
 
 /*
   symbols/strings.
@@ -436,8 +437,7 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol)
       && ly_is_procedure (type)
       && scm_is_false (scm_call_1 (type, val)))
     {
-      SCM typefunc = ly_lily_module_constant ("type-name");
-      SCM type_name = scm_call_1 (typefunc, type);
+      SCM type_name = Lily::type_name (type);
 
       warning (_f ("type check for `%s' failed; value `%s' must be of type `%s'",
                    ly_symbol2string (sym).c_str (),
@@ -455,8 +455,8 @@ ly_wrong_smob_arg (bool pred (SCM), SCM var, int number, const char *fun)
   string type = predicate_to_typename ((void *) pred);
   if (pred (var))
     {
-      // Uh oh.  derived_unsmob <T> delivered 0, yet
-      // T::is_smob delivers true.  This means that T::is_smob is a
+      // Uh oh.  unsmob<T> delivered 0, yet
+      // unsmob<T> delivers true.  This means that unsmob<T> is a
       // matching check from a base class of T, but var is of an
       // incompatible derived type.
       type = string (_ ("Wrong kind of ")).append (type);
@@ -672,8 +672,7 @@ alist_to_hashq (SCM alist)
 SCM
 ly_hash2alist (SCM tab)
 {
-  SCM func = ly_lily_module_constant ("hash-table->alist");
-  return scm_call_1 (func, tab);
+  return Lily::hash_table_to_alist (tab);
 }
 
 /*