patch::: 1.3.96.jcn9

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 7877d3674f47e0aa274b773508eb424bf4d52ca2..4a6e26d5d1ae1077af7dd7cf815c849bbb4eafce 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -45,7 +45,7 @@ ly_parse_scm (char const* s, int* n)
 {
   SCM str = gh_str02scm ((char*)s);
   SCM port = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG,
-                            "scm_eval_0str");
+                            "ly_eval_scm_0str");
   SCM from = scm_ftell (port);
 
   SCM form;
@@ -53,7 +53,7 @@ ly_parse_scm (char const* s, int* n)
 
   /* Read expression from port */
   if (!SCM_EOF_OBJECT_P (form = scm_read (port)))
-    answer = scm_eval_x (form);
+    answer = scm_eval_3 (form, 1, SCM_EOL); // guh?
 
   /*
    After parsing
@@ -100,6 +100,7 @@ ly_symbol2scm(const char *s)
   return gh_symbol2scm ((char *)s);
 }
 
+
 String
 ly_symbol2string (SCM s)
 {
@@ -147,13 +148,15 @@ read_lily_scm_file (String fn)
   gh_eval_str ((char *) gulp_file_to_string (fn).ch_C());
 }
 
-
+extern "C" {
+  // maybe gdb 5.0 becomes quicker if it doesn't do fancy C++ typing?
 void
 ly_display_scm (SCM s)
 {
   gh_display (s);
   gh_newline ();
 }
+};
 
 String
 ly_scm2string (SCM s)
@@ -343,7 +346,7 @@ ly_number2string (SCM s)
 {
   assert (gh_number_p (s));
 
-  char str[100];                       // ugh.
+  char str[400];                       // ugh.
 
   if (scm_integer_p (s) == SCM_BOOL_F)
     {
@@ -393,21 +396,21 @@ undefd ()
   return SCM_UNDEFINED;
 }
 
+
 static void
 init_functions ()
 {
-  scm_make_gsubr ("ly-warn", 1, 0, 0, (SCM(*)(...))ly_warning);
-  scm_make_gsubr ("ly-gulp-file", 1,0, 0, (SCM(*)(...))ly_gulp_file);
-  scm_make_gsubr ("dir?", 1,0, 0, (SCM(*)(...))ly_isdir_p);
-  scm_make_gsubr ("undefd", 0,0, 0, (SCM(*)(...))undefd);  
-  scm_make_gsubr ("ly-number->string", 1, 0,0, (SCM(*)(...)) ly_number2string);
+  scm_make_gsubr ("ly-warn", 1, 0, 0, (Scheme_function_unknown)ly_warning);
+  scm_make_gsubr ("ly-gulp-file", 1,0, 0, (Scheme_function_unknown)ly_gulp_file);
+  scm_make_gsubr ("dir?", 1,0, 0, (Scheme_function_unknown)ly_isdir_p);
+  scm_make_gsubr ("undefd", 0,0, 0, (Scheme_function_unknown)undefd);  
+  scm_make_gsubr ("ly-number->string", 1, 0,0, (Scheme_function_unknown) ly_number2string);
 
 
 #ifdef TEST_GC 
   scm_c_hook_add (&scm_before_mark_c_hook, greet_sweep, 0, 0);
   scm_c_hook_add (&scm_before_sweep_c_hook, wave_sweep_goodbye, 0, 0);
 #endif
-  
 }
 
 ADD_SCM_INIT_FUNC(funcs, init_functions);