release: 1.3.102

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

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 8a8f4c2d020201bba21821be20c443b2c5b7a479..d69322d91b62958bd31f6388f3054117b08b1433 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -9,23 +9,49 @@
 #ifndef LILY_GUILE_HH
 #define LILY_GUILE_HH
 
-#include  "string.hh"
-
 #include <guile/gh.h>
 #include <libguile.h>
+
+#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)
+
 #include "direction.hh"
+#include "flower-proto.hh"
+
+#ifndef SCM_PACK
+#define SCM_PACK(x) ((SCM) x)
+
+#endif
+#ifndef SCM_UNPACK
+#define SCM_UNPACK(x) ( x)
+#endif
+
+/*
+  conversion functions follow the GUILE naming convention, i.e.
 
+    A ly_B2A (B b);
+ */
 SCM ly_str02scm (char const*c);
-SCM ly_eval_str (String s);
+SCM ly_deep_copy (SCM);
 SCM ly_symbol2scm (char const *);
+String ly_scm2string (SCM s);
 String ly_symbol2string (SCM);
-SCM ly_type (SCM);
+SCM ly_offset2scm (Offset);
+Offset ly_scm2offset (SCM);
+
+Interval ly_scm2interval (SCM);
+SCM ly_interval2scm (Interval);
 
-SCM ly_eval (SCM a);
 SCM ly_parse_scm (char const* s, int* n);
 SCM ly_quote_scm (SCM s);
+SCM ly_type (SCM);
+
+/*
+  display and print newline.
+ */
+extern "C" { 
 void ly_display_scm (SCM s);
-String ly_scm2string (SCM s);
+}
 
 #include "array.hh"
 
@@ -33,8 +59,13 @@ void read_lily_scm_file (String);
 void init_lily_guile ();
 
 bool isdir_b (SCM s);
-Direction to_dir (SCM s);
 
+/*
+  these conversion functions also do a typecheck on the argument, and
+  return a default value if S has the wrong type.
+*/
+
+Direction to_dir (SCM s);
 bool to_boolean (SCM s);
 
 void init_ly_protection ();
@@ -43,24 +74,41 @@ unsigned int ly_scm_hash (SCM s);
 SCM index_cell (SCM cellp, Direction d);
 SCM index_set_cell (SCM cellp, Direction d, SCM val);
 
-template<class T>SCM array_to_scm (Array<T> arr);
-template<class T>void scm_to_array (SCM s, Array<T>* arr);
-
-//URG how templates suck!
-SCM to_scm (int i);
-int scm_to (SCM s, int* i);
-
-SCM to_scm (Real r);
-Real scm_to (SCM s, Real* r);
-
-SCM to_scm (Offset o);
-Offset scm_to (SCM s, Offset* o);
 
 /*
   snarfing.
  */
 void add_scm_init_func (void (*)());
 
+
+typedef SCM(*Scheme_function_unknown)();
+
+#if __GNUC_MINOR__ >= 96
+typedef SCM(*Scheme_function_0)();
+typedef SCM(*Scheme_function_1)(SCM);
+typedef SCM(*Scheme_function_2)(SCM,SCM);       
+#else
+typedef SCM(*Scheme_function_0)(...);
+typedef SCM(*Scheme_function_1)(...);
+typedef SCM(*Scheme_function_2)(...);
+#endif
+
+#define DECLARE_SCHEME_CALLBACK(NAME,ARGS) \
+       static SCM NAME ARGS; \
+       static SCM NAME ## _proc
+
+#define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGCOUNT) \
+SCM TYPE :: FUNC ## _proc;\
+void                                                           \
+TYPE ## _ ## FUNC ## _init_functions ()                                        \
+{                                                              \
+  TYPE :: FUNC ## _proc = gh_new_procedure ## ARGCOUNT  ## _0 (#TYPE "::" #FUNC, \
+  ((Scheme_function_ ## ARGCOUNT)TYPE :: FUNC));                               \
+}                                                              \
+                                                               \
+ADD_SCM_INIT_FUNC(TYPE ## _ ## FUNC ## _callback, TYPE ## _ ## FUNC ## _init_functions);       \
+
+
 #define ADD_SCM_INIT_FUNC(name, func)\
 class name ## _scm_initter {                   \
 public:\