release: 1.5.13

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

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 5db4d23d211859c3228c4f6226653f5692052b5e..65ca5ebb2d392ad8755c805c3e1856b868a069f4 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -41,6 +41,7 @@
 #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
@@ -87,18 +88,21 @@ SCM ly_type (SCM);
 bool type_check_assignment (SCM val, SCM sym,  SCM type_symbol) ;
 SCM ly_number2string (SCM s);
 
-
-#define ly_cdr(x) SCM_CDR(x)
-#define ly_car(x) SCM_CAR(x)
-#define ly_caar(x) SCM_CAAR(x)
-#define ly_cdar(x) SCM_CDAR(x)
-#define ly_cadr(x) SCM_CADR(x)
-#define ly_cddr(x) SCM_CDDR(x)
-
-#define ly_pair_p(x) SCM_PAIRP(x)
-#define ly_symbol_p(x) SCM_SYMBOLP(x)
-#define ly_number_p(x) SCM_NUMBERP(x)
-#define ly_procedure_p(x) SCM_NFALSEP(scm_procedure_p(x))
+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.