AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247 from Dmitry-Me/combineCheckWithDependentCall 

Move the check into dependent call
This commit is contained in:
Lee Thomason 2014-12-23 13:16:11 -08:00
parent ffee345723 a092bc1f5a
commit 69242c4b9b
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tinyxml2.cpp
View File

@ -2069,9 +2069,7 @@ void XMLPrinter::PushHeader( bool writeBOM, bool writeDec )
void XMLPrinter::OpenElement( const char* name, bool compactMode ) void XMLPrinter::OpenElement( const char* name, bool compactMode )
{ {
if ( _elementJustOpened ) { SealElementIfJustOpened();
SealElement();
}
_stack.Push( name ); _stack.Push( name );
if ( _textDepth < 0 && !_firstElement && !compactMode ) { if ( _textDepth < 0 && !_firstElement && !compactMode ) {
@ -2155,8 +2153,11 @@ void XMLPrinter::CloseElement( bool compactMode )
} }
void XMLPrinter::SealElement() void XMLPrinter::SealElementIfJustOpened()
{ {
if ( !_elementJustOpened ) {
return;
}
_elementJustOpened = false; _elementJustOpened = false;
Print( ">" ); Print( ">" );
} }
@ -2166,9 +2167,7 @@ void XMLPrinter::PushText( const char* text, bool cdata )
{ {
_textDepth = _depth-1; _textDepth = _depth-1;
if ( _elementJustOpened ) { SealElementIfJustOpened();
SealElement();
}
if ( cdata ) { if ( cdata ) {
Print( "<![CDATA[" ); Print( "<![CDATA[" );
Print( "%s", text ); Print( "%s", text );
@ -2221,9 +2220,7 @@ void XMLPrinter::PushText( double value )
void XMLPrinter::PushComment( const char* comment ) void XMLPrinter::PushComment( const char* comment )
{ {
if ( _elementJustOpened ) { SealElementIfJustOpened();
SealElement();
}
if ( _textDepth < 0 && !_firstElement && !_compactMode) { if ( _textDepth < 0 && !_firstElement && !_compactMode) {
Print( "\n" ); Print( "\n" );
PrintSpace( _depth ); PrintSpace( _depth );
@ -2235,9 +2232,7 @@ void XMLPrinter::PushComment( const char* comment )
void XMLPrinter::PushDeclaration( const char* value ) void XMLPrinter::PushDeclaration( const char* value )
{ {
if ( _elementJustOpened ) { SealElementIfJustOpened();
SealElement();
}
if ( _textDepth < 0 && !_firstElement && !_compactMode) { if ( _textDepth < 0 && !_firstElement && !_compactMode) {
Print( "\n" ); Print( "\n" );
PrintSpace( _depth ); PrintSpace( _depth );
@ -2249,9 +2244,7 @@ void XMLPrinter::PushDeclaration( const char* value )
void XMLPrinter::PushUnknown( const char* value ) void XMLPrinter::PushUnknown( const char* value )
{ {
if ( _elementJustOpened ) { SealElementIfJustOpened();
SealElement();
}
if ( _textDepth < 0 && !_firstElement && !_compactMode) { if ( _textDepth < 0 && !_firstElement && !_compactMode) {
Print( "\n" ); Print( "\n" );
PrintSpace( _depth ); PrintSpace( _depth );

2
tinyxml2.h
View File

@ -2068,7 +2068,7 @@ protected:
virtual void PrintSpace( int depth ); virtual void PrintSpace( int depth );
void Print( const char* format, ... ); void Print( const char* format, ... );
void SealElement(); void SealElementIfJustOpened();
bool _elementJustOpened; bool _elementJustOpened;
DynArray< const char*, 10 > _stack; DynArray< const char*, 10 > _stack;