Updated tinyxml to d211bb13512cf4edb408e2c4badbcf4100ce0fd0
This commit is contained in:
parent
c395512ea6
commit
ef92bcbc5a
|
@ -114,12 +114,12 @@ char* StrPair::ParseText( char* p, const char* endTag, int strFlags )
|
|||
|
||||
char* StrPair::ParseName( char* p )
|
||||
{
|
||||
char* start = p;
|
||||
|
||||
if ( !start || !(*start) ) {
|
||||
if ( !p || !(*p) ) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
char* const start = p;
|
||||
|
||||
while( *p && ( p == start ? XMLUtil::IsNameStartChar( *p ) : XMLUtil::IsNameChar( *p ) )) {
|
||||
++p;
|
||||
}
|
||||
|
@ -212,12 +212,13 @@ const char* StrPair::GetStr()
|
|||
else {
|
||||
int i=0;
|
||||
for(; i<NUM_ENTITIES; ++i ) {
|
||||
if ( strncmp( p+1, entities[i].pattern, entities[i].length ) == 0
|
||||
&& *(p+entities[i].length+1) == ';' ) {
|
||||
// Found an entity convert;
|
||||
*q = entities[i].value;
|
||||
const Entity& entity = entities[i];
|
||||
if ( strncmp( p + 1, entity.pattern, entity.length ) == 0
|
||||
&& *( p + entity.length + 1 ) == ';' ) {
|
||||
// Found an entity - convert.
|
||||
*q = entity.value;
|
||||
++q;
|
||||
p += entities[i].length + 2;
|
||||
p += entity.length + 2;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -479,8 +480,7 @@ bool XMLUtil::ToDouble( const char* str, double* value )
|
|||
|
||||
char* XMLDocument::Identify( char* p, XMLNode** node )
|
||||
{
|
||||
XMLNode* returnNode = 0;
|
||||
char* start = p;
|
||||
char* const start = p;
|
||||
p = XMLUtil::SkipWhiteSpace( p );
|
||||
if( !p || !*p ) {
|
||||
return p;
|
||||
|
@ -509,6 +509,7 @@ char* XMLDocument::Identify( char* p, XMLNode** node )
|
|||
#if defined(_MSC_VER)
|
||||
#pragma warning (pop)
|
||||
#endif
|
||||
XMLNode* returnNode = 0;
|
||||
if ( XMLUtil::StringEqual( p, xmlHeader, xmlHeaderLen ) ) {
|
||||
returnNode = new (_commentPool.Alloc()) XMLDeclaration( this );
|
||||
returnNode->_memPool = &_commentPool;
|
||||
|
@ -693,7 +694,7 @@ XMLNode* XMLNode::InsertFirstChild( XMLNode* addThis )
|
|||
addThis->_next = 0;
|
||||
}
|
||||
addThis->_parent = this;
|
||||
return addThis;
|
||||
return addThis;
|
||||
}
|
||||
|
||||
|
||||
|
@ -823,7 +824,7 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEnd )
|
|||
// We read the end tag. Return it to the parent.
|
||||
if ( ele && ele->ClosingType() == XMLElement::CLOSING ) {
|
||||
if ( parentEnd ) {
|
||||
*parentEnd = static_cast<XMLElement*>(node)->_value;
|
||||
*parentEnd = ele->_value;
|
||||
}
|
||||
node->_memPool->SetTracked(); // created and then immediately deleted.
|
||||
DeleteNode( node );
|
||||
|
@ -833,20 +834,22 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEnd )
|
|||
// Handle an end tag returned to this level.
|
||||
// And handle a bunch of annoying errors.
|
||||
if ( ele ) {
|
||||
bool mismatch = false;
|
||||
if ( endTag.Empty() && ele->ClosingType() == XMLElement::OPEN ) {
|
||||
_document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 );
|
||||
p = 0;
|
||||
mismatch = true;
|
||||
}
|
||||
else if ( !endTag.Empty() && ele->ClosingType() != XMLElement::OPEN ) {
|
||||
_document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 );
|
||||
p = 0;
|
||||
mismatch = true;
|
||||
}
|
||||
else if ( !endTag.Empty() ) {
|
||||
if ( !XMLUtil::StringEqual( endTag.GetStr(), node->Value() )) {
|
||||
_document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 );
|
||||
p = 0;
|
||||
mismatch = true;
|
||||
}
|
||||
}
|
||||
if ( mismatch ) {
|
||||
_document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 );
|
||||
p = 0;
|
||||
}
|
||||
}
|
||||
if ( p == 0 ) {
|
||||
DeleteNode( node );
|
||||
|
@ -911,7 +914,8 @@ XMLNode* XMLText::ShallowClone( XMLDocument* doc ) const
|
|||
|
||||
bool XMLText::ShallowEqual( const XMLNode* compare ) const
|
||||
{
|
||||
return ( compare->ToText() && XMLUtil::StringEqual( compare->ToText()->Value(), Value() ));
|
||||
const XMLText* text = compare->ToText();
|
||||
return ( text && XMLUtil::StringEqual( text->Value(), Value() ) );
|
||||
}
|
||||
|
||||
|
||||
|
@ -1254,7 +1258,7 @@ const char* XMLElement::Attribute( const char* name, const char* value ) const
|
|||
const char* XMLElement::GetText() const
|
||||
{
|
||||
if ( FirstChild() && FirstChild()->ToText() ) {
|
||||
return FirstChild()->ToText()->Value();
|
||||
return FirstChild()->Value();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -1314,7 +1318,7 @@ void XMLElement::SetText( double v )
|
|||
XMLError XMLElement::QueryIntText( int* ival ) const
|
||||
{
|
||||
if ( FirstChild() && FirstChild()->ToText() ) {
|
||||
const char* t = FirstChild()->ToText()->Value();
|
||||
const char* t = FirstChild()->Value();
|
||||
if ( XMLUtil::ToInt( t, ival ) ) {
|
||||
return XML_SUCCESS;
|
||||
}
|
||||
|
@ -1327,7 +1331,7 @@ XMLError XMLElement::QueryIntText( int* ival ) const
|
|||
XMLError XMLElement::QueryUnsignedText( unsigned* uval ) const
|
||||
{
|
||||
if ( FirstChild() && FirstChild()->ToText() ) {
|
||||
const char* t = FirstChild()->ToText()->Value();
|
||||
const char* t = FirstChild()->Value();
|
||||
if ( XMLUtil::ToUnsigned( t, uval ) ) {
|
||||
return XML_SUCCESS;
|
||||
}
|
||||
|
@ -1340,7 +1344,7 @@ XMLError XMLElement::QueryUnsignedText( unsigned* uval ) const
|
|||
XMLError XMLElement::QueryBoolText( bool* bval ) const
|
||||
{
|
||||
if ( FirstChild() && FirstChild()->ToText() ) {
|
||||
const char* t = FirstChild()->ToText()->Value();
|
||||
const char* t = FirstChild()->Value();
|
||||
if ( XMLUtil::ToBool( t, bval ) ) {
|
||||
return XML_SUCCESS;
|
||||
}
|
||||
|
@ -1353,7 +1357,7 @@ XMLError XMLElement::QueryBoolText( bool* bval ) const
|
|||
XMLError XMLElement::QueryDoubleText( double* dval ) const
|
||||
{
|
||||
if ( FirstChild() && FirstChild()->ToText() ) {
|
||||
const char* t = FirstChild()->ToText()->Value();
|
||||
const char* t = FirstChild()->Value();
|
||||
if ( XMLUtil::ToDouble( t, dval ) ) {
|
||||
return XML_SUCCESS;
|
||||
}
|
||||
|
@ -1366,7 +1370,7 @@ XMLError XMLElement::QueryDoubleText( double* dval ) const
|
|||
XMLError XMLElement::QueryFloatText( float* fval ) const
|
||||
{
|
||||
if ( FirstChild() && FirstChild()->ToText() ) {
|
||||
const char* t = FirstChild()->ToText()->Value();
|
||||
const char* t = FirstChild()->Value();
|
||||
if ( XMLUtil::ToFloat( t, fval ) ) {
|
||||
return XML_SUCCESS;
|
||||
}
|
||||
|
|
|
@ -523,10 +523,7 @@ public:
|
|||
return p;
|
||||
}
|
||||
static char* SkipWhiteSpace( char* p ) {
|
||||
while( !IsUTF8Continuation(*p) && isspace( *reinterpret_cast<unsigned char*>(p) ) ) {
|
||||
++p;
|
||||
}
|
||||
return p;
|
||||
return const_cast<char*>( SkipWhiteSpace( const_cast<const char*>(p) ) );
|
||||
}
|
||||
static bool IsWhiteSpace( char p ) {
|
||||
return !IsUTF8Continuation(p) && isspace( static_cast<unsigned char>(p) );
|
||||
|
@ -561,8 +558,8 @@ public:
|
|||
return false;
|
||||
}
|
||||
|
||||
inline static int IsUTF8Continuation( const char p ) {
|
||||
return p & 0x80;
|
||||
inline static bool IsUTF8Continuation( const char p ) {
|
||||
return ( p & 0x80 ) != 0;
|
||||
}
|
||||
|
||||
static const char* ReadBOM( const char* p, bool* hasBOM );
|
||||
|
|
Loading…
Reference in New Issue