From: fred Date: Sun, 24 Mar 2002 19:46:31 +0000 (+0000) Subject: lilypond-0.0.71pre X-Git-Tag: release/1.5.59~4544 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4d295d553998b52ba2ec5a8f2304be9fa3288310;p=lilypond.git lilypond-0.0.71pre --- diff --git a/lily/input-register.cc b/lily/input-register.cc index f946e622fe..d1a8b584e3 100644 --- a/lily/input-register.cc +++ b/lily/input-register.cc @@ -13,6 +13,15 @@ #include "input-register.hh" #include "register-group.hh" +bool +Input_register::is_name_b(String n) +{ + bool b = (n == name_str_); + for (int i=0; !b && i < alias_str_arr_.size(); i++) + b = b || (alias_str_arr_[i] == n); + return b; +} + void Input_register::print() const { @@ -42,16 +51,18 @@ Input_register * lookup_reg(String nm) { for (int i=0; i < iregs_p_arr.size(); i++) - if (iregs_p_arr[i]->name_str_ == nm) + if (iregs_p_arr[i]->is_name_b(nm)) return iregs_p_arr[i]; error("can't find reg `" + nm + "'"); } + + Input_register * Input_register::recursive_find(String nm) { - if ( nm == name_str_) + if ( is_name_b( nm) ) return this; Input_register * r =0; @@ -64,7 +75,7 @@ Input_register * Input_register::find_ireg_l(String nm) { for (iter(contains_ireg_p_list_.top(), i); i.ok(); i++) - if (i->name_str_ == nm) + if (i->is_name_b( nm)) return i; return 0;