]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/include/lily-guile-macros.hh
add 2007 to (c) year.
[lilypond.git] / lily / include / lily-guile-macros.hh
index 2138038481f9262fe2fbe49e2206bf5b14a172a1..dec12d19bdf1942476c2f810d8159e342c3be082 100644 (file)
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 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
 
+/* this lets us "overload" macros such as get_property to take
+   symbols as well as strings */
+inline SCM
+scm_or_str2symbol (char const *c) { return scm_str2symbol (c); }
+
+inline SCM
+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;                                                 \
     if (__builtin_constant_p ((x)))                                    \
       {                                                                        \
        if (!cached)                                                    \
-         value = cached = scm_gc_protect_object (scm_str2symbol ((x))); \
+         value = cached = scm_gc_protect_object (scm_or_str2symbol (x)); \
       }                                                                        \
     else                                                               \
-      value = scm_str2symbol ((char *) (x));                           \
+      value = scm_or_str2symbol (x);                                   \
     value;                                                             \
   })
 #else
@@ -55,7 +66,11 @@ inline SCM ly_symbol2scm (char const *x) { return scm_str2symbol ((x)); }
 
 /*
   TODO: rename me to ly_c_lily_module_eval
+
+  we don't have to protect the result; it's already part of the
+  exports list of the module.
 */
+
 #define ly_lily_module_constant(x)                                     \
   ({                                                                   \
     static SCM cached;                                                 \
@@ -64,8 +79,8 @@ inline SCM ly_symbol2scm (char const *x) { return scm_str2symbol ((x)); }
     if (__builtin_constant_p ((x)))                                    \
       {                                                                        \
        if (!cached)                                                    \
-         value = cached = scm_gc_protect_object (scm_eval (scm_str2symbol (x), \
-                                                           global_lily_module)); \
+         value = cached = scm_eval (scm_str2symbol (x),                \
+                                    global_lily_module);               \
       }                                                                        \
     else                                                               \
       value = scm_eval (scm_str2symbol (x), global_lily_module);       \
@@ -79,24 +94,29 @@ inline SCM ly_symbol2scm (char const *x) { return scm_str2symbol ((x)); }
 #define DECLARE_SCHEME_CALLBACK(NAME, ARGS)    \
   static SCM NAME ARGS;                                \
   static SCM NAME ## _proc
-
 /*
   Make TYPE::FUNC available as a Scheme function.
 */
-#define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGCOUNT)                     \
+string mangle_cxx_identifier (string);
+#define MAKE_SCHEME_CALLBACK_WITH_OPTARGS(TYPE, FUNC, ARGCOUNT, OPTIONAL_COUNT)        \
   SCM TYPE ::FUNC ## _proc;                                            \
   void                                                                 \
   TYPE ## _ ## FUNC ## _init_functions ()                              \
   {                                                                    \
-    TYPE ::FUNC ## _proc = scm_c_define_gsubr (#TYPE "::" #FUNC,       \
-                                              (ARGCOUNT), 0, 0,        \
-                                              (Scheme_function_unknown)TYPE ::FUNC); \
-    scm_c_export (#TYPE "::" #FUNC, NULL);                             \
+    string id = mangle_cxx_identifier (string (#TYPE) + "::" + string (#FUNC)); \
+    TYPE ::FUNC ## _proc = scm_c_define_gsubr (id.c_str(),                     \
+                                              (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,
@@ -143,6 +163,15 @@ ly_add_function_documentation (SCM proc, char const *fname,
                          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__)
+#else
 #define set_property(x, y) internal_set_property (ly_symbol2scm (x), y)
+#endif
 
 #endif /* LILY_GUILE_MACROS_HH */