Author: sh-sh-sh Date: Thu Sep 20 00:03:50 2007 New Revision: 40970 URL: http://svn.opensuse.org/viewcvs/yast?rev=40970&view=rev Log: reduced logging to a reasonable level Modified: branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc?rev=40970&r1=40969&r2=40970&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc Thu Sep 20 00:03:50 2007 @@ -614,11 +614,11 @@ { switch (position) { - case 0: m_param1 = arg; break; - case 1: m_param2 = arg; break; - case 2: m_param3 = arg; break; - case 3: m_param4 = arg; break; - case 4: m_param5 = arg; break; + case 0: m_param1 = arg; break; + case 1: m_param2 = arg; break; + case 2: m_param3 = arg; break; + case 3: m_param4 = arg; break; + case 4: m_param5 = arg; break; default: return false; } @@ -760,27 +760,37 @@ // still to do: m_position is just the first candidate } + bool Y2UIOverloadedFunction::finishParameters() { FunctionTypePtr real_tp = new FunctionType (Type::Unspec); //return type - if (!m_param1.isNull()) { + if (!m_param1.isNull()) + { real_tp->concat (Type::vt2type (m_param1->valuetype())); - if (!m_param2.isNull()) { + + if (!m_param2.isNull()) + { real_tp->concat (Type::vt2type (m_param2->valuetype())); - if (!m_param3.isNull()) { + + if (!m_param3.isNull()) + { real_tp->concat (Type::vt2type (m_param3->valuetype())); - if (!m_param4.isNull()) { + + if (!m_param4.isNull()) + { real_tp->concat (Type::vt2type (m_param4->valuetype())); - if (!m_param5.isNull()) { + if (!m_param5.isNull()) + { real_tp->concat (Type::vt2type (m_param5->valuetype())); } } } } } - y2debug ("Actual type: %s", real_tp->toString().c_str()); + y2debug ("Actual type: %s", real_tp->toString().c_str()); + vector<SymbolEntryPtr>::iterator b = m_candidates_b, e = m_candidates_e, @@ -851,12 +861,12 @@ } bool play_macro_blocks = (name == "UserInput" || name == "TimeoutUserInput" || name == "WaitForEvent"); - + symbols_t::iterator rb = it; // 2: find end of range of overloaded functions or the exact match for ( ; it != e; it++) { - p = (*it); + p = (*it); if ( p->name() != name ) break; // type comparison, ugh, use match @@ -865,7 +875,9 @@ // found exact match // BTW, p->position() may change as we go, don't get confused. // What matters is our own counting. +#if VERBOSE_NAMESPACE y2debug ("Found symbol '%s' @%d", p->toString().c_str(), p->position()); +#endif return new Y2UIFunction (this, m_comp, it - b, play_macro_blocks); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org