X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-def.cc;h=37690fd61a096d7c8a21f7fe777924b36393d431;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=f15a1ab1413e0c0f9e1b74617ee887a9c1503e21;hpb=e09265d8e9ad94714076ca91e63eab5c55679286;p=lilypond.git

diff --git a/lily/context-def.cc b/lily/context-def.cc
index f15a1ab141..37690fd61a 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -1,9 +1,9 @@
 /*
-  translator-def.cc -- implement Context_def
+  context-def.cc -- implement Context_def
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 /* TODO: should junk this class an replace by
@@ -27,14 +27,21 @@ Context_def::Context_def ()
   context_name_ = SCM_EOL;
   default_child_ = SCM_EOL;
   description_ = SCM_EOL;
+  input_location_ = SCM_EOL;
 
   smobify_self ();
 
+  input_location_ = make_input (Input ());
   context_name_ = ly_symbol2scm ("");
 }
 
+Input *
+Context_def::origin () const
+{
+  return unsmob_input (input_location_);
+}
+
 Context_def::Context_def (Context_def const &s)
-  : Input (s)
 {
   context_aliases_ = SCM_EOL;
   translator_group_type_ = SCM_EOL;
@@ -44,10 +51,11 @@ Context_def::Context_def (Context_def const &s)
   context_name_ = SCM_EOL;
   description_ = SCM_EOL;
   default_child_ = SCM_EOL;
-
+  input_location_ = SCM_EOL;
   smobify_self ();
-  description_ = s.description_;
 
+  description_ = s.description_;
+  input_location_ = make_input (*s.origin ()); 
   default_child_ = s.default_child_;
   accept_mods_ = s.accept_mods_;
   property_ops_ = s.property_ops_;
@@ -79,6 +87,8 @@ Context_def::print_smob (SCM smob, SCM port, scm_print_state*)
 SCM
 Context_def::mark_smob (SCM smob)
 {
+  ASSERT_LIVE_IS_ALLOWED ();
+  
   Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob);
 
   scm_gc_mark (me->description_);
@@ -88,6 +98,7 @@ Context_def::mark_smob (SCM smob)
   scm_gc_mark (me->property_ops_);
   scm_gc_mark (me->translator_group_type_);
   scm_gc_mark (me->default_child_);
+  scm_gc_mark (me->input_location_);
 
   return me->context_name_;
 }
@@ -182,12 +193,40 @@ Context_def::get_default_child (SCM user_mod) const
   return name;
 }
 
+/*
+  Given a name of a context that we want to create, finds a list of context
+  definitions such that:
+   - the first element in the list defines a context that is a valid child of
+     the context defined by this Context_def
+   - each subsequent element in the list defines a context that is a valid child
+     of the the context defined by the preceding element in the list
+   - the last element in the list defines a context with the given name
+
+  The ADDITIONAL_ACCEPTS parameter is a list of additional contexts that this
+  specific context def (but not any of the child context defs) should accept.
+*/
+vector<Context_def *>
+Context_def::path_to_acceptable_context (SCM type_sym,
+					 Output_def *odef,
+					 SCM additional_accepts) const
+{
+  set<const Context_def *> seen;
+  return internal_path_to_acceptable_context (type_sym, odef, additional_accepts, &seen);
+}
+
+/*
+The SEEN parameter is a set which keeps track of visited contexts, allowing
+contexts of the same type to be nested.
+*/
 vector<Context_def*>
-Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const
+Context_def::internal_path_to_acceptable_context (SCM type_sym,
+						  Output_def *odef,
+						  SCM additional_accepts,
+						  set<const Context_def *> *seen) const
 {
   assert (scm_is_symbol (type_sym));
 
-  SCM accepted = get_accepted (SCM_EOL);
+  SCM accepted = get_accepted (additional_accepts);
 
   vector<Context_def*> accepteds;
   for (SCM s = accepted; scm_is_pair (s); s = scm_cdr (s))
@@ -207,20 +246,25 @@ Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const
 	}
     }
 
+  seen->insert (this);
   vsize best_depth = INT_MAX;
   for (vsize i = 0; i < accepteds.size (); i++)
     {
       Context_def *g = accepteds[i];
 
-      vector<Context_def*> result
-	= g->path_to_acceptable_context (type_sym, odef);
-      if (result.size () && result.size () < best_depth)
+      if (!seen->count (g))
 	{
-	  best_depth = result.size ();
-	  result.insert (result.begin (), g);
-	  best_result = result;
+	  vector<Context_def*> result
+	    = g->internal_path_to_acceptable_context (type_sym, odef, SCM_EOL, seen);
+	  if (result.size () && result.size () < best_depth)
+	    {
+	      best_depth = result.size ();
+	      result.insert (result.begin (), g);
+	      best_result = result;
+	    }
 	}
     }
+  seen->erase (this);
 
   return best_result;
 }
@@ -250,9 +294,9 @@ Context_def::get_translator_names (SCM user_mod) const
 }
 
 Context *
-Context_def::instantiate (SCM ops, Object_key const *key)
+Context_def::instantiate (SCM ops)
 {
-  Context *context = new Context (key);
+  Context *context = new Context ();
 
   context->definition_ = self_scm ();
   context->definition_mods_ = ops;
@@ -262,13 +306,6 @@ Context_def::instantiate (SCM ops, Object_key const *key)
   return context;
 }
 
-SCM
-Context_def::clone_scm () const
-{
-  Context_def *t = new Context_def (*this);
-  return t->unprotect ();
-}
-
 SCM
 Context_def::make_scm ()
 {