AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rewrote wxHtmlEntitiesParser::Parse() using iterators, optimized for the common case of no entities in the input

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-08-22 06:18:12 +00:00
parent c471f7e18f
commit 4f7e8fda39
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/html/htmlpars.cpp
View File

@ -476,46 +476,52 @@ void wxHtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)
wxString wxHtmlEntitiesParser::Parse(const wxString& input) const
{
const wxChar *c, *last;
const wxChar *in_str = input.c_str();
wxString output;
output.reserve(input.length());
const wxString::const_iterator end(input.end());
wxString::const_iterator c(input.begin());
wxString::const_iterator last(c);
for (c = in_str, last = in_str; *c != wxT('\0'); c++)
for ( ; c < end; ++c )
{
if (*c == wxT('&'))
{
if ( output.empty() )
output.reserve(input.length());
if (c - last > 0)
output.append(last, c - last);
if ( *++c == wxT('\0') )
output.append(last, c);
if ( ++c == end )
break;
wxString entity;
const wxChar *ent_s = c;
const wxString::const_iterator ent_s = c;
wxChar entity_char;
for (; (*c >= wxT('a') && *c <= wxT('z')) ||
(*c >= wxT('A') && *c <= wxT('Z')) ||
(*c >= wxT('0') && *c <= wxT('9')) ||
*c == wxT('_') || *c == wxT('#'); c++) {}
entity.append(ent_s, c - ent_s);
if (*c != wxT(';')) c--;
for (; c != end &&
((*c >= wxT('a') && *c <= wxT('z')) ||
(*c >= wxT('A') && *c <= wxT('Z')) ||
(*c >= wxT('0') && *c <= wxT('9')) ||
*c == wxT('_') || *c == wxT('#')); ++c) {}
entity.append(ent_s, c);
if (c == end || *c != wxT(';')) --c;
last = c+1;
entity_char = GetEntityChar(entity);
if (entity_char)
output << entity_char;
else
{
output.append(ent_s-1, c-ent_s+2);
output.append(ent_s-1, c+1);
wxLogTrace(wxTRACE_HTML_DEBUG,
wxT("Unrecognized HTML entity: '%s'"),
entity.c_str());
"Unrecognized HTML entity: '%s'",
entity);
}
}
}
if (*last != wxT('\0'))
output.append(last);
if ( last == input.begin() ) // common case: no entity
return input;
if ( last != end )
output.append(last, end);
return output;
}