* The grand 2005-2006 replace.

[lilypond.git] / lily / context-def.cc

diff --git a/lily/context-def.cc b/lily/context-def.cc
index fc9466fb1a6beaf67b86a6c6f582ea6708b36727..2f5362a0522797c990057fb7c8d311a8becafbbc 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 /* TODO: should junk this class an replace by
@@ -18,6 +18,9 @@
 #include "translator-group.hh"
 #include "warn.hh"
 
+#include "engraver-group.hh"
+#include "performer-group.hh"
+
 Context_def::Context_def ()
 {
   context_aliases_ = SCM_EOL;
@@ -104,19 +107,17 @@ Context_def::add_context_mod (SCM mod)
     }
 
   /*
-    other modifiers take symbols as argument. 
+    other modifiers take symbols as argument.
   */
   SCM sym = scm_cadr (mod);
   if (scm_is_string (sym))
     sym = scm_string_to_symbol (sym);
 
   if (ly_symbol2scm ("default-child") == tag)
-    {
-      default_child_ = sym;
-    }
+    default_child_ = sym;
   else if (ly_symbol2scm ("consists") == tag
-      || ly_symbol2scm ("consists-end") == tag
-      || ly_symbol2scm ("remove") == tag)
+          || ly_symbol2scm ("consists-end") == tag
+          || ly_symbol2scm ("remove") == tag)
     {
       if (!get_translator (sym))
        error (_f ("program has no such type: `%s'",
@@ -127,8 +128,7 @@ Context_def::add_context_mod (SCM mod)
   else if (ly_symbol2scm ("accepts") == tag
           || ly_symbol2scm ("denies") == tag)
     accept_mods_ = scm_cons (scm_list_2 (tag, sym), accept_mods_);
-  else if (ly_symbol2scm ("poppush") == tag
-          || ly_symbol2scm ("pop") == tag
+  else if (ly_symbol2scm ("pop") == tag
           || ly_symbol2scm ("push") == tag
           || ly_symbol2scm ("assign") == tag
           || ly_symbol2scm ("unset") == tag)
@@ -171,11 +171,10 @@ Context_def::get_accepted (SCM user_mod) const
        acc = scm_delete_x (def, acc);
       acc = scm_cons (def, acc);
     }
-  
+
   return acc;
 }
 
-
 SCM
 Context_def::get_default_child (SCM user_mod) const
 {
@@ -254,9 +253,7 @@ Context_def::get_translator_names (SCM user_mod) const
       if (ly_symbol2scm ("consists") == tag)
        l1 = scm_cons (arg, l1);
       else if (ly_symbol2scm ("remove") == tag)
-       {
-         l1 = scm_delete_x (arg, l1);
-       }
+       l1 = scm_delete_x (arg, l1);
     }
 
   return l1;
@@ -271,7 +268,7 @@ filter_performers (SCM ell)
       if (dynamic_cast<Performer *> (unsmob_translator (scm_car (*tail))))
        *tail = scm_cdr (*tail);
       else
-       tail = SCM_CDRLOC(*tail);
+       tail = SCM_CDRLOC (*tail);
     }
   return ell;
 }
@@ -285,7 +282,7 @@ filter_engravers (SCM ell)
       if (dynamic_cast<Engraver *> (unsmob_translator (scm_car (*tail))))
        *tail = scm_cdr (*tail);
       else
-       tail = SCM_CDRLOC(*tail);
+       tail = SCM_CDRLOC (*tail);
     }
   return ell;
 }
@@ -293,21 +290,18 @@ filter_engravers (SCM ell)
 Context *
 Context_def::instantiate (SCM ops, Object_key const *key)
 {
-  Context *tg = 0;
+  Context *context = 0;
 
   if (context_name_ == ly_symbol2scm ("Score"))
-    tg = new Score_context (key);
+    context = new Score_context (key);
   else
-    tg = new Context (key);
+    context = new Context (key);
 
-  tg->definition_ = self_scm ();
+  context->definition_ = self_scm ();
 
   SCM trans_names = get_translator_names (ops);
 
-  Translator_group *g = dynamic_cast<Translator_group *>
-    (get_translator (translator_group_type_));
-  g = dynamic_cast<Translator_group *> (g->clone ());
-
+  Translator_group *g = get_translator_group (translator_group_type_);
   SCM trans_list = SCM_EOL;
 
   for (SCM s = trans_names; scm_is_pair (s); s = scm_cdr (s))
@@ -329,16 +323,13 @@ Context_def::instantiate (SCM ops, Object_key const *key)
                trans_list = cons;
            }
          else
-           {
-             trans_list = scm_cons (str, trans_list);
-           }
+           trans_list = scm_cons (str, trans_list);
 
-         tr->daddy_context_ = tg;
-         scm_gc_unprotect_object (str);
+         tr->daddy_context_ = context;
+         tr->unprotect ();
        }
     }
 
-
   /*
     Ugh,  todo: should just make a private
     copy of Context_def with the user mods.
@@ -346,38 +337,34 @@ Context_def::instantiate (SCM ops, Object_key const *key)
 
   g->simple_trans_list_ = trans_list;
 
-  tg->implementation_ = g->self_scm ();
-  if (dynamic_cast<Engraver *> (g))
+  context->implementation_ = g;
+  if (dynamic_cast<Engraver_group *> (g))
     g->simple_trans_list_ = filter_performers (g->simple_trans_list_);
-  else if (dynamic_cast<Performer *> (g))
+  else if (dynamic_cast<Performer_group *> (g))
     g->simple_trans_list_ = filter_engravers (g->simple_trans_list_);
 
-  g->daddy_context_ = tg;
-  tg->aliases_ = context_aliases_;
+  g->context_ = context;
+  context->aliases_ = context_aliases_;
+
+  g->unprotect ();
 
-  scm_gc_unprotect_object (g->self_scm ());
+  context->accepts_list_ = get_accepted (ops);
 
-  tg->accepts_list_ = get_accepted (ops);
-    
-  return tg;
+  return context;
 }
 
 SCM
 Context_def::clone_scm () const
 {
   Context_def *t = new Context_def (*this);
-  SCM x = t->self_scm ();
-  scm_gc_unprotect_object (x);
-  return x;
+  return t->unprotect ();
 }
 
 SCM
 Context_def::make_scm ()
 {
   Context_def *t = new Context_def;
-  SCM x = t->self_scm ();
-  scm_gc_unprotect_object (x);
-  return x;
+  return t->unprotect ();
 }
 
 void