Author: sh-sh-sh Date: Fri Sep 21 15:35:18 2007 New Revision: 41023 URL: http://svn.opensuse.org/viewcvs/yast?rev=41023&view=rev Log: brute-force copied latest TRUNK version over Modified: branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h 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=41023&r1=41022&r2=41023&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc Fri Sep 21 15:35:18 2007 @@ -33,7 +33,8 @@ #include "YUIComponent.h" #include "Y2UINamespace.h" -#define VERBOSE_NAMESPACE 0 +#define VERBOSE_UI_CALLS 0 + YCPValue Y2UINamespace::SetLanguage( const YCPString & language ) @@ -617,11 +618,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; } @@ -691,7 +692,7 @@ YCPValue ret = YCPVoid(); - if ( m_comp->ui()->runningWithThreads() ) + if ( m_comp->ui()-> runningWithThreads() ) { m_comp->ui()->_builtinCallData.function = this; @@ -763,37 +764,27 @@ // 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()); - + vector<SymbolEntryPtr>::iterator b = m_candidates_b, e = m_candidates_e, @@ -836,7 +827,7 @@ Y2Function* Y2UINamespace::createFunctionCall (const string name, constFunctionTypePtr type) { -#if VERBOSE_NAMESPACE +#if VERBOSE_UI_CALLS y2debug ("Creating function call for %s", name.c_str()); y2debug ("whose type is %s", type? type->toString().c_str() : "unknown"); #endif @@ -864,12 +855,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 @@ -878,7 +869,7 @@ // found exact match // BTW, p->position() may change as we go, don't get confused. // What matters is our own counting. -#if VERBOSE_NAMESPACE +#if VERBOSE_UI_CALLS y2debug ("Found symbol '%s' @%d", p->toString().c_str(), p->position()); #endif return new Y2UIFunction (this, m_comp, it - b, play_macro_blocks); Modified: branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h?rev=41023&r1=41022&r2=41023&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h Fri Sep 21 15:35:18 2007 @@ -303,6 +303,7 @@ /* TYPEINFO: boolean (term) */ YCPValue WizardCommand ( const YCPTerm & command ); + YCPValue CallHandler( void * ptr, int argc, YCPValue argv[] ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org