/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
*tail = scm_cons (evaluate_with_simple_closure (delayed_argument, scm_car (s),
pure, start, end),
SCM_EOL);
- if (scm_car (*tail) == SCM_UNSPECIFIED)
+ if (scm_is_eq (scm_car (*tail), SCM_UNSPECIFIED))
return SCM_UNSPECIFIED;
tail = SCM_CDRLOC (*tail);
}
int start,
int end)
{
- if (Simple_closure *sc = Simple_closure::unsmob (expr))
+ if (Simple_closure *sc = unsmob<Simple_closure> (expr))
{
SCM inside = sc->expression ();
- SCM proc = is_unpure_pure_container (scm_car (inside))
- ? (pure ? scm_car (inside) : unpure_pure_container_unpure_part (scm_car (inside)))
- : scm_car (inside);
+ SCM proc = !pure && unsmob<Unpure_pure_container> (scm_car (inside))
+ ? unsmob<Unpure_pure_container> (scm_car (inside))->unpure_part ()
+ : scm_car (inside);
SCM args = scm_cons (delayed_argument,
evaluate_args (delayed_argument, scm_cdr (inside),
pure, start, end));
- if (scm_cdr (args) == SCM_UNSPECIFIED)
+ if (scm_is_eq (scm_cdr (args), SCM_UNSPECIFIED))
return SCM_UNSPECIFIED;
if (pure)
return call_pure_function (proc, args, start, end);
}
else if (!scm_is_pair (expr))
return expr;
- else if (scm_car (expr) == ly_symbol2scm ("quote"))
+ else if (scm_is_eq (scm_car (expr), ly_symbol2scm ("quote")))
return scm_cadr (expr);
- else if (is_unpure_pure_container (scm_car (expr))
+ else if (unsmob<Unpure_pure_container> (scm_car (expr))
|| ly_is_procedure (scm_car (expr)))
{
- SCM proc = is_unpure_pure_container (scm_car (expr))
- ? (pure ? scm_car (expr) : unpure_pure_container_unpure_part (scm_car (expr)))
- : scm_car (expr);
+ SCM proc = !pure && unsmob<Unpure_pure_container> (scm_car (expr))
+ ? unsmob<Unpure_pure_container> (scm_car (expr))->unpure_part ()
+ : scm_car (expr);
SCM args = evaluate_args (delayed_argument, scm_cdr (expr), pure, start, end);
- if (args == SCM_UNSPECIFIED)
+ if (scm_is_eq (args, SCM_UNSPECIFIED))
return SCM_UNSPECIFIED;
if (pure)
return call_pure_function (proc, args, start, end);
bool pure = (scm_is_number (scm_start) && scm_is_number (scm_end));
int start = robust_scm2int (scm_start, 0);
int end = robust_scm2int (scm_end, 0);
- SCM expr = Simple_closure::unsmob (closure)->expression ();
+ SCM expr = unsmob<Simple_closure> (closure)->expression ();
return evaluate_with_simple_closure (delayed, expr, pure, start, end);
}
int
-Simple_closure::print_smob (SCM s, SCM port, scm_print_state *)
+Simple_closure::print_smob (SCM port, scm_print_state *) const
{
scm_puts ("#<simple-closure ", port);
- scm_display (scm_cdr (s), port);
+ scm_display (expression (), port);
scm_puts (" >", port);
return 1;
}