#include "debug.hh"
#include "direction.hh"
#include "offset.hh"
+#include "interval.hh"
SCM
ly_str02scm (char const*c)
return gh_str02scm ((char*)c);
}
-SCM
-ly_eval_str (String s)
-{
- // this all really sucks, guile should take char const* arguments!
- return gh_eval_str ((char*)s.ch_C ());
-}
-
+
/*
Pass string to scm parser, evaluate one expression.
Return result value and #chars read.
{
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;
/* 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
return gh_symbol2scm ((char *)s);
}
+
String
ly_symbol2string (SCM s)
{
}
-/**
- 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)
+String
+gulp_file_to_string (String fn)
{
String s = global_path.find (fn);
if (s == "")
e += _f ("(load path: `%s')", global_path.str ());
error (e);
}
- else
- progress_indication ("[" + s);
+ else if (verbose_global_b)
+ progress_indication ("[" + s );
Simple_file_storage f(s);
-
- ly_eval_str ((char *) f.ch_C());
- progress_indication ("]");
+ String result (f.ch_C());
+ if (verbose_global_b)
+ progress_indication ("]");
+ return result;
}
-
SCM
-ly_gulp_file (SCM name)
+ly_gulp_file (SCM fn)
{
- String fn (ly_scm2string (name));
- String s = global_path.find (fn);
- if (s == "")
- {
- String e = _f ("can't find file: `%s'", fn);
- e += " ";
- e += _f ("(load path: `%s')", global_path.str ());
- error (e);
- }
- else
- progress_indication ("[" + s );
+ return ly_str02scm (gulp_file_to_string (ly_scm2string (fn)).ch_C());
+}
- Simple_file_storage f(s);
- SCM result = ly_str02scm (f.ch_C());
- progress_indication ("]");
- return result;
+/**
+ 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)
+{
+ 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)
return (Direction) gh_scm2int (s);
}
-
-SCM
-to_scm (int i)
-{
- return gh_int2scm (i);
-}
-
-/*
- UGR. junkme.
- */
-int
-scm_to (SCM s, int* )
+Interval
+ly_scm2interval (SCM p)
{
- return gh_number_p (s) ? gh_scm2int (s) : 0;
+ return Interval (gh_scm2double (gh_car (p)),
+ gh_scm2double (gh_cdr (p)));
}
SCM
-to_scm (Real r)
+ly_interval2scm (Interval i)
{
- return gh_double2scm (r);
+ return gh_cons (gh_double2scm (i[LEFT]),
+ gh_double2scm (i[RIGHT]));
}
-Real
-scm_to (SCM s, Real* )
-{
- return gh_number_p (s) ? gh_scm2double (s) : 0;
-}
bool
to_boolean (SCM s)
SCM
-to_scm (Offset o)
+ly_offset2scm (Offset o)
{
return gh_cons (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]));
}
Offset
-scm_to (SCM s, Offset*)
+ly_scm2offset (SCM s)
{
return Offset (gh_scm2double (gh_car (s)),
gh_scm2double (gh_cdr (s)));
{
assert (gh_number_p (s));
- char str[100]; // ugh.
+ char str[400]; // ugh.
- if (scm_integer_p (s))
+ if (scm_integer_p (s) == SCM_BOOL_F)
{
Real r (gh_scm2double (s));
return gh_str02scm (str);
}
+/*
+ Undef this to see if GUILE GC is causing too many swaps.
+ */
+
+// #define TEST_GC
+
+#ifdef TEST_GC
+#include <libguile/gc.h>
+
+static void *
+greet_sweep (void *dummy1, void *dummy2, void *dummy3)
+{
+ fprintf(stderr, "entering sweep\n");
+}
+
+static void *
+wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3)
+{
+ fprintf(stderr, "leaving sweep\n");
+}
+#endif
+
+SCM
+undefd ()
+{
+ return SCM_UNDEFINED;
+}
+
+#include "version.hh"
+SCM
+ly_version ()
+{
+ char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " " PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
+
+
+ return gh_eval_str ((char*)vs);
+}
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 ("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-version", 0, 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);
+
+SCM
+ly_deep_copy (SCM l)
+{
+ if (gh_pair_p (l))
+ {
+ return gh_cons (ly_deep_copy (gh_car (l)), ly_deep_copy (gh_cdr (l)));
+ }
+ else
+ return l;
+}
+
+
projects / lilypond.git / blobdiff