From f2f5d2830878bda7fdda8018ec2285f1225cc7bd Mon Sep 17 00:00:00 2001
From: rickg <rickg@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 21 May 1998 20:38:32 +0000
Subject: [PATCH] incremental parsing; xml support; token handler dispatching;
 performance

git-svn-id: svn://10.0.0.236/trunk@2126 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/htmlparser/src/CNavDelegate.cpp       |  27 +-
 mozilla/htmlparser/src/CNavDelegate.h         |   2 +-
 mozilla/htmlparser/src/COtherDelegate.cpp     |   4 +-
 mozilla/htmlparser/src/COtherDelegate.h       |   2 +-
 mozilla/htmlparser/src/nsHTMLContentSink.cpp  |  61 +-
 mozilla/htmlparser/src/nsHTMLContentSink.h    |  28 +-
 mozilla/htmlparser/src/nsHTMLParser.cpp       | 679 +++++++++---------
 mozilla/htmlparser/src/nsHTMLParser.h         | 118 ++-
 mozilla/htmlparser/src/nsHTMLTokens.cpp       | 215 +++---
 mozilla/htmlparser/src/nsHTMLTokens.h         |  12 +-
 mozilla/htmlparser/src/nsIContentSink.h       |   8 +-
 mozilla/htmlparser/src/nsIHTMLContentSink.h   |  28 +-
 mozilla/htmlparser/src/nsIParser.h            |   4 +-
 mozilla/htmlparser/src/nsParserTypes.h        |   2 +
 mozilla/htmlparser/src/nsScanner.cpp          |  25 +
 mozilla/htmlparser/src/nsScanner.h            |  12 +-
 mozilla/htmlparser/src/nsToken.cpp            |  29 +-
 mozilla/htmlparser/src/nsToken.h              |  21 +-
 mozilla/htmlparser/src/nsTokenHandler.cpp     | 566 +--------------
 mozilla/htmlparser/src/nsTokenHandler.h       | 118 +--
 mozilla/htmlparser/src/nsTokenizer.cpp        |  14 +
 mozilla/htmlparser/src/nsTokenizer.h          |   7 +
 .../parser/htmlparser/src/CNavDelegate.cpp    |  27 +-
 mozilla/parser/htmlparser/src/CNavDelegate.h  |   2 +-
 .../parser/htmlparser/src/COtherDelegate.cpp  |   4 +-
 .../parser/htmlparser/src/COtherDelegate.h    |   2 +-
 .../htmlparser/src/nsHTMLContentSink.cpp      |  61 +-
 .../parser/htmlparser/src/nsHTMLContentSink.h |  28 +-
 .../parser/htmlparser/src/nsHTMLParser.cpp    | 679 +++++++++---------
 mozilla/parser/htmlparser/src/nsHTMLParser.h  | 118 ++-
 .../parser/htmlparser/src/nsHTMLTokens.cpp    | 215 +++---
 mozilla/parser/htmlparser/src/nsHTMLTokens.h  |  12 +-
 .../parser/htmlparser/src/nsIContentSink.h    |   8 +-
 .../htmlparser/src/nsIHTMLContentSink.h       |  28 +-
 mozilla/parser/htmlparser/src/nsIParser.h     |   4 +-
 mozilla/parser/htmlparser/src/nsParserTypes.h |   2 +
 mozilla/parser/htmlparser/src/nsScanner.cpp   |  25 +
 mozilla/parser/htmlparser/src/nsScanner.h     |  12 +-
 mozilla/parser/htmlparser/src/nsToken.cpp     |  29 +-
 mozilla/parser/htmlparser/src/nsToken.h       |  21 +-
 .../parser/htmlparser/src/nsTokenHandler.cpp  | 566 +--------------
 .../parser/htmlparser/src/nsTokenHandler.h    | 118 +--
 mozilla/parser/htmlparser/src/nsTokenizer.cpp |  14 +
 mozilla/parser/htmlparser/src/nsTokenizer.h   |   7 +
 44 files changed, 1476 insertions(+), 2488 deletions(-)

diff --git a/mozilla/htmlparser/src/CNavDelegate.cpp b/mozilla/htmlparser/src/CNavDelegate.cpp
index 857a233b1c6..14c5cf34e03 100644
--- a/mozilla/htmlparser/src/CNavDelegate.cpp
+++ b/mozilla/htmlparser/src/CNavDelegate.cpp
@@ -136,18 +136,21 @@ PRInt32 CNavDelegate::ConsumeTag(PRUnichar aChar,CScanner& aScanner,CToken*& aTo
  *  @param   aScanner: see nsScanner.h
  *  @return  
  */
-PRInt32 CNavDelegate::ConsumeAttributes(PRUnichar aChar,CScanner& aScanner) {
+PRInt32 CNavDelegate::ConsumeAttributes(PRUnichar aChar,CScanner& aScanner,CToken*& aToken) {
   PRBool done=PR_FALSE;
   PRInt32 result=kNoError;
   nsAutoString as("");
+  PRInt16 theAttrCount=0;
 
   while((!done) && (result==kNoError)) {
     CToken* theToken= new CAttributeToken(as);
     if(theToken){
       result=theToken->Consume(aChar,aScanner);  //tell new token to finish consuming text...    
       if(kNoError==result){
+        theAttrCount++;
         mTokenDeque.Push(theToken);
       }//if
+      else delete theToken; //we can't keep it...
     }//if
     
     if(kNoError==result){
@@ -158,6 +161,24 @@ PRInt32 CNavDelegate::ConsumeAttributes(PRUnichar aChar,CScanner& aScanner) {
       }//if
     }//if
   }//while
+
+  //ok, this is a bit complicated, so follow closely.
+  //Since we're incremental (but pessimistic), it is possible that even though 
+  //we've eaten a few delicious attributes, we can't keep them because
+  //we couldn't eat all of them (up to an including the close > for this tag).
+  //Therefore, we need to remove the ones we just created from the tokendeque,
+  //and destroy them. (They'll get reconsumed on the next incremental pass).
+  //NOTE: This process can be enhanced later on by adding state to the delegate
+  //      telling us that we're in the attribute consumption phase.
+  //      Remember the mantra: Crawl, Walk, Run!
+  if(kNoError==result) {
+    aToken->SetAttributeCount(theAttrCount);
+  }
+  else {
+    while(theAttrCount--) {
+      delete mTokenDeque.PopBack();
+    }
+  }
   return result;
 }
 
@@ -200,7 +221,7 @@ PRInt32 CNavDelegate::ConsumeStartTag(PRUnichar aChar,CScanner& aScanner,CToken*
     result= aToken->Consume(aChar,aScanner);  //tell new token to finish consuming text...    
     if(kNoError==result) {
       if(((CStartToken*)aToken)->IsAttributed()) {
-        result=ConsumeAttributes(aChar,aScanner);
+        result=ConsumeAttributes(aChar,aScanner,aToken);
       }
       //now that that's over with, we have one more problem to solve.
       //In the case that we just read a <SCRIPT> or <STYLE> tags, we should go and
@@ -319,7 +340,7 @@ PRInt32 CNavDelegate::ConsumeText(const nsString& aString,CScanner& aScanner,CTo
 
   PRInt32 result=kNoError;
   if(aToken=new CTextToken(aString)) {
-    PRUnichar ch;
+    PRUnichar ch=0;
     result=aToken->Consume(ch,aScanner);
   }
   return result;
diff --git a/mozilla/htmlparser/src/CNavDelegate.h b/mozilla/htmlparser/src/CNavDelegate.h
index ba80e0f53d1..d109239df28 100644
--- a/mozilla/htmlparser/src/CNavDelegate.h
+++ b/mozilla/htmlparser/src/CNavDelegate.h
@@ -150,7 +150,7 @@ protected:
      * @param   aToken is the next token (or null)
      * @return  error code
      */
-    PRInt32     ConsumeAttributes(PRUnichar aChar,CScanner& aScanner);
+    PRInt32     ConsumeAttributes(PRUnichar aChar,CScanner& aScanner,CToken*& aToken);
     
     /**
      * Retrieve a sequence of text from given scanner.
diff --git a/mozilla/htmlparser/src/COtherDelegate.cpp b/mozilla/htmlparser/src/COtherDelegate.cpp
index b5b30858fa1..1728b49dee3 100644
--- a/mozilla/htmlparser/src/COtherDelegate.cpp
+++ b/mozilla/htmlparser/src/COtherDelegate.cpp
@@ -129,7 +129,7 @@ PRInt32 COtherDelegate::ConsumeTag(PRUnichar aChar,CScanner& aScanner,CToken*& a
  *  @param   aScanner: see nsScanner.h
  *  @return  
  */
-PRInt32 COtherDelegate::ConsumeAttributes(PRUnichar aChar,CScanner& aScanner) {
+PRInt32 COtherDelegate::ConsumeAttributes(PRUnichar aChar,CScanner& aScanner,CToken*& aToken) {
   PRBool done=PR_FALSE;
   nsAutoString as("");
   PRInt32 result=kNoError;
@@ -186,7 +186,7 @@ PRInt32 COtherDelegate::ConsumeStartTag(PRUnichar aChar,CScanner& aScanner,CToke
   if(aToken) {
     result= aToken->Consume(aChar,aScanner);  //tell new token to finish consuming text...    
     if(((CStartToken*)aToken)->IsAttributed()) {
-      result=ConsumeAttributes(aChar,aScanner);
+      result=ConsumeAttributes(aChar,aScanner,aToken);
     }
     //now that that's over with, we have one more problem to solve.
     //In the case that we just read a <SCRIPT> or <STYLE> tags, we should go and
diff --git a/mozilla/htmlparser/src/COtherDelegate.h b/mozilla/htmlparser/src/COtherDelegate.h
index 6f1cb9bc438..bc74f4166ed 100644
--- a/mozilla/htmlparser/src/COtherDelegate.h
+++ b/mozilla/htmlparser/src/COtherDelegate.h
@@ -150,7 +150,7 @@ protected:
      * @param   aToken is the next token (or null)
      * @return  error code
      */
-    PRInt32     ConsumeAttributes(PRUnichar aChar,CScanner& aScanner);
+    PRInt32     ConsumeAttributes(PRUnichar aChar,CScanner& aScanner,CToken*& aToken);
     
     /**
      * Retrieve a sequence of text from given scanner.
diff --git a/mozilla/htmlparser/src/nsHTMLContentSink.cpp b/mozilla/htmlparser/src/nsHTMLContentSink.cpp
index 0fdc9911d6b..3e355127b73 100644
--- a/mozilla/htmlparser/src/nsHTMLContentSink.cpp
+++ b/mozilla/htmlparser/src/nsHTMLContentSink.cpp
@@ -18,6 +18,7 @@
 
 #include "nsHTMLContentSink.h"
 #include "nsHTMLTokens.h"
+#include "nsParserTypes.h"
 #include "prtypes.h" 
 #include <iostream.h>  
 
@@ -143,9 +144,9 @@ nsresult nsHTMLContentSink::QueryInterface(const nsIID& aIID, void** aInstancePt
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenHTML(const nsIParserNode& aNode) {
+PRInt32 nsHTMLContentSink::OpenHTML(const nsIParserNode& aNode) {
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
 #ifdef VERBOSE_DEBUG
@@ -162,11 +163,11 @@ PRBool nsHTMLContentSink::OpenHTML(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseHTML(const nsIParserNode& aNode){
+PRInt32 nsHTMLContentSink::CloseHTML(const nsIParserNode& aNode){
 
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -186,8 +187,8 @@ PRBool nsHTMLContentSink::CloseHTML(const nsIParserNode& aNode){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenHead(const nsIParserNode& aNode) {
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::OpenHead(const nsIParserNode& aNode) {
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
 #ifdef VERBOSE_DEBUG
@@ -205,10 +206,10 @@ PRBool nsHTMLContentSink::OpenHead(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseHead(const nsIParserNode& aNode) {
+PRInt32 nsHTMLContentSink::CloseHead(const nsIParserNode& aNode) {
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -226,8 +227,8 @@ PRBool nsHTMLContentSink::CloseHead(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::SetTitle(const nsString& aValue){
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::SetTitle(const nsString& aValue){
+  PRInt32 result=kNoError;
   mTitle=aValue;
   return result;
 }
@@ -240,8 +241,8 @@ PRBool nsHTMLContentSink::SetTitle(const nsString& aValue){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenBody(const nsIParserNode& aNode) {
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::OpenBody(const nsIParserNode& aNode) {
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
   #ifdef VERBOSE_DEBUG
@@ -259,9 +260,9 @@ PRBool nsHTMLContentSink::OpenBody(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseBody(const nsIParserNode& aNode){
+PRInt32 nsHTMLContentSink::CloseBody(const nsIParserNode& aNode){
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -279,8 +280,8 @@ PRBool nsHTMLContentSink::CloseBody(const nsIParserNode& aNode){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenForm(const nsIParserNode& aNode) {
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::OpenForm(const nsIParserNode& aNode) {
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
 #ifdef VERBOSE_DEBUG
@@ -298,10 +299,10 @@ PRBool nsHTMLContentSink::OpenForm(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseForm(const nsIParserNode& aNode){
+PRInt32 nsHTMLContentSink::CloseForm(const nsIParserNode& aNode){
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -319,8 +320,8 @@ PRBool nsHTMLContentSink::CloseForm(const nsIParserNode& aNode){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenFrameset(const nsIParserNode& aNode) {
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::OpenFrameset(const nsIParserNode& aNode) {
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
   #ifdef VERBOSE_DEBUG
@@ -338,10 +339,10 @@ PRBool nsHTMLContentSink::OpenFrameset(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseFrameset(const nsIParserNode& aNode){
+PRInt32 nsHTMLContentSink::CloseFrameset(const nsIParserNode& aNode){
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -360,8 +361,8 @@ PRBool nsHTMLContentSink::CloseFrameset(const nsIParserNode& aNode){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenContainer(const nsIParserNode& aNode){  
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::OpenContainer(const nsIParserNode& aNode){  
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
 #ifdef VERBOSE_DEBUG
@@ -379,10 +380,10 @@ PRBool nsHTMLContentSink::OpenContainer(const nsIParserNode& aNode){
  *  @param  
  *  @return 
  */
-PRBool nsHTMLContentSink::CloseContainer(const nsIParserNode& aNode){
+PRInt32 nsHTMLContentSink::CloseContainer(const nsIParserNode& aNode){
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -400,9 +401,9 @@ PRBool nsHTMLContentSink::CloseContainer(const nsIParserNode& aNode){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseTopmostContainer(){
+PRInt32 nsHTMLContentSink::CloseTopmostContainer(){
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos--]=eHTMLTag_unknown;
   return result;
 }
@@ -416,8 +417,8 @@ PRBool nsHTMLContentSink::CloseTopmostContainer(){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::AddLeaf(const nsIParserNode& aNode){
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::AddLeaf(const nsIParserNode& aNode){
+  PRInt32 result=kNoError;
 
 #ifdef VERBOSE_DEBUG
   DebugDump("<",aNode.GetText(),(mNodeStackPos)*2);
diff --git a/mozilla/htmlparser/src/nsHTMLContentSink.h b/mozilla/htmlparser/src/nsHTMLContentSink.h
index c445934760d..21e2f895482 100644
--- a/mozilla/htmlparser/src/nsHTMLContentSink.h
+++ b/mozilla/htmlparser/src/nsHTMLContentSink.h
@@ -87,33 +87,33 @@ class nsHTMLContentSink : public nsIHTMLContentSink {
             PRBool    SetTitle(const nsString& aValue);
 
                       // Called when Opening or closing the main HTML container
-            PRBool    OpenHTML(const nsIParserNode& aNode);
-            PRBool    CloseHTML(const nsIParserNode& aNode);
+            PRInt32    OpenHTML(const nsIParserNode& aNode);
+            PRInt32    CloseHTML(const nsIParserNode& aNode);
 
                       // Called when Opening or closing the main HEAD container
-            PRBool    OpenHead(const nsIParserNode& aNode);
-            PRBool    CloseHead(const nsIParserNode& aNode);
+            PRInt32    OpenHead(const nsIParserNode& aNode);
+            PRInt32    CloseHead(const nsIParserNode& aNode);
   
                       // Called when Opening or closing the main BODY container
-            PRBool    OpenBody(const nsIParserNode& aNode);
-            PRBool    CloseBody(const nsIParserNode& aNode);
+            PRInt32    OpenBody(const nsIParserNode& aNode);
+            PRInt32    CloseBody(const nsIParserNode& aNode);
 
                       // Called when Opening or closing FORM containers
-            PRBool    OpenForm(const nsIParserNode& aNode);
-            PRBool    CloseForm(const nsIParserNode& aNode);
+            PRInt32    OpenForm(const nsIParserNode& aNode);
+            PRInt32    CloseForm(const nsIParserNode& aNode);
         
                       // Called when Opening or closing the main FRAMESET container
-            PRBool    OpenFrameset(const nsIParserNode& aNode);
-            PRBool    CloseFrameset(const nsIParserNode& aNode);
+            PRInt32    OpenFrameset(const nsIParserNode& aNode);
+            PRInt32    CloseFrameset(const nsIParserNode& aNode);
         
                       // Called when Opening or closing a general container
                       // This includes: OL,UL,DIR,SPAN,TABLE,H[1..6],etc.
                       // Until proven otherwise, I also plan to toss STYLE, 
                       // FRAME, SCRIPT, etc. here too!
-    virtual PRBool    OpenContainer(const nsIParserNode& aNode);
-    virtual PRBool    CloseContainer(const nsIParserNode& aNode);
-    virtual PRBool    CloseTopmostContainer();
-    virtual PRBool    AddLeaf(const nsIParserNode& aNode);
+    virtual PRInt32    OpenContainer(const nsIParserNode& aNode);
+    virtual PRInt32    CloseContainer(const nsIParserNode& aNode);
+    virtual PRInt32    CloseTopmostContainer();
+    virtual PRInt32    AddLeaf(const nsIParserNode& aNode);
 
    /**
     * This method gets called when the parser begins the process
diff --git a/mozilla/htmlparser/src/nsHTMLParser.cpp b/mozilla/htmlparser/src/nsHTMLParser.cpp
index d087168164d..d02d40b8638 100644
--- a/mozilla/htmlparser/src/nsHTMLParser.cpp
+++ b/mozilla/htmlparser/src/nsHTMLParser.cpp
@@ -32,6 +32,7 @@
 #include "prenv.h"  //this is here for debug reasons...
 #include "plstr.h"
 #include <fstream.h>
+#include "nsIInputStream.h"
 #ifdef XP_PC
 #include <direct.h> //this is here for debug reasons...
 #endif
@@ -48,6 +49,8 @@ static const char* kInvalidTagStackPos = "Error: invalid tag stack position";
 
 static char*  gVerificationOutputDir=0;
 static int    rickGDebug=0;
+static const int gTransferBufferSize=4096;  //size of the buffer used in moving data from iistream
+
 
 /**
  *  This method is defined in nsIParser. It is used to 
@@ -68,6 +71,50 @@ NS_HTMLPARS nsresult NS_NewHTMLParser(nsIParser** aInstancePtrResult)
   return it->QueryInterface(kClassIID, (void **) aInstancePtrResult);
 }
 
+
+/**
+ *  This big dispatch method is used to route token handler calls to the right place.
+ *  What's wrong with it? This table, and the dispatch methods themselves need to be 
+ *  moved over to the delegate. Ah, so much to do...
+ *  
+ *  @update  gess 5/21/98
+ *  @param   aType
+ *  @param   aToken
+ *  @param   aParser
+ *  @return  
+ */
+PRInt32 DispatchTokenHandler(eHTMLTokenTypes aType,CToken* aToken,nsHTMLParser* aParser){
+  PRInt32 result=0;
+
+  if(aToken && aParser) {
+    switch(aType) {
+      case eToken_start:
+        result=aParser->HandleStartToken(aToken); break;
+      case eToken_end:
+        result=aParser->HandleEndToken(aToken); break;
+      case eToken_comment:
+        result=aParser->HandleCommentToken(aToken); break;
+      case eToken_entity:
+        result=aParser->HandleEntityToken(aToken); break;
+      case eToken_whitespace:
+        result=aParser->HandleStartToken(aToken); break;
+      case eToken_newline:
+        result=aParser->HandleStartToken(aToken); break;
+      case eToken_text:
+        result=aParser->HandleStartToken(aToken); break;
+      case eToken_attribute:
+        result=aParser->HandleAttributeToken(aToken); break;
+      case eToken_style:
+        result=aParser->HandleStyleToken(aToken); break;
+      case eToken_skippedcontent:
+        result=aParser->HandleSkippedContentToken(aToken); break;
+      default:
+        result=0;
+    }//switch
+  }//if
+  return result;
+}
+
 /**
  *  init the set of default token handlers...
  *  
@@ -76,18 +123,21 @@ NS_HTMLPARS nsresult NS_NewHTMLParser(nsIParser** aInstancePtrResult)
  *  @return  
  */
 void nsHTMLParser::InitializeDefaultTokenHandlers() {
-  AddTokenHandler(new CStartTokenHandler());
-  AddTokenHandler(new CEndTokenHandler());
-  AddTokenHandler(new CCommentTokenHandler());
-  AddTokenHandler(new CEntityTokenHandler());
-  AddTokenHandler(new CWhitespaceTokenHandler());
-  AddTokenHandler(new CNewlineTokenHandler());
-  AddTokenHandler(new CTextTokenHandler());
-  AddTokenHandler(new CAttributeTokenHandler());
-  AddTokenHandler(new CScriptTokenHandler());
-  AddTokenHandler(new CStyleTokenHandler());
-}
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_start));
 
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_end));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_comment));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_entity));
+
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_whitespace));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_newline));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_text));
+  
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_attribute));
+//  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_script));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_style));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_skippedcontent));
+}
 
 /**
  *  default constructor
@@ -98,15 +148,16 @@ void nsHTMLParser::InitializeDefaultTokenHandlers() {
  */
 nsHTMLParser::nsHTMLParser() {
   NS_INIT_REFCNT();
+  mTransferBuffer=0;
   mSink=0;
   mContextStackPos=0;
   mCurrentPos=0;
+  mMarkPos=0;
   mParseMode=eParseMode_unknown;
   nsCRT::zero(mContextStack,sizeof(mContextStack));
   nsCRT::zero(mTokenHandlers,sizeof(mTokenHandlers));
   mDTD=0;
   mHasOpenForm=PR_FALSE;
-  mTokenHandlerCount=0;
   InitializeDefaultTokenHandlers();
   gVerificationOutputDir = PR_GetEnv("VERIFY_PARSER");
 }
