#include "item.hh"
#include "program-option.hh"
#include "profile.hh"
+#include "simple-closure.hh"
SCM
Grob::get_property_alist_chain (SCM def) const
SCM_UNDEFINED);
}
-/*
- This special add_thing routine is slightly more efficient than
-
- set_prop (name, cons (thing, get_prop (name)))
-
- since it can reuse the handle returned by scm_assq ().
-*/
-// JUNKME.
-void
-Grob::add_to_list_property (SCM sym, SCM thing)
-{
- SCM handle
- = scm_sloppy_assq (sym, mutable_property_alist_);
-
- if (handle != SCM_BOOL_F)
- scm_set_cdr_x (handle, scm_cons (thing, scm_cdr (handle)));
- else
- {
- /*
- There is no mutable prop yet, so create an entry, and put it in front of the
- mutable prop list.
- */
- handle = scm_sloppy_assq (sym, immutable_property_alist_);
- SCM tail = (handle != SCM_BOOL_F) ? scm_cdr (handle) : SCM_EOL;
- SCM val = scm_cons (thing, tail);
-
- mutable_property_alist_ = scm_cons (scm_cons (sym, val),
- mutable_property_alist_);
- }
-}
extern void check_interfaces_for_property (Grob const *me, SCM sym);
if (do_internal_type_checking_global)
{
- if (!type_check_assignment (sym, v, ly_symbol2scm ("backend-type?")))
+ if (!ly_is_procedure (v)
+ && !is_simple_closure (v)
+ && v != ly_symbol2scm ("calculation-in-progress")
+ && !type_check_assignment (sym, v, ly_symbol2scm ("backend-type?")))
abort ();
check_interfaces_for_property (this, sym);
}
}
//#define PROFILE_PROPERTY_ACCESSES
-
-/*
- Ugh C&P Coding.
-
- Retrieve property without triggering callback.
- */
SCM
Grob::get_property_data (SCM sym) const
{
if (do_internal_type_checking_global && scm_is_pair (handle))
{
- if (!type_check_assignment (sym, scm_cdr (handle),
+ SCM val = scm_cdr (handle);
+ if (!ly_is_procedure (val)
+ && !is_simple_closure (val)
+ && !type_check_assignment (sym, val,
ly_symbol2scm ("backend-type?")))
abort ();
SCM
Grob::internal_get_property (SCM sym) const
{
-#ifndef NDEBUG
- 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)
- return scm_cdr (handle);
-
- handle = scm_sloppy_assq (sym, immutable_property_alist_);
-
- if (do_internal_type_checking_global && scm_is_pair (handle))
+ SCM val = get_property_data (sym);
+ if (ly_is_procedure (val)
+ || is_simple_closure (val))
{
- if (!type_check_assignment (sym, scm_cdr (handle),
- ly_symbol2scm ("backend-type?")))
- abort ();
-
- check_interfaces_for_property (this, sym);
+ val = ((Grob*)this)->try_callback (sym, val);
}
-
- if (handle == SCM_BOOL_F)
- {
- SCM value = ((Grob*) this)->try_callback (sym);
- if (value != SCM_UNSPECIFIED)
- return value;
- }
-
- return (handle == SCM_BOOL_F) ? SCM_EOL : scm_cdr (handle);
+ return val;
}
#ifndef NDEBUG
#include "protected-scm.hh"
+
Protected_scm grob_property_callback_stack = SCM_EOL;
-bool debug_property_callbacks;
+bool debug_property_callbacks = 0;
#endif
SCM
-Grob::try_callback (SCM sym)
+Grob::try_callback (SCM sym, SCM proc)
{
- SCM handle = scm_sloppy_assq (sym, property_callbacks_);
- if (scm_is_pair (handle))
- {
- SCM proc = scm_cdr (handle);
- if (ly_is_procedure (proc))
- {
- SCM marker = ly_symbol2scm ("calculation-in-progress");
- /*
- need to put a value in SYM to ensure that we don't get a
- cyclic call chain.
- */
- mutable_property_alist_
- = scm_assq_set_x (mutable_property_alist_, sym, marker);
+ SCM marker = ly_symbol2scm ("calculation-in-progress");
+ /*
+ need to put a value in SYM to ensure that we don't get a
+ cyclic call chain.
+ */
+ mutable_property_alist_
+ = scm_assq_set_x (mutable_property_alist_, sym, marker);
#ifndef NDEBUG
- if (debug_property_callbacks)
- grob_property_callback_stack = scm_acons (sym, proc, grob_property_callback_stack);
+ if (debug_property_callbacks)
+ grob_property_callback_stack = scm_acons (sym, proc, grob_property_callback_stack);
#endif
- SCM value = scm_call_1 (proc, self_scm ());
+
+ 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));
+ }
#ifndef NDEBUG
- if (debug_property_callbacks)
- grob_property_callback_stack = scm_cdr (grob_property_callback_stack);
+ if (debug_property_callbacks)
+ grob_property_callback_stack = scm_cdr (grob_property_callback_stack);
#endif
- /*
- If the function returns SCM_UNSPECIFIED, we assume the
- property has been set with an explicit set_property()
- call.
- */
- if (value == SCM_UNSPECIFIED)
- {
- value = internal_get_property (sym);
- if (value == marker)
- mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, marker);
- }
- else
- internal_set_property (sym, value);
-
- return value;
- }
- else
- programming_error ("Callback should be procedure type");
+ /*
+ If the function returns SCM_UNSPECIFIED, we assume the
+ property has been set with an explicit set_property()
+ call.
+ */
+ if (value == SCM_UNSPECIFIED)
+ {
+ value = internal_get_property (sym);
+ if (value == marker)
+ mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, marker);
}
-
- return SCM_UNSPECIFIED;
+ else
+ internal_set_property (sym, value);
+
+ return value;
}
void
object_alist_ = scm_assq_set_x (object_alist_, s, v);
}
+void
+Grob::del_property (SCM sym)
+{
+ mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, sym);
+}
+
SCM
Grob::internal_get_object (SCM sym) const
{
return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
}
-void
-Grob::substitute_object_links (SCM crit, SCM orig)
+bool
+Grob::is_live () const
{
- set_break_subsititution (crit);
- object_alist_ = substitute_object_alist (orig, object_alist_);
+ return immutable_property_alist_ != SCM_EOL;
}
+
bool
-Grob::is_live () const
+Grob::internal_has_interface (SCM k)
{
- return immutable_property_alist_ != SCM_EOL;
+ return scm_c_memq (k, interfaces_) != SCM_BOOL_F;
}
projects / lilypond.git / blobdiff