source file of the GNU LilyPond music typesetter
- (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#ifndef LILY_GUILE_MACROS_HH
#define SCM_UNPACK(x) (x)
#endif
-#if (__GNUC__ > 2)
/* Unreliable with gcc-2.x
FIXME: should add check for x86 as well? */
#define CACHE_SYMBOLS
-#endif
+
+
+
#ifdef CACHE_SYMBOLS
scm_or_str2symbol (char const *c) { return scm_str2symbol (c); }
inline SCM
-scm_or_str2symbol (SCM s) { return s; }
+scm_or_str2symbol (SCM s) {
+ assert (scm_is_symbol (s));
+ return s;
+}
/* Using this trick we cache the value of scm_str2symbol ("fooo") where
"fooo" is a constant string. This is done at the cost of one static
variable per ly_symbol2scm() use, and one boolean evaluation for
every call.
-
- The overall speedup of lily is about 5% on a run of wtk1-fugue2. */
+ */
#define ly_symbol2scm(x) \
({ \
static SCM cached; \
Make TYPE::FUNC available as a Scheme function.
*/
string mangle_cxx_identifier (string);
-#define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGCOUNT) \
+#define MAKE_SCHEME_CALLBACK_WITH_OPTARGS(TYPE, FUNC, ARGCOUNT, OPTIONAL_COUNT) \
SCM TYPE ::FUNC ## _proc; \
void \
TYPE ## _ ## FUNC ## _init_functions () \
{ \
string id = mangle_cxx_identifier (string (#TYPE) + "::" + string (#FUNC)); \
TYPE ::FUNC ## _proc = scm_c_define_gsubr (id.c_str(), \
- (ARGCOUNT), 0, 0, \
+ (ARGCOUNT-OPTIONAL_COUNT), OPTIONAL_COUNT, 0, \
(Scheme_function_unknown) TYPE::FUNC); \
scm_c_export (id.c_str (), NULL); \
} \
ADD_SCM_INIT_FUNC (TYPE ## _ ## FUNC ## _callback, \
TYPE ## _ ## FUNC ## _init_functions);
+#define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGCOUNT) \
+ MAKE_SCHEME_CALLBACK_WITH_OPTARGS(TYPE,FUNC,ARGCOUNT,0);
+
void
ly_add_function_documentation (SCM proc, char const *fname,
char const *varlist,
VAR, ARGLIST, DOCSTRING)
#define get_property(x) internal_get_property (ly_symbol2scm (x))
+#define get_property_data(x) internal_get_property_data (ly_symbol2scm (x))
#define get_object(x) internal_get_object (ly_symbol2scm (x))
#define set_object(x, y) internal_set_object (ly_symbol2scm (x), y)
#define del_property(x) internal_del_property (ly_symbol2scm (x))
#ifndef NDEBUG
-#define set_property(x, y) internal_set_property (ly_symbol2scm (x), y, __FILE__, __LINE__, __FUNCTION__)
+/*
+ TODO: include modification callback support here, perhaps
+ through intermediate Grob::instrumented_set_property( .. __LINE__ ).
+ */
+#define set_property(x, y) internal_set_property (ly_symbol2scm (x), y)
#else
#define set_property(x, y) internal_set_property (ly_symbol2scm (x), y)
#endif