release: 1.2.4

[lilypond.git] / lily / lily-guile.cc

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 46d5908d47e3cf1c3940aec8850341ca7bc79037..96e140707b3baa31f4c292c02b8ea87236614a09 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -8,7 +8,10 @@
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+
 #include <stdio.h>
+#include <stdlib.h>
+
 #include "libc-extension.hh"
 #include "lily-guile.hh"
 #include "main.hh"
@@ -16,19 +19,28 @@
 #include "file-path.hh"
 #include "debug.hh"
 
+SCM
+ly_ch_C_to_scm (char const*c)
+{
+  // this all really sucks, guile should take char const* arguments!
+  return gh_str02scm ((char*)c);
+}
 
-
+SCM
+ly_ch_C_eval_scm (char const*c)
+{
+  // this all really sucks, guile should take char const* arguments!
+  return gh_eval_str ((char*)c);
+}
 
 /*
   scm_m_quote doesn't use any env, but needs one for a good signature in GUILE.
-
-  Why there is no gh_quote () in GUILE  beats me.
 */
 
 SCM
 ly_quote_scm (SCM s)
 {
-  return scm_cons2 (scm_i_quote, s, SCM_EOL);
+  return scm_m_quote (scm_cons2 (SCM_EOL, s, SCM_EOL) ,SCM_EOL); // apparently env arg is ignored.
 }
 
 /*
@@ -41,7 +53,7 @@ ly_quote_scm (SCM s)
 SCM
 ly_symbol (String name)
 {
-  return gh_car (scm_intern (name.ch_C(), name.length_i()));
+  return gh_car (scm_intern ((char*)name.ch_C(), name.length_i()));
 }
 
 String
@@ -53,14 +65,13 @@ symbol_to_string (SCM s)
 SCM
 ly_set_scm (String name, SCM val)
 {
-  return scm_sysintern (name.ch_C(), val);
+  return scm_sysintern ((char*)name.ch_C(), val);
   
 }
-/**
 
+/**
    Read a file, and shove it down GUILE.  GUILE also has file read
    functions, but you can't fiddle with the path of those.
-   
  */
 void
 read_lily_scm_file (String fn)
@@ -79,11 +90,31 @@ read_lily_scm_file (String fn)
 
   Simple_file_storage f(s);
   
-  gh_eval_str ((char *) f.ch_C());
+  ly_ch_C_eval_scm ((char *) f.ch_C());
   *mlog << ']' << flush;  
 }
 
 
+SCM
+ly_gulp_file (SCM name)
+{
+  String fn (ly_scm2string (name));
+ String s = global_path.find (fn);
+  if (s == "")
+    {
+      String e = _f ("Can not find file `%s\'", fn);
+      e += " ";
+      e += _f ("(Load path is `%s\'", global_path.str ());
+      error (e);
+    }
+  else
+    *mlog << '[' << s;
+
+
+  Simple_file_storage f(s);
+  return ly_ch_C_to_scm (f.ch_C());
+}
+
 void
 ly_display_scm (SCM s)
 {
@@ -98,7 +129,8 @@ ly_scm2string (SCM s)
   char * p = gh_scm2newstr (s , &len);
   
   String r (p);
-  delete p;
+  //  delete p;
+  free (p);
   return r;
 }
 
@@ -125,17 +157,17 @@ SCM
 ly_warning (SCM str)
 {
   assert (gh_string_p (str));
-  warning ("scheme: " + ly_scm2string (str));
+  warning ("lily-guile: " + ly_scm2string (str));
   return SCM_BOOL_T;
 }
 
 void
 init_functions ()
 {
-  scm_make_gsubr ("ly-warn", 1, 0, 0, ly_warning);
+  scm_make_gsubr ("ly-warn", 1, 0, 0, (SCM(*)(...))ly_warning);
+  scm_make_gsubr ("ly-gulp-file", 1,0, 0, (SCM(*)(...))ly_gulp_file);
 }
 
-
 extern void init_symbols ();
 
 void