X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-function.cc;h=c485a2989c7b47738f5507931ad43153420c4b39;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=11cda8255c495b6f8d159a559987a5212df6e00f;hpb=e996beffe0f799b42f88fe6635d8e8f089ad3233;p=lilypond.git

diff --git a/lily/music-function.cc b/lily/music-function.cc
index 11cda8255c..c485a2989c 100644
--- a/lily/music-function.cc
+++ b/lily/music-function.cc
@@ -1,81 +1,41 @@
-/* 
-  music-function.cc --  implement music_function
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 #include "music-function.hh"
-#include "string.hh"
-#include "music.hh"
 
-static scm_t_bits music_function_tag;
+const char Music_function::type_p_name_[] = "ly:music-function?";
 
 /* Print a textual represenation of the smob to a given port.  */
-static int
-print_music_function (SCM b, SCM port, scm_print_state *)
+int
+Music_function::print_smob (SCM port, scm_print_state *)
 {
-  SCM value = SCM_CELL_OBJECT_1 (b);
-
-  scm_puts ("#<packaged object ", port);
-  scm_write (value, port);
+  scm_puts ("#<Music function ", port);
+  scm_write (get_function (), port);
   scm_puts (">", port);
 
   /* Non-zero means success.  */
   return 1;
 }
 
-
-LY_DEFINE (ly_make_music_function, "ly:make-music-function", 2, 0, 0,
-	   (SCM signature, SCM func),
-	  "Make a function to process music, to be used for the "
-	   "parser. @code{func} is the function, and @code{signature} describes "
-	   "Its arguments. @code{signature} is a list containing either "
-	   "@code{ly:music?} predicates or other type predicates.")
-{
-  String str = "";
-  for (SCM s = signature; ly_c_pair_p (s); s = ly_cdr (s))
-    {
-      if (str != "")
-	str += "-";
-      
-      if (ly_car (s) == Music_type_p_proc)
-	str += "music";
-      else if (ly_c_procedure_p (ly_car (s)))
-	str += "scm";
-    }
-  
-  scm_set_object_property_x (func, ly_symbol2scm ("music-function-signature"),
-			     signature);
-  
-  scm_set_object_property_x (func, ly_symbol2scm ("music-function-signature-keyword"),
-			     ly_symbol2scm (str.to_str0 ()));
-    
-  SCM_RETURN_NEWSMOB (music_function_tag, func);
-}
-
-bool
-is_music_function (SCM music_function)
-{
-  return (SCM_NIMP (music_function) && SCM_CELL_TYPE (music_function) == music_function_tag);
-}
-
-
 SCM
-get_music_function_transform (SCM music_function)
-{
-  if (!is_music_function (music_function))
-    return SCM_UNDEFINED;
-  
-  return SCM_CELL_OBJECT_1 (music_function);
-}
-
-static void
-init_music_function (void)
+Music_function::mark_smob ()
 {
-  music_function_tag = scm_make_smob_type ("music-function", 0);
-  scm_set_smob_mark (music_function_tag, scm_markcdr);
-  scm_set_smob_print (music_function_tag, print_music_function);
+  ASSERT_LIVE_IS_ALLOWED (self_scm ());
+  return Smob2<Music_function>::mark_smob ();
 }
-ADD_SCM_INIT_FUNC (music_function_tag, init_music_function);