X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-function.cc;h=65fedab7ddd70380457a9fa1304176589749eb69;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=46ac068575c92f0dce211807c0f5378fb167954c;hpb=24ac85edabed266d1de42c12971f4e81b4475d7d;p=lilypond.git

diff --git a/lily/music-function.cc b/lily/music-function.cc
index 46ac068575..65fedab7dd 100644
--- a/lily/music-function.cc
+++ b/lily/music-function.cc
@@ -1,85 +1,89 @@
-/* 
-  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--2014 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 "music.hh"
+#include "ly-smobs.icc"
+
+class Musicfunction
+{
+  DECLARE_SIMPLE_SMOBS (Musicfunction);
+  SCM signature_;
+  SCM function_;
+public:
+  Musicfunction (SCM signature, SCM function):
+    signature_ (signature), function_ (function) { }
+  SCM get_function () { return function_; }
+  SCM get_signature () { return signature_; }
+};
 
-static scm_t_bits music_function_tag;
+IMPLEMENT_SIMPLE_SMOBS (Musicfunction);
+IMPLEMENT_DEFAULT_EQUAL_P (Musicfunction);
 
 /* Print a textual represenation of the smob to a given port.  */
-static int
-print_music_function (SCM b, SCM port, scm_print_state *)
+int
+Musicfunction::print_smob (SCM b, SCM port, scm_print_state *)
 {
-  SCM value = SCM_CELL_OBJECT_1 (b);
-
   scm_puts ("#<Music function ", port);
-  scm_write (value, port);
+  scm_write (Musicfunction::unsmob (b)->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; scm_is_pair (s); s = scm_cdr (s))
-    {
-      if (str != "")
-	str += "-";
-      
-      if (scm_car (s) == Music_type_p_proc)
-	str += "music";
-      else if (scm_car (s) == ly_lily_module_constant("markup?"))
-	str += "markup";
-      else if (ly_c_procedure_p (scm_car (s)))
-	str += "scm";
-    }
-  if (str == "") str = "noarg";
-  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);
+  return Musicfunction::unsmob (music_function);
 }
 
-
 SCM
 get_music_function_transform (SCM music_function)
 {
   if (!is_music_function (music_function))
     return SCM_UNDEFINED;
-  
-  return SCM_CELL_OBJECT_1 (music_function);
+
+  return Musicfunction::unsmob (music_function)->get_function ();
+}
+
+SCM
+make_music_function (SCM signature, SCM func)
+{
+  return Musicfunction (signature, func).smobbed_copy ();
 }
 
-static void
-init_music_function (void)
+SCM
+get_music_function_signature (SCM music_function)
 {
-  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);
+  if (!is_music_function (music_function))
+    return SCM_UNDEFINED;
+
+  return Musicfunction::unsmob (music_function)->get_signature ();
 }
 
-ADD_SCM_INIT_FUNC (music_function_tag, init_music_function); 
+SCM
+Musicfunction::mark_smob (SCM s)
+{
+  Musicfunction *p = Musicfunction::unsmob (s);
+  scm_gc_mark (p->signature_);
+  ASSERT_LIVE_IS_ALLOWED (s);
+  return p->function_;
+}