#include "spanner.hh"
#include "international.hh"
#include "item.hh"
-#include "misc.hh"
-#include "item.hh"
#include "program-option.hh"
#include "profile.hh"
-#include "simple-closure.hh"
#include "unpure-pure-container.hh"
#include "warn.hh"
#include "protected-scm.hh"
-Protected_scm grob_property_callback_stack = SCM_EOL;
+Protected_scm grob_property_callback_stack (SCM_EOL);
extern bool debug_property_callbacks;
-#ifndef NDEBUG
+#ifdef DEBUG
static void
print_property_callback_stack ()
{
}
#endif
-static Protected_scm modification_callback = SCM_EOL;
-static Protected_scm cache_callback = SCM_EOL;
+static Protected_scm modification_callback (SCM_EOL);
+static Protected_scm cache_callback (SCM_EOL);
/*
FIXME: this should use ly:set-option interface instead.
int line,
char const *fun)
{
-#ifndef NDEBUG
+#ifdef DEBUG
if (ly_is_procedure (modification_callback))
scm_apply_0 (modification_callback,
scm_list_n (self_scm (),
scm_from_locale_string (file),
scm_from_int (line),
- scm_from_locale_string (fun),
+ scm_from_ascii_string (fun),
sym, v, SCM_UNDEFINED));
#else
(void) file;
SCM
Grob::get_property_alist_chain (SCM def) const
{
- return scm_list_n (mutable_property_alist_,
+ return scm_list_3 (mutable_property_alist_,
immutable_property_alist_,
- def,
- SCM_UNDEFINED);
+ def);
}
extern void check_interfaces_for_property (Grob const *me, SCM sym);
if (do_internal_type_checking_global)
{
if (!ly_is_procedure (v)
- && !is_simple_closure (v)
- && !is_unpure_pure_container (v)
- && v != ly_symbol2scm ("calculation-in-progress"))
+ && !unsmob<Unpure_pure_container> (v)
+ && !scm_is_eq (v, ly_symbol2scm ("calculation-in-progress")))
type_check_assignment (sym, v, ly_symbol2scm ("backend-type?"));
check_interfaces_for_property (this, sym);
SCM
Grob::internal_get_property_data (SCM sym) const
{
-#ifndef NDEBUG
+#ifdef DEBUG
if (profile_property_accesses)
note_property_access (&grob_property_lookup_table, sym);
#endif
SCM handle = scm_sloppy_assq (sym, mutable_property_alist_);
- if (handle != SCM_BOOL_F)
+ if (scm_is_true (handle))
return scm_cdr (handle);
handle = scm_sloppy_assq (sym, immutable_property_alist_);
if (do_internal_type_checking_global && scm_is_pair (handle))
{
SCM val = scm_cdr (handle);
- if (!ly_is_procedure (val) && !is_simple_closure (val) && !is_unpure_pure_container (val))
+ if (!ly_is_procedure (val)
+ && !unsmob<Unpure_pure_container> (val))
type_check_assignment (sym, val, ly_symbol2scm ("backend-type?"));
check_interfaces_for_property (this, sym);
}
- return (handle == SCM_BOOL_F) ? SCM_EOL : scm_cdr (handle);
+ return scm_is_false (handle) ? SCM_EOL : scm_cdr (handle);
}
SCM
{
SCM val = get_property_data (sym);
-#ifndef NDEBUG
- if (val == ly_symbol2scm ("calculation-in-progress"))
+#ifdef DEBUG
+ if (scm_is_eq (val, ly_symbol2scm ("calculation-in-progress")))
{
programming_error (to_string ("cyclic dependency: calculation-in-progress encountered for #'%s (%s)",
ly_symbol2string (sym).c_str (),
- name ().c_str ()));
+ name ().c_str ()));//assert (1==0);
if (debug_property_callbacks)
{
message ("backtrace: ");
}
#endif
- if (is_unpure_pure_container (val))
- val = unpure_pure_container_unpure_part (val);
- if (ly_is_procedure (val)
- || is_simple_closure (val))
+ if (Unpure_pure_container *upc = unsmob<Unpure_pure_container> (val))
+ val = upc->unpure_part ();
+
+ if (ly_is_procedure (val))
{
Grob *me = ((Grob *)this);
val = me->try_callback_on_alist (&me->mutable_property_alist_, sym, val);
Grob::internal_get_pure_property (SCM sym, int start, int end) const
{
SCM val = internal_get_property_data (sym);
- if (ly_is_procedure (val) || is_unpure_pure_container (val))
+ if (ly_is_procedure (val))
return call_pure_function (val, scm_list_1 (self_scm ()), start, end);
- if (is_simple_closure (val))
- return evaluate_with_simple_closure (self_scm (),
- simple_closure_expression (val),
- true, start, end);
+
+ if (Unpure_pure_container *upc = unsmob<Unpure_pure_container> (val)) {
+ // Do cache, if the function ignores 'start' and 'end'
+ if (upc->is_unchanging ())
+ return internal_get_property (sym);
+ else
+ return call_pure_function (val, scm_list_1 (self_scm ()), start, end);
+ }
+
return val;
}
*/
*alist = scm_assq_set_x (*alist, sym, marker);
-#ifndef NDEBUG
+#ifdef DEBUG
if (debug_property_callbacks)
grob_property_callback_stack = scm_cons (scm_list_3 (self_scm (), sym, proc), grob_property_callback_stack);
#endif
SCM value = SCM_EOL;
if (ly_is_procedure (proc))
value = scm_call_1 (proc, self_scm ());
- else if (is_simple_closure (proc))
- {
- value = evaluate_with_simple_closure (self_scm (),
- simple_closure_expression (proc),
- false, 0, 0);
- }
-#ifndef NDEBUG
+#ifdef DEBUG
if (debug_property_callbacks)
grob_property_callback_stack = scm_cdr (grob_property_callback_stack);
#endif
- if (value == SCM_UNSPECIFIED)
+ if (scm_is_eq (value, SCM_UNSPECIFIED))
{
value = get_property_data (sym);
- assert (value == SCM_EOL || value == marker);
- if (value == marker)
+ assert (scm_is_null (value) || scm_is_eq (value, marker));
+ if (scm_is_eq (value, marker))
*alist = scm_assq_remove_x (*alist, sym);
}
else
{
-#ifndef NDEBUG
+#ifdef DEBUG
if (ly_is_procedure (cache_callback))
- scm_apply_0 (cache_callback,
- scm_list_n (self_scm (),
- sym,
- proc,
- value,
- SCM_UNDEFINED));
+ scm_call_4 (cache_callback,
+ self_scm (),
+ sym,
+ proc,
+ value);
#endif
internal_set_value_on_alist (alist, sym, value);
}
SCM s = scm_sloppy_assq (sym, object_alist_);
- if (s != SCM_BOOL_F)
+ if (scm_is_true (s))
{
SCM val = scm_cdr (s);
if (ly_is_procedure (val)
- || is_simple_closure (val)
- || is_unpure_pure_container (val))
+ || unsmob<Unpure_pure_container> (val))
{
Grob *me = ((Grob *)this);
val = me->try_callback_on_alist (&me->object_alist_, sym, val);
bool
Grob::internal_has_interface (SCM k)
{
- return scm_c_memq (k, interfaces_) != SCM_BOOL_F;
+ return scm_is_true (scm_c_memq (k, interfaces_));
}
SCM
-call_pure_function (SCM unpure, SCM args, int start, int end)
+call_pure_function (SCM value, SCM args, int start, int end)
{
- SCM scm_call_pure_function = ly_lily_module_constant ("call-pure-function");
+ if (Unpure_pure_container *upc = unsmob<Unpure_pure_container> (value))
+ {
+ if (upc->is_unchanging ())
+ {
+ // Don't bother forming an Unpure_pure_call here.
+ value = upc->unpure_part ();
- return scm_apply_0 (scm_call_pure_function,
- scm_list_4 (unpure, args, scm_from_int (start), scm_from_int (end)));
-}
+ if (ly_is_procedure (value))
+ return scm_apply_0 (value, args);
+ return value;
+ }
+
+ value = upc->pure_part ();
+
+ if (ly_is_procedure (value))
+ return scm_apply_3 (value,
+ scm_car (args),
+ scm_from_int (start),
+ scm_from_int (end),
+ scm_cdr (args));
+ return value;
+ }
+
+ if (!ly_is_procedure (value))
+ return value;
+
+ return SCM_BOOL_F;
+}
projects / lilypond.git / blobdiff