matching changes for makefile.g95

[wxWidgets.git] / src / html / htmlpars.cpp

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 3a5d300ee6bc0eb29a243cc876f5542de8b116ae..17fb0afb1cb73450f8d04320878d7e6edcfa4727 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -15,7 +15,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"

-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 
 #ifdef __BORDLANDC__
 #pragma hdrstop


@@ -69,35 +69,36 @@ void wxHtmlParser::DoneParser()
 
 
 
 
 
 

-#define wxHTML_MAX_BUFLEN 1024

 
 void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
 {
 
 void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
 {

-    char temp[wxHTML_BUFLEN], c;
+    if (end_pos <= begin_pos) return;
+
+    char c;
+    char *temp = new char[end_pos - begin_pos + 1];

     int i;
     int templen;
 
     templen = 0;
     i = begin_pos;
 
     int i;
     int templen;
 
     templen = 0;
     i = begin_pos;
 

-    while (i < end_pos) {
-        c = m_Source[i];
+    while (i < end_pos) 
+    {
+        c = m_Source[(unsigned int) i];

 
         // continue building word:
 
         // continue building word:

-        if (c != '<') {
+        if (c != '<') 
+           {

             temp[templen++] = c;
             temp[templen++] = c;

-            if (templen == wxHTML_BUFLEN-1) {
-                temp[templen] = 0;
-                AddText(temp);
-                templen = 0;
-            }

             i++;
         }
 
             i++;
         }
 

-        else if (c == '<')  {
+        else if (c == '<')  
+           {

             wxHtmlTag tag(m_Source, i, end_pos, m_Cache);
 
             wxHtmlTag tag(m_Source, i, end_pos, m_Cache);
 

-            if (templen) {
+            if (templen) 
+               {

                 temp[templen] = 0;
                 AddText(temp);
                 templen = 0;
                 temp[templen] = 0;
                 AddText(temp);
                 templen = 0;


@@ -108,10 +109,12 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
         }
     }
 
         }
     }
 

-    if (templen) { // last word of block :-(
+    if (templen) 
+    { // last word of block :-(

         temp[templen] = 0;
         AddText(temp);
     }
         temp[templen] = 0;
         AddText(temp);
     }

+    delete[] temp;

 }
 
 
 }
 
 


@@ -123,8 +126,9 @@ void wxHtmlParser::AddTag(const wxHtmlTag& tag)
 
     h = (wxHtmlTagHandler*) m_HandlersHash.Get(tag.GetName());
     if (h)
 
     h = (wxHtmlTagHandler*) m_HandlersHash.Get(tag.GetName());
     if (h)

-        inner = h -> HandleTag(tag);
-    if (!inner) {
+        inner = h->HandleTag(tag);
+    if (!inner) 
+    {

         if (tag.HasEnding())
             DoParsing(tag.GetBeginPos(), tag.GetEndPos1());
     }
         if (tag.HasEnding())
             DoParsing(tag.GetBeginPos(), tag.GetEndPos1());
     }


@@ -134,7 +138,7 @@ void wxHtmlParser::AddTag(const wxHtmlTag& tag)
 
 void wxHtmlParser::AddTagHandler(wxHtmlTagHandler *handler)
 {
 
 void wxHtmlParser::AddTagHandler(wxHtmlTagHandler *handler)
 {

-    wxString s(handler -> GetSupportedTags());
+    wxString s(handler->GetSupportedTags());

     wxStringTokenizer tokenizer(s, ", ");
 
     while (tokenizer.HasMoreTokens())
     wxStringTokenizer tokenizer(s, ", ");
 
     while (tokenizer.HasMoreTokens())


@@ -143,7 +147,7 @@ void wxHtmlParser::AddTagHandler(wxHtmlTagHandler *handler)
     if (m_HandlersList.IndexOf(handler) == wxNOT_FOUND)
         m_HandlersList.Append(handler);
 
     if (m_HandlersList.IndexOf(handler) == wxNOT_FOUND)
         m_HandlersList.Append(handler);
 

-    handler -> SetParser(this);
+    handler->SetParser(this);

 }
 
 
 }
 
 


@@ -153,14 +157,16 @@ void wxHtmlParser::PushTagHandler(wxHtmlTagHandler *handler, wxString tags)
     wxStringTokenizer tokenizer(tags, ", ");
     wxString key;
 
     wxStringTokenizer tokenizer(tags, ", ");
     wxString key;
 

-    if (m_HandlersStack == NULL) {
+    if (m_HandlersStack == NULL) 
+    {

         m_HandlersStack = new wxList;
         m_HandlersStack = new wxList;

-        m_HandlersStack -> DeleteContents(TRUE);
+        m_HandlersStack->DeleteContents(TRUE);

     }
 
     }
 

-    m_HandlersStack -> Insert(new wxHashTable(m_HandlersHash));
+    m_HandlersStack->Insert(new wxHashTable(m_HandlersHash));

 
 

-    while (tokenizer.HasMoreTokens()) {
+    while (tokenizer.HasMoreTokens()) 
+    {

         key = tokenizer.NextToken();
         m_HandlersHash.Delete(key);
         m_HandlersHash.Put(key, handler);
         key = tokenizer.NextToken();
         m_HandlersHash.Delete(key);
         m_HandlersHash.Put(key, handler);


@@ -173,9 +179,14 @@ void wxHtmlParser::PopTagHandler()
 {
     wxNode *first;
     
 {
     wxNode *first;
     

-    if (m_HandlersStack == NULL || (first = m_HandlersStack -> GetFirst()) == NULL) return;
-    m_HandlersHash = *((wxHashTable*) first -> GetData());
-    m_HandlersStack -> DeleteNode(first);
+    if (m_HandlersStack == NULL || 
+        (first = m_HandlersStack->GetFirst()) == NULL) 
+    {
+        wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
+        return;
+    }
+    m_HandlersHash = *((wxHashTable*) first->GetData());
+    m_HandlersStack->DeleteNode(first);

 }
 
 
 }