X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchange-iterator.cc;h=0f8823d484350fdb580998ba2895e2f0227bb7df;hb=bf5e12cca7be0cf62014de7186dffaebbee13bfa;hp=c6ebf2907f41548c37853df1d4a1341a08cdbc16;hpb=2181534bd94587fcac8f1769f2dda7bece693649;p=lilypond.git

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index c6ebf2907f..0f8823d484 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -1,43 +1,103 @@
 /*
-  change-iterator.cc -- implement 
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "change-iterator.hh"
-#include "translator-group.hh"
-#include "change-translator.hh"
 
-Change_iterator::Change_iterator (Change_translator *change_l)
+#include "context.hh"
+#include "input.hh"
+#include "international.hh"
+#include "music.hh"
+#include "warn.hh"
+
+void
+Change_iterator::error (const string &reason)
 {
-  change_l_ = change_l;
+  string to_type = ly_symbol2string (get_music ()->get_property ("change-to-type"));
+  string to_id = ly_scm2string (get_music ()->get_property ("change-to-id"));
+
+  string warn1 = _f ("cannot change `%s' to `%s'", to_type, to_id)
+                 + ": " + reason;
+
+  /*
+    GUHG!
+  */
+  string warn2 = "Change_iterator::process (): "
+                 + get_outlet ()->context_name () + " = `"
+                 + get_outlet ()->id_string () + "': ";
+  warning (warn2);
+  get_music ()->origin ()->warning (warn1);
 }
 
-/*
-  move to construct_children ?
- */
-void
-Change_iterator::process_and_next (Moment m)
+string
+Change_iterator::change_to (Music_iterator &it,
+                            SCM to_type,
+                            const string &to_id)
 {
-  Translator_group * current = report_to_l ();
-  Translator_group * last = 0;
-  while  (current && current->type_str_ != change_l_->change_to_type_str_)
+  string result; // error message
+
+  // Find the context that should have its parent changed.
+  Context *last = find_context_above_by_parent_type (it.get_outlet (), to_type);
+  if (last)
     {
-      last = current;
-      current = current->daddy_trans_l_;
+      // Find the new parent.
+      Context *dest = find_context_near (it.get_outlet (), to_type, to_id);
+      if (dest)
+        {
+          send_stream_event (last, "ChangeParent", it.get_music ()->origin (),
+                             ly_symbol2scm ("context"), dest->self_scm ());
+        }
+      else
+        /* FIXME: constant error message.  */
+        it.get_music ()->origin ()->warning (_ ("cannot find context to switch to"));
     }
-  if (current) 
+  else if (it.get_outlet ()->is_alias (to_type))
     {
-      Translator_group * dest = 
-	report_to_l ()->find_create_translator_l (change_l_->change_to_type_str_, 
-						  change_l_->change_to_id_str_);
-      current->remove_translator_p (last);
-      dest->add (last);
+      // No enclosing context was found because the iterator's immediate
+      // context is the kind that was sought.
+      /* We could change the current translator's id, but that would make
+         errors hard to catch.
+
+         last->translator_id_string () = get_change
+         ()->change_to_id_string (); */
+      result = _f ("not changing to same context type: %s", ly_symbol2string (to_type).c_str ());
     }
-  
-  Music_iterator::process_and_next (m);
+  else
+    /* FIXME: incomprehensible message */
+    result = _ ("none of these in my family");
+
+  return result;
+}
+
+/*
+  move to construct_children ?
+*/
+void
+Change_iterator::process (Moment m)
+{
+  SCM to_type = get_music ()->get_property ("change-to-type");
+  string to_id = ly_scm2string (get_music ()->get_property ("change-to-id"));
+
+  string msg = change_to (*this, to_type, to_id);
+  if (!msg.empty ())
+    error (msg);
+
+  Simple_music_iterator::process (m);
 }
 
-IMPLEMENT_IS_TYPE_B1 (Change_iterator, Music_iterator);
+IMPLEMENT_CTOR_CALLBACK (Change_iterator);