/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2004--2012 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
#include "music-function.hh"
#include "music.hh"
+#include "ly-smobs.icc"
-static scm_t_bits music_function_tag;
+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_; }
+};
+
+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. */
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
if (!is_music_function (music_function))
return SCM_UNDEFINED;
- return SCM_CELL_OBJECT_1 (music_function);
+ return Musicfunction::unsmob (music_function)->get_function ();
}
-static void
-init_music_function (void)
+SCM
+make_music_function (SCM signature, SCM func)
{
- 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);
+ return Musicfunction (signature, func).smobbed_copy ();
}
SCM
-make_music_function (SCM signature, SCM func)
+get_music_function_signature (SCM music_function)
{
- scm_set_object_property_x (func, ly_symbol2scm ("music-function-signature"),
- signature);
+ if (!is_music_function (music_function))
+ return SCM_UNDEFINED;
- SCM_RETURN_NEWSMOB (music_function_tag, func);
+ 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_;
+}