release: 1.3.6

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index db3549fad49927de559389a2bba907274954ae4e..20f470b0bd274d327e7327f067516a6140150333 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -20,54 +20,106 @@
 #include "debug.hh"
 
 SCM
-ly_ch_C_to_scm (char const*c)
+ly_str02scm (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)
+ly_eval_str (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.
+  Pass string to scm parser, evaluate one expression.
+  Return result value and #chars read.
+
+  Thanks to Gary Houston <ghouston@freewire.co.uk>
+
+  Need guile-1.3.4 (>1.3 anyway) for ftell on str ports -- jcn
 */
+SCM
+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");
+  SCM from = scm_ftell (port);
+
+  SCM form;
+  SCM answer = SCM_UNSPECIFIED;
+
+  /* Read expression from port */
+  if (!SCM_EOF_OBJECT_P (form = scm_read (port)))
+    answer = scm_eval_x (form);
+
+  /*
+   After parsing
+
+       (begin (foo 1 2))
+
+   all seems fine, but after parsing
 
+       (foo 1 2)
+
+   read_buf has been advanced to read_pos - 1,
+   so that scm_ftell returns 1, instead of #parsed chars
+   */
+  
+  /*
+    urg: reset read_buf for scm_ftell
+    shouldn't scm_read () do this for us?
+  */
+  scm_fill_input (port);
+  SCM to = scm_ftell (port);
+  *n = gh_scm2int (to) - gh_scm2int (from);
+
+  /* Don't close the port here; if we re-enter this function via a
+     continuation, then the next time we enter it, we'll get an error.
+     It's a string port anyway, so there's no advantage to closing it
+     early.
+
+     scm_close_port (port);
+  */
+
+  return answer;
+}
+
+/*
+  scm_m_quote doesn't use any env, but needs one for a good signature in GUILE.
+*/
+// apparently env arg is ignored.
 SCM
 ly_quote_scm (SCM s)
 {
-  return scm_m_quote (scm_cons2 (SCM_EOL, s, SCM_EOL) ,SCM_EOL); // apparently env arg is ignored.
+  return scm_m_quote (scm_cons2 (SCM_EOL, s, SCM_EOL) ,SCM_EOL);
 }
 
-/*
-  See: libguile/symbols.c
 
-  SCM
-  scm_string_to_symbol(s)
-  
-*/
 SCM
-ly_symbol (String name)
+ly_symbol2scm(const char *s)
 {
-  return gh_car (scm_intern ((char*)name.ch_C(), name.length_i()));
+  return gh_symbol2scm ((char *)s);
 }
 
 String
-symbol_to_string (SCM s)
+ly_symbol2string (SCM s)
 {
   return String((Byte*)SCM_CHARS (s), (int) SCM_LENGTH(s));
 }
 
+#if 0
 SCM
-ly_set_scm (String name, SCM val)
+ly_set_x (String name, SCM val)
 {
   return scm_sysintern ((char*)name.ch_C(), val);
   
 }
+#endif
 
 /**
    Read a file, and shove it down GUILE.  GUILE also has file read
@@ -90,8 +142,8 @@ read_lily_scm_file (String fn)
 
   Simple_file_storage f(s);
   
-  ly_ch_C_eval_scm ((char *) f.ch_C());
-  *mlog << ']' << flush;  
+  ly_eval_str ((char *) f.ch_C());
+  *mlog << "]" << flush;  
 }
 
 
@@ -112,7 +164,9 @@ ly_gulp_file (SCM name)
 
 
   Simple_file_storage f(s);
-  return ly_ch_C_to_scm (f.ch_C());
+  SCM result = ly_str02scm (f.ch_C());
+  *mlog << "]";
+  return result;
 }
 
 void
@@ -129,7 +183,7 @@ ly_scm2string (SCM s)
   char * p = gh_scm2newstr (s , &len);
   
   String r (p);
-  //  delete p;
+
   free (p);
   return r;
 }
@@ -161,18 +215,48 @@ ly_warning (SCM str)
   return SCM_BOOL_T;
 }
 
+SCM
+ly_isdir_p (SCM s)
+{
+  if (gh_number_p (s))
+    {
+      int i = gh_scm2int (s);
+      return (i>= -1 && i <= 1)  ? SCM_BOOL_T : SCM_BOOL_F; 
+    }
+  return SCM_BOOL_F;
+}
+
+
 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);  
 }
 
-extern void init_symbols ();
+ADD_SCM_INIT_FUNC(funcs, init_functions);
+
+
+typedef void (*Void_fptr)();
+Array<Void_fptr> *scm_init_funcs_;
+
+void add_scm_init_func (void (*f)())
+{
+  if (!scm_init_funcs_)
+    scm_init_funcs_ = new Array<Void_fptr>;
+
+  scm_init_funcs_->push (f);
+}
 
 void
 init_lily_guile ()
 {
-  init_symbols();
-  init_functions ();
+  for (int i=scm_init_funcs_->size() ; i--;)
+    (scm_init_funcs_->elem (i)) ();
+}
+
+unsigned int ly_scm_hash (SCM s)
+{
+  return scm_ihashv (s, ~1u);
 }