X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffunction-documentation.cc;h=7a9d33bd6241712901afb2b0a70fe1cd91490fb4;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=df73ddcefe478875c0fe3dc3aa01fdb5cc9612ef;hpb=69622b49b7a5a9c992e36ef11ba60c1fdd3c34b6;p=lilypond.git

diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc
index df73ddcefe..7a9d33bd62 100644
--- a/lily/function-documentation.cc
+++ b/lily/function-documentation.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--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
@@ -27,7 +27,7 @@ using namespace std;
 static SCM doc_hash_table;
 
 void
-ly_check_name (string cxx, string scm_name)
+ly_check_name (const string &cxx, const string &scm_name)
 {
   string mangle = mangle_cxx_identifier (cxx);
   if (mangle != scm_name)
@@ -38,9 +38,9 @@ ly_check_name (string cxx, string scm_name)
 
 void
 ly_add_function_documentation (SCM func,
-                               string fname,
-                               string varlist,
-                               string doc)
+                               const string &fname,
+                               const string &varlist,
+                               const string &doc)
 {
   if (doc == "")
     return;
@@ -70,7 +70,7 @@ map<void *, string> type_names;
 
 void
 ly_add_type_predicate (void *ptr,
-                       string name)
+                       const string &name)
 {
   type_names[ptr] = name;
 }
@@ -103,16 +103,11 @@ void
 init_func_doc ()
 {
   ly_add_type_predicate ((void *) &is_direction, "direction");
-  ly_add_type_predicate ((void *) &is_music_function, "Music_function");
   ly_add_type_predicate ((void *) &ly_is_port, "port");
   ly_add_type_predicate ((void *) &ly_cheap_is_list, "list");
-  ly_add_type_predicate ((void *) &unsmob_global_context, "Global_context");
-  ly_add_type_predicate ((void *) &unsmob_input, "Input");
-  ly_add_type_predicate ((void *) &unsmob_moment, "Moment");
-  ly_add_type_predicate ((void *) &unsmob_paper_score, "Paper_score");
-  ly_add_type_predicate ((void *) &unsmob_performance, "Performance");
-  ly_add_type_predicate ((void *) &is_unpure_pure_container, "unpure pure container");
-
+  ly_add_type_predicate ((void *) &Global_context::is_smob, "Global_context");
+  ly_add_type_predicate ((void *) &Paper_score::is_smob, "Paper_score");
+  ly_add_type_predicate ((void *) &Performance::is_smob, "Performance");
   ly_add_type_predicate ((void *) &is_axis, "axis");
   ly_add_type_predicate ((void *) &is_number_pair, "number pair");
   ly_add_type_predicate ((void *) &ly_is_list, "list");
@@ -125,10 +120,10 @@ init_func_doc ()
   ly_add_type_predicate ((void *) &scm_is_rational, "rational");
   ly_add_type_predicate ((void *) &scm_is_string, "string");
   ly_add_type_predicate ((void *) &scm_is_vector, "vector");
-  ly_add_type_predicate ((void *) &unsmob_item, "Item");
-  ly_add_type_predicate ((void *) &unsmob_music, "Music");
-  ly_add_type_predicate ((void *) &unsmob_spanner, "Spanner");
-  ly_add_type_predicate ((void *) &unsmob_stream_event, "Stream_event");
+  ly_add_type_predicate ((void *) &Item::is_smob, "Item");
+  ly_add_type_predicate ((void *) &Music::is_smob, "Music");
+  ly_add_type_predicate ((void *) &Spanner::is_smob, "Spanner");
+  ly_add_type_predicate ((void *) &Stream_event::is_smob, "Stream_event");
 }
 
 ADD_SCM_INIT_FUNC (func_doc, init_func_doc);