#include <stdio.h>
#include <stdlib.h>
-#include <math.h> // isinf
-
+#include <math.h> /* isinf */
+#include <string.h> /* strdup, strchr */
#include "libc-extension.hh"
#include "lily-guile.hh"
#include "main.hh"
SCM
ly_last (SCM list)
{
- return gh_car (scm_last_pair (list));
+ return ly_car (scm_last_pair (list));
}
SCM
SCM_OPN | SCM_WRTNG,
"ly_write2string");
// SCM write = scm_eval_3 (ly_symbol2scm ("write"), s, SCM_EOL);
- SCM write = scm_eval2 (ly_symbol2scm ("write"), SCM_EOL);
+ SCM write = scm_primitive_eval (ly_symbol2scm ("write"));
// scm_apply (write, port, SCM_EOL);
gh_call2 (write, s, port);
/* Read expression from port */
if (!SCM_EOF_OBJECT_P (form = scm_read (port)))
- answer = scm_eval_3 (form, 1, SCM_EOL); // guh?
-
+ answer = scm_primitive_eval (form);
+
/*
After parsing
SCM
ly_quote_scm (SCM s)
{
- return gh_list (ly_symbol2scm ("quote"), s, SCM_UNDEFINED);
+ return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED);
}
-SCM
-ly_symbol2scm (const char *s)
-{
- return gh_symbol2scm ((char *)s);
-}
-
String
ly_symbol2string (SCM s)
{
assert (gh_symbol_p (s));
- return String ((Byte*)SCM_CHARS (s), (int) SCM_LENGTH (s));
+ return String ((Byte*)SCM_STRING_CHARS (s), (int) SCM_STRING_LENGTH (s));
}
ly_scm2string (SCM s)
{
assert (gh_string_p (s));
- int len;
- char * p = gh_scm2newstr (s , &len);
+
+ size_t len;
+ char *p = gh_scm2newstr (s , &len);
String r (p);
index_cell (SCM s, Direction d)
{
assert (d);
- return (d == LEFT) ? gh_car (s) : gh_cdr (s);
+ return (d == LEFT) ? ly_car (s) : ly_cdr (s);
}
SCM
return SCM_BOOL_F;
}
+bool
+ly_number_pair_p (SCM p)
+{
+ return gh_pair_p (p) && gh_number_p (ly_car (p)) && gh_number_p (ly_cdr (p));
+}
+bool
+ly_axis_p (SCM a)
+{
+ return gh_number_p (a) && (gh_scm2int (a) == 0 || gh_scm2int (a) == 1);
+}
typedef void (*Void_fptr) ();
Array<Void_fptr> *scm_init_funcs_;
scm_init_funcs_->push (f);
}
+
extern void init_cxx_function_smobs ();
void
-init_lily_guile ()
+prepend_load_path (String p )
{
+ char s[1024];
+ sprintf (s,
+ "(set! %%load-path (cons \"%s\" %%load-path))", p.ch_C());
+
+ scm_c_eval_string (s);
+}
+
+void
+init_lily_guile (String p )
+{
+ prepend_load_path (p);
+
+ // todo: junk this. We should make real modules iso. just loading files.
+ prepend_load_path (p + "/scm/");
+
+ SCM last_mod = scm_current_module ();
+ scm_set_current_module (scm_c_resolve_module ("guile"));
+
init_cxx_function_smobs ();
for (int i=scm_init_funcs_->size () ; i--;)
- (scm_init_funcs_->elem (i)) ();
+ (scm_init_funcs_->elem (i)) ();
+
+ if (verbose_global_b)
+ progress_indication ("\n");
+ read_lily_scm_file ("lily.scm");
+
+ scm_set_current_module (last_mod);
}
unsigned int ly_scm_hash (SCM s)
Interval
ly_scm2interval (SCM p)
{
- return Interval (gh_scm2double (gh_car (p)),
- gh_scm2double (gh_cdr (p)));
+ return Interval (gh_scm2double (ly_car (p)),
+ gh_scm2double (ly_cdr (p)));
}
SCM
{
SCM newcons = gh_cons (elt, SCM_EOL);
- gh_set_cdr_x (gh_car (l), newcons);
+ gh_set_cdr_x (ly_car (l), newcons);
gh_set_car_x (l, newcons);
}
Offset
ly_scm2offset (SCM s)
{
- return Offset (gh_scm2double (gh_car (s)),
- gh_scm2double (gh_cdr (s)));
+ return Offset (gh_scm2double (ly_car (s)),
+ gh_scm2double (ly_cdr (s)));
}
SCM
char str[400]; // ugh.
- if (scm_integer_p (s) == SCM_BOOL_F)
+ if (scm_exact_p (s) == SCM_BOOL_F)
{
Real r (gh_scm2double (s));
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, (Scheme_function_unknown)ly_warning);
- scm_make_gsubr ("ly-version", 0, 0, 0, (Scheme_function_unknown)ly_version);
- 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 ("ly-number->string", 1, 0,0, (Scheme_function_unknown) ly_number2string);
+ scm_c_define_gsubr ("ly-warn", 1, 0, 0,
+ (Scheme_function_unknown)ly_warning);
+ scm_c_define_gsubr ("ly-version", 0, 0, 0,
+ (Scheme_function_unknown)ly_version);
+ scm_c_define_gsubr ("ly-gulp-file", 1,0, 0,
+ (Scheme_function_unknown)ly_gulp_file);
+ scm_c_define_gsubr ("dir?", 1,0, 0, (Scheme_function_unknown)ly_isdir_p);
+ scm_c_define_gsubr ("ly-number->string", 1, 0,0,
+ (Scheme_function_unknown) ly_number2string);
#ifdef TEST_GC
{
if (gh_pair_p (l))
{
- return gh_cons (ly_deep_copy (gh_car (l)), ly_deep_copy (gh_cdr (l)));
+ return gh_cons (ly_deep_copy (ly_car (l)), ly_deep_copy (ly_cdr (l)));
}
else
return l;
{
if (gh_pair_p (achain))
{
- SCM handle = scm_assoc (key, gh_car (achain));
+ SCM handle = scm_assoc (key, ly_car (achain));
if (gh_pair_p (handle))
return handle;
else
- return ly_assoc_chain (key, gh_cdr (achain));
+ return ly_assoc_chain (key, ly_cdr (achain));
}
else
return SCM_BOOL_F;
}
+
+/*
+ LIST has the form "sym1 sym2 sym3"
+ */
+SCM
+parse_symbol_list (const char * list)
+{
+ char * s = strdup (list);
+ char *orig = s;
+ SCM create_list = SCM_EOL;
+ if (!s[0] )
+ s = 0;
+
+ while (s)
+ {
+ char *next = strchr (s, ' ');
+ if (next)
+ *next++ = 0;
+
+ create_list = gh_cons (ly_symbol2scm (s), create_list);
+ s = next;
+ }
+
+ free (orig);
+ return create_list;
+}
+
+
+SCM
+ly_truncate_list (int k, SCM l )
+{
+ if (k == 0)
+ {
+ l = SCM_EOL;
+ }
+ else
+ {
+ SCM s = l;
+ k--;
+ for (; gh_pair_p (s) && k--; s = ly_cdr (s))
+ ;
+
+ if (gh_pair_p (s))
+ {
+ gh_set_cdr_x (s, SCM_EOL);
+ }
+ }
+ return l;
+}
+
+SCM my_gh_symbol2scm (const char* x)
+{
+ return gh_symbol2scm ((char*)x);
+}
projects / lilypond.git / blobdiff