#pragma implementation
#endif
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML
#endif
#ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
#endif
#include "wx/html/htmltag.h"
#include <stdarg.h>
-
-
//-----------------------------------------------------------------------------
// wxHtmlTagsCache
//-----------------------------------------------------------------------------
+struct wxHtmlCacheItem
+{
+ // this is "pos" value passed to wxHtmlTag's constructor.
+ // it is position of '<' character of the tag
+ int Key;
+
+ // end positions for the tag:
+ // end1 is '<' of ending tag,
+ // end2 is '>' or both are
+ // -1 if there is no ending tag for this one...
+ // or -2 if this is ending tag </...>
+ int End1, End2;
+
+ // name of this tag
+ wxChar *Name;
+};
+
+
IMPLEMENT_CLASS(wxHtmlTagsCache,wxObject)
#define CACHE_INCREMENT 64
m_CachePos = 0;
pos = 0;
- while (pos < lng) {
- if (src[pos] == wxT('<')) { // tag found:
+ while (pos < lng)
+ {
+ if (src[pos] == wxT('<')) // tag found:
+ {
if (m_CacheSize % CACHE_INCREMENT == 0)
- m_Cache = (sCacheItem*) realloc(m_Cache, (m_CacheSize + CACHE_INCREMENT) * sizeof(sCacheItem));
+ m_Cache = (wxHtmlCacheItem*) realloc(m_Cache, (m_CacheSize + CACHE_INCREMENT) * sizeof(wxHtmlCacheItem));
tg = m_CacheSize++;
m_Cache[tg].Key = stpos = pos++;
dummy[0] = 0; i = 0;
- while ((src[pos] != wxT('>')) && (src[pos] != wxT(' '))) {
+ while (pos < lng &&
+ src[pos] != wxT('>') &&
+ src[pos] != wxT(' ') && src[pos] != wxT('\r') &&
+ src[pos] != wxT('\n') && src[pos] != wxT('\t'))
+ {
dummy[i] = src[pos++];
if ((dummy[i] >= wxT('a')) && (dummy[i] <= wxT('z'))) dummy[i] -= (wxT('a') - wxT('A'));
i++;
m_Cache[tg].Name = new wxChar[i+1];
memcpy(m_Cache[tg].Name, dummy, (i+1)*sizeof(wxChar));
- while (src[pos] != wxT('>')) pos++;
+ while (pos < lng && src[pos] != wxT('>')) pos++;
- if (src[stpos+1] == wxT('/')) { // ending tag:
+ if (src[stpos+1] == wxT('/')) // ending tag:
+ {
m_Cache[tg].End1 = m_Cache[tg].End2 = -2;
// find matching begin tag:
for (i = tg; i >= 0; i--)
- if ((m_Cache[i].End1 == -1) && (wxStrcmp(m_Cache[i].Name, dummy+1) == 0)) {
+ if ((m_Cache[i].End1 == -1) && (wxStrcmp(m_Cache[i].Name, dummy+1) == 0))
+ {
m_Cache[i].End1 = stpos;
m_Cache[i].End2 = pos + 1;
break;
}
}
- else {
+ else
+ {
m_Cache[tg].End1 = m_Cache[tg].End2 = -1;
}
}
}
// ok, we're done, now we'll free .Name members of cache - we don't need it anymore:
- for (i = 0; i < m_CacheSize; i++) {
+ for (i = 0; i < m_CacheSize; i++)
+ {
delete[] m_Cache[i].Name;
m_Cache[i].Name = NULL;
}
void wxHtmlTagsCache::QueryTag(int at, int* end1, int* end2)
{
if (m_Cache == NULL) return;
- if (m_Cache[m_CachePos].Key != at) {
+ if (m_Cache[m_CachePos].Key != at)
+ {
int delta = (at < m_Cache[m_CachePos].Key) ? -1 : 1;
do {m_CachePos += delta;} while (m_Cache[m_CachePos].Key != at);
}
// fill-in name, params and begin pos:
m_Name = m_Params = wxEmptyString;
i = pos+1;
- if (source[i] == '/') {m_Ending = TRUE; i++;}
+ if (source[i] == wxT('/')) { m_Ending = TRUE; i++; }
else m_Ending = FALSE;
- while ((i < end_pos) && ((c = source[i++]) != ' ') && (c != '>')) {
- if ((c >= 'a') && (c <= 'z')) c -= ('a' - 'A');
+ // find tag's name and convert it to uppercase:
+ while ((i < end_pos) &&
+ ((c = source[i++]) != wxT(' ') && c != wxT('\r') &&
+ c != wxT('\n') && c != wxT('\t') &&
+ c != wxT('>')))
+ {
+ if ((c >= wxT('a')) && (c <= wxT('z'))) c -= (wxT('a') - wxT('A'));
m_Name += c;
}
- if (source[i-1] != '>')
- while ((i < end_pos) && ((c = source[i++]) != '>')) {
- if ((c >= 'a') && (c <= 'z')) c -= ('a' - 'A');
+ // if the tag has parameters, read them and "normalize" them,
+ // i.e. convert to uppercase, replace whitespaces by spaces and
+ // remove whitespaces around '=':
+ if (source[i-1] != wxT('>'))
+ while ((i < end_pos) && ((c = source[i++]) != wxT('>')))
+ {
+ if ((c >= wxT('a')) && (c <= wxT('z')))
+ c -= (wxT('a') - wxT('A'));
+ if (c == wxT('\r') || c == wxT('\n') || c == wxT('\t'))
+ c = wxT(' '); // make future parsing a bit simpler
m_Params += c;
- if (c == '"') {
- while ((i < end_pos) && ((c = source[i++]) != '"')) m_Params += c;
+ if (c == wxT('"'))
+ {
+ // remove spaces around the '=' character:
+ if (m_Params.Length() > 1 &&
+ m_Params[m_Params.Length()-2] == wxT(' '))
+ {
+ m_Params.RemoveLast();
+ while (m_Params.Length() > 0 && m_Params.Last() == wxT(' '))
+ m_Params.RemoveLast();
+ m_Params += wxT('"');
+ }
+ while ((i < end_pos) && (source[i++] == wxT(' '))) {}
+ if (i < end_pos) i--;
+
+ // ...and copy the value to m_Params:
+ while ((i < end_pos) && ((c = source[i++]) != wxT('"')))
+ m_Params += c;
m_Params += c;
}
- else if (c == '\'') {
- while ((i < end_pos) && ((c = source[i++]) != '\'')) m_Params += c;
+ else if (c == wxT('\''))
+ {
+ while ((i < end_pos) && ((c = source[i++]) != wxT('\'')))
+ m_Params += c;
m_Params += c;
}
}
m_Begin = i;
- cache -> QueryTag(pos, &m_End1, &m_End2);
+ cache->QueryTag(pos, &m_End1, &m_End2);
if (m_End1 > end_pos) m_End1 = end_pos;
if (m_End2 > end_pos) m_End2 = end_pos;
}
{
const wxChar *st = m_Params, *p = par;
const wxChar *st2, *p2;
+ const wxChar invalid = wxT('\1');
if (*st == 0) return FALSE;
if (*p == 0) return FALSE;
- for (st2 = st, p2 = p; ; st2++) {
+ for (st2 = st, p2 = p; ; st2++)
+ {
if (*p2 == 0) return TRUE;
if (*st2 == 0) return FALSE;
- if (*p2 != *st2) p2 = p;
+ if (*p2 != *st2) p2 = &invalid;
if (*p2 == *st2) p2++;
- if (*st2 == ' ') p2 = p;
- else if (*st2 == '=') {
+ if (*st2 == wxT(' ')) p2 = p;
+ else if (*st2 == wxT('='))
+ {
p2 = p;
- while (*st2 != ' ') {
- if (*st2 == '"') {
+ while (*st2 != wxT(' '))
+ {
+ if (*st2 == wxT('"'))
+ {
st2++;
- while (*st2 != '"') st2++;
+ while (*st2 != wxT('"')) st2++;
}
st2++;
if (*st2 == 0) return FALSE;
{
const wxChar *st = m_Params, *p = par;
const wxChar *st2, *p2;
+ const wxChar invalid = wxT('\1');
bool comma;
- char comma_char;
-
- if (*st == 0) return "";
- if (*p == 0) return "";
- for (st2 = st, p2 = p; ; st2++) {
- if (*p2 == 0) { // found
- wxString fnd = "";
+ wxChar comma_char;
+
+ if (*st == 0) return wxEmptyString;
+ if (*p == 0) return wxEmptyString;
+ for (st2 = st, p2 = p; ; st2++)
+ {
+ if (*p2 == 0) // found
+ {
+ wxString fnd = wxEmptyString;
st2++; // '=' character
comma = FALSE;
- comma_char = '\0';
- if (!with_commas && (*(st2) == '"')) {
- st2++;
- comma = TRUE;
- comma_char = '"';
- }
- else if (!with_commas && (*(st2) == '\'')) {
- st2++;
- comma = TRUE;
- comma_char = '\'';
- }
- while (*st2 != 0) {
+ comma_char = wxT('\0');
+ if (!with_commas && (*(st2) == wxT('"')))
+ {
+ st2++;
+ comma = TRUE;
+ comma_char = wxT('"');
+ }
+ else if (!with_commas && (*(st2) == wxT('\'')))
+ {
+ st2++;
+ comma = TRUE;
+ comma_char = wxT('\'');
+ }
+
+ while (*st2 != 0)
+ {
if (comma && *st2 == comma_char) comma = FALSE;
- else if ((*st2 == ' ') && (!comma)) break;
+ else if ((*st2 == wxT(' ')) && (!comma)) break;
fnd += (*(st2++));
}
if (!with_commas && (*(st2-1) == comma_char)) fnd.RemoveLast();
return fnd;
}
- if (*st2 == 0) return "";
- if (*p2 != *st2) p2 = p;
+ if (*st2 == 0) return wxEmptyString;
+ if (*p2 != *st2) p2 = &invalid;
if (*p2 == *st2) p2++;
- if (*st2 == ' ') p2 = p;
- else if (*st2 == '=') {
+ if (*st2 == wxT(' ')) p2 = p;
+ else if (*st2 == wxT('='))
+ {
p2 = p;
- while (*st2 != ' ') {
- if (*st2 == '"') {
+ while (*st2 != wxT(' '))
+ {
+ if (*st2 == wxT('"'))
+ {
st2++;
- while (*st2 != '"') st2++;
+ while (*st2 != wxT('"')) st2++;
}
- else if (*st2 == '\'') {
+ else if (*st2 == wxT('\''))
+ {
st2++;
- while (*st2 != '\'') st2++;
+ while (*st2 != wxT('\'')) st2++;
}
st2++;
}
int wxHtmlTag::ScanParam(const wxString& par, wxChar *format, void *param) const
{
wxString parval = GetParam(par);
- return wxSscanf((const wxChar*)parval, format, param);
+ return wxSscanf(parval, format, param);
}
#endif
projects / wxWidgets.git / blobdiff