From 7693865115cc20ff6711e730d6a8006d5f89611a Mon Sep 17 00:00:00 2001 From: "rickg%netscape.com" Date: Sat, 25 Jul 1998 01:02:01 +0000 Subject: [PATCH] fixed a state problem in parser related to nesting levels --- htmlparser/src/CNavDTD.cpp | 2 +- htmlparser/src/nsParser.cpp | 2 ++ parser/htmlparser/src/CNavDTD.cpp | 2 +- parser/htmlparser/src/nsParser.cpp | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/htmlparser/src/CNavDTD.cpp b/htmlparser/src/CNavDTD.cpp index 9091b82e2236..19e905c95e12 100644 --- a/htmlparser/src/CNavDTD.cpp +++ b/htmlparser/src/CNavDTD.cpp @@ -427,9 +427,9 @@ nsresult CNavDTD::WillBuildModel(nsString& aFilename,PRInt32 aLevel){ nsresult result=NS_OK; mFilename=aFilename; - mLineNumber=1; if((1==aLevel) && (mSink)) { + mLineNumber=1; result = mSink->WillBuildModel(); } diff --git a/htmlparser/src/nsParser.cpp b/htmlparser/src/nsParser.cpp index 9b2348b81575..543b1f49533a 100644 --- a/htmlparser/src/nsParser.cpp +++ b/htmlparser/src/nsParser.cpp @@ -497,6 +497,7 @@ PRInt32 nsParser::Parse(fstream& aStream){ pc=PopContext(); delete pc; + mParseLevel--; return status; } @@ -528,6 +529,7 @@ PRInt32 nsParser::Parse(nsString& aSourceBuffer,PRBool anHTMLString){ } pc=PopContext(); delete pc; + mParseLevel--; return result; } diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp index 9091b82e2236..19e905c95e12 100644 --- a/parser/htmlparser/src/CNavDTD.cpp +++ b/parser/htmlparser/src/CNavDTD.cpp @@ -427,9 +427,9 @@ nsresult CNavDTD::WillBuildModel(nsString& aFilename,PRInt32 aLevel){ nsresult result=NS_OK; mFilename=aFilename; - mLineNumber=1; if((1==aLevel) && (mSink)) { + mLineNumber=1; result = mSink->WillBuildModel(); } diff --git a/parser/htmlparser/src/nsParser.cpp b/parser/htmlparser/src/nsParser.cpp index 9b2348b81575..543b1f49533a 100644 --- a/parser/htmlparser/src/nsParser.cpp +++ b/parser/htmlparser/src/nsParser.cpp @@ -497,6 +497,7 @@ PRInt32 nsParser::Parse(fstream& aStream){ pc=PopContext(); delete pc; + mParseLevel--; return status; } @@ -528,6 +529,7 @@ PRInt32 nsParser::Parse(nsString& aSourceBuffer,PRBool anHTMLString){ } pc=PopContext(); delete pc; + mParseLevel--; return result; }