release: 1.5.19

[lilypond.git] / lily / include / lily-guile.hh

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 0dc9e3406e67787caa3a25a9ddf04c42b73d3fde..e67293e06f89c3c4897097722899b1e692e53f41 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -9,12 +9,33 @@
 #ifndef LILY_GUILE_HH
 #define LILY_GUILE_HH
 
-#include <guile/gh.h>
+#define SCM_VOIDP_TEST
+
 #include <libguile.h>
+
+/*
+  TODO: the  GH interface is deprecated as of GUILE 1.6
+
+  Remove all gh_XXX functions.
+ */
+#include <guile/gh.h>
+
 #include "config.h"
 
 /* Guile 1.3.4 compatibility */
 #if GUILE_MINOR_VERSION < 4
+
+
+#ifndef SCM_CELL_TYPE
+#define SCM_CELL_TYPE(X) SCM_CAR (X)
+#endif
+
+#ifndef SCM_CELL_WORD_1
+#define SCM_CELL_WORD_1(X) SCM_CDR (X)
+#endif
+
+#define scm_bits_t SCM
+
 #define fix_guile_1_3_4_scm_puts(scm_data, port) scm_puts ((char*)scm_data, port)
 #define scm_puts(scm_data, port) fix_guile_1_3_4_scm_puts (scm_data, port)
 #endif
@@ -31,12 +52,15 @@
 #define scm_primitive_eval(form) fix_guile_1_4_scm_primitive_eval (form)
 
 #define scm_c_define_gsubr scm_make_gsubr
+#define scm_c_eval_string(str) gh_eval_str ((char*)str)
 #define scm_c_memq scm_sloppy_memq
 #define scm_gc_protect_object scm_protect_object
 #define scm_gc_unprotect_object scm_unprotect_object
 #define scm_list_n scm_listify
 #define SCM_STRING_CHARS SCM_CHARS
 #define SCM_STRING_LENGTH SCM_LENGTH
+#define SCM_SYMBOL_CHARS SCM_CHARS
+#define SCM_SYMBOL_LENGTH SCM_LENGTH
 #endif
 
 
@@ -62,7 +86,38 @@ SCM ly_last (SCM list);
 SCM ly_str02scm (char const*c);
 SCM ly_write2scm (SCM s);
 SCM ly_deep_copy (SCM);
-SCM ly_symbol2scm (char const *);
+SCM ly_truncate_list (int k, SCM l );
+
+#define CACHE_SYMBOLS
+#ifdef CACHE_SYMBOLS
+
+SCM my_gh_symbol2scm (const char* x);
+
+// #warning: CACHE_SYMBOLS
+
+/*
+  Using this trick we cache the value of gh_symbol2scm ("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;  \
+ SCM value = cached;  /* We store this one locally, since G++ -O2 fucks up else */   \
+ if ( __builtin_constant_p ((x)))\
+ {  if (!cached)\
+     value = cached =  scm_gc_protect_object (my_gh_symbol2scm((char*) (x)));\
+ } else\
+  value = gh_symbol2scm ((char*) (x)); \
+  value; })
+#else
+inline SCM ly_symbol2scm(char const* x) { return gh_symbol2scm((char*)x); }
+#endif 
+
+
+
 String ly_scm2string (SCM s);
 String ly_symbol2string (SCM);
 SCM ly_offset2scm (Offset);
@@ -77,6 +132,22 @@ SCM ly_type (SCM);
 bool type_check_assignment (SCM val, SCM sym,  SCM type_symbol) ;
 SCM ly_number2string (SCM s);
 
+SCM parse_symbol_list (char const *);
+
+inline SCM ly_cdr (SCM x) { return SCM_CDR (x); }
+inline SCM ly_car (SCM x) { return SCM_CAR (x); } 
+inline SCM ly_caar (SCM x) { return SCM_CAAR (x); }
+inline SCM ly_cdar (SCM x) { return SCM_CDAR (x); }
+inline SCM ly_cadr (SCM x) { return SCM_CADR (x); }
+inline SCM ly_cddr (SCM x) { return SCM_CDDR (x); }
+inline SCM ly_caddr (SCM x) { return SCM_CADDR (x); }
+inline SCM ly_cdadr (SCM x) { return SCM_CDADR (x); }
+inline SCM ly_caadr (SCM x) { return SCM_CAADR (x); }
+inline bool ly_pair_p (SCM x) { return SCM_NFALSEP (scm_pair_p (x)); }
+inline bool ly_symbol_p (SCM x) { return SCM_SYMBOLP (x); }
+inline bool ly_number_p (SCM x) { return SCM_NUMBERP (x); }
+inline bool ly_procedure_p (SCM x) { return SCM_NFALSEP (scm_procedure_p(x)); }
+
 /*
   display and print newline.
  */