source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "change-iterator.hh"
#include "change-translator.hh"
#include "debug.hh"
-Change_iterator::Change_iterator (Change_translator *change_l)
-{
- change_l_ = change_l;
-}
void
Change_iterator::error (String reason)
{
- String to_type = change_l_->change_to_type_str_;
- String to_id = change_l_->change_to_id_str_;
+ Change_translator const * t = dynamic_cast<Change_translator const*> (music_l_);
+ String to_type = t->change_to_type_str_;
+ String to_id = t->change_to_id_str_;
- String warn1 = _f ("can't change `%s\' to `%s\'", to_type, to_id)
+ String warn1 = _f ("can't change `%s' to `%s'", to_type, to_id)
+ ": " + reason;
- String warn2= "Change_iterator::process_and_next (): "
+ /*
+ GUHG!
+ */
+ String warn2= "Change_iterator::do_process_and_next (): "
+ report_to_l ()->type_str_ + " = `"
- + report_to_l ()->id_str_ + "\': ";
+ + report_to_l ()->id_str_ + "': ";
warning (warn2);
- change_l_->warning (warn1);
+ t->warning (warn1);
}
/*
move to construct_children ?
*/
void
-Change_iterator::process_and_next (Moment m)
+Change_iterator::do_process_and_next (Moment m)
{
Translator_group * current = report_to_l ();
Translator_group * last = 0;
- String to_type = change_l_->change_to_type_str_;
- String to_id = change_l_->change_to_id_str_;
+ Change_translator const * t = dynamic_cast<Change_translator const*> (music_l_);
+ String to_type = t->change_to_type_str_;
+ String to_id = t->change_to_id_str_;
/* find the type of translator that we're changing.
last = current;
current = current->daddy_trans_l_;
}
-
+
+ if (current && current->id_str_ == to_id)
+ {
+ String msg;
+ msg += _ ("Can't switch translators, I'm there already");
+ }
if (current)
if (last)
Translator_group * dest =
report_to_l ()->find_create_translator_l (to_type, to_id);
current->remove_translator_p (last);
- dest->add (last);
+ dest->add_translator (last);
}
else
{
-
/*
We could change the current translator's id, but that would make
errors hard to catch
- last->translator_id_str_ = change_l_->change_to_id_str_;
+ last->translator_id_str_ = change_l ()->change_to_id_str_;
*/
- error ("I'm one myself");
+ error (_ ("I'm one myself"));
}
else
- error ("None of these in my family.");
- Music_iterator::process_and_next (m);
+ error (_ ("none of these in my family"));
+ Music_iterator::do_process_and_next (m);
}
-IMPLEMENT_IS_TYPE_B1 (Change_iterator, Music_iterator);
+