From ccd42d2e17fbf8db224c51d5e09f6d168f343425 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Wed, 9 Apr 2003 22:44:25 +0000 Subject: [PATCH] Bug 201271 Fix interface inconsistencies in parser patch by choess@stwing.upenn.edu r=harishd sr=jst --- htmlparser/src/CNavDTD.cpp | 88 ++++++++++++++-------------- htmlparser/src/CNavDTD.h | 12 ++-- htmlparser/src/COtherDTD.cpp | 2 +- htmlparser/src/COtherDTD.h | 2 +- htmlparser/src/nsDTDUtils.cpp | 4 +- htmlparser/src/nsDTDUtils.h | 6 +- parser/htmlparser/src/CNavDTD.cpp | 88 ++++++++++++++-------------- parser/htmlparser/src/CNavDTD.h | 12 ++-- parser/htmlparser/src/COtherDTD.cpp | 2 +- parser/htmlparser/src/COtherDTD.h | 2 +- parser/htmlparser/src/nsDTDUtils.cpp | 4 +- parser/htmlparser/src/nsDTDUtils.h | 6 +- 12 files changed, 114 insertions(+), 114 deletions(-) diff --git a/htmlparser/src/CNavDTD.cpp b/htmlparser/src/CNavDTD.cpp index 4a047508b6c4..ffc47d5f8dc3 100644 --- a/htmlparser/src/CNavDTD.cpp +++ b/htmlparser/src/CNavDTD.cpp @@ -1391,7 +1391,7 @@ nsresult CNavDTD::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsC * This gets called before we've handled a given start tag. * It's a generic hook to let us do pre processing. * @param aToken contains the tag in question - * @param aChildTag is the tag itself. + * @param aTag is the tag itself. * @param aNode is the node (tag) with associated attributes. * @return TRUE if tag processing should continue; FALSE if the tag has been handled. */ @@ -2569,34 +2569,34 @@ PRBool CNavDTD::IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const { * @param aChild -- tag enum of child container * @return PR_TRUE if propagation should occur */ -PRBool CNavDTD::CanPropagate(eHTMLTags aParentTag,eHTMLTags aChildTag,PRBool aParentContains) { +PRBool CNavDTD::CanPropagate(eHTMLTags aParent,eHTMLTags aChild,PRBool aParentContains) { PRBool result=PR_FALSE; - PRBool theParentContains=(-1==aParentContains) ? CanContain(aParentTag,aChildTag) : aParentContains; + PRBool theParentContains=(-1==aParentContains) ? CanContain(aParent,aChild) : aParentContains; - if(aParentTag==aChildTag) { + if(aParent==aChild) { return result; } - if(nsHTMLElement::IsContainer(aChildTag)){ + if(nsHTMLElement::IsContainer(aChild)){ mScratch.Truncate(); - if(!gHTMLElements[aChildTag].HasSpecialProperty(kNoPropagate)){ - if(nsHTMLElement::IsBlockParent(aParentTag) || (gHTMLElements[aParentTag].GetSpecialChildren())) { + if(!gHTMLElements[aChild].HasSpecialProperty(kNoPropagate)){ + if(nsHTMLElement::IsBlockParent(aParent) || (gHTMLElements[aParent].GetSpecialChildren())) { - result=ForwardPropagate(mScratch,aParentTag,aChildTag); + result=ForwardPropagate(mScratch,aParent,aChild); if(PR_FALSE==result){ - if(eHTMLTag_unknown!=aParentTag) { - if(aParentTag!=aChildTag) //dont even bother if we're already inside a similar element... - result=BackwardPropagate(mScratch,aParentTag,aChildTag); + if(eHTMLTag_unknown!=aParent) { + if(aParent!=aChild) //dont even bother if we're already inside a similar element... + result=BackwardPropagate(mScratch,aParent,aChild); } //if - else result=BackwardPropagate(mScratch,eHTMLTag_html,aChildTag); + else result=BackwardPropagate(mScratch,eHTMLTag_html,aChild); } //elseif }//if }//if - if(mScratch.Length()-1>gHTMLElements[aParentTag].mPropagateRange) + if(mScratch.Length()-1>gHTMLElements[aParent].mPropagateRange) result=PR_FALSE; }//if else result=theParentContains; @@ -2709,24 +2709,24 @@ PRBool CNavDTD::IsContainer(PRInt32 aTag) const { * @param aChild -- tag type of child * @return TRUE if propagation closes; false otherwise */ -PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLTags aChildTag) { +PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParent,eHTMLTags aChild) { PRBool result=PR_FALSE; - switch(aParentTag) { + switch(aParent) { case eHTMLTag_table: { - if((eHTMLTag_tr==aChildTag) || (eHTMLTag_td==aChildTag)) { - return BackwardPropagate(aSequence,aParentTag,aChildTag); + if((eHTMLTag_tr==aChild) || (eHTMLTag_td==aChild)) { + return BackwardPropagate(aSequence,aParent,aChild); } } //otherwise, intentionally fall through... case eHTMLTag_tr: { - PRBool theCanContainResult=CanContain(eHTMLTag_td,aChildTag); + PRBool theCanContainResult=CanContain(eHTMLTag_td,aChild); if(PR_TRUE==theCanContainResult) { aSequence.Append((PRUnichar)eHTMLTag_td); - result=BackwardPropagate(aSequence,aParentTag,eHTMLTag_td); + result=BackwardPropagate(aSequence,aParent,eHTMLTag_td); } } break; @@ -2752,25 +2752,25 @@ PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLT * @param aChild -- tag type of child * @return TRUE if propagation closes; false otherwise */ -PRBool CNavDTD::BackwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLTags aChildTag) const { +PRBool CNavDTD::BackwardPropagate(nsString& aSequence,eHTMLTags aParent,eHTMLTags aChild) const { - eHTMLTags theParentTag=aParentTag; //just init to get past first condition... + eHTMLTags theParent=aParent; //just init to get past first condition... do { - const TagList* theRootTags=gHTMLElements[aChildTag].GetRootTags(); + const TagList* theRootTags=gHTMLElements[aChild].GetRootTags(); if(theRootTags) { - theParentTag=theRootTags->mTags[0]; - if(CanContain(theParentTag,aChildTag)) { + theParent=theRootTags->mTags[0]; + if(CanContain(theParent,aChild)) { //we've found a complete sequence, so push the parent... - aChildTag=theParentTag; - aSequence.Append((PRUnichar)theParentTag); + aChild=theParent; + aSequence.Append((PRUnichar)theParent); } } else break; } - while((theParentTag!=eHTMLTag_unknown) && (theParentTag!=aParentTag)); + while((theParent!=eHTMLTag_unknown) && (theParent!=aParent)); - return PRBool(aParentTag==theParentTag); + return PRBool(aParent==theParent); } @@ -3635,21 +3635,21 @@ nsresult CNavDTD::CloseContainersTo(PRInt32 anIndex,eHTMLTags aTarget, PRBool aC * @param aClosedByStartTag -- ONLY TRUE if the container is being closed by opening of another container. * @return TRUE if ok, FALSE if error */ -nsresult CNavDTD::CloseContainersTo(eHTMLTags aTarget,PRBool aClosedByStartTag){ +nsresult CNavDTD::CloseContainersTo(eHTMLTags aTag,PRBool aClosedByStartTag){ NS_PRECONDITION(mBodyContext->GetCount() > 0, kInvalidTagStackPos); - PRInt32 pos=mBodyContext->LastOf(aTarget); + PRInt32 pos=mBodyContext->LastOf(aTag); if(kNotFound!=pos) { //the tag is indeed open, so close it. - return CloseContainersTo(pos,aTarget,aClosedByStartTag); + return CloseContainersTo(pos,aTag,aClosedByStartTag); } eHTMLTags theTopTag=mBodyContext->Last(); - PRBool theTagIsSynonymous=((nsHTMLElement::IsResidualStyleTag(aTarget)) && (nsHTMLElement::IsResidualStyleTag(theTopTag))); + PRBool theTagIsSynonymous=((nsHTMLElement::IsResidualStyleTag(aTag)) && (nsHTMLElement::IsResidualStyleTag(theTopTag))); if(!theTagIsSynonymous){ - theTagIsSynonymous=(gHTMLElements[aTarget].IsMemberOf(kHeading) && + theTagIsSynonymous=(gHTMLElements[aTag].IsMemberOf(kHeading) && gHTMLElements[theTopTag].IsMemberOf(kHeading)); } @@ -3657,21 +3657,21 @@ nsresult CNavDTD::CloseContainersTo(eHTMLTags aTarget,PRBool aClosedByStartTag){ //if you're here, it's because we're trying to close one tag, //but a different (synonymous) one is actually open. Because this is NAV4x //compatibililty mode, we must close the one that's really open. - aTarget=theTopTag; - pos=mBodyContext->LastOf(aTarget); + aTag=theTopTag; + pos=mBodyContext->LastOf(aTag); if(kNotFound!=pos) { //the tag is indeed open, so close it. - return CloseContainersTo(pos,aTarget,aClosedByStartTag); + return CloseContainersTo(pos,aTag,aClosedByStartTag); } } nsresult result=NS_OK; - const TagList* theRootTags=gHTMLElements[aTarget].GetRootTags(); + const TagList* theRootTags=gHTMLElements[aTag].GetRootTags(); eHTMLTags theParentTag=(theRootTags) ? theRootTags->mTags[0] : eHTMLTag_unknown; pos=mBodyContext->LastOf(theParentTag); if(kNotFound!=pos) { //the parent container is open, so close it instead - result=CloseContainersTo(pos+1,aTarget,aClosedByStartTag); + result=CloseContainersTo(pos+1,aTag,aClosedByStartTag); } return result; } @@ -3762,25 +3762,25 @@ nsresult CNavDTD::AddHeadLeaf(nsIParserNode *aNode){ * stack until the child can be properly placed. * * @update gess 4/8/98 - * @param aChildTag is the child for whom we need to + * @param aChild is the child for whom we need to * create a new context vector * @return true if we succeeded, otherwise false */ -nsresult CNavDTD::CreateContextStackFor(eHTMLTags aChildTag){ +nsresult CNavDTD::CreateContextStackFor(eHTMLTags aChild){ mScratch.Truncate(); nsresult result=(nsresult)kContextMismatch; eHTMLTags theTop=mBodyContext->Last(); - PRBool bResult=ForwardPropagate(mScratch,theTop,aChildTag); + PRBool bResult=ForwardPropagate(mScratch,theTop,aChild); if(PR_FALSE==bResult){ if(eHTMLTag_unknown!=theTop) { - if(theTop!=aChildTag) //dont even bother if we're already inside a similar element... - bResult=BackwardPropagate(mScratch,theTop,aChildTag); + if(theTop!=aChild) //dont even bother if we're already inside a similar element... + bResult=BackwardPropagate(mScratch,theTop,aChild); } //if - else bResult=BackwardPropagate(mScratch,eHTMLTag_html,aChildTag); + else bResult=BackwardPropagate(mScratch,eHTMLTag_html,aChild); } //elseif PRInt32 theLen=mScratch.Length(); diff --git a/htmlparser/src/CNavDTD.h b/htmlparser/src/CNavDTD.h index 5407429b29ec..c2094ac0ddd0 100644 --- a/htmlparser/src/CNavDTD.h +++ b/htmlparser/src/CNavDTD.h @@ -176,8 +176,8 @@ public: * @return True if closure was achieved -- other false */ virtual PRBool ForwardPropagate(nsString& aSequence, - eHTMLTags aParentTag, - eHTMLTags aChildTag); + eHTMLTags aParent, + eHTMLTags aChild); /** * This method tries to design a context map (without actually @@ -189,17 +189,17 @@ public: * @return True if closure was achieved -- other false */ virtual PRBool BackwardPropagate(nsString& aSequence, - eHTMLTags aParentTag, - eHTMLTags aChildTag) const; + eHTMLTags aParent, + eHTMLTags aChild) const; /** * Attempt forward and/or backward propagation for the given * child within the current context vector stack. * @update gess5/11/98 - * @param type of child to be propagated. + * @param aChild -- type of child to be propagated. * @return TRUE if succeeds, otherwise FALSE */ - nsresult CreateContextStackFor(eHTMLTags aChildTag); + nsresult CreateContextStackFor(eHTMLTags aChild); /** * Ask parser if a given container is open ANYWHERE on stack diff --git a/htmlparser/src/COtherDTD.cpp b/htmlparser/src/COtherDTD.cpp index 3807f5ee5863..bdfabd2089ea 100644 --- a/htmlparser/src/COtherDTD.cpp +++ b/htmlparser/src/COtherDTD.cpp @@ -554,7 +554,7 @@ nsresult COtherDTD::HandleToken(CToken* aToken,nsIParser* aParser){ * This gets called after we've handled a given start tag. * It's a generic hook to let us to post processing. * @param aToken contains the tag in question - * @param aChildTag is the tag itself. + * @param aTag is the tag itself. * @return status */ nsresult COtherDTD::DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag){ diff --git a/htmlparser/src/COtherDTD.h b/htmlparser/src/COtherDTD.h index fc1d224c85f7..f88432b0a6ee 100644 --- a/htmlparser/src/COtherDTD.h +++ b/htmlparser/src/COtherDTD.h @@ -159,7 +159,7 @@ class COtherDTD : public nsIDTD protected: nsresult CollectAttributes(nsIParserNode& aNode,eHTMLTags aTag,PRInt32 aCount); - nsresult WillHandleStartTag(CToken* aToken,eHTMLTags aChildTag,nsIParserNode& aNode); + nsresult WillHandleStartTag(CToken* aToken,eHTMLTags aTag,nsIParserNode& aNode); nsresult DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag); nsIParserNode* CreateNode(CToken* aToken=nsnull,PRInt32 aLineNumber=1,nsTokenAllocator* aTokenAllocator=0); diff --git a/htmlparser/src/nsDTDUtils.cpp b/htmlparser/src/nsDTDUtils.cpp index f91f8cf8efa1..23d3b714c9d2 100644 --- a/htmlparser/src/nsDTDUtils.cpp +++ b/htmlparser/src/nsDTDUtils.cpp @@ -379,7 +379,7 @@ eHTMLTags nsEntryStack::operator[](PRInt32 anIndex) const * @update harishd 04/04/99 * @update gess 04/21/99 */ -eHTMLTags nsEntryStack::Last() const +eHTMLTags nsEntryStack::Last(void) const { eHTMLTags result=eHTMLTag_unknown; if(0gHTMLElements[aParentTag].mPropagateRange) + if(mScratch.Length()-1>gHTMLElements[aParent].mPropagateRange) result=PR_FALSE; }//if else result=theParentContains; @@ -2709,24 +2709,24 @@ PRBool CNavDTD::IsContainer(PRInt32 aTag) const { * @param aChild -- tag type of child * @return TRUE if propagation closes; false otherwise */ -PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLTags aChildTag) { +PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParent,eHTMLTags aChild) { PRBool result=PR_FALSE; - switch(aParentTag) { + switch(aParent) { case eHTMLTag_table: { - if((eHTMLTag_tr==aChildTag) || (eHTMLTag_td==aChildTag)) { - return BackwardPropagate(aSequence,aParentTag,aChildTag); + if((eHTMLTag_tr==aChild) || (eHTMLTag_td==aChild)) { + return BackwardPropagate(aSequence,aParent,aChild); } } //otherwise, intentionally fall through... case eHTMLTag_tr: { - PRBool theCanContainResult=CanContain(eHTMLTag_td,aChildTag); + PRBool theCanContainResult=CanContain(eHTMLTag_td,aChild); if(PR_TRUE==theCanContainResult) { aSequence.Append((PRUnichar)eHTMLTag_td); - result=BackwardPropagate(aSequence,aParentTag,eHTMLTag_td); + result=BackwardPropagate(aSequence,aParent,eHTMLTag_td); } } break; @@ -2752,25 +2752,25 @@ PRBool CNavDTD::ForwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLT * @param aChild -- tag type of child * @return TRUE if propagation closes; false otherwise */ -PRBool CNavDTD::BackwardPropagate(nsString& aSequence,eHTMLTags aParentTag,eHTMLTags aChildTag) const { +PRBool CNavDTD::BackwardPropagate(nsString& aSequence,eHTMLTags aParent,eHTMLTags aChild) const { - eHTMLTags theParentTag=aParentTag; //just init to get past first condition... + eHTMLTags theParent=aParent; //just init to get past first condition... do { - const TagList* theRootTags=gHTMLElements[aChildTag].GetRootTags(); + const TagList* theRootTags=gHTMLElements[aChild].GetRootTags(); if(theRootTags) { - theParentTag=theRootTags->mTags[0]; - if(CanContain(theParentTag,aChildTag)) { + theParent=theRootTags->mTags[0]; + if(CanContain(theParent,aChild)) { //we've found a complete sequence, so push the parent... - aChildTag=theParentTag; - aSequence.Append((PRUnichar)theParentTag); + aChild=theParent; + aSequence.Append((PRUnichar)theParent); } } else break; } - while((theParentTag!=eHTMLTag_unknown) && (theParentTag!=aParentTag)); + while((theParent!=eHTMLTag_unknown) && (theParent!=aParent)); - return PRBool(aParentTag==theParentTag); + return PRBool(aParent==theParent); } @@ -3635,21 +3635,21 @@ nsresult CNavDTD::CloseContainersTo(PRInt32 anIndex,eHTMLTags aTarget, PRBool aC * @param aClosedByStartTag -- ONLY TRUE if the container is being closed by opening of another container. * @return TRUE if ok, FALSE if error */ -nsresult CNavDTD::CloseContainersTo(eHTMLTags aTarget,PRBool aClosedByStartTag){ +nsresult CNavDTD::CloseContainersTo(eHTMLTags aTag,PRBool aClosedByStartTag){ NS_PRECONDITION(mBodyContext->GetCount() > 0, kInvalidTagStackPos); - PRInt32 pos=mBodyContext->LastOf(aTarget); + PRInt32 pos=mBodyContext->LastOf(aTag); if(kNotFound!=pos) { //the tag is indeed open, so close it. - return CloseContainersTo(pos,aTarget,aClosedByStartTag); + return CloseContainersTo(pos,aTag,aClosedByStartTag); } eHTMLTags theTopTag=mBodyContext->Last(); - PRBool theTagIsSynonymous=((nsHTMLElement::IsResidualStyleTag(aTarget)) && (nsHTMLElement::IsResidualStyleTag(theTopTag))); + PRBool theTagIsSynonymous=((nsHTMLElement::IsResidualStyleTag(aTag)) && (nsHTMLElement::IsResidualStyleTag(theTopTag))); if(!theTagIsSynonymous){ - theTagIsSynonymous=(gHTMLElements[aTarget].IsMemberOf(kHeading) && + theTagIsSynonymous=(gHTMLElements[aTag].IsMemberOf(kHeading) && gHTMLElements[theTopTag].IsMemberOf(kHeading)); } @@ -3657,21 +3657,21 @@ nsresult CNavDTD::CloseContainersTo(eHTMLTags aTarget,PRBool aClosedByStartTag){ //if you're here, it's because we're trying to close one tag, //but a different (synonymous) one is actually open. Because this is NAV4x //compatibililty mode, we must close the one that's really open. - aTarget=theTopTag; - pos=mBodyContext->LastOf(aTarget); + aTag=theTopTag; + pos=mBodyContext->LastOf(aTag); if(kNotFound!=pos) { //the tag is indeed open, so close it. - return CloseContainersTo(pos,aTarget,aClosedByStartTag); + return CloseContainersTo(pos,aTag,aClosedByStartTag); } } nsresult result=NS_OK; - const TagList* theRootTags=gHTMLElements[aTarget].GetRootTags(); + const TagList* theRootTags=gHTMLElements[aTag].GetRootTags(); eHTMLTags theParentTag=(theRootTags) ? theRootTags->mTags[0] : eHTMLTag_unknown; pos=mBodyContext->LastOf(theParentTag); if(kNotFound!=pos) { //the parent container is open, so close it instead - result=CloseContainersTo(pos+1,aTarget,aClosedByStartTag); + result=CloseContainersTo(pos+1,aTag,aClosedByStartTag); } return result; } @@ -3762,25 +3762,25 @@ nsresult CNavDTD::AddHeadLeaf(nsIParserNode *aNode){ * stack until the child can be properly placed. * * @update gess 4/8/98 - * @param aChildTag is the child for whom we need to + * @param aChild is the child for whom we need to * create a new context vector * @return true if we succeeded, otherwise false */ -nsresult CNavDTD::CreateContextStackFor(eHTMLTags aChildTag){ +nsresult CNavDTD::CreateContextStackFor(eHTMLTags aChild){ mScratch.Truncate(); nsresult result=(nsresult)kContextMismatch; eHTMLTags theTop=mBodyContext->Last(); - PRBool bResult=ForwardPropagate(mScratch,theTop,aChildTag); + PRBool bResult=ForwardPropagate(mScratch,theTop,aChild); if(PR_FALSE==bResult){ if(eHTMLTag_unknown!=theTop) { - if(theTop!=aChildTag) //dont even bother if we're already inside a similar element... - bResult=BackwardPropagate(mScratch,theTop,aChildTag); + if(theTop!=aChild) //dont even bother if we're already inside a similar element... + bResult=BackwardPropagate(mScratch,theTop,aChild); } //if - else bResult=BackwardPropagate(mScratch,eHTMLTag_html,aChildTag); + else bResult=BackwardPropagate(mScratch,eHTMLTag_html,aChild); } //elseif PRInt32 theLen=mScratch.Length(); diff --git a/parser/htmlparser/src/CNavDTD.h b/parser/htmlparser/src/CNavDTD.h index 5407429b29ec..c2094ac0ddd0 100644 --- a/parser/htmlparser/src/CNavDTD.h +++ b/parser/htmlparser/src/CNavDTD.h @@ -176,8 +176,8 @@ public: * @return True if closure was achieved -- other false */ virtual PRBool ForwardPropagate(nsString& aSequence, - eHTMLTags aParentTag, - eHTMLTags aChildTag); + eHTMLTags aParent, + eHTMLTags aChild); /** * This method tries to design a context map (without actually @@ -189,17 +189,17 @@ public: * @return True if closure was achieved -- other false */ virtual PRBool BackwardPropagate(nsString& aSequence, - eHTMLTags aParentTag, - eHTMLTags aChildTag) const; + eHTMLTags aParent, + eHTMLTags aChild) const; /** * Attempt forward and/or backward propagation for the given * child within the current context vector stack. * @update gess5/11/98 - * @param type of child to be propagated. + * @param aChild -- type of child to be propagated. * @return TRUE if succeeds, otherwise FALSE */ - nsresult CreateContextStackFor(eHTMLTags aChildTag); + nsresult CreateContextStackFor(eHTMLTags aChild); /** * Ask parser if a given container is open ANYWHERE on stack diff --git a/parser/htmlparser/src/COtherDTD.cpp b/parser/htmlparser/src/COtherDTD.cpp index 3807f5ee5863..bdfabd2089ea 100644 --- a/parser/htmlparser/src/COtherDTD.cpp +++ b/parser/htmlparser/src/COtherDTD.cpp @@ -554,7 +554,7 @@ nsresult COtherDTD::HandleToken(CToken* aToken,nsIParser* aParser){ * This gets called after we've handled a given start tag. * It's a generic hook to let us to post processing. * @param aToken contains the tag in question - * @param aChildTag is the tag itself. + * @param aTag is the tag itself. * @return status */ nsresult COtherDTD::DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag){ diff --git a/parser/htmlparser/src/COtherDTD.h b/parser/htmlparser/src/COtherDTD.h index fc1d224c85f7..f88432b0a6ee 100644 --- a/parser/htmlparser/src/COtherDTD.h +++ b/parser/htmlparser/src/COtherDTD.h @@ -159,7 +159,7 @@ class COtherDTD : public nsIDTD protected: nsresult CollectAttributes(nsIParserNode& aNode,eHTMLTags aTag,PRInt32 aCount); - nsresult WillHandleStartTag(CToken* aToken,eHTMLTags aChildTag,nsIParserNode& aNode); + nsresult WillHandleStartTag(CToken* aToken,eHTMLTags aTag,nsIParserNode& aNode); nsresult DidHandleStartTag(nsIParserNode& aNode,eHTMLTags aChildTag); nsIParserNode* CreateNode(CToken* aToken=nsnull,PRInt32 aLineNumber=1,nsTokenAllocator* aTokenAllocator=0); diff --git a/parser/htmlparser/src/nsDTDUtils.cpp b/parser/htmlparser/src/nsDTDUtils.cpp index f91f8cf8efa1..23d3b714c9d2 100644 --- a/parser/htmlparser/src/nsDTDUtils.cpp +++ b/parser/htmlparser/src/nsDTDUtils.cpp @@ -379,7 +379,7 @@ eHTMLTags nsEntryStack::operator[](PRInt32 anIndex) const * @update harishd 04/04/99 * @update gess 04/21/99 */ -eHTMLTags nsEntryStack::Last() const +eHTMLTags nsEntryStack::Last(void) const { eHTMLTags result=eHTMLTag_unknown; if(0