Author: kkaempf
Date: Thu Jul 5 18:27:28 2007
New Revision: 39192
URL: http://svn.opensuse.org/viewcvs/yast?rev=39192&view=rev
Log:
clean up XML output, use more properties
- constants are enclosed by
- symbol definitions are
- variable references are
Modified:
trunk/core/libycp/src/YCPBoolean.cc
trunk/core/libycp/src/YCPFloat.cc
trunk/core/libycp/src/YCPInteger.cc
trunk/core/libycp/src/YCPPath.cc
trunk/core/libycp/src/YCPString.cc
trunk/core/libycp/src/YCPSymbol.cc
trunk/core/libycp/src/YCPVoid.cc
trunk/core/libycp/src/YExpression.cc
trunk/core/libycp/src/YSymbolEntry.cc
Modified: trunk/core/libycp/src/YCPBoolean.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBoolean.cc?rev=39192&r1=39191&r2=39192&view=diff
==============================================================================
--- trunk/core/libycp/src/YCPBoolean.cc (original)
+++ trunk/core/libycp/src/YCPBoolean.cc Thu Jul 5 18:27:28 2007
@@ -62,7 +62,7 @@
std::ostream &
YCPBooleanRep::toXml (std::ostream & str, int indent ) const
{
- return str << "<bool>" << ( v ? "true" : "false" ) << "</bool>";
+ return str << "";
}
Modified: trunk/core/libycp/src/YCPFloat.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPFloat.cc?rev=39192&r1=39191&r2=39192&view=diff
==============================================================================
--- trunk/core/libycp/src/YCPFloat.cc (original)
+++ trunk/core/libycp/src/YCPFloat.cc Thu Jul 5 18:27:28 2007
@@ -102,7 +102,7 @@
std::ostream &
YCPFloatRep::toXml (std::ostream & str, int indent ) const
{
- return str << "<float>" << toString() << "</float>";
+ return str << "";
}
Modified: trunk/core/libycp/src/YCPInteger.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPInteger.cc?rev=39192&r1=39191&r2=39192&view=diff
==============================================================================
--- trunk/core/libycp/src/YCPInteger.cc (original)
+++ trunk/core/libycp/src/YCPInteger.cc Thu Jul 5 18:27:28 2007
@@ -114,7 +114,7 @@
std::ostream &
YCPIntegerRep::toXml (std::ostream & str, int indent ) const
{
- return str << "<int>" << v << "</int>";
+ return str << "";
}
Modified: trunk/core/libycp/src/YCPPath.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPPath.cc?rev=39192&r1=39191&r2=39192&view=diff
==============================================================================
--- trunk/core/libycp/src/YCPPath.cc (original)
+++ trunk/core/libycp/src/YCPPath.cc Thu Jul 5 18:27:28 2007
@@ -361,7 +361,7 @@
std::ostream &
YCPPathRep::toXml (std::ostream & str, int indent ) const
{
- str << "<path>";
+ str << "";
#if 0
if (Xmlcode::writeInt32 (str, components.size()))
{
@@ -375,7 +375,7 @@
#else
str << toString();
#endif
- return str << "</path>";
+ return str << "\"/>";
}
Modified: trunk/core/libycp/src/YCPString.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPString.cc?rev=39192&r1=39191&r2=39192&view=diff
==============================================================================
--- trunk/core/libycp/src/YCPString.cc (original)
+++ trunk/core/libycp/src/YCPString.cc Thu Jul 5 18:27:28 2007
@@ -126,7 +126,7 @@
std::ostream &
YCPStringRep::toXml (std::ostream & str, int indent ) const
{
- return str << "<string>" << Xmlcode::xmlify(v) << "</string>";
+ return str << "";
}
Modified: trunk/core/libycp/src/YCPSymbol.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPSymbol.cc?rev=39192&r1=39191&r2=39192&view=diff
==============================================================================
--- trunk/core/libycp/src/YCPSymbol.cc (original)
+++ trunk/core/libycp/src/YCPSymbol.cc Thu Jul 5 18:27:28 2007
@@ -85,9 +85,8 @@
std::ostream &
YCPSymbolRep::toXml (std::ostream & str, int indent ) const
{
- str << "<symbol>";
- str << v.asString();
- return str << "</symbol>";
+ str << "";
+ return str;
}
Modified: trunk/core/libycp/src/YCPVoid.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPVoid.cc?rev=39192&r1=39191&r2=39192&view=diff
==============================================================================
--- trunk/core/libycp/src/YCPVoid.cc (original)
+++ trunk/core/libycp/src/YCPVoid.cc Thu Jul 5 18:27:28 2007
@@ -61,7 +61,7 @@
std::ostream &
YCPVoidRep::toXml (std::ostream & str, int indent ) const
{
- return str << "<void/>";
+ return str << "";
}
Modified: trunk/core/libycp/src/YExpression.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YExpression.cc?rev=39192&r1=39191&r2=39192&view=diff
==============================================================================
--- trunk/core/libycp/src/YExpression.cc (original)
+++ trunk/core/libycp/src/YExpression.cc Thu Jul 5 18:27:28 2007
@@ -147,9 +147,9 @@
std::ostream &
YEVariable::toXml( std::ostream & str, int indent ) const
{
- str << "";
+ str << "toString (false /*definition*/);
- return str << "";
+ return str << "\"/>";
}
Modified: trunk/core/libycp/src/YSymbolEntry.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YSymbolEntry.cc?rev=39192&r1=39191&r2=39192&view=diff
==============================================================================
--- trunk/core/libycp/src/YSymbolEntry.cc (original)
+++ trunk/core/libycp/src/YSymbolEntry.cc Thu Jul 5 18:27:28 2007
@@ -265,24 +265,11 @@
std::ostream &
YSymbolEntry::toXml (std::ostream & str, int indent ) const
{
- str << Xmlcode::spaces( indent ) << "toXmlString(); str << "\"";
- str << ">";
- str << m_name.asString();
-#if 0
- if (m_category == c_variable)
- {
- if (m_payload.m_code != 0) // formal arguments don't have a payload (a default value)
- {
- str << "<payload>";
- m_payload.m_code->toXml( str, indent+2 );
- str << "</payload>";
- }
- }
-#endif
- return str << "";
+ str << " name=\""; str << m_name.asString(); str << "\"/>";
// value is never written
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
