source file of the GNU LilyPond music typesetter
- (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "simple-file-storage.hh"
#include "file-path.hh"
#include "debug.hh"
+#include "direction.hh"
+#include "offset.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 (String s)
{
// this all really sucks, guile should take char const* arguments!
- return gh_eval_str ((char*)c);
+ return gh_eval_str ((char*)s.ch_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
ly_quote_scm (SCM s)
{
- return scm_m_quote (scm_cons2 (SCM_EOL, s, SCM_EOL) ,SCM_EOL); // apparently env arg is ignored.
+ return gh_list (ly_symbol2scm ("quote"), s, SCM_UNDEFINED);
}
-/*
- 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)
{
+ assert (gh_symbol_p (s));
return String((Byte*)SCM_CHARS (s), (int) SCM_LENGTH(s));
}
-SCM
-ly_set_scm (String name, SCM val)
-{
- return scm_sysintern ((char*)name.ch_C(), val);
-
-}
/**
Read a file, and shove it down GUILE. GUILE also has file read
String s = global_path.find (fn);
if (s == "")
{
- String e = _f ("Can not find file `%s\'", fn);
+ String e = _f ("Can't find file: `%s'", fn);
e += " ";
- e += _f ("(Load path is `%s\'", global_path.str ());
+ e += _f ("(load path: `%s')", global_path.str ());
error (e);
}
else
- *mlog << '[' << s;
+ progress_indication ("[" + s);
Simple_file_storage f(s);
- ly_ch_C_eval_scm ((char *) f.ch_C());
- *mlog << ']' << flush;
+ ly_eval_str ((char *) f.ch_C());
+ progress_indication ("]");
}
String s = global_path.find (fn);
if (s == "")
{
- String e = _f ("Can not find file `%s\'", fn);
+ String e = _f ("Can't find file: `%s'", fn);
e += " ";
- e += _f ("(Load path is `%s\'", global_path.str ());
+ e += _f ("(load path: `%s')", global_path.str ());
error (e);
}
else
- *mlog << '[' << s;
+ progress_indication ("[" + s );
Simple_file_storage f(s);
- return ly_ch_C_to_scm (f.ch_C());
+ SCM result = ly_str02scm (f.ch_C());
+ progress_indication ("]");
+ return result;
}
void
String
ly_scm2string (SCM s)
{
+ assert (gh_string_p (s));
int len;
char * p = gh_scm2newstr (s , &len);
String r (p);
- // delete p;
+
free (p);
return r;
}
index_cell (SCM s, Direction d)
{
assert (d);
- return (d == LEFT) ? SCM_CAR (s) : SCM_CDR (s);
+ return (d == LEFT) ? gh_car (s) : gh_cdr (s);
}
-
SCM
-array_to_list (SCM *a , int l)
+index_set_cell (SCM s, Direction d, SCM v)
{
- SCM list = SCM_EOL;
- for (int i= l; i--; )
- {
- list = gh_cons (a[i], list);
- }
- return list;
+ if (d == LEFT)
+ gh_set_car_x (s, v);
+ else if (d == RIGHT)
+ gh_set_cdr_x (s, v);
+ return s;
}
-
+
SCM
ly_warning (SCM str)
{
return SCM_BOOL_T;
}
-void
+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;
+}
+
+
+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);
}
-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);
+}
+
+
+
+bool
+isdir_b (SCM s)
+{
+ if (gh_number_p (s))
+ {
+ int i = gh_scm2int (s);
+ return i>= -1 && i <= 1;
+ }
+ return false;
+}
+
+Direction
+to_dir (SCM s)
+{
+ return (Direction) gh_scm2int (s);
+}
+
+
+SCM
+to_scm (int i)
+{
+ return gh_int2scm (i);
+}
+
+/*
+ UGR. junkme.
+ */
+int
+scm_to (SCM s, int* )
+{
+ return gh_number_p (s) ? gh_scm2int (s) : 0;
+}
+
+SCM
+to_scm (Real r)
+{
+ return gh_double2scm (r);
+}
+
+Real
+scm_to (SCM s, Real* )
+{
+ return gh_number_p (s) ? gh_scm2double (s) : 0;
+}
+
+bool
+to_boolean (SCM s)
+{
+ return gh_boolean_p (s) && gh_scm2bool (s);
+}
+
+/*
+ Appendable list L: the cdr contains the list, the car the last cons
+ in the list.
+ */
+SCM
+appendable_list ()
+{
+ SCM s = gh_cons (SCM_EOL, SCM_EOL);
+ gh_set_car_x (s, s);
+
+ return s;
+}
+
+void
+appendable_list_append (SCM l, SCM elt)
+{
+ SCM newcons = gh_cons (elt, SCM_EOL);
+
+ gh_set_cdr_x (gh_car (l), newcons);
+ gh_set_car_x (l, newcons);
+}
+
+
+SCM
+ly_offset2scm (Offset o)
+{
+ return gh_cons (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]));
+}
+
+Offset
+ly_scm2offset (SCM s)
+{
+ return Offset (gh_scm2double (gh_car (s)),
+ gh_scm2double (gh_cdr (s)));
}
projects / lilypond.git / blobdiff