Miroirs/arabica
1
0
Fork 0
mirror of https://github.com/jezhiggins/arabica synced 2025-01-17 18:12:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't create a namespace context unless we need one - performance tweak provided by Gunther Laure

Browse source
This commit is contained in:
Jez Higgins 2013-01-05 21:53:59 +00:00
parent b65f7be0b3
commit 97ecf9040b
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/SAX/wrappers/saxexpat.hpp
View file

@ -352,6 +352,7 @@ class expat_wrapper :
const SAX::AttributeDefaults<string_type, string_adaptor> attrDefaults_;
std::map<string_type, string_type> declaredExternalEnts_;
std::vector<bool> namespaceContextCreated_;
}; // class expat_wrapper
//////////////////////////////////////////////////////////////////
@ -638,6 +639,7 @@ void expat_wrapper<string_type, T0, T1>::charHandler(const char* txt, int txtlen
template<class string_type, class T0, class T1>
void expat_wrapper<string_type, T0, T1>::startElement(const char* qName, const char** atts)
{
bool pushedContext = false;
if(!contentHandler_)
return;
@ -648,7 +650,6 @@ void expat_wrapper<string_type, T0, T1>::startElement(const char* qName, const c
} // if(!namespaces)
// OK we're doing Namespaces
nsSupport_.pushContext();
SAX::AttributesImpl<string_type, string_adaptor> attributes;
// take a first pass and copy all the attributes, noting any declarations
@ -663,6 +664,12 @@ void expat_wrapper<string_type, T0, T1>::startElement(const char* qName, const c
// declaration?
if(SA::find(attQName, nsc_.xmlns) == 0)
{
if (!pushedContext)
{
nsSupport_.pushContext();
pushedContext = true;
}
string_type prefix;
typename SA::size_type n = SA::find(attQName, nsc_.colon);
if(n != SA::npos())
@ -697,6 +704,7 @@ void expat_wrapper<string_type, T0, T1>::startElement(const char* qName, const c
} // while ...
} // if ...
namespaceContextCreated_.push_back(pushedContext);
// at last! report the event
qualifiedNameT name = processName(SA::construct_from_utf8(qName), false);
contentHandler_->startElement(name.namespaceUri(), name.localName(), name.rawName(), attributes);
@ -742,7 +750,13 @@ void expat_wrapper<string_type, T0, T1>::endElement(const char* qName)
typename namespaceSupportT::stringListT prefixes = nsSupport_.getDeclaredPrefixes();
for(size_t i = 0, end = prefixes.size(); i < end; ++i)
contentHandler_->endPrefixMapping(prefixes[i]);
bool pushedContext = namespaceContextCreated_.back();
namespaceContextCreated_.pop_back();
if (pushedContext)
{
nsSupport_.popContext();
}
} // endElement
template<class string_type, class T0, class T1>