attribute support

This commit is contained in:
Lee Thomason 2012-01-23 13:29:35 -08:00
parent ec975cede8
commit 22aead1c73
4 changed files with 12 additions and 4 deletions

View File

@ -288,6 +288,9 @@ char* XMLComment::ParseDeep( char* p )
// --------- XMLAttribute ---------- //
char* XMLAttribute::ParseDeep( char* p )
{
p = ParseText( p, &name, "=" );
if ( !p || !*p ) return 0;
char endTag[2] = { *p, 0 };
++p;
p = ParseText( p, &value, endTag );
@ -298,7 +301,8 @@ char* XMLAttribute::ParseDeep( char* p )
void XMLAttribute::Print( FILE* cfile )
{
fprintf( cfile, "\"%s\"", value );
// fixme: sort out single vs. double quote
fprintf( cfile, "%s=\"%s\"", name.GetStr(), value.GetStr() );
}
@ -351,7 +355,7 @@ char* XMLElement::ParseDeep( char* p )
}
// attribute.
if ( *p == SINGLE_QUOTE || *p == DOUBLE_QUOTE ) {
if ( IsAlpha( *p ) ) {
XMLAttribute* attrib = new XMLAttribute( this );
p = attrib->ParseDeep( p );
if ( !p ) {
@ -459,6 +463,7 @@ bool XMLDocument::Parse( const char* p )
charBuffer = CharBuffer::Construct( p );
XMLNode* node = 0;
// fixme: clean up
char* q = Identify( this, charBuffer->mem, &node );
while ( node ) {
root->InsertEndChild( node );

View File

@ -169,6 +169,7 @@ public:
private:
char* ParseDeep( char* p );
StrPair name;
StrPair value;
XMLAttribute* next;
};

Binary file not shown.

View File

@ -28,13 +28,15 @@ int main( int argc, const char* argv )
}
#endif
{
static const char* test[] = { "<!--single element-->",
static const char* test[] = { //"<!--single element-->",
"<element />",
"<element></element>",
"<!--single sub-element-->",
//"<!--single sub-element-->",
"<element><subelement/></element>",
"<element><subelement></subelement></element>",
"<!--comment beside elements--><element><subelement></subelement></element>",
"<!--comment beside elements, this time with spaces--> \n <element> <subelement> \n </subelement> </element>",
"<element attrib1='foo' attrib2=\"bar\" ></element>",
0
};
for( int i=0; test[i]; ++i ) {