Author: kkaempf
Date: Tue Jul 10 14:30:32 2007
New Revision: 39280
URL: http://svn.opensuse.org/viewcvs/yast?rev=39280&view=rev
Log:
fix yepropagate, yebracket and yeis type handling
parameter -> args for
Modified:
trunk/core/libycp/src/YExpression.cc
Modified: trunk/core/libycp/src/YExpression.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YExpression.cc?rev=39280&r1=39279&r2=39280&view=diff
==============================================================================
--- trunk/core/libycp/src/YExpression.cc (original)
+++ trunk/core/libycp/src/YExpression.cc Tue Jul 10 14:30:32 2007
@@ -1173,9 +1173,7 @@
std::ostream &
YEPropagate::toXml (std::ostream & str, int indent ) const
{
- str << "<yepropagate>";
- str << "<from>"; m_from->toXml( str, 0); str << "</from>";
- str << "<to>"; m_to->toXml( str, 0 ); str << "</to>";
+ str << "toString() << "\" to=\"" << m_to->toString() << "\">";
m_value->toXml( str, 0 );
return str << "</yepropagate>";
}
@@ -1614,8 +1612,7 @@
std::ostream &
YEIs::toXml (std::ostream & str, int indent ) const
{
- str << "<yeis>";
- str << "<type>"; m_type->toXml( str, 0); str << "</type>";
+ str << "toXml( str, 0); str << "/>";
str << "<expr>"; m_expr->toXml( str, 0); str << "</expr>";
return str << "</yeis>";
}
@@ -1841,16 +1838,12 @@
std::ostream &
YEBracket::toXml (std::ostream & str, int indent ) const
{
- str << "<yebracket>";
- str << "<var>";
- m_var->toXml( str, 0 );
- str << "</var><arg>";
- m_arg->toXml( str, 0 );
- str << "</arg><def>";
- m_def->toXml( str, 0 );
- str << "</def><type>";
+ str << "toXml( str, 0);
- str << "</type>";
+ str << ">";
+ m_var->toXml( str, 0 ); // <variable>...</variable>
+ m_arg->toXml( str, 0 ); // <list>...</list>
+ m_def->toXml( str, 0 ); // default
return str << "</yebracket>";
}
@@ -2924,13 +2917,13 @@
{
str << "nameSpace()->name() << "\" name=\"" << m_sentry->name() << "\">";
if (m_next_param_id > 0) {
- str << "<parameter>";
+ str << "<args>";
for (uint i = 0 ; i < m_next_param_id; i++)
{
m_parameters[i]->toXml( str, 0 );
}
- str << "</parameter>";
+ str << "</args>";
}
return str << "</yecall>";
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