@@ -121,6 +172,10 @@ nsHTMLParser::nsHTMLParser() {
  */
 nsHTMLParser::~nsHTMLParser() {
   DeleteTokenHandlers();
+  if(mTransferBuffer)
+    delete [] mTransferBuffer;
+  mTransferBuffer=0;
+  NS_RELEASE(mSink);
   if(mCurrentPos)
     delete mCurrentPos;
   mCurrentPos=0;
@@ -171,21 +226,6 @@ nsresult nsHTMLParser::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   return NS_OK;                                                        
 }
 
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-eHTMLTags nsHTMLParser::NodeAt(PRInt32 aPos) const {
-  NS_PRECONDITION(0 <= aPos, "bad nodeAt");
-  if((aPos>-1) && (aPos<mContextStackPos))
-    return (eHTMLTags)mContextStack[aPos];
-  return eHTMLTag_unknown;
-}
-
 /**
  *  This method allows the caller to determine if a form
  *  element is currently open.
@@ -231,64 +271,30 @@ eHTMLTags nsHTMLParser::GetTopNode() const {
  *  @return  topmost index of tag on stack
  */
 PRInt32 nsHTMLParser::GetTopmostIndex(eHTMLTags aTag) const {
-  for(int i=mContextStackPos-1;i>=0;i--){
+  int i=0;
+  for(i=mContextStackPos-1;i>=0;i--){
     if(mContextStack[i]==aTag)
       return i;
   }
   return kNotFound;
 }
 
-/**
- *  Determine whether the given tag is open anywhere
- *  in our context stack.
- *  
- *  @update  gess 4/2/98
- *  @param   eHTMLTags tag to be searched for in stack
- *  @return  topmost index of tag on stack
- */
-PRBool nsHTMLParser::IsOpen(eHTMLTags aTag) const {
-  PRInt32 pos=GetTopmostIndex(aTag);
-  return PRBool(kNotFound!=pos);
-}
 
 /**
- *  Gets the number of open containers on the stack.
+ *  Destroy the list of token handlers
  *  
  *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRInt32 nsHTMLParser::GetStackPos() const {
-  return mContextStackPos;
-}
-
-/**
- *  Finds a tag handler for the given tag type, given in string.
- *  
- *  @update  gess 4/2/98
- *  @param   aString contains name of tag to be handled
- *  @return  valid tag handler (if found) or null
+ *  @return  this
  */
 nsHTMLParser& nsHTMLParser::DeleteTokenHandlers(void) {
-  for(int i=0;i<mTokenHandlerCount;i++){
+  int i=0;
+  for(i=eToken_unknown;i<eToken_last;i++){
     delete mTokenHandlers[i];
+    mTokenHandlers[i]=0;
   }
-  mTokenHandlerCount=0;
   return *this;
 }
 
-/**
- *  Finds a tag handler for the given tag type, given in string.
- *  
- *  @update  gess 4/2/98
- *  @param   aString contains name of tag to be handled
- *  @return  valid tag handler (if found) or null
- */
-CTokenHandler* nsHTMLParser::GetTokenHandler(const nsString& aString) const{
-  eHTMLTokenTypes theType=DetermineTokenType(aString);
-  return GetTokenHandler(theType);
-}
-
 
 /**
  *  Finds a tag handler for the given tag type.
@@ -298,12 +304,13 @@ CTokenHandler* nsHTMLParser::GetTokenHandler(const nsString& aString) const{
  *  @return  valid tag handler (if found) or null
  */
 CTokenHandler* nsHTMLParser::GetTokenHandler(eHTMLTokenTypes aType) const {
-  for(int i=0;i<mTokenHandlerCount;i++) {
-    if(mTokenHandlers[i]->CanHandle(aType)) {
-      return mTokenHandlers[i];
-    }
+  CTokenHandler* result=0;
+  if((aType>0) && (aType<eToken_last)) {
+    result=mTokenHandlers[aType];
+  } 
+  else {
   }
-  return 0;
+  return result;
 }
 
 
@@ -317,11 +324,15 @@ CTokenHandler* nsHTMLParser::GetTokenHandler(eHTMLTokenTypes aType) const {
 CTokenHandler* nsHTMLParser::AddTokenHandler(CTokenHandler* aHandler) {
   NS_ASSERTION(0!=aHandler,"Error: Null handler argument");
   
-  if(aHandler) {
-    int max=sizeof(mTokenHandlers)/sizeof(mTokenHandlers[0]);
-    if(mTokenHandlerCount<max) {
-      mTokenHandlers[mTokenHandlerCount++]=aHandler;
-    } 
+  if(aHandler)  {
+    eHTMLTokenTypes type=aHandler->GetTokenType();
+    if(type<eToken_last) {
+      CTokenHandler* old=mTokenHandlers[type];
+      mTokenHandlers[type]=aHandler;
+    }
+    else {
+      //add code here to handle dynamic tokens...
+    }
   }
   return 0;
 }
@@ -337,8 +348,11 @@ CTokenHandler* nsHTMLParser::AddTokenHandler(CTokenHandler* aHandler) {
 nsIContentSink* nsHTMLParser::SetContentSink(nsIContentSink* aSink) {
   NS_PRECONDITION(0!=aSink,"sink cannot be null!");
   nsIContentSink* old=mSink;
+  if(old)
+    NS_RELEASE(old);
   if(aSink) {
     mSink=(nsHTMLContentSink*)(aSink);
+    NS_ADDREF(aSink);
   }
   return old;
 }
@@ -367,7 +381,8 @@ PRBool VerifyContextVector(PRInt32 aTags[],PRInt32 count,nsIDTD* aDTD) {
       strcpy(path,gVerificationOutputDir);
 #endif
 
-      for(int i=0;i<count;i++){
+      int i=0;      
+      for(i=0;i<count;i++){
 
 #ifdef NS_WIN32
         strcat(path,"/");
@@ -380,10 +395,6 @@ PRBool VerifyContextVector(PRInt32 aTags[],PRInt32 count,nsIDTD* aDTD) {
       result=aDTD->VerifyContextVector(aTags,count);
     }
     if(PR_FALSE==result){
-#ifdef NS_WIN32
-      // save file to directory indicated by bad context vector
-
-#endif
       //add debugging code here to record the fact that we just encountered
       //a context vector we don't know how to handle.
     }
@@ -392,23 +403,6 @@ PRBool VerifyContextVector(PRInt32 aTags[],PRInt32 count,nsIDTD* aDTD) {
   return result;
 }
 
-/**
- *  This debug routine sets the verification directory.  It overrides
- *  the value from PR_GetEnv()
- *
- *  @update  jevering 5/19/98
- *  @param   
- *  @return 
- */
-
-extern "C" NS_EXPORT void SetVerificationDirectory(char * verify_dir)
-{
-   if (verify_dir && PL_strlen(verify_dir))
-      gVerificationOutputDir = verify_dir;
-   else
-      gVerificationOutputDir = NULL;
-   
-}
 
 /**
  *  This is where we loop over the tokens created in the 
@@ -418,74 +412,38 @@ extern "C" NS_EXPORT void SetVerificationDirectory(char * verify_dir)
  *  @param   
  *  @return  PR_TRUE if parse succeeded, PR_FALSE otherwise.
  */
-PRBool nsHTMLParser::IterateTokens() {
+PRInt32 nsHTMLParser::IterateTokens() {
   nsDeque& deque=mTokenizer->GetDeque();
   nsDequeIterator e=deque.End(); 
+  nsDequeIterator theMarkPos(e);
 
-  if(mCurrentPos)
-    delete mCurrentPos; //don't leak, now!
-  mCurrentPos=new nsDequeIterator(deque.Begin());
+  if(!mCurrentPos)
+    mCurrentPos=new nsDequeIterator(deque.Begin());
 
-  CToken* theToken;
-  PRBool  done=PR_FALSE;
-  PRBool  result=PR_TRUE;
-  PRInt32 iteration=0;
+  PRInt32 result=kNoError;
 
-  while((!done) && (result)) {
-    theToken=(CToken*)mCurrentPos->GetCurrent();
+  while((kNoError==result) && ((*mCurrentPos<e))){
 
-#if defined(NS_DEBUG)
-    if (!theToken)
-       break;
-#endif
-
-    eHTMLTokenTypes type=eHTMLTokenTypes(theToken->GetTokenType());
-    iteration++; //debug purposes...
-
-    switch(type){
-  
-      case eToken_start: 
-      case eToken_text:
-      case eToken_newline:
-      case eToken_whitespace:
-        result=HandleStartToken(theToken); break;
-      
-      case eToken_end:
-        result=HandleEndToken(theToken); break;
-      
-      case eToken_entity:
-        result=HandleEntityToken(theToken); break;
+    CToken* theToken=(CToken*)mCurrentPos->GetCurrent();
     
-      case eToken_skippedcontent:  
-        //used in cases like <SCRIPT> where we skip over script content.
-        result=HandleSkippedContentToken(theToken); break;
-      
-      case eToken_attribute:
-        result=HandleAttributeToken(theToken); break;
-      
-      case eToken_style:
-        result=HandleStyleToken(theToken); break;
-      
-      case eToken_comment:
-        result=HandleCommentToken(theToken); break;
-      
-      default:
-        //for all these non-interesting types, just skip them for now.
-        //later you have to Handle them, because they're relevent to certain containers (eg PRE).
-        break;
+    eHTMLTokenTypes type=eHTMLTokenTypes(theToken->GetTokenType());
+    CTokenHandler* aHandler=GetTokenHandler(type);
+
+    if(aHandler) {
+      theMarkPos=*mCurrentPos;
+      result=(*aHandler)(theToken,this);
+      VerifyContextVector(mContextStack,mContextStackPos,mDTD);
     }
-    VerifyContextVector(mContextStack,mContextStackPos,mDTD);
     ++(*mCurrentPos);
-    done=PRBool(!(*mCurrentPos<e));
   }
 
-  //One last thing...close any open containers.
-  if((PR_TRUE==result) && (mContextStackPos>0)) {
-    result=CloseContainersTo(0);
-  }
+  if(kInterrupted==result)
+    *mCurrentPos=theMarkPos;
+
   return result;
 }
 
+
 /**
  *  
  *  
@@ -526,6 +484,36 @@ void GetDelegateAndDTD(eParseMode aMode,ITokenizerDelegate*& aDelegate,nsIDTD*&
 }
 
 
+/**
+ * 
+ * @update	gess5/18/98
+ * @param 
+ * @return
+ */
+PRInt32 nsHTMLParser::WillBuildModel(void) {
+  mIteration=-1;
+  if(mSink)
+    mSink->WillBuildModel();
+  return kNoError;
+}
+
+/**
+ * 
+ * @update	gess5/18/98
+ * @param 
+ * @return
+ */
+PRInt32 nsHTMLParser::DidBuildModel(PRInt32 anErrorCode) {
+  //One last thing...close any open containers.
+  if((kNoError==anErrorCode) && (mContextStackPos>0)) {
+    CloseContainersTo(0);
+  }
+  if(mSink) {
+    mSink->DidBuildModel();
+  }
+  return anErrorCode;
+}
+
 /**
  *  This DEBUG ONLY method is used to simulate a network-based
  *  i/o model where data comes in incrementally.
@@ -538,9 +526,9 @@ PRInt32 nsHTMLParser::ParseFileIncrementally(const char* aFilename){
   PRInt32   result=kBadFilename;
   fstream*  mFileStream;
   nsString  theBuffer;
-  PRInt32   iter=-1;
-  const int kBufSize=10;
+  const int kLocalBufSize=10;
 
+  mIteration=-1;
 #if defined(XP_UNIX) && defined(IRIX)
   /* XXX: IRIX does not support ios::binary */
   mFileStream=new fstream(aFilename,ios::in);
@@ -552,18 +540,20 @@ PRInt32 nsHTMLParser::ParseFileIncrementally(const char* aFilename){
     while((kNoError==result) || (kInterrupted==result)) {
       //read some data from the file...
 
-      char buf[kBufSize];
-      buf[kBufSize]=0;
+      char buf[kLocalBufSize];
+      buf[kLocalBufSize]=0;
 
       if(mFileStream) {
-        mFileStream->read(buf,kBufSize);
+        mFileStream->read(buf,kLocalBufSize);
         PRInt32 numread=mFileStream->gcount();
         if(numread>0) {
+          buf[numread]=0;
           theBuffer.Truncate();
           theBuffer.Append(buf);
           mTokenizer->Append(theBuffer);
-          result=ResumeParse(++iter);
+          result=ResumeParse();
         }
+        else break;
       }
 
     }
@@ -600,7 +590,7 @@ PRBool nsHTMLParser::Parse(const char* aFilename,PRBool aIncremental){
       if(mDTD)
         mDTD->SetParser(this);
 
-      mSink->WillBuildModel();
+      WillBuildModel();
 
       //ok, time to create our tokenizer and begin the process
       if(aIncremental) {
@@ -610,9 +600,9 @@ PRBool nsHTMLParser::Parse(const char* aFilename,PRBool aIncremental){
       else {
         //ok, time to create our tokenizer and begin the process
         mTokenizer=new CTokenizer(aFilename,mDelegate,mParseMode);
-        status=ResumeParse(0);
+        status=ResumeParse();
       }
-      mSink->DidBuildModel();
+      DidBuildModel(status);
     }//if
   }
   return status;
@@ -635,10 +625,10 @@ PRInt32 nsHTMLParser::Parse(nsIURL* aURL,PRBool aIncremental ){
   PRInt32 status=kBadURL;
 
   if(rickGDebug)
-    status=Parse("c:/temp/temp.html",PR_TRUE);
+    return Parse("c:/temp/temp.html",PR_TRUE);
 
   mIncremental=aIncremental;
-  mParseMode=DetermineParseMode();  
+  mParseMode=DetermineParseMode();   
 
   if(aURL) {
 
@@ -648,17 +638,18 @@ PRInt32 nsHTMLParser::Parse(nsIURL* aURL,PRBool aIncremental ){
       if(mDTD)
         mDTD->SetParser(this);
 
-      mSink->WillBuildModel();
+      WillBuildModel();
 
       //ok, time to create our tokenizer and begin the process
-      if(aIncremental) {
-        mTokenizer=new CTokenizer(mDelegate,mParseMode);
+      if(mIncremental) {  
+        mTokenizer=new CTokenizer(mDelegate,mParseMode);   
         status=aURL->Open(this);
       }
       else {
         mTokenizer=new CTokenizer(aURL,mDelegate,mParseMode);
-        status=ResumeParse(0);
-        mSink->DidBuildModel();
+        WillBuildModel();
+        status=ResumeParse();
+        DidBuildModel(status);
       }
     }//if
   }
@@ -676,10 +667,10 @@ PRInt32 nsHTMLParser::Parse(nsIURL* aURL,PRBool aIncremental ){
 PRInt32 nsHTMLParser::Parse(nsString& aSourceBuffer,PRBool appendTokens){
   PRInt32 result=kNoError;
   
-  mSink->WillBuildModel();
+  WillBuildModel();
   mTokenizer->Append(aSourceBuffer);
-  result=ResumeParse(0);
-  mSink->DidBuildModel();
+  result=ResumeParse();
+  DidBuildModel(result);
   
   return result;
 }
@@ -694,17 +685,15 @@ PRInt32 nsHTMLParser::Parse(nsString& aSourceBuffer,PRBool appendTokens){
  *  @param   
  *  @return  PR_TRUE if parsing concluded successfully.
  */
-PRInt32 nsHTMLParser::ResumeParse(PRInt32 anIteration) {
+PRInt32 nsHTMLParser::ResumeParse() {
   PRInt32 result=kNoError;
 
   mSink->WillResume();
   if(kNoError==result) {
-    result=mTokenizer->Tokenize(anIteration);
+    result=mTokenizer->Tokenize(++mIteration);
     if(kInterrupted==result)
       mSink->WillInterrupt();
-
-    if(!rickGDebug)
-      IterateTokens();
+    IterateTokens();
   }
   return result;
 }
@@ -722,28 +711,33 @@ PRInt32 nsHTMLParser::GetStack(PRInt32* aStackPtr) {
 
 
 /**
- * 
+ * Retrieve the attributes for this node, and add then into
+ * the node.
+ *
  * @update  gess4/22/98
- * @param 
- * @return
+ * @param   aNode is the node you want to collect attributes for
+ * @param   aCount is the # of attributes you're expecting
+ * @return error code (should be 0)
  */
-PRInt32 nsHTMLParser::CollectAttributes(nsCParserNode& aNode){
-  eHTMLTokenTypes subtype=eToken_attribute;
-  nsDeque&         deque=mTokenizer->GetDeque();
-  nsDequeIterator  end=deque.End();
-  
-  while((*mCurrentPos<end) && (eToken_attribute==subtype)) {
-    CHTMLToken* tkn=(CHTMLToken*)(++(*mCurrentPos));
-    if(tkn){
-      subtype=eHTMLTokenTypes(tkn->GetTokenType());
-      if(eToken_attribute==subtype) {
-        aNode.AddAttribute(tkn);
-      } 
-      else (*mCurrentPos)--;
-    }
-  }
-  return aNode.GetAttributeCount();
+PRInt32 nsHTMLParser::CollectAttributes(nsCParserNode& aNode,PRInt32 aCount){
+  nsDeque&        deque=mTokenizer->GetDeque();
+  nsDequeIterator end=deque.End();
 
+  int attr=0;
+  for(attr=0;attr<aCount;attr++) {
+    if(*mCurrentPos<end) {
+      CHTMLToken* tkn=(CHTMLToken*)(++(*mCurrentPos));
+      if(tkn){
+        if(eToken_attribute==eHTMLTokenTypes(tkn->GetTokenType())){
+          aNode.AddAttribute(tkn);
+        } 
+        else (*mCurrentPos)--;
+      }
+      else kInterrupted;
+    }
+    else return kInterrupted;
+  }
+  return kNoError;
 }
 
 
@@ -786,13 +780,14 @@ PRInt32 nsHTMLParser::CollectSkippedContent(nsCParserNode& aNode){
  *  @param   aNode -- CParserNode representing this start token
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsCParserNode& aNode) {
+PRInt32 nsHTMLParser::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsCParserNode& aNode) {
   NS_PRECONDITION(0!=aToken,kNullToken);
 
   eHTMLTags parentTag=(eHTMLTags)GetTopNode();
-  PRBool    result=mDTD->CanContain(parentTag,aChildTag);
+  PRInt32   result=kNoError;
+  PRBool    contains=mDTD->CanContain(parentTag,aChildTag);
 
-  if(PR_FALSE==result){
+  if(PR_FALSE==contains){
     result=CreateContextStackFor(aChildTag);
     if(PR_FALSE==result) {
       //if you're here, then the new topmost container can't contain aToken.
@@ -829,90 +824,96 @@ PRBool nsHTMLParser::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,
  *  @param   aNode -- CParserNode representing this start token
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleStartToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleStartToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
 
-  PRBool        result=PR_FALSE;
   CStartToken*  st= (CStartToken*)(aToken);
   eHTMLTags     tokenTagType=st->GetHTMLTag();
 
-
   //Begin by gathering up attributes...
-  nsCParserNode   attrNode((CHTMLToken*)aToken);
-  PRInt32 attrCount=CollectAttributes(attrNode);
+  nsCParserNode attrNode((CHTMLToken*)aToken);
+  PRInt16       attrCount=aToken->GetAttributeCount();
+  PRInt32       result=(0==attrCount) ? kNoError : CollectAttributes(attrNode,attrCount);
 
-    //now check to see if this token should be omitted...
-  if(PR_TRUE==mDTD->CanOmit(GetTopNode(),tokenTagType)) {
-    return PR_TRUE;
-  }
+  if(kNoError==result) {
+      //now check to see if this token should be omitted...
+    if(PR_FALSE==mDTD->CanOmit(GetTopNode(),tokenTagType)) {
   
-  switch(tokenTagType) {
+      switch(tokenTagType) {
 
-    case eHTMLTag_html:
-      result=OpenHTML(attrNode); break;
+        case eHTMLTag_html:
+          result=OpenHTML(attrNode); break;
 
-    case eHTMLTag_title:
-      {
-        nsCParserNode theNode(st);
-        result=OpenHead(theNode); //open the head...
-        CollectSkippedContent(attrNode);
-        result=mSink->SetTitle(attrNode.GetSkippedContent());
-        result=CloseHead(theNode); //close the head...
-      }
-      break;
+        case eHTMLTag_title:
+          {
+            nsCParserNode theNode(st);
+            result=OpenHead(theNode); //open the head...
+            if(kNoError==result) {
+              CollectSkippedContent(attrNode);
+              mSink->SetTitle(attrNode.GetSkippedContent());
+              result=CloseHead(theNode); //close the head...
+            }
+          }
+          break;
 
-    case eHTMLTag_textarea:
-      {
-        CollectSkippedContent(attrNode);
-        result=AddLeaf(attrNode);
-      }
-      break;
+        case eHTMLTag_textarea:
+          {
+            CollectSkippedContent(attrNode);
+            result=AddLeaf(attrNode);
+          }
+          break;
 
-    case eHTMLTag_form:
-      result = OpenForm(attrNode);
-      break;
+        case eHTMLTag_form:
+          result = OpenForm(attrNode);
+          break;
 
-    case eHTMLTag_meta:
-    case eHTMLTag_link:
-      {
-        nsCParserNode theNode((CHTMLToken*)aToken);
-        result=OpenHead(theNode);
-        result=AddLeaf(theNode);
-        result=CloseHead(theNode);
-      }
-      break;
+        case eHTMLTag_meta:
+        case eHTMLTag_link:
+          {
+            nsCParserNode theNode((CHTMLToken*)aToken);
+            result=OpenHead(theNode);
+            if(kNoError==result)
+              result=AddLeaf(theNode);
+            if(kNoError==result)
+              result=CloseHead(theNode);
+          }
+          break;
 
-    case eHTMLTag_style:
-      {
-        nsCParserNode theNode((CHTMLToken*)aToken);
-        result=OpenHead(theNode);
-        CollectSkippedContent(attrNode);
-        result=AddLeaf(attrNode);
-        result=CloseHead(theNode);
-      }
-      break;
+        case eHTMLTag_style:
+          {
+            nsCParserNode theNode((CHTMLToken*)aToken);
+            result=OpenHead(theNode);
+            if(kNoError==result) {
+              CollectSkippedContent(attrNode);
+              if(kNoError==result) {
+                result=AddLeaf(attrNode);
+                if(kNoError==result)
+                  result=CloseHead(theNode);
+              }
+            }
+          }
+          break;
 
-    case eHTMLTag_script:
-      result=HandleScriptToken(st); break;
+        case eHTMLTag_script:
+          result=HandleScriptToken(st); break;
       
 
-    case eHTMLTag_map:
-      // Put map into the head section
-      result=OpenHead(attrNode);
-      result=OpenContainer(attrNode);
-      break;
+        case eHTMLTag_map:
+          // Put map into the head section
+          result=OpenHead(attrNode);
+          if(kNoError==result)
+            result=OpenContainer(attrNode);
+          break;
 
-    case eHTMLTag_head:
-      result=PR_TRUE; break; //ignore head tags...
-
-    case eHTMLTag_select:
-      result=PR_FALSE;
-
-    default:
-      result=HandleDefaultStartToken(aToken,tokenTagType,attrNode);
-      break;
-  }
+        case eHTMLTag_head:
+          break; //ignore head tags...
 
+        default:
+          result=HandleDefaultStartToken(aToken,tokenTagType,attrNode);
+          break;
+      } //switch
+    } //if
+  } //if
   return result;
 }
 
@@ -929,16 +930,16 @@ PRBool nsHTMLParser::HandleStartToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleEndToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleEndToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
 
-  PRBool      result=PR_FALSE;
+  PRInt32     result=kNoError;
   CEndToken*  et = (CEndToken*)(aToken);
   eHTMLTags   tokenTagType=et->GetHTMLTag();
 
     //now check to see if this token should be omitted...
   if(PR_TRUE==mDTD->CanOmitEndTag(GetTopNode(),tokenTagType)) {
-    return PR_TRUE;
+    return result;
   }
 
   nsCParserNode theNode((CHTMLToken*)aToken);
@@ -951,12 +952,12 @@ PRBool nsHTMLParser::HandleEndToken(CToken* aToken) {
     case eHTMLTag_title:
     case eHTMLTag_head:
     case eHTMLTag_script:
-      result=PR_TRUE; 
       break;
 
     case eHTMLTag_map:
       result=CloseContainer(theNode);
-      result=CloseHead(theNode);
+      if(kNoError==result)
+        result=CloseHead(theNode);
       break;
 
     case eHTMLTag_form:
@@ -970,7 +971,6 @@ PRBool nsHTMLParser::HandleEndToken(CToken* aToken) {
       if(mDTD->IsContainer(tokenTagType)){
         result=CloseContainersTo(tokenTagType); 
       }
-      result=PR_TRUE;
       //
       break;
   }
@@ -985,10 +985,10 @@ PRBool nsHTMLParser::HandleEndToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleEntityToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleEntityToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
   CEntityToken*  et = (CEntityToken*)(aToken);
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   nsCParserNode aNode((CHTMLToken*)aToken);
   result=AddLeaf(aNode);
   return result;
@@ -1004,9 +1004,9 @@ PRBool nsHTMLParser::HandleEntityToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleCommentToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleCommentToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
-  return PR_TRUE;
+  return kNoError;
 }
 
 /**
@@ -1019,10 +1019,10 @@ PRBool nsHTMLParser::HandleCommentToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleSkippedContentToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleSkippedContentToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
 
   if(HasOpenContainer(eHTMLTag_body)) {
     nsCParserNode aNode((CHTMLToken*)aToken);
@@ -1041,12 +1041,12 @@ PRBool nsHTMLParser::HandleSkippedContentToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleAttributeToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleAttributeToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
   NS_ERROR("attribute encountered -- this shouldn't happen!");
 
   CAttributeToken*  at = (CAttributeToken*)(aToken);
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   return result;
 }
 
@@ -1058,11 +1058,11 @@ PRBool nsHTMLParser::HandleAttributeToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleScriptToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleScriptToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
 
   CScriptToken*  st = (CScriptToken*)(aToken);
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   return result;
 }
 
@@ -1074,11 +1074,11 @@ PRBool nsHTMLParser::HandleScriptToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleStyleToken(CToken* aToken){
+PRInt32 nsHTMLParser::HandleStyleToken(CToken* aToken){
   NS_PRECONDITION(0!=aToken,kNullToken);
 
   CStyleToken*  st = (CStyleToken*)(aToken);
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   return result;
 }
 
@@ -1092,10 +1092,10 @@ PRBool nsHTMLParser::HandleStyleToken(CToken* aToken){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenHTML(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenHTML(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos >= 0, kInvalidTagStackPos);
 
-  PRBool result=mSink->OpenHTML(aNode); 
+  PRInt32 result=mSink->OpenHTML(aNode); 
   mContextStack[mContextStackPos++]=(eHTMLTags)aNode.GetNodeType();
   return result;
 }
@@ -1109,9 +1109,9 @@ PRBool nsHTMLParser::OpenHTML(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseHTML(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::CloseHTML(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
-  PRBool result=mSink->CloseHTML(aNode); 
+  PRInt32 result=mSink->CloseHTML(aNode); 
   mContextStack[--mContextStackPos]=eHTMLTag_unknown;
   return result;
 }
@@ -1125,9 +1125,9 @@ PRBool nsHTMLParser::CloseHTML(const nsIParserNode& aNode){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenHead(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenHead(const nsIParserNode& aNode){
   mContextStack[mContextStackPos++]=eHTMLTag_head;
-  PRBool result=mSink->OpenHead(aNode); 
+  PRInt32 result=mSink->OpenHead(aNode); 
   return result;
 }
 
@@ -1139,8 +1139,8 @@ PRBool nsHTMLParser::OpenHead(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseHead(const nsIParserNode& aNode){
-  PRBool result=mSink->CloseHead(aNode); 
+PRInt32 nsHTMLParser::CloseHead(const nsIParserNode& aNode){
+  PRInt32 result=mSink->CloseHead(aNode); 
   mContextStack[--mContextStackPos]=eHTMLTag_unknown;
   return result;
 }
@@ -1153,10 +1153,10 @@ PRBool nsHTMLParser::CloseHead(const nsIParserNode& aNode){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenBody(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenBody(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos >= 0, kInvalidTagStackPos);
 
-  PRBool    result=PR_TRUE;
+  PRInt32 result=kNoError;
   eHTMLTags topTag=(eHTMLTags)nsHTMLParser::GetTopNode();
 
   if(eHTMLTag_html!=topTag) {
@@ -1185,7 +1185,7 @@ PRBool nsHTMLParser::OpenBody(const nsIParserNode& aNode){
     }
   }
 
-  if(PR_TRUE==result) {
+  if(kNoError==result) {
     result=mSink->OpenBody(aNode); 
     mContextStack[mContextStackPos++]=(eHTMLTags)aNode.GetNodeType();
   }
@@ -1200,9 +1200,9 @@ PRBool nsHTMLParser::OpenBody(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseBody(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::CloseBody(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos >= 0, kInvalidTagStackPos);
-  PRBool result=mSink->CloseBody(aNode); 
+  PRInt32 result=mSink->CloseBody(aNode); 
   mContextStack[--mContextStackPos]=eHTMLTag_unknown;
   return result;
 }
@@ -1215,11 +1215,11 @@ PRBool nsHTMLParser::CloseBody(const nsIParserNode& aNode){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenForm(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenForm(const nsIParserNode& aNode){
   if(mHasOpenForm)
     CloseForm(aNode);
-  mHasOpenForm=PR_TRUE;
-  return mSink->OpenForm(aNode); 
+  PRInt32 result=mSink->OpenForm(aNode);
+  return result;
 }
 
 /**
@@ -1230,8 +1230,8 @@ PRBool nsHTMLParser::OpenForm(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseForm(const nsIParserNode& aNode){
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLParser::CloseForm(const nsIParserNode& aNode){
+  PRInt32 result=kNoError;
   if(mHasOpenForm) {
     mHasOpenForm=PR_FALSE;
     result=mSink->CloseForm(aNode); 
@@ -1247,9 +1247,9 @@ PRBool nsHTMLParser::CloseForm(const nsIParserNode& aNode){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenFrameset(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenFrameset(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos >= 0, kInvalidTagStackPos);
-  PRBool result=mSink->OpenFrameset(aNode); 
+  PRInt32 result=mSink->OpenFrameset(aNode); 
   mContextStack[mContextStackPos++]=(eHTMLTags)aNode.GetNodeType();
   return result;
 }
@@ -1262,9 +1262,9 @@ PRBool nsHTMLParser::OpenFrameset(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseFrameset(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::CloseFrameset(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
-  PRBool result=mSink->CloseFrameset(aNode); 
+  PRInt32 result=mSink->CloseFrameset(aNode); 
   mContextStack[--mContextStackPos]=eHTMLTag_unknown;
   return result;
 }
@@ -1277,9 +1277,9 @@ PRBool nsHTMLParser::CloseFrameset(const nsIParserNode& aNode){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenContainer(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenContainer(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
-  PRBool result=PR_FALSE;
+  PRInt32 result=kNoError; //was false
   
   //XXX Hack! We know this is wrong, but it works
   //for the general case until we get it right.
@@ -1295,7 +1295,6 @@ PRBool nsHTMLParser::OpenContainer(const nsIParserNode& aNode){
     case eHTMLTag_textarea:
     case eHTMLTag_head:
     case eHTMLTag_title:
-      result=PR_TRUE;
       break;
 
     case eHTMLTag_form:
@@ -1317,9 +1316,9 @@ PRBool nsHTMLParser::OpenContainer(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseContainer(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::CloseContainer(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
-  PRBool result=PR_FALSE;
+  PRInt32 result=kNoError; //was false
   
   //XXX Hack! We know this is wrong, but it works
   //for the general case until we get it right.
@@ -1359,9 +1358,9 @@ PRBool nsHTMLParser::CloseContainer(const nsIParserNode& aNode){
  * @param   
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseContainersTo(PRInt32 anIndex){
+PRInt32 nsHTMLParser::CloseContainersTo(PRInt32 anIndex){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
 
   nsAutoString empty;
   CEndToken aToken(empty);
@@ -1384,11 +1383,11 @@ PRBool nsHTMLParser::CloseContainersTo(PRInt32 anIndex){
  * @param   
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseContainersTo(eHTMLTags aTag){
+PRInt32 nsHTMLParser::CloseContainersTo(eHTMLTags aTag){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
 
   PRInt32 pos=GetTopmostIndex(aTag);
-  PRBool result=PR_FALSE;
+  PRInt32 result=kNoError;
 
   if(kNotFound!=pos) {
     //the tag is indeed open, so close it.
@@ -1403,6 +1402,7 @@ PRBool nsHTMLParser::CloseContainersTo(eHTMLTags aTag){
     }
     else {
       //XXX HACK! This is a real problem -- the unhandled case.!
+      result=kUnknownError;
     }
   }
   return result;
@@ -1416,15 +1416,15 @@ PRBool nsHTMLParser::CloseContainersTo(eHTMLTags aTag){
  * @param   
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseTopmostContainer(){
+PRInt32 nsHTMLParser::CloseTopmostContainer(){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
 
   nsAutoString empty;
   CEndToken aToken(empty);
   aToken.SetHTMLTag((eHTMLTags)mContextStack[mContextStackPos-1]);
   nsCParserNode theNode(&aToken);
-
-  return CloseContainer(theNode);
+  PRInt32 result=CloseContainer(theNode);
+  return result;
 }
 
 /**
@@ -1435,8 +1435,8 @@ PRBool nsHTMLParser::CloseTopmostContainer(){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::AddLeaf(const nsIParserNode& aNode){
-  PRBool result=mSink->AddLeaf(aNode); 
+PRInt32 nsHTMLParser::AddLeaf(const nsIParserNode& aNode){
+  PRInt32 result=mSink->AddLeaf(aNode); 
   return result;
 }
 
@@ -1451,10 +1451,10 @@ PRBool nsHTMLParser::AddLeaf(const nsIParserNode& aNode){
  *           create a new context vector
  *  @return  true if we succeeded, otherwise false
  */
-PRBool nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
+PRInt32 nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
   nsAutoString  theVector;
   
-  PRBool result=PR_FALSE;
+  PRInt32 result=kNoError;
   PRInt32 pos=0;
   PRInt32 cnt=0;
   PRInt32 theTop=GetTopNode();
@@ -1463,7 +1463,9 @@ PRBool nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
     //add code here to build up context stack based on forward propagated context vector...
     pos=0;
     cnt=theVector.Length()-1;
-    result=PRBool(mContextStack[mContextStackPos-1]==theVector[cnt]);
+    if(mContextStack[mContextStackPos-1]==theVector[cnt])
+      result=kNoError;
+    else result=kContextMismatch;
   }
   else {
     PRBool tempResult;
@@ -1479,7 +1481,7 @@ PRBool nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
       //propagation worked, so pop unwanted containers, push new ones, then exit...
       pos=0;
       cnt=theVector.Length();
-      result=PR_TRUE;
+      result=kNoError;
       while(pos<mContextStackPos) {
         if(mContextStack[pos]==theVector[cnt-1-pos]) {
           pos++;
@@ -1496,9 +1498,10 @@ PRBool nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
 
     //now, build up the stack according to the tags 
     //you have that aren't in the stack...
-  if(PR_TRUE==result){
+  if(kNoError==result){
     nsAutoString  empty;
-    for(int i=pos;i<cnt;i++) {
+    int i=0;
+    for(i=pos;i<cnt;i++) {
       CStartToken* st=new CStartToken(empty);
       st->SetHTMLTag((eHTMLTags)theVector[cnt-1-i]);
       HandleStartToken(st);
@@ -1519,8 +1522,8 @@ PRBool nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLParser::ReduceContextStackFor(PRInt32 aChildTag){
-  PRBool    result=PR_TRUE;
+PRInt32 nsHTMLParser::ReduceContextStackFor(PRInt32 aChildTag){
+  PRInt32    result=kNoError;
   eHTMLTags topTag=(eHTMLTags)nsHTMLParser::GetTopNode();
 
   while( (topTag!=kNotFound) && 
@@ -1565,7 +1568,10 @@ nsresult nsHTMLParser::OnProgress(PRInt32 Progress, PRInt32 ProgressMax, const c
  *  @return  
  */
 nsresult nsHTMLParser::OnStartBinding(void){
-  nsresult result=0;
+  nsresult result=WillBuildModel();
+  if(!mTransferBuffer) {
+    mTransferBuffer=new char[gTransferBufferSize+1];
+  }
   return result;
 }
 
@@ -1577,7 +1583,19 @@ nsresult nsHTMLParser::OnStartBinding(void){
  *  @return  
  */
 nsresult nsHTMLParser::OnDataAvailable(nsIInputStream *pIStream, PRInt32 length){
-  nsresult result=0;
+
+  int len=0;
+
+  do {
+      PRInt32 err;
+      len = pIStream->Read(&err, mTransferBuffer, 0, gTransferBufferSize);
+      if(len>0) {
+        mTransferBuffer[len]=0;
+        mTokenizer->Append(mTransferBuffer,len);
+      }
+  } while (len > 0);
+
+  nsresult result=ResumeParse();
   return result;
 }
 
@@ -1589,8 +1607,7 @@ nsresult nsHTMLParser::OnDataAvailable(nsIInputStream *pIStream, PRInt32 length)
  *  @return  
  */
 nsresult nsHTMLParser::OnStopBinding(PRInt32 status, const char *msg){
-  nsresult result=0;
+  nsresult result=DidBuildModel(status);
   return result;
 }
 
-
diff --git a/mozilla/htmlparser/src/nsHTMLParser.h b/mozilla/htmlparser/src/nsHTMLParser.h
index b48caf9bcb9..c3a51b9f75d 100644
--- a/mozilla/htmlparser/src/nsHTMLParser.h
+++ b/mozilla/htmlparser/src/nsHTMLParser.h
@@ -15,7 +15,7 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
-
+ 
 /**
  * MODULE NOTES:
  * @update  gess 4/1/98
@@ -114,7 +114,7 @@ friend class CTokenHandler;
      * @param   aMode is the desired parser mode (Nav, other, etc.)
      * @return  TRUE if all went well -- FALSE otherwise
      */
-    virtual PRInt32 Parse(nsIURL* aURL,PRBool aIncremental=PR_FALSE);
+    virtual PRInt32 Parse(nsIURL* aURL,PRBool aIncremental=PR_TRUE);
 
     /**
      * Cause parser to parse input from given file in given mode
@@ -138,7 +138,7 @@ friend class CTokenHandler;
      * @update	gess5/11/98
      * @return  TRUE if all went well, otherwise FALSE
      */
-    virtual PRInt32 ResumeParse(PRInt32 anIteration);
+    virtual PRInt32 ResumeParse(void);
 
     /**
      * Retrieve ptr to internal context vector stack
@@ -164,7 +164,7 @@ friend class CTokenHandler;
      * @param   aToken is the start token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleStartToken(CToken* aToken);
+    PRInt32 HandleStartToken(CToken* aToken);
 
     /**
      * This method gets called when a start token has been consumed, and
@@ -177,7 +177,7 @@ friend class CTokenHandler;
      * @param   aNode is a node be updated with info from given token
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsCParserNode& aNode);
+    PRInt32 HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsCParserNode& aNode);
 
     /**
      * This method gets called when an end token has been consumed and needs 
@@ -186,7 +186,7 @@ friend class CTokenHandler;
      * @param   aToken is the end token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleEndToken(CToken* aToken);
+    PRInt32 HandleEndToken(CToken* aToken);
 
     /**
      * This method gets called when an entity token has been consumed and needs 
@@ -195,7 +195,7 @@ friend class CTokenHandler;
      * @param   aToken is the entity token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleEntityToken(CToken* aToken);
+    PRInt32 HandleEntityToken(CToken* aToken);
 
     /**
      * This method gets called when a comment token has been consumed and needs 
@@ -204,7 +204,7 @@ friend class CTokenHandler;
      * @param   aToken is the comment token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleCommentToken(CToken* aToken);
+    PRInt32 HandleCommentToken(CToken* aToken);
 
     /**
      * This method gets called when a skipped-content token has been consumed and needs 
@@ -213,7 +213,7 @@ friend class CTokenHandler;
      * @param   aToken is the skipped-content token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleSkippedContentToken(CToken* aToken);
+    PRInt32 HandleSkippedContentToken(CToken* aToken);
 
     /**
      * This method gets called when an attribute token has been consumed and needs 
@@ -222,7 +222,7 @@ friend class CTokenHandler;
      * @param   aToken is the attribute token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleAttributeToken(CToken* aToken);
+    PRInt32 HandleAttributeToken(CToken* aToken);
 
     /**
      * This method gets called when a script token has been consumed and needs 
@@ -231,7 +231,7 @@ friend class CTokenHandler;
      * @param   aToken is the script token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleScriptToken(CToken* aToken);
+    PRInt32 HandleScriptToken(CToken* aToken);
     
     /**
      * This method gets called when a style token has been consumed and needs 
@@ -240,7 +240,7 @@ friend class CTokenHandler;
      * @param   aToken is the style token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleStyleToken(CToken* aToken);
+    PRInt32 HandleStyleToken(CToken* aToken);
 
       //*********************************************
       // These methods are callback methods used by
@@ -254,21 +254,29 @@ friend class CTokenHandler;
 
 protected:
 
+    /**
+     * 
+     * @update	gess5/18/98
+     * @param 
+     * @return
+     */
+    PRInt32 WillBuildModel(void);
+
+    /**
+     * 
+     * @update	gess5/18/98
+     * @param 
+     * @return
+     */
+    PRInt32 DidBuildModel(PRInt32 anErrorCode);
+
     /**
      * This method gets called when the tokens have been consumed, and it's time
      * to build the model via the content sink.
      * @update	gess5/11/98
      * @return  YES if model building went well -- NO otherwise.
      */
-    PRBool IterateTokens();
-
-    /**
-     * Retrieves the tag type for the element on the context vector stack at given pos.
-     * @update	gess5/11/98
-     * @param   pos of item you want to retrieve
-     * @return  tag type (may be unknown)
-     */
-    eHTMLTags NodeAt(PRInt32 aPos) const;
+    PRInt32 IterateTokens(void);
 
     /**
      * Retrieve the tag type of the topmost item on context vector stack
@@ -277,13 +285,6 @@ protected:
      */
     eHTMLTags GetTopNode() const;
 
-    /**
-     * Retrieve the number of items on context vector stack
-     * @update	gess5/11/98
-     * @return  count of items on stack -- may be 0
-     */
-    PRInt32 GetStackPos() const;
-
     /**
      * Causes the parser to scan foward, collecting nearby (sequential)
      * attribute tokens into the given node.
@@ -291,7 +292,7 @@ protected:
      * @param   node to store attributes
      * @return  number of attributes added to node.
      */
-    PRInt32 CollectAttributes(nsCParserNode& aNode);
+    PRInt32 CollectAttributes(nsCParserNode& aNode,PRInt32 aCount);
 
     /**
      * Causes the next skipped-content token (if any) to
@@ -309,12 +310,7 @@ protected:
      */
     void InitializeDefaultTokenHandlers();
 
-    /**
-     * DEPRECATED
-     * @update	gess5/11/98
-     */
-    CTokenHandler* GetTokenHandler(const nsString& aString) const;
-
+   
     /**
      * DEPRECATED
      * @update	gess5/11/98
@@ -345,7 +341,7 @@ protected:
      * @param   HTML (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenHTML(const nsIParserNode& aNode);
+    PRInt32 OpenHTML(const nsIParserNode& aNode);
 
     /**
      * 
@@ -353,7 +349,7 @@ protected:
      * @param 
      * @return
      */
-    PRBool CloseHTML(const nsIParserNode& aNode);
+    PRInt32 CloseHTML(const nsIParserNode& aNode);
 
     /**
      * This cover method opens the given node as a head item in 
@@ -362,7 +358,7 @@ protected:
      * @param   HEAD (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenHead(const nsIParserNode& aNode);
+    PRInt32 OpenHead(const nsIParserNode& aNode);
 
     /**
      * This cover method causes the content-sink head to be closed
@@ -370,7 +366,7 @@ protected:
      * @param   aNode is the node to be closed in sink (usually ignored)
      * @return  TRUE if all went well.
      */
-    PRBool CloseHead(const nsIParserNode& aNode);
+    PRInt32 CloseHead(const nsIParserNode& aNode);
 
     /**
      * This cover method opens the given node as a body item in 
@@ -379,7 +375,7 @@ protected:
      * @param   BODY (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenBody(const nsIParserNode& aNode);
+    PRInt32 OpenBody(const nsIParserNode& aNode);
 
     /**
      * This cover method causes the content-sink body to be closed
@@ -387,7 +383,7 @@ protected:
      * @param   aNode is the body node to be closed in sink (usually ignored)
      * @return  TRUE if all went well.
      */
-    PRBool CloseBody(const nsIParserNode& aNode);
+    PRInt32 CloseBody(const nsIParserNode& aNode);
 
     /**
      * This cover method opens the given node as a form item in 
@@ -396,7 +392,7 @@ protected:
      * @param   FORM (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenForm(const nsIParserNode& aNode);
+    PRInt32 OpenForm(const nsIParserNode& aNode);
 
     /**
      * This cover method causes the content-sink form to be closed
@@ -404,7 +400,7 @@ protected:
      * @param   aNode is the form node to be closed in sink (usually ignored)
      * @return  TRUE if all went well.
      */
-    PRBool CloseForm(const nsIParserNode& aNode);
+    PRInt32 CloseForm(const nsIParserNode& aNode);
 
     /**
      * This cover method opens the given node as a frameset item in 
@@ -413,7 +409,7 @@ protected:
      * @param   FRAMESET (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenFrameset(const nsIParserNode& aNode);
+    PRInt32 OpenFrameset(const nsIParserNode& aNode);
 
     /**
      * This cover method causes the content-sink frameset to be closed
@@ -421,7 +417,7 @@ protected:
      * @param   aNode is the frameeset node to be closed in sink (usually ignored)
      * @return  TRUE if all went well.
      */
-    PRBool CloseFrameset(const nsIParserNode& aNode);
+    PRInt32 CloseFrameset(const nsIParserNode& aNode);
 
     /**
      * This cover method opens the given node as a generic container in 
@@ -430,7 +426,7 @@ protected:
      * @param   generic container (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenContainer(const nsIParserNode& aNode);
+    PRInt32 OpenContainer(const nsIParserNode& aNode);
 
     /**
      * This cover method causes a generic containre in the content-sink to be closed
@@ -438,14 +434,14 @@ protected:
      * @param   aNode is the node to be closed in sink (usually ignored)
      * @return  TRUE if all went well.
      */
-    PRBool CloseContainer(const nsIParserNode& aNode);
+    PRInt32 CloseContainer(const nsIParserNode& aNode);
     
     /**
      * This cover method causes the topmost container to be closed in sink
      * @update	gess5/11/98
      * @return  TRUE if all went well.
      */
-    PRBool CloseTopmostContainer();
+    PRInt32 CloseTopmostContainer();
     
     /**
      * Cause all containers down to topmost given tag to be closed
@@ -453,7 +449,7 @@ protected:
      * @param   aTag is the tag at which auto-closure should stop (inclusive) 
      * @return  TRUE if all went well -- otherwise FALSE
      */
-    PRBool CloseContainersTo(eHTMLTags aTag);
+    PRInt32 CloseContainersTo(eHTMLTags aTag);
 
     /**
      * Cause all containers down to given position to be closed
@@ -461,7 +457,7 @@ protected:
      * @param   anIndex is the stack pos at which auto-closure should stop (inclusive) 
      * @return  TRUE if all went well -- otherwise FALSE
      */
-    PRBool CloseContainersTo(PRInt32 anIndex);
+    PRInt32 CloseContainersTo(PRInt32 anIndex);
 
     /**
      * Causes leaf to be added to sink at current vector pos.
@@ -469,15 +465,8 @@ protected:
      * @param   aNode is leaf node to be added.
      * @return  TRUE if all went well -- FALSE otherwise.
      */
-    PRBool AddLeaf(const nsIParserNode& aNode);
+    PRInt32 AddLeaf(const nsIParserNode& aNode);
 
-    /**
-     * Determine if the given tag is open in the context vector stack.
-     * @update	gess5/11/98
-     * @param   aTag is the type of tag you want to test for openness
-     * @return  TRUE if open, FALSE otherwise.
-     */
-    PRBool IsOpen(eHTMLTags aTag) const;
 
     /**
      * Finds the topmost occurance of given tag within context vector stack.
@@ -495,7 +484,7 @@ protected:
      * @param   child to be added (somewhere) to context vector stack.
      * @return  TRUE if succeeds, otherwise FALSE
      */
-    PRBool ReduceContextStackFor(PRInt32 aChildTag);
+    PRInt32 ReduceContextStackFor(PRInt32 aChildTag);
 
     /**
      * Attempt forward and/or backward propagation for the given
@@ -504,7 +493,7 @@ protected:
      * @param   type of child to be propagated.
      * @return  TRUE if succeeds, otherwise FALSE
      */
-    PRBool CreateContextStackFor(PRInt32 aChildTag);
+    PRInt32 CreateContextStackFor(PRInt32 aChildTag);
 
 private:
     PRInt32 ParseFileIncrementally(const char* aFilename);  //XXX ONLY FOR DEBUG PURPOSES...
@@ -520,19 +509,20 @@ protected:
     PRInt32             mContextStack[50];
     PRInt32             mContextStackPos;
 
-    CTokenHandler*      mTokenHandlers[100];
-    PRInt32             mTokenHandlerCount;
+    CTokenHandler*      mTokenHandlers[eToken_last];
+
     nsDequeIterator*    mCurrentPos;
+    nsDequeIterator*    mMarkPos;
 
     nsIDTD*             mDTD;
     eParseMode          mParseMode;
     PRBool              mHasOpenForm;
     PRBool              mIncremental;
     ITokenizerDelegate* mDelegate;
+    PRInt32             mIteration;
+    char*               mTransferBuffer;
 };
 
 
 #endif 
 
-
-
diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp
index 920230fa7e9..af6690dda8e 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp
@@ -368,21 +368,26 @@ PRInt32 CStartToken::Consume(PRUnichar aChar, CScanner& aScanner) {
    //Stop consuming as soon as you see a space or a '>'.
    //NOTE: We don't Consume the tag attributes here, nor do we eat the ">"
 
-   mTextValue=aChar;
+  mTextValue=aChar;
   PRInt32 result=aScanner.ReadWhile(mTextValue,gIdentChars,PR_FALSE);
 
    //Good. Now, let's skip whitespace after the identifier,
    //and see if the next char is ">". If so, we have a complete
    //tag without attributes.
-
-   aScanner.SkipWhite();
-   result=aScanner.GetChar(aChar);
-   if(kGreaterThan!=aChar) { //look for '>' 
-     //push that char back, since we apparently have attributes...
-      aScanner.PutBack(aChar);
-      mAttributed=PR_TRUE;
-   }
-   return result;
+  if(kNoError==result) {  
+    result=aScanner.SkipWhite();
+    if(kNoError==result) {
+      result=aScanner.GetChar(aChar);
+      if(kNoError==result) {
+        if(kGreaterThan!=aChar) { //look for '>' 
+         //push that char back, since we apparently have attributes...
+          aScanner.PutBack(aChar);
+          mAttributed=PR_TRUE;
+        } //if
+      } //if
+    }//if
+  }
+  return result;
 };
 
 
@@ -431,7 +436,8 @@ PRInt32 CEndToken::Consume(PRUnichar aChar, CScanner& aScanner) {
   mTextValue="";
   static nsAutoString terminals(">");
   PRInt32 result=aScanner.ReadUntil(mTextValue,terminals,PR_FALSE);
-  aScanner.GetChar(aChar); //eat the closing '>;
+  if(kNoError==result)
+    result=aScanner.GetChar(aChar); //eat the closing '>;
   return result;
 };
 
@@ -567,17 +573,19 @@ PRInt32 CCommentToken::Consume(PRUnichar aChar, CScanner& aScanner) {
   aScanner.GetChar(ch);
   mTextValue="<!";
   if(kMinus==ch) {
-    aScanner.GetChar(ch2);
-    if(kMinus==ch2) {
-         //in this case, we're reading a long-form comment <-- xxx -->
-      mTextValue+="--";
-      PRInt32 findpos=-1;
-      while((findpos==kNotFound) && (!result)) {
-        result=aScanner.ReadUntil(mTextValue,terminals,PR_TRUE);
-        findpos=mTextValue.RFind("-->");
+    result=aScanner.GetChar(ch2);
+    if(kNoError==result) {
+      if(kMinus==ch2) {
+           //in this case, we're reading a long-form comment <-- xxx -->
+        mTextValue+="--";
+        PRInt32 findpos=-1;
+        while((findpos==kNotFound) && (kNoError==result)) {
+          result=aScanner.ReadUntil(mTextValue,terminals,PR_TRUE);
+          findpos=mTextValue.RFind("-->");
+        }
       }
-      return result;
     }
+    return result;
   }
      //if you're here, we're consuming a "short-form" comment
   mTextValue+=ch;
@@ -667,25 +675,26 @@ PRInt32 CNewlineToken::Consume(PRUnichar aChar, CScanner& aScanner) {
   PRUnichar nextChar;
   PRInt32 result=aScanner.Peek(nextChar);
 
-  switch(aChar) {
-    case kNewLine:
-      if(kCR==nextChar) {
-        result=aScanner.GetChar(nextChar);
-        mTextValue+=nextChar;
-      }
-      break;
-    case kCR:
-      if(kNewLine==nextChar) {
-        result=aScanner.GetChar(nextChar);
-        mTextValue+=nextChar;
-      }
-      break;
-    default:
-      break;
-  }
-  
+  if(kNoError==result) {
+    switch(aChar) {
+      case kNewLine:
+        if(kCR==nextChar) {
+          result=aScanner.GetChar(nextChar);
+          mTextValue+=nextChar;
+        }
+        break;
+      case kCR:
+        if(kNewLine==nextChar) {
+          result=aScanner.GetChar(nextChar);
+          mTextValue+=nextChar;
+        }
+        break;
+      default:
+        break;
+    }
+  }  
   return result;
-};
+}
 
 /*
  *  default constructor
@@ -798,16 +807,20 @@ PRInt32 CAttributeToken::Consume(PRUnichar aChar, CScanner& aScanner) {
 
   aScanner.SkipWhite();             //skip leading whitespace                                      
   PRInt32 result=aScanner.Peek(aChar);
-  if(kEOF!=result) {
+  if(kNoError==result) {
     if(kQuote==aChar) {               //if you're here, handle quoted key...
-       aScanner.GetChar(aChar);        //skip the quote sign...
-      mTextKey=aChar;
-      result=ConsumeQuotedString(aChar,mTextKey,aScanner);
+      result=aScanner.GetChar(aChar);        //skip the quote sign...
+      if(kNoError==result) {
+        mTextKey=aChar;
+        result=ConsumeQuotedString(aChar,mTextKey,aScanner);
+      }
     }
     else if(kHashsign==aChar) {
-       aScanner.GetChar(aChar);        //skip the hash sign...
-      mTextKey=aChar;
-      result=aScanner.ReadWhile(mTextKey,gDigits,PR_TRUE);
+      result=aScanner.GetChar(aChar);        //skip the hash sign...
+      if(kNoError==result) {
+        mTextKey=aChar;
+        result=aScanner.ReadWhile(mTextKey,gDigits,PR_TRUE);
+      }
     }
     else {
         //If you're here, handle an unquoted key.
@@ -820,28 +833,35 @@ PRInt32 CAttributeToken::Consume(PRUnichar aChar, CScanner& aScanner) {
     if(!(result=aScanner.SkipWhite())) { 
       if(!(result=aScanner.Peek(aChar))) {
         if(kEqual==aChar){
-          aScanner.GetChar(aChar);  //skip the equal sign...
-          aScanner.SkipWhite();     //now skip any intervening whitespace
-           aScanner.GetChar(aChar);  //and grab the next char.    
-  
-          if((kQuote==aChar) || (kApostrophe==aChar)) {
-            mTextValue=aChar;
-            result=ConsumeQuotedString(aChar,mTextValue,aScanner);
-          }
-          else {      
-            mTextValue=aChar;       //it's an alphanum attribute...
-            result=ConsumeAttributeValueText(aChar,mTextValue,aScanner);
-          } 
-
-          aScanner.SkipWhite();     
-        }
-      }
+          result=aScanner.GetChar(aChar);  //skip the equal sign...
+          if(kNoError==result) {
+            result=aScanner.SkipWhite();     //now skip any intervening whitespace
+            if(kNoError==result) {
+              result=aScanner.GetChar(aChar);  //and grab the next char.    
+              if(kNoError==result) {
+                if((kQuote==aChar) || (kApostrophe==aChar)) {
+                  mTextValue=aChar;
+                  result=ConsumeQuotedString(aChar,mTextValue,aScanner);
+                }
+                else {      
+                  mTextValue=aChar;       //it's an alphanum attribute...
+                  result=ConsumeAttributeValueText(aChar,mTextValue,aScanner);
+                } 
+              }//if
+              if(kNoError==result)
+                result=aScanner.SkipWhite();     
+            }//if
+          }//if
+        }//if
+      }//if
+    }
+    if(kNoError==result) {
+      result=aScanner.Peek(aChar);
+      mLastAttribute= PRBool((kGreaterThan==aChar) || (kEOF==result));
     }
-    aScanner.Peek(aChar);
-    mLastAttribute= PRBool((kGreaterThan==aChar) || (kEOF==result));
   }
   return result;
-};
+}
 
 /*
  *  Dump contents of this token to givne output stream
@@ -907,12 +927,15 @@ PRInt32 CWhitespaceToken::GetTokenType(void) {
  *  @return  error result
  */
 PRInt32 CWhitespaceToken::Consume(PRUnichar aChar, CScanner& aScanner) {
-
+  
   mTextValue=aChar;
+
   PRInt32 result=aScanner.ReadWhile(mTextValue,gWhitespace,PR_FALSE);
-  mTextValue.StripChars("\r");
+  if(kNoError==result) {
+    mTextValue.StripChars("\r");
+  }
   return result;
-};
+}
 
 /*
  *  default constructor
@@ -943,7 +966,7 @@ PRInt32 CEntityToken::Consume(PRUnichar aChar, CScanner& aScanner) {
     mTextValue=aChar;
   PRInt32 result=ConsumeEntity(aChar,mTextValue,aScanner);
   return result;
-};
+}
 
 /*
  *  
@@ -979,27 +1002,35 @@ PRInt32 CEntityToken::GetTokenType(void) {
  */
 PRInt32 CEntityToken::ConsumeEntity(PRUnichar aChar,nsString& aString,CScanner& aScanner){
 
-  PRInt32 result=kNotFound;
-  aScanner.Peek(aChar);
-  if(kLeftBrace==aChar) {
-    //you're consuming a script entity...
-    static nsAutoString terminals("}>");
-    result=aScanner.ReadUntil(aString,terminals,PR_FALSE);
-    aScanner.Peek(aChar);
-    if(kRightBrace==aChar) {
-      aString+=kRightBrace;   //append rightbrace, and...
-      aScanner.GetChar(aChar);//yank the closing right-brace
-    }
-  }
-  else
-  {
-    result=aScanner.ReadWhile(aString,gIdentChars,PR_FALSE);
-    aScanner.Peek(aChar);
-    if (kSemicolon == aChar) {
-      // consume semicolon that stopped the scan
-      aScanner.GetChar(aChar);
-    }
-  }
+  PRInt32 result=aScanner.Peek(aChar);
+  if(kNoError==result) {
+    if(kLeftBrace==aChar) {
+      //you're consuming a script entity...
+      static nsAutoString terminals("}>");
+      result=aScanner.ReadUntil(aString,terminals,PR_FALSE);
+      if(kNoError==result) {
+        result=aScanner.Peek(aChar);
+        if(kNoError==result) {
+          if(kRightBrace==aChar) {
+            aString+=kRightBrace;   //append rightbrace, and...
+            result=aScanner.GetChar(aChar);//yank the closing right-brace
+          }
+        }
+      }
+    } //if
+    else {
+      result=aScanner.ReadWhile(aString,gIdentChars,PR_FALSE);
+      if(kNoError==result) {
+        result=aScanner.Peek(aChar);
+        if(kNoError==result) {
+          if (kSemicolon == aChar) {
+            // consume semicolon that stopped the scan
+            result=aScanner.GetChar(aChar);
+          }
+        }
+      }//if
+    } //else
+  } //if
   return result;
 }
 
@@ -1238,7 +1269,8 @@ PRInt32 CSkippedContentToken::Consume(PRUnichar aChar,CScanner& aScanner) {
   PRInt32     result=kNoError;
   nsString    temp;
 
-  while((!done) && (!aScanner.Eof())) {
+//  while((!done) && (!aScanner.Eof())) {
+  while((!done) && (kNoError==result)) {
     static nsAutoString terminals(">");
     result=aScanner.ReadUntil(temp,terminals,PR_TRUE);
     done=PRBool(kNotFound!=temp.RFind(mTextValue,PR_TRUE));
@@ -1328,7 +1360,8 @@ const char* GetTagName(PRInt32 aTag) {
   const char* result=0;
   PRInt32     cnt=sizeof(gHTMLTagTable)/sizeof(HTMLTagEntry);
 
-  for(int i=0;i<cnt;i++){
+  int i=0;
+  for(i=0;i<cnt;i++){
     if(aTag==gHTMLTagTable[i].fTagID)
       return gHTMLTagTable[i].fName;
   }
diff --git a/mozilla/htmlparser/src/nsHTMLTokens.h b/mozilla/htmlparser/src/nsHTMLTokens.h
index 8669d8248a0..b8eae70f8b9 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.h
+++ b/mozilla/htmlparser/src/nsHTMLTokens.h
@@ -39,12 +39,12 @@
 class CScanner;
 
 enum eHTMLTokenTypes {
-  eToken_unknown=2000,
-
-  eToken_start,       eToken_end,     eToken_comment, eToken_entity,
-  eToken_whitespace,  eToken_newline, eToken_text,    eToken_attribute,
-  eToken_script,      eToken_style,   eToken_skippedcontent,  //used in cases like <SCRIPT> where we skip over script content.
-  eToken_last
+  
+  eToken_unknown=0,
+  eToken_start=1,     eToken_end,     eToken_comment,         eToken_entity,
+  eToken_whitespace,  eToken_newline, eToken_text,            eToken_attribute,
+  eToken_script,      eToken_style,   eToken_skippedcontent,  
+  eToken_last //make sure this stays the last token...
 };
 
 //*** This enum is used to define the known universe of HTML tags.
diff --git a/mozilla/htmlparser/src/nsIContentSink.h b/mozilla/htmlparser/src/nsIContentSink.h
index d5df0f03724..425ebc0c68b 100644
--- a/mozilla/htmlparser/src/nsIContentSink.h
+++ b/mozilla/htmlparser/src/nsIContentSink.h
@@ -48,7 +48,7 @@ class nsIContentSink : public nsISupports {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-  virtual PRBool        OpenContainer(const nsIParserNode& aNode) = 0;
+  virtual PRInt32 OpenContainer(const nsIParserNode& aNode) = 0;
 
    /**
     *  This method gets called by the parser when a close
@@ -58,7 +58,7 @@ class nsIContentSink : public nsISupports {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-  virtual PRBool        CloseContainer(const nsIParserNode& aNode) = 0;
+  virtual PRInt32 CloseContainer(const nsIParserNode& aNode) = 0;
 
    /**
     * This method gets called by the parser when a the
@@ -67,7 +67,7 @@ class nsIContentSink : public nsISupports {
     * @update 4/1/98 gess
     * @return PR_TRUE if successful. 
     */     
-  virtual PRBool        CloseTopmostContainer() = 0;
+  virtual PRInt32 CloseTopmostContainer() = 0;
 
    /**
     * This gets called by the parser when you want to add
@@ -78,7 +78,7 @@ class nsIContentSink : public nsISupports {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-  virtual PRBool        AddLeaf(const nsIParserNode& aNode) = 0;
+  virtual PRInt32 AddLeaf(const nsIParserNode& aNode) = 0;
 
    /**
     * This method gets called when the parser begins the process
diff --git a/mozilla/htmlparser/src/nsIHTMLContentSink.h b/mozilla/htmlparser/src/nsIHTMLContentSink.h
index 9359dfbcffb..a75f5813c2b 100644
--- a/mozilla/htmlparser/src/nsIHTMLContentSink.h
+++ b/mozilla/htmlparser/src/nsIHTMLContentSink.h
@@ -92,7 +92,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenHTML(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenHTML(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the outer HTML container.
@@ -101,7 +101,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseHTML(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseHTML(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to open the only HEAD container.
@@ -110,7 +110,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenHead(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenHead(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the only HEAD container.
@@ -119,7 +119,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseHead(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseHead(const nsIParserNode& aNode)=0;
   
    /**
     * This method is used to open the main BODY container.
@@ -128,7 +128,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenBody(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenBody(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the main BODY container.
@@ -137,7 +137,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseBody(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseBody(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to open a new FORM container.
@@ -146,7 +146,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenForm(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenForm(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the outer FORM container.
@@ -155,7 +155,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseForm(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseForm(const nsIParserNode& aNode)=0;
         
    /**
     * This method is used to open the FRAMESET container.
@@ -164,7 +164,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenFrameset(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenFrameset(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the FRAMESET container.
@@ -173,7 +173,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseFrameset(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseFrameset(const nsIParserNode& aNode)=0;
         
    /**
     * This method is used to a general container. 
@@ -183,7 +183,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenContainer(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenContainer(const nsIParserNode& aNode)=0;
     
    /**
     * This method is used to close a generic container.
@@ -192,7 +192,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseContainer(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseContainer(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the topmost container, regardless
@@ -202,7 +202,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseTopmostContainer()=0;
+    virtual PRInt32 CloseTopmostContainer()=0;
 
    /**
     * This method is used to add a leaf to the currently 
@@ -212,7 +212,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool AddLeaf(const nsIParserNode& aNode)=0;
+    virtual PRInt32 AddLeaf(const nsIParserNode& aNode)=0;
 
    /**
     * This method gets called when the parser begins the process
diff --git a/mozilla/htmlparser/src/nsIParser.h b/mozilla/htmlparser/src/nsIParser.h
index a788f749ac4..804f6f61dd1 100644
--- a/mozilla/htmlparser/src/nsIParser.h
+++ b/mozilla/htmlparser/src/nsIParser.h
@@ -54,11 +54,11 @@ class nsIParser : public nsISupports {
 
     virtual nsIContentSink* SetContentSink(nsIContentSink* aContentSink)=0;
 
-    virtual PRInt32 Parse(nsIURL* aURL,PRBool aIncremental=PR_FALSE)=0;
+    virtual PRInt32 Parse(nsIURL* aURL,PRBool aIncremental=PR_TRUE)=0;
     virtual PRInt32 Parse(const char* aFilename,PRBool aIncremental)=0;
     virtual PRInt32 Parse(nsString& anHTMLString,PRBool appendTokens)=0;
 
-    virtual PRInt32 ResumeParse(PRInt32 anIterator)=0;
+    virtual PRInt32 ResumeParse(void)=0;
     virtual PRInt32 GetStack(PRInt32* aStackPtr)=0;
     virtual PRBool  HasOpenContainer(PRInt32 aContainer) const=0;
 };
diff --git a/mozilla/htmlparser/src/nsParserTypes.h b/mozilla/htmlparser/src/nsParserTypes.h
index 59630f0e291..39122d4b844 100644
--- a/mozilla/htmlparser/src/nsParserTypes.h
+++ b/mozilla/htmlparser/src/nsParserTypes.h
@@ -42,6 +42,8 @@ enum  eParseMode {
 };
 
 const PRInt32   kEOF          = 1000000L;
+const PRInt32   kUnknownError = -1000;
+const PRInt32   kContextMismatch = -5;
 const PRInt32   kBadFilename  = -4;
 const PRInt32   kBadURL       = -3;
 const PRInt32   kInterrupted  = -2;
diff --git a/mozilla/htmlparser/src/nsScanner.cpp b/mozilla/htmlparser/src/nsScanner.cpp
index 63d942f1f5d..ca6feea325f 100644
--- a/mozilla/htmlparser/src/nsScanner.cpp
+++ b/mozilla/htmlparser/src/nsScanner.cpp
@@ -154,6 +154,8 @@ void _PreCompressBuffer(nsString& aBuffer,PRInt32& anOffset,PRInt32& aMarkPos){
   //we should check mMarkPos. That represents the point at which
   //we've guaranteed the client we can back up to, so make sure
   //you don't lose any of the data beyond that point.
+
+/*
   if((anOffset!=aMarkPos) && (0<=aMarkPos)) {
     if(aMarkPos>0) {
       aBuffer.Cut(0,aMarkPos);
@@ -162,6 +164,16 @@ void _PreCompressBuffer(nsString& aBuffer,PRInt32& anOffset,PRInt32& aMarkPos){
     }
   }
   else aBuffer.Truncate();
+*/
+  PRInt32 len=aBuffer.Length();
+  if((aMarkPos<len) && (aMarkPos>=0)) {
+    aBuffer.Cut(0,aMarkPos);
+    anOffset-=aMarkPos;
+  }
+  else {
+    aBuffer.Truncate();
+    anOffset=0;
+  }
   aMarkPos=0;
 }
 
@@ -204,6 +216,19 @@ PRBool CScanner::Append(nsString& aBuffer) {
   return PR_TRUE;
 }
 
+/**
+ *  
+ *  
+ *  @update  gess 5/21/98
+ *  @param   
+ *  @return  
+ */
+PRBool CScanner::Append(const char* aBuffer, PRInt32 aLen){
+  _PreCompressBuffer(mBuffer,mOffset,mMarkPos);
+  mBuffer.Append(aBuffer,aLen);
+  return PR_TRUE;
+}
+
 /** 
  * Grab data from underlying stream.
  *
diff --git a/mozilla/htmlparser/src/nsScanner.h b/mozilla/htmlparser/src/nsScanner.h
index 244544d0a15..621da11e8d5 100644
--- a/mozilla/htmlparser/src/nsScanner.h
+++ b/mozilla/htmlparser/src/nsScanner.h
@@ -39,8 +39,7 @@
 #include <fstream.h>
 
 class nsIURL;
-//class ifstream; XXX mac didn't like this, but this doesn't seem to be needed
-// for the pc either...
+class ifstream;
 
 class CScanner {
   public:
@@ -216,6 +215,15 @@ class CScanner {
        */
       PRBool Append(nsString& aBuffer);
 
+      /**
+       *  
+       *  
+       *  @update  gess 5/21/98
+       *  @param   
+       *  @return  
+       */
+      PRBool Append(const char* aBuffer, PRInt32 aLen);
+
       /**
        *  
        *  
diff --git a/mozilla/htmlparser/src/nsToken.cpp b/mozilla/htmlparser/src/nsToken.cpp
index cbf622551fc..03000a678b2 100644
--- a/mozilla/htmlparser/src/nsToken.cpp
+++ b/mozilla/htmlparser/src/nsToken.cpp
@@ -27,6 +27,7 @@
  */
 CToken::CToken(const nsString& aName) : mTextValue(aName) {
   mOrdinalValue=0;
+  mAttrCount=0;
 }
  
 /**
@@ -71,7 +72,8 @@ void CToken::SetStringValue(const char* aValue) {
  */
 void CToken::DebugDumpToken(ostream& anOutputStream) {
   anOutputStream << "[" << GetClassName() << "] ";
-  for(int i=0;i<mTextValue.Length();i++){
+  int i=0;
+  for(i=0;i<mTextValue.Length();i++){
     anOutputStream << char(mTextValue[i]);
   }
   anOutputStream << ": " << mOrdinalValue << endl;
@@ -116,7 +118,7 @@ nsString& CToken::GetText(void) {
  *  @update gess 3/25/98
  *  @param  value -- new ordinal value for this token
  */
-void CToken::SetOrdinal(PRInt32 value) {
+void CToken::SetOrdinal(PRInt16 value) {
   mOrdinalValue=value;
 }
 
@@ -127,10 +129,31 @@ void CToken::SetOrdinal(PRInt32 value) {
  *  @update gess 3/25/98
  *  @return int containing ordinal value
  */
-PRInt32  CToken::GetOrdinal(void) {
+PRInt16 CToken::GetOrdinal(void) {
   return mOrdinalValue;
 }
 
+/**
+ *  Sets the attribute count for this token
+ *  
+ *  @update gess 3/25/98
+ *  @param  value -- new attr count
+ */
+void CToken::SetAttributeCount(PRInt16 value) {
+  mAttrCount=value;
+}
+
+/**
+ *  Retrieves copy of attr count for this token
+ *  
+ *  @update gess 3/25/98
+ *  @return int containing attribute count
+ */
+PRInt16  CToken::GetAttributeCount(void) {
+  return mAttrCount;
+}
+
+
 /**
  *  Retrieve type of token. This class returns -1, but 
  *  subclasses return something more meaningful.
diff --git a/mozilla/htmlparser/src/nsToken.h b/mozilla/htmlparser/src/nsToken.h
index 3baf08dbad6..0bdf7a0a0d8 100644
--- a/mozilla/htmlparser/src/nsToken.h
+++ b/mozilla/htmlparser/src/nsToken.h
@@ -92,14 +92,28 @@ class CToken {
      * @update	gess5/11/98
      * @param   value is the new ord value for this token
      */
-    virtual void SetOrdinal(PRInt32 value);
+    virtual void SetOrdinal(PRInt16 value);
 
     /**
      * Getter which retrieves the current ordinal value for this token
      * @update	gess5/11/98
      * @return  current ordinal value 
      */
-    virtual PRInt32 GetOrdinal(void);
+    virtual PRInt16 GetOrdinal(void);
+
+    /**
+     * Sets the # of attributes found for this token.
+     * @update	gess5/11/98
+     * @param   value is the attr count
+     */
+    virtual void SetAttributeCount(PRInt16 aValue);
+
+    /**
+     * Getter which retrieves the current attribute count for this token
+     * @update	gess5/11/98
+     * @return  current attribute count 
+     */
+    virtual PRInt16 GetAttributeCount(void);
 
     /**
      * Causes token to consume data from given scanner.
@@ -147,7 +161,8 @@ class CToken {
     virtual void SelfTest(void);
 
 protected:
-            PRInt32       mOrdinalValue;
+            PRInt16       mOrdinalValue;
+            PRInt16       mAttrCount;
             nsString      mTextValue;
 };
 
diff --git a/mozilla/htmlparser/src/nsTokenHandler.cpp b/mozilla/htmlparser/src/nsTokenHandler.cpp
index 125d036206b..b752c24ee99 100644
--- a/mozilla/htmlparser/src/nsTokenHandler.cpp
+++ b/mozilla/htmlparser/src/nsTokenHandler.cpp
@@ -38,8 +38,9 @@ static const char* kNullParserGiven = "Error: Null parser given as argument";
  *  @param   
  *  @return  
  */
-CTokenHandler::CTokenHandler(eHTMLTokenTypes aType) {
+CTokenHandler::CTokenHandler(dispatchFP aFP,eHTMLTokenTypes aType){
   mType=aType;
+  mFP=aFP;
 }
 
 
@@ -65,18 +66,6 @@ eHTMLTokenTypes CTokenHandler::GetTokenType(void){
   return mType;
 }
 
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
 
 /**
  *  
@@ -85,555 +74,12 @@ PRBool CTokenHandler::CanHandle(eHTMLTokenTypes aType){
  *  @param   
  *  @return  
  */
-PRBool CTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  PRBool result=PR_FALSE;
-  if(aParser){
-    result=PR_TRUE;
+PRInt32 CTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
+  PRInt32 result=kNoError;
+  if((0!=aParser) && (0!=mFP)) {
+     result=(*mFP)(mType,aToken,aParser);
   }
   return result;
 }
 
 
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CStartTokenHandler::CStartTokenHandler() : CTokenHandler(eToken_start) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CStartTokenHandler::~CStartTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CStartTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleStartToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CStartTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CEndTokenHandler::CEndTokenHandler(): CTokenHandler(eToken_end) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CEndTokenHandler::~CEndTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CEndTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleEndToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CEndTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CCommentTokenHandler::CCommentTokenHandler() : CTokenHandler(eToken_comment) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CCommentTokenHandler::~CCommentTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CCommentTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleCommentToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CCommentTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CEntityTokenHandler::CEntityTokenHandler() : CTokenHandler(eToken_entity) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CEntityTokenHandler::~CEntityTokenHandler() {
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CEntityTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleEntityToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CEntityTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CWhitespaceTokenHandler::CWhitespaceTokenHandler() : CTokenHandler(eToken_whitespace) {
-}
-
-  
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CWhitespaceTokenHandler::~CWhitespaceTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CWhitespaceTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleStartToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CWhitespaceTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CNewlineTokenHandler::CNewlineTokenHandler() : CTokenHandler(eToken_newline) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CNewlineTokenHandler::~CNewlineTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CNewlineTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleStartToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CNewlineTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CTextTokenHandler::CTextTokenHandler() : CTokenHandler(eToken_text) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CTextTokenHandler::~CTextTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CTextTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleStartToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CTextTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CAttributeTokenHandler::CAttributeTokenHandler() : CTokenHandler(eToken_attribute) {
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CAttributeTokenHandler::~CAttributeTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CAttributeTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleAttributeToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CAttributeTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CScriptTokenHandler::CScriptTokenHandler() : CTokenHandler(eToken_script) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CScriptTokenHandler::~CScriptTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CScriptTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleScriptToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CScriptTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CStyleTokenHandler::CStyleTokenHandler() : CTokenHandler(eToken_style) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CStyleTokenHandler::~CStyleTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CStyleTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleStyleToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CStyleTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CSkippedContentTokenHandler::CSkippedContentTokenHandler() : CTokenHandler(eToken_skippedcontent) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CSkippedContentTokenHandler::~CSkippedContentTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CSkippedContentTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleSkippedContentToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CSkippedContentTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-
diff --git a/mozilla/htmlparser/src/nsTokenHandler.h b/mozilla/htmlparser/src/nsTokenHandler.h
index d805aa9055a..de252bb014e 100644
--- a/mozilla/htmlparser/src/nsTokenHandler.h
+++ b/mozilla/htmlparser/src/nsTokenHandler.h
@@ -33,130 +33,22 @@
 class CToken;
 class nsHTMLParser;
 
+typedef PRInt32 (*dispatchFP)(eHTMLTokenTypes,CToken*,nsHTMLParser*);
 
 class CTokenHandler : public CITokenHandler {
 public:
-                          CTokenHandler(eHTMLTokenTypes aType=eToken_unknown);
-  virtual                 ~CTokenHandler();
+                            CTokenHandler(dispatchFP aFP,eHTMLTokenTypes aType=eToken_unknown);
+  virtual                   ~CTokenHandler();
                           
   virtual   eHTMLTokenTypes GetTokenType(void);
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
+  virtual   PRInt32         operator()(CToken* aToken,nsHTMLParser* aParser);
 
 protected:
             eHTMLTokenTypes mType;
+            dispatchFP      mFP;
 };
 
 
-class CStartTokenHandler : public CTokenHandler  {
-public:
-                          CStartTokenHandler();
-  virtual                 ~CStartTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CEndTokenHandler : public CTokenHandler  {
-public:
-                          CEndTokenHandler();
-  virtual                 ~CEndTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CCommentTokenHandler : public CTokenHandler  {
-public:
-                          CCommentTokenHandler();
-  virtual                 ~CCommentTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CEntityTokenHandler : public CTokenHandler  {
-public:
-                          CEntityTokenHandler();
-  virtual                 ~CEntityTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CWhitespaceTokenHandler : public CTokenHandler  {
-public:
-                          CWhitespaceTokenHandler();
-  virtual                 ~CWhitespaceTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CNewlineTokenHandler : public CTokenHandler  {
-public:
-                          CNewlineTokenHandler();
-  virtual                 ~CNewlineTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CTextTokenHandler : public CTokenHandler  {
-public:
-                          CTextTokenHandler();
-  virtual                 ~CTextTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CAttributeTokenHandler : public CTokenHandler  {
-public:
-                          CAttributeTokenHandler();
-  virtual                 ~CAttributeTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CScriptTokenHandler :  public CTokenHandler  {
-public:
-                          CScriptTokenHandler();
-  virtual                 ~CScriptTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CStyleTokenHandler : public CTokenHandler  {
-public:
-                          CStyleTokenHandler();
-  virtual                 ~CStyleTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CSkippedContentTokenHandler : public CTokenHandler  {
-public:
-                          CSkippedContentTokenHandler();
-  virtual                 ~CSkippedContentTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
 
 #endif
 
diff --git a/mozilla/htmlparser/src/nsTokenizer.cpp b/mozilla/htmlparser/src/nsTokenizer.cpp
index 1ca79abee46..62c6967e78a 100644
--- a/mozilla/htmlparser/src/nsTokenizer.cpp
+++ b/mozilla/htmlparser/src/nsTokenizer.cpp
@@ -96,6 +96,20 @@ PRBool CTokenizer::Append(nsString& aBuffer) {
   return PR_FALSE;
 }
 
+
+/**
+ *  
+ *  
+ *  @update  gess 5/21/98
+ *  @param   
+ *  @return  
+ */
+PRBool CTokenizer::Append(const char* aBuffer, PRInt32 aLen){
+  if(mScanner)
+    return mScanner->Append(aBuffer,aLen);
+  return PR_FALSE;
+}
+
 /**
  * Retrieve a reference to the internal token deque.
  *
diff --git a/mozilla/htmlparser/src/nsTokenizer.h b/mozilla/htmlparser/src/nsTokenizer.h
index fb99233d151..7ea83e261b5 100644
--- a/mozilla/htmlparser/src/nsTokenizer.h
+++ b/mozilla/htmlparser/src/nsTokenizer.h
@@ -106,6 +106,13 @@ class  CTokenizer {
      */
     PRBool Append(nsString& aBuffer);
 
+    /**
+     *
+     * @update  gess 4/20/98
+     * @return  deque reference
+     */
+    PRBool Append(const char* aBuffer, PRInt32 aLen);
+
 
     /**
      *  
diff --git a/mozilla/parser/htmlparser/src/CNavDelegate.cpp b/mozilla/parser/htmlparser/src/CNavDelegate.cpp
index 857a233b1c6..14c5cf34e03 100644
--- a/mozilla/parser/htmlparser/src/CNavDelegate.cpp
+++ b/mozilla/parser/htmlparser/src/CNavDelegate.cpp
@@ -136,18 +136,21 @@ PRInt32 CNavDelegate::ConsumeTag(PRUnichar aChar,CScanner& aScanner,CToken*& aTo
  *  @param   aScanner: see nsScanner.h
  *  @return  
  */
-PRInt32 CNavDelegate::ConsumeAttributes(PRUnichar aChar,CScanner& aScanner) {
+PRInt32 CNavDelegate::ConsumeAttributes(PRUnichar aChar,CScanner& aScanner,CToken*& aToken) {
   PRBool done=PR_FALSE;
   PRInt32 result=kNoError;
   nsAutoString as("");
+  PRInt16 theAttrCount=0;
 
   while((!done) && (result==kNoError)) {
     CToken* theToken= new CAttributeToken(as);
     if(theToken){
       result=theToken->Consume(aChar,aScanner);  //tell new token to finish consuming text...    
       if(kNoError==result){
+        theAttrCount++;
         mTokenDeque.Push(theToken);
       }//if
+      else delete theToken; //we can't keep it...
     }//if
     
     if(kNoError==result){
@@ -158,6 +161,24 @@ PRInt32 CNavDelegate::ConsumeAttributes(PRUnichar aChar,CScanner& aScanner) {
       }//if
     }//if
   }//while
+
+  //ok, this is a bit complicated, so follow closely.
+  //Since we're incremental (but pessimistic), it is possible that even though 
+  //we've eaten a few delicious attributes, we can't keep them because
+  //we couldn't eat all of them (up to an including the close > for this tag).
+  //Therefore, we need to remove the ones we just created from the tokendeque,
+  //and destroy them. (They'll get reconsumed on the next incremental pass).
+  //NOTE: This process can be enhanced later on by adding state to the delegate
+  //      telling us that we're in the attribute consumption phase.
+  //      Remember the mantra: Crawl, Walk, Run!
+  if(kNoError==result) {
+    aToken->SetAttributeCount(theAttrCount);
+  }
+  else {
+    while(theAttrCount--) {
+      delete mTokenDeque.PopBack();
+    }
+  }
   return result;
 }
 
@@ -200,7 +221,7 @@ PRInt32 CNavDelegate::ConsumeStartTag(PRUnichar aChar,CScanner& aScanner,CToken*
     result= aToken->Consume(aChar,aScanner);  //tell new token to finish consuming text...    
     if(kNoError==result) {
       if(((CStartToken*)aToken)->IsAttributed()) {
-        result=ConsumeAttributes(aChar,aScanner);
+        result=ConsumeAttributes(aChar,aScanner,aToken);
       }
       //now that that's over with, we have one more problem to solve.
       //In the case that we just read a <SCRIPT> or <STYLE> tags, we should go and
@@ -319,7 +340,7 @@ PRInt32 CNavDelegate::ConsumeText(const nsString& aString,CScanner& aScanner,CTo
 
   PRInt32 result=kNoError;
   if(aToken=new CTextToken(aString)) {
-    PRUnichar ch;
+    PRUnichar ch=0;
     result=aToken->Consume(ch,aScanner);
   }
   return result;
diff --git a/mozilla/parser/htmlparser/src/CNavDelegate.h b/mozilla/parser/htmlparser/src/CNavDelegate.h
index ba80e0f53d1..d109239df28 100644
--- a/mozilla/parser/htmlparser/src/CNavDelegate.h
+++ b/mozilla/parser/htmlparser/src/CNavDelegate.h
@@ -150,7 +150,7 @@ protected:
      * @param   aToken is the next token (or null)
      * @return  error code
      */
-    PRInt32     ConsumeAttributes(PRUnichar aChar,CScanner& aScanner);
+    PRInt32     ConsumeAttributes(PRUnichar aChar,CScanner& aScanner,CToken*& aToken);
     
     /**
      * Retrieve a sequence of text from given scanner.
diff --git a/mozilla/parser/htmlparser/src/COtherDelegate.cpp b/mozilla/parser/htmlparser/src/COtherDelegate.cpp
index b5b30858fa1..1728b49dee3 100644
--- a/mozilla/parser/htmlparser/src/COtherDelegate.cpp
+++ b/mozilla/parser/htmlparser/src/COtherDelegate.cpp
@@ -129,7 +129,7 @@ PRInt32 COtherDelegate::ConsumeTag(PRUnichar aChar,CScanner& aScanner,CToken*& a
  *  @param   aScanner: see nsScanner.h
  *  @return  
  */
-PRInt32 COtherDelegate::ConsumeAttributes(PRUnichar aChar,CScanner& aScanner) {
+PRInt32 COtherDelegate::ConsumeAttributes(PRUnichar aChar,CScanner& aScanner,CToken*& aToken) {
   PRBool done=PR_FALSE;
   nsAutoString as("");
   PRInt32 result=kNoError;
@@ -186,7 +186,7 @@ PRInt32 COtherDelegate::ConsumeStartTag(PRUnichar aChar,CScanner& aScanner,CToke
   if(aToken) {
     result= aToken->Consume(aChar,aScanner);  //tell new token to finish consuming text...    
     if(((CStartToken*)aToken)->IsAttributed()) {
-      result=ConsumeAttributes(aChar,aScanner);
+      result=ConsumeAttributes(aChar,aScanner,aToken);
     }
     //now that that's over with, we have one more problem to solve.
     //In the case that we just read a <SCRIPT> or <STYLE> tags, we should go and
diff --git a/mozilla/parser/htmlparser/src/COtherDelegate.h b/mozilla/parser/htmlparser/src/COtherDelegate.h
index 6f1cb9bc438..bc74f4166ed 100644
--- a/mozilla/parser/htmlparser/src/COtherDelegate.h
+++ b/mozilla/parser/htmlparser/src/COtherDelegate.h
@@ -150,7 +150,7 @@ protected:
      * @param   aToken is the next token (or null)
      * @return  error code
      */
-    PRInt32     ConsumeAttributes(PRUnichar aChar,CScanner& aScanner);
+    PRInt32     ConsumeAttributes(PRUnichar aChar,CScanner& aScanner,CToken*& aToken);
     
     /**
      * Retrieve a sequence of text from given scanner.
diff --git a/mozilla/parser/htmlparser/src/nsHTMLContentSink.cpp b/mozilla/parser/htmlparser/src/nsHTMLContentSink.cpp
index 0fdc9911d6b..3e355127b73 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLContentSink.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLContentSink.cpp
@@ -18,6 +18,7 @@
 
 #include "nsHTMLContentSink.h"
 #include "nsHTMLTokens.h"
+#include "nsParserTypes.h"
 #include "prtypes.h" 
 #include <iostream.h>  
 
@@ -143,9 +144,9 @@ nsresult nsHTMLContentSink::QueryInterface(const nsIID& aIID, void** aInstancePt
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenHTML(const nsIParserNode& aNode) {
+PRInt32 nsHTMLContentSink::OpenHTML(const nsIParserNode& aNode) {
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
 #ifdef VERBOSE_DEBUG
@@ -162,11 +163,11 @@ PRBool nsHTMLContentSink::OpenHTML(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseHTML(const nsIParserNode& aNode){
+PRInt32 nsHTMLContentSink::CloseHTML(const nsIParserNode& aNode){
 
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -186,8 +187,8 @@ PRBool nsHTMLContentSink::CloseHTML(const nsIParserNode& aNode){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenHead(const nsIParserNode& aNode) {
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::OpenHead(const nsIParserNode& aNode) {
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
 #ifdef VERBOSE_DEBUG
@@ -205,10 +206,10 @@ PRBool nsHTMLContentSink::OpenHead(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseHead(const nsIParserNode& aNode) {
+PRInt32 nsHTMLContentSink::CloseHead(const nsIParserNode& aNode) {
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -226,8 +227,8 @@ PRBool nsHTMLContentSink::CloseHead(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::SetTitle(const nsString& aValue){
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::SetTitle(const nsString& aValue){
+  PRInt32 result=kNoError;
   mTitle=aValue;
   return result;
 }
@@ -240,8 +241,8 @@ PRBool nsHTMLContentSink::SetTitle(const nsString& aValue){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenBody(const nsIParserNode& aNode) {
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::OpenBody(const nsIParserNode& aNode) {
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
   #ifdef VERBOSE_DEBUG
@@ -259,9 +260,9 @@ PRBool nsHTMLContentSink::OpenBody(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseBody(const nsIParserNode& aNode){
+PRInt32 nsHTMLContentSink::CloseBody(const nsIParserNode& aNode){
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -279,8 +280,8 @@ PRBool nsHTMLContentSink::CloseBody(const nsIParserNode& aNode){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenForm(const nsIParserNode& aNode) {
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::OpenForm(const nsIParserNode& aNode) {
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
 #ifdef VERBOSE_DEBUG
@@ -298,10 +299,10 @@ PRBool nsHTMLContentSink::OpenForm(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseForm(const nsIParserNode& aNode){
+PRInt32 nsHTMLContentSink::CloseForm(const nsIParserNode& aNode){
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -319,8 +320,8 @@ PRBool nsHTMLContentSink::CloseForm(const nsIParserNode& aNode){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenFrameset(const nsIParserNode& aNode) {
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::OpenFrameset(const nsIParserNode& aNode) {
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
   #ifdef VERBOSE_DEBUG
@@ -338,10 +339,10 @@ PRBool nsHTMLContentSink::OpenFrameset(const nsIParserNode& aNode) {
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseFrameset(const nsIParserNode& aNode){
+PRInt32 nsHTMLContentSink::CloseFrameset(const nsIParserNode& aNode){
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -360,8 +361,8 @@ PRBool nsHTMLContentSink::CloseFrameset(const nsIParserNode& aNode){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::OpenContainer(const nsIParserNode& aNode){  
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::OpenContainer(const nsIParserNode& aNode){  
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos++]=(eHTMLTags)aNode.GetNodeType();
 
 #ifdef VERBOSE_DEBUG
@@ -379,10 +380,10 @@ PRBool nsHTMLContentSink::OpenContainer(const nsIParserNode& aNode){
  *  @param  
  *  @return 
  */
-PRBool nsHTMLContentSink::CloseContainer(const nsIParserNode& aNode){
+PRInt32 nsHTMLContentSink::CloseContainer(const nsIParserNode& aNode){
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[--mNodeStackPos]=eHTMLTag_unknown;
 
 #ifdef VERBOSE_DEBUG
@@ -400,9 +401,9 @@ PRBool nsHTMLContentSink::CloseContainer(const nsIParserNode& aNode){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::CloseTopmostContainer(){
+PRInt32 nsHTMLContentSink::CloseTopmostContainer(){
   NS_PRECONDITION(mNodeStackPos > 0, "node stack empty");
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   mNodeStack[mNodeStackPos--]=eHTMLTag_unknown;
   return result;
 }
@@ -416,8 +417,8 @@ PRBool nsHTMLContentSink::CloseTopmostContainer(){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLContentSink::AddLeaf(const nsIParserNode& aNode){
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLContentSink::AddLeaf(const nsIParserNode& aNode){
+  PRInt32 result=kNoError;
 
 #ifdef VERBOSE_DEBUG
   DebugDump("<",aNode.GetText(),(mNodeStackPos)*2);
diff --git a/mozilla/parser/htmlparser/src/nsHTMLContentSink.h b/mozilla/parser/htmlparser/src/nsHTMLContentSink.h
index c445934760d..21e2f895482 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLContentSink.h
+++ b/mozilla/parser/htmlparser/src/nsHTMLContentSink.h
@@ -87,33 +87,33 @@ class nsHTMLContentSink : public nsIHTMLContentSink {
             PRBool    SetTitle(const nsString& aValue);
 
                       // Called when Opening or closing the main HTML container
-            PRBool    OpenHTML(const nsIParserNode& aNode);
-            PRBool    CloseHTML(const nsIParserNode& aNode);
+            PRInt32    OpenHTML(const nsIParserNode& aNode);
+            PRInt32    CloseHTML(const nsIParserNode& aNode);
 
                       // Called when Opening or closing the main HEAD container
-            PRBool    OpenHead(const nsIParserNode& aNode);
-            PRBool    CloseHead(const nsIParserNode& aNode);
+            PRInt32    OpenHead(const nsIParserNode& aNode);
+            PRInt32    CloseHead(const nsIParserNode& aNode);
   
                       // Called when Opening or closing the main BODY container
-            PRBool    OpenBody(const nsIParserNode& aNode);
-            PRBool    CloseBody(const nsIParserNode& aNode);
+            PRInt32    OpenBody(const nsIParserNode& aNode);
+            PRInt32    CloseBody(const nsIParserNode& aNode);
 
                       // Called when Opening or closing FORM containers
-            PRBool    OpenForm(const nsIParserNode& aNode);
-            PRBool    CloseForm(const nsIParserNode& aNode);
+            PRInt32    OpenForm(const nsIParserNode& aNode);
+            PRInt32    CloseForm(const nsIParserNode& aNode);
         
                       // Called when Opening or closing the main FRAMESET container
-            PRBool    OpenFrameset(const nsIParserNode& aNode);
-            PRBool    CloseFrameset(const nsIParserNode& aNode);
+            PRInt32    OpenFrameset(const nsIParserNode& aNode);
+            PRInt32    CloseFrameset(const nsIParserNode& aNode);
         
                       // Called when Opening or closing a general container
                       // This includes: OL,UL,DIR,SPAN,TABLE,H[1..6],etc.
                       // Until proven otherwise, I also plan to toss STYLE, 
                       // FRAME, SCRIPT, etc. here too!
-    virtual PRBool    OpenContainer(const nsIParserNode& aNode);
-    virtual PRBool    CloseContainer(const nsIParserNode& aNode);
-    virtual PRBool    CloseTopmostContainer();
-    virtual PRBool    AddLeaf(const nsIParserNode& aNode);
+    virtual PRInt32    OpenContainer(const nsIParserNode& aNode);
+    virtual PRInt32    CloseContainer(const nsIParserNode& aNode);
+    virtual PRInt32    CloseTopmostContainer();
+    virtual PRInt32    AddLeaf(const nsIParserNode& aNode);
 
    /**
     * This method gets called when the parser begins the process
diff --git a/mozilla/parser/htmlparser/src/nsHTMLParser.cpp b/mozilla/parser/htmlparser/src/nsHTMLParser.cpp
index d087168164d..d02d40b8638 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLParser.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLParser.cpp
@@ -32,6 +32,7 @@
 #include "prenv.h"  //this is here for debug reasons...
 #include "plstr.h"
 #include <fstream.h>
+#include "nsIInputStream.h"
 #ifdef XP_PC
 #include <direct.h> //this is here for debug reasons...
 #endif
@@ -48,6 +49,8 @@ static const char* kInvalidTagStackPos = "Error: invalid tag stack position";
 
 static char*  gVerificationOutputDir=0;
 static int    rickGDebug=0;
+static const int gTransferBufferSize=4096;  //size of the buffer used in moving data from iistream
+
 
 /**
  *  This method is defined in nsIParser. It is used to 
@@ -68,6 +71,50 @@ NS_HTMLPARS nsresult NS_NewHTMLParser(nsIParser** aInstancePtrResult)
   return it->QueryInterface(kClassIID, (void **) aInstancePtrResult);
 }
 
+
+/**
+ *  This big dispatch method is used to route token handler calls to the right place.
+ *  What's wrong with it? This table, and the dispatch methods themselves need to be 
+ *  moved over to the delegate. Ah, so much to do...
+ *  
+ *  @update  gess 5/21/98
+ *  @param   aType
+ *  @param   aToken
+ *  @param   aParser
+ *  @return  
+ */
+PRInt32 DispatchTokenHandler(eHTMLTokenTypes aType,CToken* aToken,nsHTMLParser* aParser){
+  PRInt32 result=0;
+
+  if(aToken && aParser) {
+    switch(aType) {
+      case eToken_start:
+        result=aParser->HandleStartToken(aToken); break;
+      case eToken_end:
+        result=aParser->HandleEndToken(aToken); break;
+      case eToken_comment:
+        result=aParser->HandleCommentToken(aToken); break;
+      case eToken_entity:
+        result=aParser->HandleEntityToken(aToken); break;
+      case eToken_whitespace:
+        result=aParser->HandleStartToken(aToken); break;
+      case eToken_newline:
+        result=aParser->HandleStartToken(aToken); break;
+      case eToken_text:
+        result=aParser->HandleStartToken(aToken); break;
+      case eToken_attribute:
+        result=aParser->HandleAttributeToken(aToken); break;
+      case eToken_style:
+        result=aParser->HandleStyleToken(aToken); break;
+      case eToken_skippedcontent:
+        result=aParser->HandleSkippedContentToken(aToken); break;
+      default:
+        result=0;
+    }//switch
+  }//if
+  return result;
+}
+
 /**
  *  init the set of default token handlers...
  *  
@@ -76,18 +123,21 @@ NS_HTMLPARS nsresult NS_NewHTMLParser(nsIParser** aInstancePtrResult)
  *  @return  
  */
 void nsHTMLParser::InitializeDefaultTokenHandlers() {
-  AddTokenHandler(new CStartTokenHandler());
-  AddTokenHandler(new CEndTokenHandler());
-  AddTokenHandler(new CCommentTokenHandler());
-  AddTokenHandler(new CEntityTokenHandler());
-  AddTokenHandler(new CWhitespaceTokenHandler());
-  AddTokenHandler(new CNewlineTokenHandler());
-  AddTokenHandler(new CTextTokenHandler());
-  AddTokenHandler(new CAttributeTokenHandler());
-  AddTokenHandler(new CScriptTokenHandler());
-  AddTokenHandler(new CStyleTokenHandler());
-}
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_start));
 
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_end));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_comment));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_entity));
+
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_whitespace));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_newline));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_text));
+  
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_attribute));
+//  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_script));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_style));
+  AddTokenHandler(new CTokenHandler(DispatchTokenHandler,eToken_skippedcontent));
+}
 
 /**
  *  default constructor
@@ -98,15 +148,16 @@ void nsHTMLParser::InitializeDefaultTokenHandlers() {
  */
 nsHTMLParser::nsHTMLParser() {
   NS_INIT_REFCNT();
+  mTransferBuffer=0;
   mSink=0;
   mContextStackPos=0;
   mCurrentPos=0;
+  mMarkPos=0;
   mParseMode=eParseMode_unknown;
   nsCRT::zero(mContextStack,sizeof(mContextStack));
   nsCRT::zero(mTokenHandlers,sizeof(mTokenHandlers));
   mDTD=0;
   mHasOpenForm=PR_FALSE;
-  mTokenHandlerCount=0;
   InitializeDefaultTokenHandlers();
   gVerificationOutputDir = PR_GetEnv("VERIFY_PARSER");
 }
@@ -121,6 +172,10 @@ nsHTMLParser::nsHTMLParser() {
  */
 nsHTMLParser::~nsHTMLParser() {
   DeleteTokenHandlers();
+  if(mTransferBuffer)
+    delete [] mTransferBuffer;
+  mTransferBuffer=0;
+  NS_RELEASE(mSink);
   if(mCurrentPos)
     delete mCurrentPos;
   mCurrentPos=0;
@@ -171,21 +226,6 @@ nsresult nsHTMLParser::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   return NS_OK;                                                        
 }
 
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-eHTMLTags nsHTMLParser::NodeAt(PRInt32 aPos) const {
-  NS_PRECONDITION(0 <= aPos, "bad nodeAt");
-  if((aPos>-1) && (aPos<mContextStackPos))
-    return (eHTMLTags)mContextStack[aPos];
-  return eHTMLTag_unknown;
-}
-
 /**
  *  This method allows the caller to determine if a form
  *  element is currently open.
@@ -231,64 +271,30 @@ eHTMLTags nsHTMLParser::GetTopNode() const {
  *  @return  topmost index of tag on stack
  */
 PRInt32 nsHTMLParser::GetTopmostIndex(eHTMLTags aTag) const {
-  for(int i=mContextStackPos-1;i>=0;i--){
+  int i=0;
+  for(i=mContextStackPos-1;i>=0;i--){
     if(mContextStack[i]==aTag)
       return i;
   }
   return kNotFound;
 }
 
-/**
- *  Determine whether the given tag is open anywhere
- *  in our context stack.
- *  
- *  @update  gess 4/2/98
- *  @param   eHTMLTags tag to be searched for in stack
- *  @return  topmost index of tag on stack
- */
-PRBool nsHTMLParser::IsOpen(eHTMLTags aTag) const {
-  PRInt32 pos=GetTopmostIndex(aTag);
-  return PRBool(kNotFound!=pos);
-}
 
 /**
- *  Gets the number of open containers on the stack.
+ *  Destroy the list of token handlers
  *  
  *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRInt32 nsHTMLParser::GetStackPos() const {
-  return mContextStackPos;
-}
-
-/**
- *  Finds a tag handler for the given tag type, given in string.
- *  
- *  @update  gess 4/2/98
- *  @param   aString contains name of tag to be handled
- *  @return  valid tag handler (if found) or null
+ *  @return  this
  */
 nsHTMLParser& nsHTMLParser::DeleteTokenHandlers(void) {
-  for(int i=0;i<mTokenHandlerCount;i++){
+  int i=0;
+  for(i=eToken_unknown;i<eToken_last;i++){
     delete mTokenHandlers[i];
+    mTokenHandlers[i]=0;
   }
-  mTokenHandlerCount=0;
   return *this;
 }
 
-/**
- *  Finds a tag handler for the given tag type, given in string.
- *  
- *  @update  gess 4/2/98
- *  @param   aString contains name of tag to be handled
- *  @return  valid tag handler (if found) or null
- */
-CTokenHandler* nsHTMLParser::GetTokenHandler(const nsString& aString) const{
-  eHTMLTokenTypes theType=DetermineTokenType(aString);
-  return GetTokenHandler(theType);
-}
-
 
 /**
  *  Finds a tag handler for the given tag type.
@@ -298,12 +304,13 @@ CTokenHandler* nsHTMLParser::GetTokenHandler(const nsString& aString) const{
  *  @return  valid tag handler (if found) or null
  */
 CTokenHandler* nsHTMLParser::GetTokenHandler(eHTMLTokenTypes aType) const {
-  for(int i=0;i<mTokenHandlerCount;i++) {
-    if(mTokenHandlers[i]->CanHandle(aType)) {
-      return mTokenHandlers[i];
-    }
+  CTokenHandler* result=0;
+  if((aType>0) && (aType<eToken_last)) {
+    result=mTokenHandlers[aType];
+  } 
+  else {
   }
-  return 0;
+  return result;
 }
 
 
@@ -317,11 +324,15 @@ CTokenHandler* nsHTMLParser::GetTokenHandler(eHTMLTokenTypes aType) const {
 CTokenHandler* nsHTMLParser::AddTokenHandler(CTokenHandler* aHandler) {
   NS_ASSERTION(0!=aHandler,"Error: Null handler argument");
   
-  if(aHandler) {
-    int max=sizeof(mTokenHandlers)/sizeof(mTokenHandlers[0]);
-    if(mTokenHandlerCount<max) {
-      mTokenHandlers[mTokenHandlerCount++]=aHandler;
-    } 
+  if(aHandler)  {
+    eHTMLTokenTypes type=aHandler->GetTokenType();
+    if(type<eToken_last) {
+      CTokenHandler* old=mTokenHandlers[type];
+      mTokenHandlers[type]=aHandler;
+    }
+    else {
+      //add code here to handle dynamic tokens...
+    }
   }
   return 0;
 }
@@ -337,8 +348,11 @@ CTokenHandler* nsHTMLParser::AddTokenHandler(CTokenHandler* aHandler) {
 nsIContentSink* nsHTMLParser::SetContentSink(nsIContentSink* aSink) {
   NS_PRECONDITION(0!=aSink,"sink cannot be null!");
   nsIContentSink* old=mSink;
+  if(old)
+    NS_RELEASE(old);
   if(aSink) {
     mSink=(nsHTMLContentSink*)(aSink);
+    NS_ADDREF(aSink);
   }
   return old;
 }
@@ -367,7 +381,8 @@ PRBool VerifyContextVector(PRInt32 aTags[],PRInt32 count,nsIDTD* aDTD) {
       strcpy(path,gVerificationOutputDir);
 #endif
 
-      for(int i=0;i<count;i++){
+      int i=0;      
+      for(i=0;i<count;i++){
 
 #ifdef NS_WIN32
         strcat(path,"/");
@@ -380,10 +395,6 @@ PRBool VerifyContextVector(PRInt32 aTags[],PRInt32 count,nsIDTD* aDTD) {
       result=aDTD->VerifyContextVector(aTags,count);
     }
     if(PR_FALSE==result){
-#ifdef NS_WIN32
-      // save file to directory indicated by bad context vector
-
-#endif
       //add debugging code here to record the fact that we just encountered
       //a context vector we don't know how to handle.
     }
@@ -392,23 +403,6 @@ PRBool VerifyContextVector(PRInt32 aTags[],PRInt32 count,nsIDTD* aDTD) {
   return result;
 }
 
-/**
- *  This debug routine sets the verification directory.  It overrides
- *  the value from PR_GetEnv()
- *
- *  @update  jevering 5/19/98
- *  @param   
- *  @return 
- */
-
-extern "C" NS_EXPORT void SetVerificationDirectory(char * verify_dir)
-{
-   if (verify_dir && PL_strlen(verify_dir))
-      gVerificationOutputDir = verify_dir;
-   else
-      gVerificationOutputDir = NULL;
-   
-}
 
 /**
  *  This is where we loop over the tokens created in the 
@@ -418,74 +412,38 @@ extern "C" NS_EXPORT void SetVerificationDirectory(char * verify_dir)
  *  @param   
  *  @return  PR_TRUE if parse succeeded, PR_FALSE otherwise.
  */
-PRBool nsHTMLParser::IterateTokens() {
+PRInt32 nsHTMLParser::IterateTokens() {
   nsDeque& deque=mTokenizer->GetDeque();
   nsDequeIterator e=deque.End(); 
+  nsDequeIterator theMarkPos(e);
 
-  if(mCurrentPos)
-    delete mCurrentPos; //don't leak, now!
-  mCurrentPos=new nsDequeIterator(deque.Begin());
+  if(!mCurrentPos)
+    mCurrentPos=new nsDequeIterator(deque.Begin());
 
-  CToken* theToken;
-  PRBool  done=PR_FALSE;
-  PRBool  result=PR_TRUE;
-  PRInt32 iteration=0;
+  PRInt32 result=kNoError;
 
-  while((!done) && (result)) {
-    theToken=(CToken*)mCurrentPos->GetCurrent();
+  while((kNoError==result) && ((*mCurrentPos<e))){
 
-#if defined(NS_DEBUG)
-    if (!theToken)
-       break;
-#endif
-
-    eHTMLTokenTypes type=eHTMLTokenTypes(theToken->GetTokenType());
-    iteration++; //debug purposes...
-
-    switch(type){
-  
-      case eToken_start: 
-      case eToken_text:
-      case eToken_newline:
-      case eToken_whitespace:
-        result=HandleStartToken(theToken); break;
-      
-      case eToken_end:
-        result=HandleEndToken(theToken); break;
-      
-      case eToken_entity:
-        result=HandleEntityToken(theToken); break;
+    CToken* theToken=(CToken*)mCurrentPos->GetCurrent();
     
-      case eToken_skippedcontent:  
-        //used in cases like <SCRIPT> where we skip over script content.
-        result=HandleSkippedContentToken(theToken); break;
-      
-      case eToken_attribute:
-        result=HandleAttributeToken(theToken); break;
-      
-      case eToken_style:
-        result=HandleStyleToken(theToken); break;
-      
-      case eToken_comment:
-        result=HandleCommentToken(theToken); break;
-      
-      default:
-        //for all these non-interesting types, just skip them for now.
-        //later you have to Handle them, because they're relevent to certain containers (eg PRE).
-        break;
+    eHTMLTokenTypes type=eHTMLTokenTypes(theToken->GetTokenType());
+    CTokenHandler* aHandler=GetTokenHandler(type);
+
+    if(aHandler) {
+      theMarkPos=*mCurrentPos;
+      result=(*aHandler)(theToken,this);
+      VerifyContextVector(mContextStack,mContextStackPos,mDTD);
     }
-    VerifyContextVector(mContextStack,mContextStackPos,mDTD);
     ++(*mCurrentPos);
-    done=PRBool(!(*mCurrentPos<e));
   }
 
-  //One last thing...close any open containers.
-  if((PR_TRUE==result) && (mContextStackPos>0)) {
-    result=CloseContainersTo(0);
-  }
+  if(kInterrupted==result)
+    *mCurrentPos=theMarkPos;
+
   return result;
 }
 
+
 /**
  *  
  *  
@@ -526,6 +484,36 @@ void GetDelegateAndDTD(eParseMode aMode,ITokenizerDelegate*& aDelegate,nsIDTD*&
 }
 
 
+/**
+ * 
+ * @update	gess5/18/98
+ * @param 
+ * @return
+ */
+PRInt32 nsHTMLParser::WillBuildModel(void) {
+  mIteration=-1;
+  if(mSink)
+    mSink->WillBuildModel();
+  return kNoError;
+}
+
+/**
+ * 
+ * @update	gess5/18/98
+ * @param 
+ * @return
+ */
+PRInt32 nsHTMLParser::DidBuildModel(PRInt32 anErrorCode) {
+  //One last thing...close any open containers.
+  if((kNoError==anErrorCode) && (mContextStackPos>0)) {
+    CloseContainersTo(0);
+  }
+  if(mSink) {
+    mSink->DidBuildModel();
+  }
+  return anErrorCode;
+}
+
 /**
  *  This DEBUG ONLY method is used to simulate a network-based
  *  i/o model where data comes in incrementally.
@@ -538,9 +526,9 @@ PRInt32 nsHTMLParser::ParseFileIncrementally(const char* aFilename){
   PRInt32   result=kBadFilename;
   fstream*  mFileStream;
   nsString  theBuffer;
-  PRInt32   iter=-1;
-  const int kBufSize=10;
+  const int kLocalBufSize=10;
 
+  mIteration=-1;
 #if defined(XP_UNIX) && defined(IRIX)
   /* XXX: IRIX does not support ios::binary */
   mFileStream=new fstream(aFilename,ios::in);
@@ -552,18 +540,20 @@ PRInt32 nsHTMLParser::ParseFileIncrementally(const char* aFilename){
     while((kNoError==result) || (kInterrupted==result)) {
       //read some data from the file...
 
-      char buf[kBufSize];
-      buf[kBufSize]=0;
+      char buf[kLocalBufSize];
+      buf[kLocalBufSize]=0;
 
       if(mFileStream) {
-        mFileStream->read(buf,kBufSize);
+        mFileStream->read(buf,kLocalBufSize);
         PRInt32 numread=mFileStream->gcount();
         if(numread>0) {
+          buf[numread]=0;
           theBuffer.Truncate();
           theBuffer.Append(buf);
           mTokenizer->Append(theBuffer);
-          result=ResumeParse(++iter);
+          result=ResumeParse();
         }
+        else break;
       }
 
     }
@@ -600,7 +590,7 @@ PRBool nsHTMLParser::Parse(const char* aFilename,PRBool aIncremental){
       if(mDTD)
         mDTD->SetParser(this);
 
-      mSink->WillBuildModel();
+      WillBuildModel();
 
       //ok, time to create our tokenizer and begin the process
       if(aIncremental) {
@@ -610,9 +600,9 @@ PRBool nsHTMLParser::Parse(const char* aFilename,PRBool aIncremental){
       else {
         //ok, time to create our tokenizer and begin the process
         mTokenizer=new CTokenizer(aFilename,mDelegate,mParseMode);
-        status=ResumeParse(0);
+        status=ResumeParse();
       }
-      mSink->DidBuildModel();
+      DidBuildModel(status);
     }//if
   }
   return status;
@@ -635,10 +625,10 @@ PRInt32 nsHTMLParser::Parse(nsIURL* aURL,PRBool aIncremental ){
   PRInt32 status=kBadURL;
 
   if(rickGDebug)
-    status=Parse("c:/temp/temp.html",PR_TRUE);
+    return Parse("c:/temp/temp.html",PR_TRUE);
 
   mIncremental=aIncremental;
-  mParseMode=DetermineParseMode();  
+  mParseMode=DetermineParseMode();   
 
   if(aURL) {
 
@@ -648,17 +638,18 @@ PRInt32 nsHTMLParser::Parse(nsIURL* aURL,PRBool aIncremental ){
       if(mDTD)
         mDTD->SetParser(this);
 
-      mSink->WillBuildModel();
+      WillBuildModel();
 
       //ok, time to create our tokenizer and begin the process
-      if(aIncremental) {
-        mTokenizer=new CTokenizer(mDelegate,mParseMode);
+      if(mIncremental) {  
+        mTokenizer=new CTokenizer(mDelegate,mParseMode);   
         status=aURL->Open(this);
       }
       else {
         mTokenizer=new CTokenizer(aURL,mDelegate,mParseMode);
-        status=ResumeParse(0);
-        mSink->DidBuildModel();
+        WillBuildModel();
+        status=ResumeParse();
+        DidBuildModel(status);
       }
     }//if
   }
@@ -676,10 +667,10 @@ PRInt32 nsHTMLParser::Parse(nsIURL* aURL,PRBool aIncremental ){
 PRInt32 nsHTMLParser::Parse(nsString& aSourceBuffer,PRBool appendTokens){
   PRInt32 result=kNoError;
   
-  mSink->WillBuildModel();
+  WillBuildModel();
   mTokenizer->Append(aSourceBuffer);
-  result=ResumeParse(0);
-  mSink->DidBuildModel();
+  result=ResumeParse();
+  DidBuildModel(result);
   
   return result;
 }
@@ -694,17 +685,15 @@ PRInt32 nsHTMLParser::Parse(nsString& aSourceBuffer,PRBool appendTokens){
  *  @param   
  *  @return  PR_TRUE if parsing concluded successfully.
  */
-PRInt32 nsHTMLParser::ResumeParse(PRInt32 anIteration) {
+PRInt32 nsHTMLParser::ResumeParse() {
   PRInt32 result=kNoError;
 
   mSink->WillResume();
   if(kNoError==result) {
-    result=mTokenizer->Tokenize(anIteration);
+    result=mTokenizer->Tokenize(++mIteration);
     if(kInterrupted==result)
       mSink->WillInterrupt();
-
-    if(!rickGDebug)
-      IterateTokens();
+    IterateTokens();
   }
   return result;
 }
@@ -722,28 +711,33 @@ PRInt32 nsHTMLParser::GetStack(PRInt32* aStackPtr) {
 
 
 /**
- * 
+ * Retrieve the attributes for this node, and add then into
+ * the node.
+ *
  * @update  gess4/22/98
- * @param 
- * @return
+ * @param   aNode is the node you want to collect attributes for
+ * @param   aCount is the # of attributes you're expecting
+ * @return error code (should be 0)
  */
-PRInt32 nsHTMLParser::CollectAttributes(nsCParserNode& aNode){
-  eHTMLTokenTypes subtype=eToken_attribute;
-  nsDeque&         deque=mTokenizer->GetDeque();
-  nsDequeIterator  end=deque.End();
-  
-  while((*mCurrentPos<end) && (eToken_attribute==subtype)) {
-    CHTMLToken* tkn=(CHTMLToken*)(++(*mCurrentPos));
-    if(tkn){
-      subtype=eHTMLTokenTypes(tkn->GetTokenType());
-      if(eToken_attribute==subtype) {
-        aNode.AddAttribute(tkn);
-      } 
-      else (*mCurrentPos)--;
-    }
-  }
-  return aNode.GetAttributeCount();
+PRInt32 nsHTMLParser::CollectAttributes(nsCParserNode& aNode,PRInt32 aCount){
+  nsDeque&        deque=mTokenizer->GetDeque();
+  nsDequeIterator end=deque.End();
 
+  int attr=0;
+  for(attr=0;attr<aCount;attr++) {
+    if(*mCurrentPos<end) {
+      CHTMLToken* tkn=(CHTMLToken*)(++(*mCurrentPos));
+      if(tkn){
+        if(eToken_attribute==eHTMLTokenTypes(tkn->GetTokenType())){
+          aNode.AddAttribute(tkn);
+        } 
+        else (*mCurrentPos)--;
+      }
+      else kInterrupted;
+    }
+    else return kInterrupted;
+  }
+  return kNoError;
 }
 
 
@@ -786,13 +780,14 @@ PRInt32 nsHTMLParser::CollectSkippedContent(nsCParserNode& aNode){
  *  @param   aNode -- CParserNode representing this start token
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsCParserNode& aNode) {
+PRInt32 nsHTMLParser::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsCParserNode& aNode) {
   NS_PRECONDITION(0!=aToken,kNullToken);
 
   eHTMLTags parentTag=(eHTMLTags)GetTopNode();
-  PRBool    result=mDTD->CanContain(parentTag,aChildTag);
+  PRInt32   result=kNoError;
+  PRBool    contains=mDTD->CanContain(parentTag,aChildTag);
 
-  if(PR_FALSE==result){
+  if(PR_FALSE==contains){
     result=CreateContextStackFor(aChildTag);
     if(PR_FALSE==result) {
       //if you're here, then the new topmost container can't contain aToken.
@@ -829,90 +824,96 @@ PRBool nsHTMLParser::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,
  *  @param   aNode -- CParserNode representing this start token
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleStartToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleStartToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
 
-  PRBool        result=PR_FALSE;
   CStartToken*  st= (CStartToken*)(aToken);
   eHTMLTags     tokenTagType=st->GetHTMLTag();
 
-
   //Begin by gathering up attributes...
-  nsCParserNode   attrNode((CHTMLToken*)aToken);
-  PRInt32 attrCount=CollectAttributes(attrNode);
+  nsCParserNode attrNode((CHTMLToken*)aToken);
+  PRInt16       attrCount=aToken->GetAttributeCount();
+  PRInt32       result=(0==attrCount) ? kNoError : CollectAttributes(attrNode,attrCount);
 
-    //now check to see if this token should be omitted...
-  if(PR_TRUE==mDTD->CanOmit(GetTopNode(),tokenTagType)) {
-    return PR_TRUE;
-  }
+  if(kNoError==result) {
+      //now check to see if this token should be omitted...
+    if(PR_FALSE==mDTD->CanOmit(GetTopNode(),tokenTagType)) {
   
-  switch(tokenTagType) {
+      switch(tokenTagType) {
 
-    case eHTMLTag_html:
-      result=OpenHTML(attrNode); break;
+        case eHTMLTag_html:
+          result=OpenHTML(attrNode); break;
 
-    case eHTMLTag_title:
-      {
-        nsCParserNode theNode(st);
-        result=OpenHead(theNode); //open the head...
-        CollectSkippedContent(attrNode);
-        result=mSink->SetTitle(attrNode.GetSkippedContent());
-        result=CloseHead(theNode); //close the head...
-      }
-      break;
+        case eHTMLTag_title:
+          {
+            nsCParserNode theNode(st);
+            result=OpenHead(theNode); //open the head...
+            if(kNoError==result) {
+              CollectSkippedContent(attrNode);
+              mSink->SetTitle(attrNode.GetSkippedContent());
+              result=CloseHead(theNode); //close the head...
+            }
+          }
+          break;
 
-    case eHTMLTag_textarea:
-      {
-        CollectSkippedContent(attrNode);
-        result=AddLeaf(attrNode);
-      }
-      break;
+        case eHTMLTag_textarea:
+          {
+            CollectSkippedContent(attrNode);
+            result=AddLeaf(attrNode);
+          }
+          break;
 
-    case eHTMLTag_form:
-      result = OpenForm(attrNode);
-      break;
+        case eHTMLTag_form:
+          result = OpenForm(attrNode);
+          break;
 
-    case eHTMLTag_meta:
-    case eHTMLTag_link:
-      {
-        nsCParserNode theNode((CHTMLToken*)aToken);
-        result=OpenHead(theNode);
-        result=AddLeaf(theNode);
-        result=CloseHead(theNode);
-      }
-      break;
+        case eHTMLTag_meta:
+        case eHTMLTag_link:
+          {
+            nsCParserNode theNode((CHTMLToken*)aToken);
+            result=OpenHead(theNode);
+            if(kNoError==result)
+              result=AddLeaf(theNode);
+            if(kNoError==result)
+              result=CloseHead(theNode);
+          }
+          break;
 
-    case eHTMLTag_style:
-      {
-        nsCParserNode theNode((CHTMLToken*)aToken);
-        result=OpenHead(theNode);
-        CollectSkippedContent(attrNode);
-        result=AddLeaf(attrNode);
-        result=CloseHead(theNode);
-      }
-      break;
+        case eHTMLTag_style:
+          {
+            nsCParserNode theNode((CHTMLToken*)aToken);
+            result=OpenHead(theNode);
+            if(kNoError==result) {
+              CollectSkippedContent(attrNode);
+              if(kNoError==result) {
+                result=AddLeaf(attrNode);
+                if(kNoError==result)
+                  result=CloseHead(theNode);
+              }
+            }
+          }
+          break;
 
-    case eHTMLTag_script:
-      result=HandleScriptToken(st); break;
+        case eHTMLTag_script:
+          result=HandleScriptToken(st); break;
       
 
-    case eHTMLTag_map:
-      // Put map into the head section
-      result=OpenHead(attrNode);
-      result=OpenContainer(attrNode);
-      break;
+        case eHTMLTag_map:
+          // Put map into the head section
+          result=OpenHead(attrNode);
+          if(kNoError==result)
+            result=OpenContainer(attrNode);
+          break;
 
-    case eHTMLTag_head:
-      result=PR_TRUE; break; //ignore head tags...
-
-    case eHTMLTag_select:
-      result=PR_FALSE;
-
-    default:
-      result=HandleDefaultStartToken(aToken,tokenTagType,attrNode);
-      break;
-  }
+        case eHTMLTag_head:
+          break; //ignore head tags...
 
+        default:
+          result=HandleDefaultStartToken(aToken,tokenTagType,attrNode);
+          break;
+      } //switch
+    } //if
+  } //if
   return result;
 }
 
@@ -929,16 +930,16 @@ PRBool nsHTMLParser::HandleStartToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleEndToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleEndToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
 
-  PRBool      result=PR_FALSE;
+  PRInt32     result=kNoError;
   CEndToken*  et = (CEndToken*)(aToken);
   eHTMLTags   tokenTagType=et->GetHTMLTag();
 
     //now check to see if this token should be omitted...
   if(PR_TRUE==mDTD->CanOmitEndTag(GetTopNode(),tokenTagType)) {
-    return PR_TRUE;
+    return result;
   }
 
   nsCParserNode theNode((CHTMLToken*)aToken);
@@ -951,12 +952,12 @@ PRBool nsHTMLParser::HandleEndToken(CToken* aToken) {
     case eHTMLTag_title:
     case eHTMLTag_head:
     case eHTMLTag_script:
-      result=PR_TRUE; 
       break;
 
     case eHTMLTag_map:
       result=CloseContainer(theNode);
-      result=CloseHead(theNode);
+      if(kNoError==result)
+        result=CloseHead(theNode);
       break;
 
     case eHTMLTag_form:
@@ -970,7 +971,6 @@ PRBool nsHTMLParser::HandleEndToken(CToken* aToken) {
       if(mDTD->IsContainer(tokenTagType)){
         result=CloseContainersTo(tokenTagType); 
       }
-      result=PR_TRUE;
       //
       break;
   }
@@ -985,10 +985,10 @@ PRBool nsHTMLParser::HandleEndToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleEntityToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleEntityToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
   CEntityToken*  et = (CEntityToken*)(aToken);
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   nsCParserNode aNode((CHTMLToken*)aToken);
   result=AddLeaf(aNode);
   return result;
@@ -1004,9 +1004,9 @@ PRBool nsHTMLParser::HandleEntityToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleCommentToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleCommentToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
-  return PR_TRUE;
+  return kNoError;
 }
 
 /**
@@ -1019,10 +1019,10 @@ PRBool nsHTMLParser::HandleCommentToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleSkippedContentToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleSkippedContentToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
 
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
 
   if(HasOpenContainer(eHTMLTag_body)) {
     nsCParserNode aNode((CHTMLToken*)aToken);
@@ -1041,12 +1041,12 @@ PRBool nsHTMLParser::HandleSkippedContentToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleAttributeToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleAttributeToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
   NS_ERROR("attribute encountered -- this shouldn't happen!");
 
   CAttributeToken*  at = (CAttributeToken*)(aToken);
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   return result;
 }
 
@@ -1058,11 +1058,11 @@ PRBool nsHTMLParser::HandleAttributeToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleScriptToken(CToken* aToken) {
+PRInt32 nsHTMLParser::HandleScriptToken(CToken* aToken) {
   NS_PRECONDITION(0!=aToken,kNullToken);
 
   CScriptToken*  st = (CScriptToken*)(aToken);
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   return result;
 }
 
@@ -1074,11 +1074,11 @@ PRBool nsHTMLParser::HandleScriptToken(CToken* aToken) {
  *  @param   aToken -- next (start) token to be handled
  *  @return  PR_TRUE if all went well; PR_FALSE if error occured
  */
-PRBool nsHTMLParser::HandleStyleToken(CToken* aToken){
+PRInt32 nsHTMLParser::HandleStyleToken(CToken* aToken){
   NS_PRECONDITION(0!=aToken,kNullToken);
 
   CStyleToken*  st = (CStyleToken*)(aToken);
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
   return result;
 }
 
@@ -1092,10 +1092,10 @@ PRBool nsHTMLParser::HandleStyleToken(CToken* aToken){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenHTML(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenHTML(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos >= 0, kInvalidTagStackPos);
 
-  PRBool result=mSink->OpenHTML(aNode); 
+  PRInt32 result=mSink->OpenHTML(aNode); 
   mContextStack[mContextStackPos++]=(eHTMLTags)aNode.GetNodeType();
   return result;
 }
@@ -1109,9 +1109,9 @@ PRBool nsHTMLParser::OpenHTML(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseHTML(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::CloseHTML(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
-  PRBool result=mSink->CloseHTML(aNode); 
+  PRInt32 result=mSink->CloseHTML(aNode); 
   mContextStack[--mContextStackPos]=eHTMLTag_unknown;
   return result;
 }
@@ -1125,9 +1125,9 @@ PRBool nsHTMLParser::CloseHTML(const nsIParserNode& aNode){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenHead(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenHead(const nsIParserNode& aNode){
   mContextStack[mContextStackPos++]=eHTMLTag_head;
-  PRBool result=mSink->OpenHead(aNode); 
+  PRInt32 result=mSink->OpenHead(aNode); 
   return result;
 }
 
@@ -1139,8 +1139,8 @@ PRBool nsHTMLParser::OpenHead(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseHead(const nsIParserNode& aNode){
-  PRBool result=mSink->CloseHead(aNode); 
+PRInt32 nsHTMLParser::CloseHead(const nsIParserNode& aNode){
+  PRInt32 result=mSink->CloseHead(aNode); 
   mContextStack[--mContextStackPos]=eHTMLTag_unknown;
   return result;
 }
@@ -1153,10 +1153,10 @@ PRBool nsHTMLParser::CloseHead(const nsIParserNode& aNode){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenBody(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenBody(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos >= 0, kInvalidTagStackPos);
 
-  PRBool    result=PR_TRUE;
+  PRInt32 result=kNoError;
   eHTMLTags topTag=(eHTMLTags)nsHTMLParser::GetTopNode();
 
   if(eHTMLTag_html!=topTag) {
@@ -1185,7 +1185,7 @@ PRBool nsHTMLParser::OpenBody(const nsIParserNode& aNode){
     }
   }
 
-  if(PR_TRUE==result) {
+  if(kNoError==result) {
     result=mSink->OpenBody(aNode); 
     mContextStack[mContextStackPos++]=(eHTMLTags)aNode.GetNodeType();
   }
@@ -1200,9 +1200,9 @@ PRBool nsHTMLParser::OpenBody(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseBody(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::CloseBody(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos >= 0, kInvalidTagStackPos);
-  PRBool result=mSink->CloseBody(aNode); 
+  PRInt32 result=mSink->CloseBody(aNode); 
   mContextStack[--mContextStackPos]=eHTMLTag_unknown;
   return result;
 }
@@ -1215,11 +1215,11 @@ PRBool nsHTMLParser::CloseBody(const nsIParserNode& aNode){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenForm(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenForm(const nsIParserNode& aNode){
   if(mHasOpenForm)
     CloseForm(aNode);
-  mHasOpenForm=PR_TRUE;
-  return mSink->OpenForm(aNode); 
+  PRInt32 result=mSink->OpenForm(aNode);
+  return result;
 }
 
 /**
@@ -1230,8 +1230,8 @@ PRBool nsHTMLParser::OpenForm(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseForm(const nsIParserNode& aNode){
-  PRBool result=PR_TRUE;
+PRInt32 nsHTMLParser::CloseForm(const nsIParserNode& aNode){
+  PRInt32 result=kNoError;
   if(mHasOpenForm) {
     mHasOpenForm=PR_FALSE;
     result=mSink->CloseForm(aNode); 
@@ -1247,9 +1247,9 @@ PRBool nsHTMLParser::CloseForm(const nsIParserNode& aNode){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenFrameset(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenFrameset(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos >= 0, kInvalidTagStackPos);
-  PRBool result=mSink->OpenFrameset(aNode); 
+  PRInt32 result=mSink->OpenFrameset(aNode); 
   mContextStack[mContextStackPos++]=(eHTMLTags)aNode.GetNodeType();
   return result;
 }
@@ -1262,9 +1262,9 @@ PRBool nsHTMLParser::OpenFrameset(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseFrameset(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::CloseFrameset(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
-  PRBool result=mSink->CloseFrameset(aNode); 
+  PRInt32 result=mSink->CloseFrameset(aNode); 
   mContextStack[--mContextStackPos]=eHTMLTag_unknown;
   return result;
 }
@@ -1277,9 +1277,9 @@ PRBool nsHTMLParser::CloseFrameset(const nsIParserNode& aNode){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::OpenContainer(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::OpenContainer(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
-  PRBool result=PR_FALSE;
+  PRInt32 result=kNoError; //was false
   
   //XXX Hack! We know this is wrong, but it works
   //for the general case until we get it right.
@@ -1295,7 +1295,6 @@ PRBool nsHTMLParser::OpenContainer(const nsIParserNode& aNode){
     case eHTMLTag_textarea:
     case eHTMLTag_head:
     case eHTMLTag_title:
-      result=PR_TRUE;
       break;
 
     case eHTMLTag_form:
@@ -1317,9 +1316,9 @@ PRBool nsHTMLParser::OpenContainer(const nsIParserNode& aNode){
  * @param   aNode -- next node to be removed from our model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseContainer(const nsIParserNode& aNode){
+PRInt32 nsHTMLParser::CloseContainer(const nsIParserNode& aNode){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
-  PRBool result=PR_FALSE;
+  PRInt32 result=kNoError; //was false
   
   //XXX Hack! We know this is wrong, but it works
   //for the general case until we get it right.
@@ -1359,9 +1358,9 @@ PRBool nsHTMLParser::CloseContainer(const nsIParserNode& aNode){
  * @param   
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseContainersTo(PRInt32 anIndex){
+PRInt32 nsHTMLParser::CloseContainersTo(PRInt32 anIndex){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
-  PRBool result=PR_TRUE;
+  PRInt32 result=kNoError;
 
   nsAutoString empty;
   CEndToken aToken(empty);
@@ -1384,11 +1383,11 @@ PRBool nsHTMLParser::CloseContainersTo(PRInt32 anIndex){
  * @param   
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseContainersTo(eHTMLTags aTag){
+PRInt32 nsHTMLParser::CloseContainersTo(eHTMLTags aTag){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
 
   PRInt32 pos=GetTopmostIndex(aTag);
-  PRBool result=PR_FALSE;
+  PRInt32 result=kNoError;
 
   if(kNotFound!=pos) {
     //the tag is indeed open, so close it.
@@ -1403,6 +1402,7 @@ PRBool nsHTMLParser::CloseContainersTo(eHTMLTags aTag){
     }
     else {
       //XXX HACK! This is a real problem -- the unhandled case.!
+      result=kUnknownError;
     }
   }
   return result;
@@ -1416,15 +1416,15 @@ PRBool nsHTMLParser::CloseContainersTo(eHTMLTags aTag){
  * @param   
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::CloseTopmostContainer(){
+PRInt32 nsHTMLParser::CloseTopmostContainer(){
   NS_PRECONDITION(mContextStackPos > 0, kInvalidTagStackPos);
 
   nsAutoString empty;
   CEndToken aToken(empty);
   aToken.SetHTMLTag((eHTMLTags)mContextStack[mContextStackPos-1]);
   nsCParserNode theNode(&aToken);
-
-  return CloseContainer(theNode);
+  PRInt32 result=CloseContainer(theNode);
+  return result;
 }
 
 /**
@@ -1435,8 +1435,8 @@ PRBool nsHTMLParser::CloseTopmostContainer(){
  * @param   aNode -- next node to be added to model
  * @return  TRUE if ok, FALSE if error
  */
-PRBool nsHTMLParser::AddLeaf(const nsIParserNode& aNode){
-  PRBool result=mSink->AddLeaf(aNode); 
+PRInt32 nsHTMLParser::AddLeaf(const nsIParserNode& aNode){
+  PRInt32 result=mSink->AddLeaf(aNode); 
   return result;
 }
 
@@ -1451,10 +1451,10 @@ PRBool nsHTMLParser::AddLeaf(const nsIParserNode& aNode){
  *           create a new context vector
  *  @return  true if we succeeded, otherwise false
  */
-PRBool nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
+PRInt32 nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
   nsAutoString  theVector;
   
-  PRBool result=PR_FALSE;
+  PRInt32 result=kNoError;
   PRInt32 pos=0;
   PRInt32 cnt=0;
   PRInt32 theTop=GetTopNode();
@@ -1463,7 +1463,9 @@ PRBool nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
     //add code here to build up context stack based on forward propagated context vector...
     pos=0;
     cnt=theVector.Length()-1;
-    result=PRBool(mContextStack[mContextStackPos-1]==theVector[cnt]);
+    if(mContextStack[mContextStackPos-1]==theVector[cnt])
+      result=kNoError;
+    else result=kContextMismatch;
   }
   else {
     PRBool tempResult;
@@ -1479,7 +1481,7 @@ PRBool nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
       //propagation worked, so pop unwanted containers, push new ones, then exit...
       pos=0;
       cnt=theVector.Length();
-      result=PR_TRUE;
+      result=kNoError;
       while(pos<mContextStackPos) {
         if(mContextStack[pos]==theVector[cnt-1-pos]) {
           pos++;
@@ -1496,9 +1498,10 @@ PRBool nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
 
     //now, build up the stack according to the tags 
     //you have that aren't in the stack...
-  if(PR_TRUE==result){
+  if(kNoError==result){
     nsAutoString  empty;
-    for(int i=pos;i<cnt;i++) {
+    int i=0;
+    for(i=pos;i<cnt;i++) {
       CStartToken* st=new CStartToken(empty);
       st->SetHTMLTag((eHTMLTags)theVector[cnt-1-i]);
       HandleStartToken(st);
@@ -1519,8 +1522,8 @@ PRBool nsHTMLParser::CreateContextStackFor(PRInt32 aChildTag){
  *  @param   
  *  @return  
  */
-PRBool nsHTMLParser::ReduceContextStackFor(PRInt32 aChildTag){
-  PRBool    result=PR_TRUE;
+PRInt32 nsHTMLParser::ReduceContextStackFor(PRInt32 aChildTag){
+  PRInt32    result=kNoError;
   eHTMLTags topTag=(eHTMLTags)nsHTMLParser::GetTopNode();
 
   while( (topTag!=kNotFound) && 
@@ -1565,7 +1568,10 @@ nsresult nsHTMLParser::OnProgress(PRInt32 Progress, PRInt32 ProgressMax, const c
  *  @return  
  */
 nsresult nsHTMLParser::OnStartBinding(void){
-  nsresult result=0;
+  nsresult result=WillBuildModel();
+  if(!mTransferBuffer) {
+    mTransferBuffer=new char[gTransferBufferSize+1];
+  }
   return result;
 }
 
@@ -1577,7 +1583,19 @@ nsresult nsHTMLParser::OnStartBinding(void){
  *  @return  
  */
 nsresult nsHTMLParser::OnDataAvailable(nsIInputStream *pIStream, PRInt32 length){
-  nsresult result=0;
+
+  int len=0;
+
+  do {
+      PRInt32 err;
+      len = pIStream->Read(&err, mTransferBuffer, 0, gTransferBufferSize);
+      if(len>0) {
+        mTransferBuffer[len]=0;
+        mTokenizer->Append(mTransferBuffer,len);
+      }
+  } while (len > 0);
+
+  nsresult result=ResumeParse();
   return result;
 }
 
@@ -1589,8 +1607,7 @@ nsresult nsHTMLParser::OnDataAvailable(nsIInputStream *pIStream, PRInt32 length)
  *  @return  
  */
 nsresult nsHTMLParser::OnStopBinding(PRInt32 status, const char *msg){
-  nsresult result=0;
+  nsresult result=DidBuildModel(status);
   return result;
 }
 
-
diff --git a/mozilla/parser/htmlparser/src/nsHTMLParser.h b/mozilla/parser/htmlparser/src/nsHTMLParser.h
index b48caf9bcb9..c3a51b9f75d 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLParser.h
+++ b/mozilla/parser/htmlparser/src/nsHTMLParser.h
@@ -15,7 +15,7 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
-
+ 
 /**
  * MODULE NOTES:
  * @update  gess 4/1/98
@@ -114,7 +114,7 @@ friend class CTokenHandler;
      * @param   aMode is the desired parser mode (Nav, other, etc.)
      * @return  TRUE if all went well -- FALSE otherwise
      */
-    virtual PRInt32 Parse(nsIURL* aURL,PRBool aIncremental=PR_FALSE);
+    virtual PRInt32 Parse(nsIURL* aURL,PRBool aIncremental=PR_TRUE);
 
     /**
      * Cause parser to parse input from given file in given mode
@@ -138,7 +138,7 @@ friend class CTokenHandler;
      * @update	gess5/11/98
      * @return  TRUE if all went well, otherwise FALSE
      */
-    virtual PRInt32 ResumeParse(PRInt32 anIteration);
+    virtual PRInt32 ResumeParse(void);
 
     /**
      * Retrieve ptr to internal context vector stack
@@ -164,7 +164,7 @@ friend class CTokenHandler;
      * @param   aToken is the start token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleStartToken(CToken* aToken);
+    PRInt32 HandleStartToken(CToken* aToken);
 
     /**
      * This method gets called when a start token has been consumed, and
@@ -177,7 +177,7 @@ friend class CTokenHandler;
      * @param   aNode is a node be updated with info from given token
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsCParserNode& aNode);
+    PRInt32 HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsCParserNode& aNode);
 
     /**
      * This method gets called when an end token has been consumed and needs 
@@ -186,7 +186,7 @@ friend class CTokenHandler;
      * @param   aToken is the end token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleEndToken(CToken* aToken);
+    PRInt32 HandleEndToken(CToken* aToken);
 
     /**
      * This method gets called when an entity token has been consumed and needs 
@@ -195,7 +195,7 @@ friend class CTokenHandler;
      * @param   aToken is the entity token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleEntityToken(CToken* aToken);
+    PRInt32 HandleEntityToken(CToken* aToken);
 
     /**
      * This method gets called when a comment token has been consumed and needs 
@@ -204,7 +204,7 @@ friend class CTokenHandler;
      * @param   aToken is the comment token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleCommentToken(CToken* aToken);
+    PRInt32 HandleCommentToken(CToken* aToken);
 
     /**
      * This method gets called when a skipped-content token has been consumed and needs 
@@ -213,7 +213,7 @@ friend class CTokenHandler;
      * @param   aToken is the skipped-content token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleSkippedContentToken(CToken* aToken);
+    PRInt32 HandleSkippedContentToken(CToken* aToken);
 
     /**
      * This method gets called when an attribute token has been consumed and needs 
@@ -222,7 +222,7 @@ friend class CTokenHandler;
      * @param   aToken is the attribute token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleAttributeToken(CToken* aToken);
+    PRInt32 HandleAttributeToken(CToken* aToken);
 
     /**
      * This method gets called when a script token has been consumed and needs 
@@ -231,7 +231,7 @@ friend class CTokenHandler;
      * @param   aToken is the script token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleScriptToken(CToken* aToken);
+    PRInt32 HandleScriptToken(CToken* aToken);
     
     /**
      * This method gets called when a style token has been consumed and needs 
@@ -240,7 +240,7 @@ friend class CTokenHandler;
      * @param   aToken is the style token to be handled
      * @return  TRUE if the token was handled.
      */
-    PRBool HandleStyleToken(CToken* aToken);
+    PRInt32 HandleStyleToken(CToken* aToken);
 
       //*********************************************
       // These methods are callback methods used by
@@ -254,21 +254,29 @@ friend class CTokenHandler;
 
 protected:
 
+    /**
+     * 
+     * @update	gess5/18/98
+     * @param 
+     * @return
+     */
+    PRInt32 WillBuildModel(void);
+
+    /**
+     * 
+     * @update	gess5/18/98
+     * @param 
+     * @return
+     */
+    PRInt32 DidBuildModel(PRInt32 anErrorCode);
+
     /**
      * This method gets called when the tokens have been consumed, and it's time
      * to build the model via the content sink.
      * @update	gess5/11/98
      * @return  YES if model building went well -- NO otherwise.
      */
-    PRBool IterateTokens();
-
-    /**
-     * Retrieves the tag type for the element on the context vector stack at given pos.
-     * @update	gess5/11/98
-     * @param   pos of item you want to retrieve
-     * @return  tag type (may be unknown)
-     */
-    eHTMLTags NodeAt(PRInt32 aPos) const;
+    PRInt32 IterateTokens(void);
 
     /**
      * Retrieve the tag type of the topmost item on context vector stack
@@ -277,13 +285,6 @@ protected:
      */
     eHTMLTags GetTopNode() const;
 
-    /**
-     * Retrieve the number of items on context vector stack
-     * @update	gess5/11/98
-     * @return  count of items on stack -- may be 0
-     */
-    PRInt32 GetStackPos() const;
-
     /**
      * Causes the parser to scan foward, collecting nearby (sequential)
      * attribute tokens into the given node.
@@ -291,7 +292,7 @@ protected:
      * @param   node to store attributes
      * @return  number of attributes added to node.
      */
-    PRInt32 CollectAttributes(nsCParserNode& aNode);
+    PRInt32 CollectAttributes(nsCParserNode& aNode,PRInt32 aCount);
 
     /**
      * Causes the next skipped-content token (if any) to
@@ -309,12 +310,7 @@ protected:
      */
     void InitializeDefaultTokenHandlers();
 
-    /**
-     * DEPRECATED
-     * @update	gess5/11/98
-     */
-    CTokenHandler* GetTokenHandler(const nsString& aString) const;
-
+   
     /**
      * DEPRECATED
      * @update	gess5/11/98
@@ -345,7 +341,7 @@ protected:
      * @param   HTML (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenHTML(const nsIParserNode& aNode);
+    PRInt32 OpenHTML(const nsIParserNode& aNode);
 
     /**
      * 
@@ -353,7 +349,7 @@ protected:
      * @param 
      * @return
      */
-    PRBool CloseHTML(const nsIParserNode& aNode);
+    PRInt32 CloseHTML(const nsIParserNode& aNode);
 
     /**
      * This cover method opens the given node as a head item in 
@@ -362,7 +358,7 @@ protected:
      * @param   HEAD (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenHead(const nsIParserNode& aNode);
+    PRInt32 OpenHead(const nsIParserNode& aNode);
 
     /**
      * This cover method causes the content-sink head to be closed
@@ -370,7 +366,7 @@ protected:
      * @param   aNode is the node to be closed in sink (usually ignored)
      * @return  TRUE if all went well.
      */
-    PRBool CloseHead(const nsIParserNode& aNode);
+    PRInt32 CloseHead(const nsIParserNode& aNode);
 
     /**
      * This cover method opens the given node as a body item in 
@@ -379,7 +375,7 @@ protected:
      * @param   BODY (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenBody(const nsIParserNode& aNode);
+    PRInt32 OpenBody(const nsIParserNode& aNode);
 
     /**
      * This cover method causes the content-sink body to be closed
@@ -387,7 +383,7 @@ protected:
      * @param   aNode is the body node to be closed in sink (usually ignored)
      * @return  TRUE if all went well.
      */
-    PRBool CloseBody(const nsIParserNode& aNode);
+    PRInt32 CloseBody(const nsIParserNode& aNode);
 
     /**
      * This cover method opens the given node as a form item in 
@@ -396,7 +392,7 @@ protected:
      * @param   FORM (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenForm(const nsIParserNode& aNode);
+    PRInt32 OpenForm(const nsIParserNode& aNode);
 
     /**
      * This cover method causes the content-sink form to be closed
@@ -404,7 +400,7 @@ protected:
      * @param   aNode is the form node to be closed in sink (usually ignored)
      * @return  TRUE if all went well.
      */
-    PRBool CloseForm(const nsIParserNode& aNode);
+    PRInt32 CloseForm(const nsIParserNode& aNode);
 
     /**
      * This cover method opens the given node as a frameset item in 
@@ -413,7 +409,7 @@ protected:
      * @param   FRAMESET (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenFrameset(const nsIParserNode& aNode);
+    PRInt32 OpenFrameset(const nsIParserNode& aNode);
 
     /**
      * This cover method causes the content-sink frameset to be closed
@@ -421,7 +417,7 @@ protected:
      * @param   aNode is the frameeset node to be closed in sink (usually ignored)
      * @return  TRUE if all went well.
      */
-    PRBool CloseFrameset(const nsIParserNode& aNode);
+    PRInt32 CloseFrameset(const nsIParserNode& aNode);
 
     /**
      * This cover method opens the given node as a generic container in 
@@ -430,7 +426,7 @@ protected:
      * @param   generic container (node) to be opened in content sink.
      * @return  TRUE if all went well.
      */
-    PRBool OpenContainer(const nsIParserNode& aNode);
+    PRInt32 OpenContainer(const nsIParserNode& aNode);
 
     /**
      * This cover method causes a generic containre in the content-sink to be closed
@@ -438,14 +434,14 @@ protected:
      * @param   aNode is the node to be closed in sink (usually ignored)
      * @return  TRUE if all went well.
      */
-    PRBool CloseContainer(const nsIParserNode& aNode);
+    PRInt32 CloseContainer(const nsIParserNode& aNode);
     
     /**
      * This cover method causes the topmost container to be closed in sink
      * @update	gess5/11/98
      * @return  TRUE if all went well.
      */
-    PRBool CloseTopmostContainer();
+    PRInt32 CloseTopmostContainer();
     
     /**
      * Cause all containers down to topmost given tag to be closed
@@ -453,7 +449,7 @@ protected:
      * @param   aTag is the tag at which auto-closure should stop (inclusive) 
      * @return  TRUE if all went well -- otherwise FALSE
      */
-    PRBool CloseContainersTo(eHTMLTags aTag);
+    PRInt32 CloseContainersTo(eHTMLTags aTag);
 
     /**
      * Cause all containers down to given position to be closed
@@ -461,7 +457,7 @@ protected:
      * @param   anIndex is the stack pos at which auto-closure should stop (inclusive) 
      * @return  TRUE if all went well -- otherwise FALSE
      */
-    PRBool CloseContainersTo(PRInt32 anIndex);
+    PRInt32 CloseContainersTo(PRInt32 anIndex);
 
     /**
      * Causes leaf to be added to sink at current vector pos.
@@ -469,15 +465,8 @@ protected:
      * @param   aNode is leaf node to be added.
      * @return  TRUE if all went well -- FALSE otherwise.
      */
-    PRBool AddLeaf(const nsIParserNode& aNode);
+    PRInt32 AddLeaf(const nsIParserNode& aNode);
 
-    /**
-     * Determine if the given tag is open in the context vector stack.
-     * @update	gess5/11/98
-     * @param   aTag is the type of tag you want to test for openness
-     * @return  TRUE if open, FALSE otherwise.
-     */
-    PRBool IsOpen(eHTMLTags aTag) const;
 
     /**
      * Finds the topmost occurance of given tag within context vector stack.
@@ -495,7 +484,7 @@ protected:
      * @param   child to be added (somewhere) to context vector stack.
      * @return  TRUE if succeeds, otherwise FALSE
      */
-    PRBool ReduceContextStackFor(PRInt32 aChildTag);
+    PRInt32 ReduceContextStackFor(PRInt32 aChildTag);
 
     /**
      * Attempt forward and/or backward propagation for the given
@@ -504,7 +493,7 @@ protected:
      * @param   type of child to be propagated.
      * @return  TRUE if succeeds, otherwise FALSE
      */
-    PRBool CreateContextStackFor(PRInt32 aChildTag);
+    PRInt32 CreateContextStackFor(PRInt32 aChildTag);
 
 private:
     PRInt32 ParseFileIncrementally(const char* aFilename);  //XXX ONLY FOR DEBUG PURPOSES...
@@ -520,19 +509,20 @@ protected:
     PRInt32             mContextStack[50];
     PRInt32             mContextStackPos;
 
-    CTokenHandler*      mTokenHandlers[100];
-    PRInt32             mTokenHandlerCount;
+    CTokenHandler*      mTokenHandlers[eToken_last];
+
     nsDequeIterator*    mCurrentPos;
+    nsDequeIterator*    mMarkPos;
 
     nsIDTD*             mDTD;
     eParseMode          mParseMode;
     PRBool              mHasOpenForm;
     PRBool              mIncremental;
     ITokenizerDelegate* mDelegate;
+    PRInt32             mIteration;
+    char*               mTransferBuffer;
 };
 
 
 #endif 
 
-
-
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
index 920230fa7e9..af6690dda8e 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -368,21 +368,26 @@ PRInt32 CStartToken::Consume(PRUnichar aChar, CScanner& aScanner) {
    //Stop consuming as soon as you see a space or a '>'.
    //NOTE: We don't Consume the tag attributes here, nor do we eat the ">"
 
-   mTextValue=aChar;
+  mTextValue=aChar;
   PRInt32 result=aScanner.ReadWhile(mTextValue,gIdentChars,PR_FALSE);
 
    //Good. Now, let's skip whitespace after the identifier,
    //and see if the next char is ">". If so, we have a complete
    //tag without attributes.
-
-   aScanner.SkipWhite();
-   result=aScanner.GetChar(aChar);
-   if(kGreaterThan!=aChar) { //look for '>' 
-     //push that char back, since we apparently have attributes...
-      aScanner.PutBack(aChar);
-      mAttributed=PR_TRUE;
-   }
-   return result;
+  if(kNoError==result) {  
+    result=aScanner.SkipWhite();
+    if(kNoError==result) {
+      result=aScanner.GetChar(aChar);
+      if(kNoError==result) {
+        if(kGreaterThan!=aChar) { //look for '>' 
+         //push that char back, since we apparently have attributes...
+          aScanner.PutBack(aChar);
+          mAttributed=PR_TRUE;
+        } //if
+      } //if
+    }//if
+  }
+  return result;
 };
 
 
@@ -431,7 +436,8 @@ PRInt32 CEndToken::Consume(PRUnichar aChar, CScanner& aScanner) {
   mTextValue="";
   static nsAutoString terminals(">");
   PRInt32 result=aScanner.ReadUntil(mTextValue,terminals,PR_FALSE);
-  aScanner.GetChar(aChar); //eat the closing '>;
+  if(kNoError==result)
+    result=aScanner.GetChar(aChar); //eat the closing '>;
   return result;
 };
 
@@ -567,17 +573,19 @@ PRInt32 CCommentToken::Consume(PRUnichar aChar, CScanner& aScanner) {
   aScanner.GetChar(ch);
   mTextValue="<!";
   if(kMinus==ch) {
-    aScanner.GetChar(ch2);
-    if(kMinus==ch2) {
-         //in this case, we're reading a long-form comment <-- xxx -->
-      mTextValue+="--";
-      PRInt32 findpos=-1;
-      while((findpos==kNotFound) && (!result)) {
-        result=aScanner.ReadUntil(mTextValue,terminals,PR_TRUE);
-        findpos=mTextValue.RFind("-->");
+    result=aScanner.GetChar(ch2);
+    if(kNoError==result) {
+      if(kMinus==ch2) {
+           //in this case, we're reading a long-form comment <-- xxx -->
+        mTextValue+="--";
+        PRInt32 findpos=-1;
+        while((findpos==kNotFound) && (kNoError==result)) {
+          result=aScanner.ReadUntil(mTextValue,terminals,PR_TRUE);
+          findpos=mTextValue.RFind("-->");
+        }
       }
-      return result;
     }
+    return result;
   }
      //if you're here, we're consuming a "short-form" comment
   mTextValue+=ch;
@@ -667,25 +675,26 @@ PRInt32 CNewlineToken::Consume(PRUnichar aChar, CScanner& aScanner) {
   PRUnichar nextChar;
   PRInt32 result=aScanner.Peek(nextChar);
 
-  switch(aChar) {
-    case kNewLine:
-      if(kCR==nextChar) {
-        result=aScanner.GetChar(nextChar);
-        mTextValue+=nextChar;
-      }
-      break;
-    case kCR:
-      if(kNewLine==nextChar) {
-        result=aScanner.GetChar(nextChar);
-        mTextValue+=nextChar;
-      }
-      break;
-    default:
-      break;
-  }
-  
+  if(kNoError==result) {
+    switch(aChar) {
+      case kNewLine:
+        if(kCR==nextChar) {
+          result=aScanner.GetChar(nextChar);
+          mTextValue+=nextChar;
+        }
+        break;
+      case kCR:
+        if(kNewLine==nextChar) {
+          result=aScanner.GetChar(nextChar);
+          mTextValue+=nextChar;
+        }
+        break;
+      default:
+        break;
+    }
+  }  
   return result;
-};
+}
 
 /*
  *  default constructor
@@ -798,16 +807,20 @@ PRInt32 CAttributeToken::Consume(PRUnichar aChar, CScanner& aScanner) {
 
   aScanner.SkipWhite();             //skip leading whitespace                                      
   PRInt32 result=aScanner.Peek(aChar);
-  if(kEOF!=result) {
+  if(kNoError==result) {
     if(kQuote==aChar) {               //if you're here, handle quoted key...
-       aScanner.GetChar(aChar);        //skip the quote sign...
-      mTextKey=aChar;
-      result=ConsumeQuotedString(aChar,mTextKey,aScanner);
+      result=aScanner.GetChar(aChar);        //skip the quote sign...
+      if(kNoError==result) {
+        mTextKey=aChar;
+        result=ConsumeQuotedString(aChar,mTextKey,aScanner);
+      }
     }
     else if(kHashsign==aChar) {
-       aScanner.GetChar(aChar);        //skip the hash sign...
-      mTextKey=aChar;
-      result=aScanner.ReadWhile(mTextKey,gDigits,PR_TRUE);
+      result=aScanner.GetChar(aChar);        //skip the hash sign...
+      if(kNoError==result) {
+        mTextKey=aChar;
+        result=aScanner.ReadWhile(mTextKey,gDigits,PR_TRUE);
+      }
     }
     else {
         //If you're here, handle an unquoted key.
@@ -820,28 +833,35 @@ PRInt32 CAttributeToken::Consume(PRUnichar aChar, CScanner& aScanner) {
     if(!(result=aScanner.SkipWhite())) { 
       if(!(result=aScanner.Peek(aChar))) {
         if(kEqual==aChar){
-          aScanner.GetChar(aChar);  //skip the equal sign...
-          aScanner.SkipWhite();     //now skip any intervening whitespace
-           aScanner.GetChar(aChar);  //and grab the next char.    
-  
-          if((kQuote==aChar) || (kApostrophe==aChar)) {
-            mTextValue=aChar;
-            result=ConsumeQuotedString(aChar,mTextValue,aScanner);
-          }
-          else {      
-            mTextValue=aChar;       //it's an alphanum attribute...
-            result=ConsumeAttributeValueText(aChar,mTextValue,aScanner);
-          } 
-
-          aScanner.SkipWhite();     
-        }
-      }
+          result=aScanner.GetChar(aChar);  //skip the equal sign...
+          if(kNoError==result) {
+            result=aScanner.SkipWhite();     //now skip any intervening whitespace
+            if(kNoError==result) {
+              result=aScanner.GetChar(aChar);  //and grab the next char.    
+              if(kNoError==result) {
+                if((kQuote==aChar) || (kApostrophe==aChar)) {
+                  mTextValue=aChar;
+                  result=ConsumeQuotedString(aChar,mTextValue,aScanner);
+                }
+                else {      
+                  mTextValue=aChar;       //it's an alphanum attribute...
+                  result=ConsumeAttributeValueText(aChar,mTextValue,aScanner);
+                } 
+              }//if
+              if(kNoError==result)
+                result=aScanner.SkipWhite();     
+            }//if
+          }//if
+        }//if
+      }//if
+    }
+    if(kNoError==result) {
+      result=aScanner.Peek(aChar);
+      mLastAttribute= PRBool((kGreaterThan==aChar) || (kEOF==result));
     }
-    aScanner.Peek(aChar);
-    mLastAttribute= PRBool((kGreaterThan==aChar) || (kEOF==result));
   }
   return result;
-};
+}
 
 /*
  *  Dump contents of this token to givne output stream
@@ -907,12 +927,15 @@ PRInt32 CWhitespaceToken::GetTokenType(void) {
  *  @return  error result
  */
 PRInt32 CWhitespaceToken::Consume(PRUnichar aChar, CScanner& aScanner) {
-
+  
   mTextValue=aChar;
+
   PRInt32 result=aScanner.ReadWhile(mTextValue,gWhitespace,PR_FALSE);
-  mTextValue.StripChars("\r");
+  if(kNoError==result) {
+    mTextValue.StripChars("\r");
+  }
   return result;
-};
+}
 
 /*
  *  default constructor
@@ -943,7 +966,7 @@ PRInt32 CEntityToken::Consume(PRUnichar aChar, CScanner& aScanner) {
     mTextValue=aChar;
   PRInt32 result=ConsumeEntity(aChar,mTextValue,aScanner);
   return result;
-};
+}
 
 /*
  *  
@@ -979,27 +1002,35 @@ PRInt32 CEntityToken::GetTokenType(void) {
  */
 PRInt32 CEntityToken::ConsumeEntity(PRUnichar aChar,nsString& aString,CScanner& aScanner){
 
-  PRInt32 result=kNotFound;
-  aScanner.Peek(aChar);
-  if(kLeftBrace==aChar) {
-    //you're consuming a script entity...
-    static nsAutoString terminals("}>");
-    result=aScanner.ReadUntil(aString,terminals,PR_FALSE);
-    aScanner.Peek(aChar);
-    if(kRightBrace==aChar) {
-      aString+=kRightBrace;   //append rightbrace, and...
-      aScanner.GetChar(aChar);//yank the closing right-brace
-    }
-  }
-  else
-  {
-    result=aScanner.ReadWhile(aString,gIdentChars,PR_FALSE);
-    aScanner.Peek(aChar);
-    if (kSemicolon == aChar) {
-      // consume semicolon that stopped the scan
-      aScanner.GetChar(aChar);
-    }
-  }
+  PRInt32 result=aScanner.Peek(aChar);
+  if(kNoError==result) {
+    if(kLeftBrace==aChar) {
+      //you're consuming a script entity...
+      static nsAutoString terminals("}>");
+      result=aScanner.ReadUntil(aString,terminals,PR_FALSE);
+      if(kNoError==result) {
+        result=aScanner.Peek(aChar);
+        if(kNoError==result) {
+          if(kRightBrace==aChar) {
+            aString+=kRightBrace;   //append rightbrace, and...
+            result=aScanner.GetChar(aChar);//yank the closing right-brace
+          }
+        }
+      }
+    } //if
+    else {
+      result=aScanner.ReadWhile(aString,gIdentChars,PR_FALSE);
+      if(kNoError==result) {
+        result=aScanner.Peek(aChar);
+        if(kNoError==result) {
+          if (kSemicolon == aChar) {
+            // consume semicolon that stopped the scan
+            result=aScanner.GetChar(aChar);
+          }
+        }
+      }//if
+    } //else
+  } //if
   return result;
 }
 
@@ -1238,7 +1269,8 @@ PRInt32 CSkippedContentToken::Consume(PRUnichar aChar,CScanner& aScanner) {
   PRInt32     result=kNoError;
   nsString    temp;
 
-  while((!done) && (!aScanner.Eof())) {
+//  while((!done) && (!aScanner.Eof())) {
+  while((!done) && (kNoError==result)) {
     static nsAutoString terminals(">");
     result=aScanner.ReadUntil(temp,terminals,PR_TRUE);
     done=PRBool(kNotFound!=temp.RFind(mTextValue,PR_TRUE));
@@ -1328,7 +1360,8 @@ const char* GetTagName(PRInt32 aTag) {
   const char* result=0;
   PRInt32     cnt=sizeof(gHTMLTagTable)/sizeof(HTMLTagEntry);
 
-  for(int i=0;i<cnt;i++){
+  int i=0;
+  for(i=0;i<cnt;i++){
     if(aTag==gHTMLTagTable[i].fTagID)
       return gHTMLTagTable[i].fName;
   }
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.h b/mozilla/parser/htmlparser/src/nsHTMLTokens.h
index 8669d8248a0..b8eae70f8b9 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.h
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.h
@@ -39,12 +39,12 @@
 class CScanner;
 
 enum eHTMLTokenTypes {
-  eToken_unknown=2000,
-
-  eToken_start,       eToken_end,     eToken_comment, eToken_entity,
-  eToken_whitespace,  eToken_newline, eToken_text,    eToken_attribute,
-  eToken_script,      eToken_style,   eToken_skippedcontent,  //used in cases like <SCRIPT> where we skip over script content.
-  eToken_last
+  
+  eToken_unknown=0,
+  eToken_start=1,     eToken_end,     eToken_comment,         eToken_entity,
+  eToken_whitespace,  eToken_newline, eToken_text,            eToken_attribute,
+  eToken_script,      eToken_style,   eToken_skippedcontent,  
+  eToken_last //make sure this stays the last token...
 };
 
 //*** This enum is used to define the known universe of HTML tags.
diff --git a/mozilla/parser/htmlparser/src/nsIContentSink.h b/mozilla/parser/htmlparser/src/nsIContentSink.h
index d5df0f03724..425ebc0c68b 100644
--- a/mozilla/parser/htmlparser/src/nsIContentSink.h
+++ b/mozilla/parser/htmlparser/src/nsIContentSink.h
@@ -48,7 +48,7 @@ class nsIContentSink : public nsISupports {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-  virtual PRBool        OpenContainer(const nsIParserNode& aNode) = 0;
+  virtual PRInt32 OpenContainer(const nsIParserNode& aNode) = 0;
 
    /**
     *  This method gets called by the parser when a close
@@ -58,7 +58,7 @@ class nsIContentSink : public nsISupports {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-  virtual PRBool        CloseContainer(const nsIParserNode& aNode) = 0;
+  virtual PRInt32 CloseContainer(const nsIParserNode& aNode) = 0;
 
    /**
     * This method gets called by the parser when a the
@@ -67,7 +67,7 @@ class nsIContentSink : public nsISupports {
     * @update 4/1/98 gess
     * @return PR_TRUE if successful. 
     */     
-  virtual PRBool        CloseTopmostContainer() = 0;
+  virtual PRInt32 CloseTopmostContainer() = 0;
 
    /**
     * This gets called by the parser when you want to add
@@ -78,7 +78,7 @@ class nsIContentSink : public nsISupports {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-  virtual PRBool        AddLeaf(const nsIParserNode& aNode) = 0;
+  virtual PRInt32 AddLeaf(const nsIParserNode& aNode) = 0;
 
    /**
     * This method gets called when the parser begins the process
diff --git a/mozilla/parser/htmlparser/src/nsIHTMLContentSink.h b/mozilla/parser/htmlparser/src/nsIHTMLContentSink.h
index 9359dfbcffb..a75f5813c2b 100644
--- a/mozilla/parser/htmlparser/src/nsIHTMLContentSink.h
+++ b/mozilla/parser/htmlparser/src/nsIHTMLContentSink.h
@@ -92,7 +92,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenHTML(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenHTML(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the outer HTML container.
@@ -101,7 +101,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseHTML(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseHTML(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to open the only HEAD container.
@@ -110,7 +110,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenHead(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenHead(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the only HEAD container.
@@ -119,7 +119,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseHead(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseHead(const nsIParserNode& aNode)=0;
   
    /**
     * This method is used to open the main BODY container.
@@ -128,7 +128,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenBody(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenBody(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the main BODY container.
@@ -137,7 +137,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseBody(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseBody(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to open a new FORM container.
@@ -146,7 +146,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenForm(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenForm(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the outer FORM container.
@@ -155,7 +155,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseForm(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseForm(const nsIParserNode& aNode)=0;
         
    /**
     * This method is used to open the FRAMESET container.
@@ -164,7 +164,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenFrameset(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenFrameset(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the FRAMESET container.
@@ -173,7 +173,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseFrameset(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseFrameset(const nsIParserNode& aNode)=0;
         
    /**
     * This method is used to a general container. 
@@ -183,7 +183,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool OpenContainer(const nsIParserNode& aNode)=0;
+    virtual PRInt32 OpenContainer(const nsIParserNode& aNode)=0;
     
    /**
     * This method is used to close a generic container.
@@ -192,7 +192,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseContainer(const nsIParserNode& aNode)=0;
+    virtual PRInt32 CloseContainer(const nsIParserNode& aNode)=0;
 
    /**
     * This method is used to close the topmost container, regardless
@@ -202,7 +202,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool CloseTopmostContainer()=0;
+    virtual PRInt32 CloseTopmostContainer()=0;
 
    /**
     * This method is used to add a leaf to the currently 
@@ -212,7 +212,7 @@ class nsIHTMLContentSink : public nsIContentSink {
     * @param  nsIParserNode reference to parser node interface
     * @return PR_TRUE if successful. 
     */     
-    virtual PRBool AddLeaf(const nsIParserNode& aNode)=0;
+    virtual PRInt32 AddLeaf(const nsIParserNode& aNode)=0;
 
    /**
     * This method gets called when the parser begins the process
diff --git a/mozilla/parser/htmlparser/src/nsIParser.h b/mozilla/parser/htmlparser/src/nsIParser.h
index a788f749ac4..804f6f61dd1 100644
--- a/mozilla/parser/htmlparser/src/nsIParser.h
+++ b/mozilla/parser/htmlparser/src/nsIParser.h
@@ -54,11 +54,11 @@ class nsIParser : public nsISupports {
 
     virtual nsIContentSink* SetContentSink(nsIContentSink* aContentSink)=0;
 
-    virtual PRInt32 Parse(nsIURL* aURL,PRBool aIncremental=PR_FALSE)=0;
+    virtual PRInt32 Parse(nsIURL* aURL,PRBool aIncremental=PR_TRUE)=0;
     virtual PRInt32 Parse(const char* aFilename,PRBool aIncremental)=0;
     virtual PRInt32 Parse(nsString& anHTMLString,PRBool appendTokens)=0;
 
-    virtual PRInt32 ResumeParse(PRInt32 anIterator)=0;
+    virtual PRInt32 ResumeParse(void)=0;
     virtual PRInt32 GetStack(PRInt32* aStackPtr)=0;
     virtual PRBool  HasOpenContainer(PRInt32 aContainer) const=0;
 };
diff --git a/mozilla/parser/htmlparser/src/nsParserTypes.h b/mozilla/parser/htmlparser/src/nsParserTypes.h
index 59630f0e291..39122d4b844 100644
--- a/mozilla/parser/htmlparser/src/nsParserTypes.h
+++ b/mozilla/parser/htmlparser/src/nsParserTypes.h
@@ -42,6 +42,8 @@ enum  eParseMode {
 };
 
 const PRInt32   kEOF          = 1000000L;
+const PRInt32   kUnknownError = -1000;
+const PRInt32   kContextMismatch = -5;
 const PRInt32   kBadFilename  = -4;
 const PRInt32   kBadURL       = -3;
 const PRInt32   kInterrupted  = -2;
diff --git a/mozilla/parser/htmlparser/src/nsScanner.cpp b/mozilla/parser/htmlparser/src/nsScanner.cpp
index 63d942f1f5d..ca6feea325f 100644
--- a/mozilla/parser/htmlparser/src/nsScanner.cpp
+++ b/mozilla/parser/htmlparser/src/nsScanner.cpp
@@ -154,6 +154,8 @@ void _PreCompressBuffer(nsString& aBuffer,PRInt32& anOffset,PRInt32& aMarkPos){
   //we should check mMarkPos. That represents the point at which
   //we've guaranteed the client we can back up to, so make sure
   //you don't lose any of the data beyond that point.
+
+/*
   if((anOffset!=aMarkPos) && (0<=aMarkPos)) {
     if(aMarkPos>0) {
       aBuffer.Cut(0,aMarkPos);
@@ -162,6 +164,16 @@ void _PreCompressBuffer(nsString& aBuffer,PRInt32& anOffset,PRInt32& aMarkPos){
     }
   }
   else aBuffer.Truncate();
+*/
+  PRInt32 len=aBuffer.Length();
+  if((aMarkPos<len) && (aMarkPos>=0)) {
+    aBuffer.Cut(0,aMarkPos);
+    anOffset-=aMarkPos;
+  }
+  else {
+    aBuffer.Truncate();
+    anOffset=0;
+  }
   aMarkPos=0;
 }
 
@@ -204,6 +216,19 @@ PRBool CScanner::Append(nsString& aBuffer) {
   return PR_TRUE;
 }
 
+/**
+ *  
+ *  
+ *  @update  gess 5/21/98
+ *  @param   
+ *  @return  
+ */
+PRBool CScanner::Append(const char* aBuffer, PRInt32 aLen){
+  _PreCompressBuffer(mBuffer,mOffset,mMarkPos);
+  mBuffer.Append(aBuffer,aLen);
+  return PR_TRUE;
+}
+
 /** 
  * Grab data from underlying stream.
  *
diff --git a/mozilla/parser/htmlparser/src/nsScanner.h b/mozilla/parser/htmlparser/src/nsScanner.h
index 244544d0a15..621da11e8d5 100644
--- a/mozilla/parser/htmlparser/src/nsScanner.h
+++ b/mozilla/parser/htmlparser/src/nsScanner.h
@@ -39,8 +39,7 @@
 #include <fstream.h>
 
 class nsIURL;
-//class ifstream; XXX mac didn't like this, but this doesn't seem to be needed
-// for the pc either...
+class ifstream;
 
 class CScanner {
   public:
@@ -216,6 +215,15 @@ class CScanner {
        */
       PRBool Append(nsString& aBuffer);
 
+      /**
+       *  
+       *  
+       *  @update  gess 5/21/98
+       *  @param   
+       *  @return  
+       */
+      PRBool Append(const char* aBuffer, PRInt32 aLen);
+
       /**
        *  
        *  
diff --git a/mozilla/parser/htmlparser/src/nsToken.cpp b/mozilla/parser/htmlparser/src/nsToken.cpp
index cbf622551fc..03000a678b2 100644
--- a/mozilla/parser/htmlparser/src/nsToken.cpp
+++ b/mozilla/parser/htmlparser/src/nsToken.cpp
@@ -27,6 +27,7 @@
  */
 CToken::CToken(const nsString& aName) : mTextValue(aName) {
   mOrdinalValue=0;
+  mAttrCount=0;
 }
  
 /**
@@ -71,7 +72,8 @@ void CToken::SetStringValue(const char* aValue) {
  */
 void CToken::DebugDumpToken(ostream& anOutputStream) {
   anOutputStream << "[" << GetClassName() << "] ";
-  for(int i=0;i<mTextValue.Length();i++){
+  int i=0;
+  for(i=0;i<mTextValue.Length();i++){
     anOutputStream << char(mTextValue[i]);
   }
   anOutputStream << ": " << mOrdinalValue << endl;
@@ -116,7 +118,7 @@ nsString& CToken::GetText(void) {
  *  @update gess 3/25/98
  *  @param  value -- new ordinal value for this token
  */
-void CToken::SetOrdinal(PRInt32 value) {
+void CToken::SetOrdinal(PRInt16 value) {
   mOrdinalValue=value;
 }
 
@@ -127,10 +129,31 @@ void CToken::SetOrdinal(PRInt32 value) {
  *  @update gess 3/25/98
  *  @return int containing ordinal value
  */
-PRInt32  CToken::GetOrdinal(void) {
+PRInt16 CToken::GetOrdinal(void) {
   return mOrdinalValue;
 }
 
+/**
+ *  Sets the attribute count for this token
+ *  
+ *  @update gess 3/25/98
+ *  @param  value -- new attr count
+ */
+void CToken::SetAttributeCount(PRInt16 value) {
+  mAttrCount=value;
+}
+
+/**
+ *  Retrieves copy of attr count for this token
+ *  
+ *  @update gess 3/25/98
+ *  @return int containing attribute count
+ */
+PRInt16  CToken::GetAttributeCount(void) {
+  return mAttrCount;
+}
+
+
 /**
  *  Retrieve type of token. This class returns -1, but 
  *  subclasses return something more meaningful.
diff --git a/mozilla/parser/htmlparser/src/nsToken.h b/mozilla/parser/htmlparser/src/nsToken.h
index 3baf08dbad6..0bdf7a0a0d8 100644
--- a/mozilla/parser/htmlparser/src/nsToken.h
+++ b/mozilla/parser/htmlparser/src/nsToken.h
@@ -92,14 +92,28 @@ class CToken {
      * @update	gess5/11/98
      * @param   value is the new ord value for this token
      */
-    virtual void SetOrdinal(PRInt32 value);
+    virtual void SetOrdinal(PRInt16 value);
 
     /**
      * Getter which retrieves the current ordinal value for this token
      * @update	gess5/11/98
      * @return  current ordinal value 
      */
-    virtual PRInt32 GetOrdinal(void);
+    virtual PRInt16 GetOrdinal(void);
+
+    /**
+     * Sets the # of attributes found for this token.
+     * @update	gess5/11/98
+     * @param   value is the attr count
+     */
+    virtual void SetAttributeCount(PRInt16 aValue);
+
+    /**
+     * Getter which retrieves the current attribute count for this token
+     * @update	gess5/11/98
+     * @return  current attribute count 
+     */
+    virtual PRInt16 GetAttributeCount(void);
 
     /**
      * Causes token to consume data from given scanner.
@@ -147,7 +161,8 @@ class CToken {
     virtual void SelfTest(void);
 
 protected:
-            PRInt32       mOrdinalValue;
+            PRInt16       mOrdinalValue;
+            PRInt16       mAttrCount;
             nsString      mTextValue;
 };
 
diff --git a/mozilla/parser/htmlparser/src/nsTokenHandler.cpp b/mozilla/parser/htmlparser/src/nsTokenHandler.cpp
index 125d036206b..b752c24ee99 100644
--- a/mozilla/parser/htmlparser/src/nsTokenHandler.cpp
+++ b/mozilla/parser/htmlparser/src/nsTokenHandler.cpp
@@ -38,8 +38,9 @@ static const char* kNullParserGiven = "Error: Null parser given as argument";
  *  @param   
  *  @return  
  */
-CTokenHandler::CTokenHandler(eHTMLTokenTypes aType) {
+CTokenHandler::CTokenHandler(dispatchFP aFP,eHTMLTokenTypes aType){
   mType=aType;
+  mFP=aFP;
 }
 
 
@@ -65,18 +66,6 @@ eHTMLTokenTypes CTokenHandler::GetTokenType(void){
   return mType;
 }
 
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
 
 /**
  *  
@@ -85,555 +74,12 @@ PRBool CTokenHandler::CanHandle(eHTMLTokenTypes aType){
  *  @param   
  *  @return  
  */
-PRBool CTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  PRBool result=PR_FALSE;
-  if(aParser){
-    result=PR_TRUE;
+PRInt32 CTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
+  PRInt32 result=kNoError;
+  if((0!=aParser) && (0!=mFP)) {
+     result=(*mFP)(mType,aToken,aParser);
   }
   return result;
 }
 
 
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CStartTokenHandler::CStartTokenHandler() : CTokenHandler(eToken_start) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CStartTokenHandler::~CStartTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CStartTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleStartToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CStartTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CEndTokenHandler::CEndTokenHandler(): CTokenHandler(eToken_end) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CEndTokenHandler::~CEndTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CEndTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleEndToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CEndTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CCommentTokenHandler::CCommentTokenHandler() : CTokenHandler(eToken_comment) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CCommentTokenHandler::~CCommentTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CCommentTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleCommentToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CCommentTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CEntityTokenHandler::CEntityTokenHandler() : CTokenHandler(eToken_entity) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CEntityTokenHandler::~CEntityTokenHandler() {
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CEntityTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleEntityToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CEntityTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CWhitespaceTokenHandler::CWhitespaceTokenHandler() : CTokenHandler(eToken_whitespace) {
-}
-
-  
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CWhitespaceTokenHandler::~CWhitespaceTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CWhitespaceTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleStartToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CWhitespaceTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CNewlineTokenHandler::CNewlineTokenHandler() : CTokenHandler(eToken_newline) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CNewlineTokenHandler::~CNewlineTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CNewlineTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleStartToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CNewlineTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CTextTokenHandler::CTextTokenHandler() : CTokenHandler(eToken_text) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CTextTokenHandler::~CTextTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CTextTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleStartToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CTextTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CAttributeTokenHandler::CAttributeTokenHandler() : CTokenHandler(eToken_attribute) {
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CAttributeTokenHandler::~CAttributeTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CAttributeTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleAttributeToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CAttributeTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CScriptTokenHandler::CScriptTokenHandler() : CTokenHandler(eToken_script) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CScriptTokenHandler::~CScriptTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CScriptTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleScriptToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CScriptTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CStyleTokenHandler::CStyleTokenHandler() : CTokenHandler(eToken_style) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CStyleTokenHandler::~CStyleTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CStyleTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleStyleToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CStyleTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CSkippedContentTokenHandler::CSkippedContentTokenHandler() : CTokenHandler(eToken_skippedcontent) {
-}
-
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-CSkippedContentTokenHandler::~CSkippedContentTokenHandler(){
-}
-                          
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CSkippedContentTokenHandler::operator()(CToken* aToken,nsHTMLParser* aParser){
-  NS_ASSERTION(0!=aParser,kNullParserGiven);
-  if(aParser){
-    return aParser->HandleSkippedContentToken(aToken);
-  }
-  return PR_FALSE;
-}
-
-/**
- *  
- *  
- *  @update  gess 4/2/98
- *  @param   
- *  @return  
- */
-PRBool CSkippedContentTokenHandler::CanHandle(eHTMLTokenTypes aType){
-  PRBool result=PR_FALSE;
-  return result;
-}
-
-
diff --git a/mozilla/parser/htmlparser/src/nsTokenHandler.h b/mozilla/parser/htmlparser/src/nsTokenHandler.h
index d805aa9055a..de252bb014e 100644
--- a/mozilla/parser/htmlparser/src/nsTokenHandler.h
+++ b/mozilla/parser/htmlparser/src/nsTokenHandler.h
@@ -33,130 +33,22 @@
 class CToken;
 class nsHTMLParser;
 
+typedef PRInt32 (*dispatchFP)(eHTMLTokenTypes,CToken*,nsHTMLParser*);
 
 class CTokenHandler : public CITokenHandler {
 public:
-                          CTokenHandler(eHTMLTokenTypes aType=eToken_unknown);
-  virtual                 ~CTokenHandler();
+                            CTokenHandler(dispatchFP aFP,eHTMLTokenTypes aType=eToken_unknown);
+  virtual                   ~CTokenHandler();
                           
   virtual   eHTMLTokenTypes GetTokenType(void);
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
+  virtual   PRInt32         operator()(CToken* aToken,nsHTMLParser* aParser);
 
 protected:
             eHTMLTokenTypes mType;
+            dispatchFP      mFP;
 };
 
 
-class CStartTokenHandler : public CTokenHandler  {
-public:
-                          CStartTokenHandler();
-  virtual                 ~CStartTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CEndTokenHandler : public CTokenHandler  {
-public:
-                          CEndTokenHandler();
-  virtual                 ~CEndTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CCommentTokenHandler : public CTokenHandler  {
-public:
-                          CCommentTokenHandler();
-  virtual                 ~CCommentTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CEntityTokenHandler : public CTokenHandler  {
-public:
-                          CEntityTokenHandler();
-  virtual                 ~CEntityTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CWhitespaceTokenHandler : public CTokenHandler  {
-public:
-                          CWhitespaceTokenHandler();
-  virtual                 ~CWhitespaceTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CNewlineTokenHandler : public CTokenHandler  {
-public:
-                          CNewlineTokenHandler();
-  virtual                 ~CNewlineTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CTextTokenHandler : public CTokenHandler  {
-public:
-                          CTextTokenHandler();
-  virtual                 ~CTextTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CAttributeTokenHandler : public CTokenHandler  {
-public:
-                          CAttributeTokenHandler();
-  virtual                 ~CAttributeTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CScriptTokenHandler :  public CTokenHandler  {
-public:
-                          CScriptTokenHandler();
-  virtual                 ~CScriptTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CStyleTokenHandler : public CTokenHandler  {
-public:
-                          CStyleTokenHandler();
-  virtual                 ~CStyleTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
-
-class CSkippedContentTokenHandler : public CTokenHandler  {
-public:
-                          CSkippedContentTokenHandler();
-  virtual                 ~CSkippedContentTokenHandler();
-                          
-  virtual   PRBool        operator()(CToken* aToken,nsHTMLParser* aParser);
-  virtual   PRBool        CanHandle(eHTMLTokenTypes aType);
-};
-
 
 #endif
 
diff --git a/mozilla/parser/htmlparser/src/nsTokenizer.cpp b/mozilla/parser/htmlparser/src/nsTokenizer.cpp
index 1ca79abee46..62c6967e78a 100644
--- a/mozilla/parser/htmlparser/src/nsTokenizer.cpp
+++ b/mozilla/parser/htmlparser/src/nsTokenizer.cpp
@@ -96,6 +96,20 @@ PRBool CTokenizer::Append(nsString& aBuffer) {
   return PR_FALSE;
 }
 
+
+/**
+ *  
+ *  
+ *  @update  gess 5/21/98
+ *  @param   
+ *  @return  
+ */
+PRBool CTokenizer::Append(const char* aBuffer, PRInt32 aLen){
+  if(mScanner)
+    return mScanner->Append(aBuffer,aLen);
+  return PR_FALSE;
+}
+
 /**
  * Retrieve a reference to the internal token deque.
  *
diff --git a/mozilla/parser/htmlparser/src/nsTokenizer.h b/mozilla/parser/htmlparser/src/nsTokenizer.h
index fb99233d151..7ea83e261b5 100644
--- a/mozilla/parser/htmlparser/src/nsTokenizer.h
+++ b/mozilla/parser/htmlparser/src/nsTokenizer.h
@@ -106,6 +106,13 @@ class  CTokenizer {
      */
     PRBool Append(nsString& aBuffer);
 
+    /**
+     *
+     * @update  gess 4/20/98
+     * @return  deque reference
+     */
+    PRBool Append(const char* aBuffer, PRInt32 aLen);
+
 
     /**
      *