release: 1.3.8

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

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index b7eea3d2f570d9c25382b132da9c800c4c47b83f..ddb21f4c5ce844e71256f37dea57f1f2710879d6 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -8,21 +8,23 @@
 
 #ifndef LILY_GUILE_HH
 #define LILY_GUILE_HH
-// order of includes important?
-#include "config.hh"
+
 #include  "string.hh"
 
 #include <guile/gh.h>
 #include <libguile.h>
 #include "direction.hh"
 
-SCM ly_symbol (String name);
-String symbol_to_string (SCM);
-SCM ly_set_scm (String name , SCM val);
+SCM ly_str02scm (char const*c);
+SCM ly_eval_str (char const*c);
+SCM ly_symbol2scm (char const *);
+String ly_symbol2string (SCM);
+SCM ly_set_x (String name , SCM val);
 
 SCM ly_append (SCM a, SCM b);
 SCM ly_eval (SCM a);
 SCM ly_func_o (char const* name);
+SCM ly_parse_scm (char const* s, int* n);
 SCM ly_quote_scm (SCM s);
 void ly_display_scm (SCM s);
 String ly_scm2string (SCM s);
@@ -30,20 +32,35 @@ SCM array_to_list (SCM *a , int l);
 
 
 #include "array.hh"
-#include "scalar.hh"
-
 
 void read_lily_scm_file (String);
-void init_symbols ();
-#include "ly-symbols.hh"
+void init_lily_guile ();
+
+bool isdir_b (SCM s);
+Direction to_dir (SCM s);
+
 
-/*
-  DIY gc protection.
- */
-SCM ly_protect_scm (SCM s);
-SCM ly_unprotect_scm (SCM s);
 void init_ly_protection ();
+unsigned int ly_scm_hash (SCM s);
 
 SCM index_cell (SCM cellp, Direction d);
 
+
+/*
+  snarfing.
+ */
+void add_scm_init_func (void (*)());
+
+#define ADD_SCM_INIT_FUNC(name, func)\
+class name ## _scm_initter {                   \
+public:\
+  name ## _scm_initter ()                      \
+  {                                            \
+    add_scm_init_func (func);          \
+  }                                            \
+} _ ## name ## _scm_initter;                   \
+/* end define */
+
+
+
 #endif // LILY_GUILE_HH