Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added line number support to nodes for Javascript

Browse Source
This commit is contained in:
rickg%netscape.com 1998-07-25 00:29:15 +00:00
parent a6035c39f1
commit 79205ce3c8
16 changed files with 60 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
htmlparser/src/CNavDTD.cpp
View File

@ -341,6 +341,7 @@ CNavDTD::CNavDTD() : nsIDTD(), mTokenDeque(gTokenKiller),
mParser=0;
mSink = nsnull;
mDTDDebug=0;
mLineNumber=1;
nsCRT::zero(mTokenHandlers,sizeof(mTokenHandlers));
mHasOpenForm=PR_FALSE;
mHasOpenMap=PR_FALSE;
@ -426,6 +427,7 @@ nsresult CNavDTD::WillBuildModel(nsString& aFilename,PRInt32 aLevel){
nsresult result=NS_OK;
mFilename=aFilename;
mLineNumber=1;
if((1==aLevel) && (mSink)) {
result = mSink->WillBuildModel();
@ -557,7 +559,7 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
eHTMLTags tokenTagType=(eHTMLTags)st->GetTypeID();
//Begin by gathering up attributes...
nsCParserNode attrNode((CHTMLToken*)aToken);
nsCParserNode attrNode((CHTMLToken*)aToken,mLineNumber);
PRInt16 attrCount=aToken->GetAttributeCount();
PRInt32 theCount;
nsresult result=(0==attrCount)
@ -575,7 +577,7 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
case eHTMLTag_title:
{
nsCParserNode theNode(st);
nsCParserNode theNode(st,mLineNumber);
result=OpenHead(theNode); //open the head...
if(NS_OK==result) {
result=mParser->CollectSkippedContent(attrNode,theCount);
@ -599,7 +601,7 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
case eHTMLTag_meta:
case eHTMLTag_link:
{
nsCParserNode theNode((CHTMLToken*)aToken);
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber);
result=OpenHead(theNode);
if(NS_OK==result)
result=AddLeaf(attrNode);
@ -610,7 +612,7 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
case eHTMLTag_style:
{
nsCParserNode theNode((CHTMLToken*)aToken);
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber);
result=OpenHead(theNode);
if(NS_OK==result) {
mParser->CollectSkippedContent(attrNode,theCount);
@ -654,6 +656,10 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
} //switch
} //if
} //if
if(eHTMLTag_newline==tokenTagType)
mLineNumber++;
return result;
}
@ -694,7 +700,7 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
return result;
}
nsCParserNode theNode((CHTMLToken*)aToken);
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber);
switch(tokenTagType) {
case eHTMLTag_style:
@ -708,14 +714,14 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
case eHTMLTag_map:
{
nsCParserNode aNode((CHTMLToken*)aToken);
nsCParserNode aNode((CHTMLToken*)aToken,mLineNumber);
result=CloseMap(aNode);
}
break;
case eHTMLTag_form:
{
nsCParserNode aNode((CHTMLToken*)aToken);
nsCParserNode aNode((CHTMLToken*)aToken,mLineNumber);
result=CloseForm(aNode);
}
break;
@ -755,7 +761,7 @@ nsresult CNavDTD::HandleEntityToken(CToken* aToken) {
eHTMLTags tokenTagType=(eHTMLTags)et->GetTypeID();
if(PR_FALSE==CanOmit(GetTopNode(),tokenTagType)) {
nsCParserNode aNode((CHTMLToken*)aToken);
nsCParserNode aNode((CHTMLToken*)aToken,mLineNumber);
result=AddLeaf(aNode);
}
return result;
@ -792,7 +798,7 @@ nsresult CNavDTD::HandleSkippedContentToken(CToken* aToken) {
nsresult result=NS_OK;
if(HasOpenContainer(eHTMLTag_body)) {
nsCParserNode aNode((CHTMLToken*)aToken);
nsCParserNode aNode((CHTMLToken*)aToken,mLineNumber);
result=AddLeaf(aNode);
}
return result;
@ -830,8 +836,6 @@ nsresult CNavDTD::HandleScriptToken(CToken* aToken, nsCParserNode& aNode) {
nsresult result=NS_OK;
PRInt32 pos=GetTopmostIndexOf(eHTMLTag_body);
// nsCParserNode theNode((CHTMLToken*)aToken);
// nsCParserNode attrNode((CHTMLToken*)aToken);
PRInt32 attrCount=aToken->GetAttributeCount();
if (kNotFound == pos) {
@ -1913,7 +1917,7 @@ nsresult CNavDTD::OpenTransientStyles(eHTMLTags aTag){
if(PR_FALSE==HasOpenContainer(theTag)) {
CStartToken token(theTag);
nsCParserNode theNode(&token);
nsCParserNode theNode(&token,mLineNumber);
switch(theTag) {
case eHTMLTag_secret_h1style: case eHTMLTag_secret_h2style:
@ -2053,7 +2057,7 @@ nsresult CNavDTD::OpenBody(const nsIParserNode& aNode){
result=CloseContainersTo(0,eHTMLTag_html,PR_TRUE); //close current stack containers.
CHTMLToken token(gEmpty);
nsCParserNode htmlNode(&token);
nsCParserNode htmlNode(&token,mLineNumber);
token.SetTypeID(eHTMLTag_html); //open the html container...
result=OpenHTML(htmlNode);
@ -2195,6 +2199,7 @@ CNavDTD::OpenContainer(const nsIParserNode& aNode,PRBool aUpdateStyleStack){
nsresult result=NS_OK;
eHTMLTags nodeType=(eHTMLTags)aNode.GetNodeType();
PRInt32 num=aNode.GetSourceLineNumber();
// CloseTransientStyles(nodeType);
@ -2302,7 +2307,7 @@ CNavDTD::CloseContainersTo(PRInt32 anIndex,eHTMLTags aTag,
nsresult result=NS_OK;
CEndToken aToken(gEmpty);
nsCParserNode theNode(&aToken);
nsCParserNode theNode(&aToken,mLineNumber);
if((anIndex<mContextStack.mCount) && (anIndex>=0)) {
while(mContextStack.mCount>anIndex) {
@ -2369,7 +2374,7 @@ nsresult CNavDTD::CloseTopmostContainer(){
CEndToken aToken(gEmpty);
eHTMLTags theTag=mContextStack.Last();
aToken.SetTypeID(theTag);
nsCParserNode theNode(&aToken);
nsCParserNode theNode(&aToken,mLineNumber);
return CloseContainer(theNode,theTag,PR_TRUE);
}

1
htmlparser/src/CNavDTD.h
View File

@ -602,6 +602,7 @@ protected:
nsDeque mTokenDeque;
nsString mFilename;
nsIDTDDebug* mDTDDebug;
PRInt32 mLineNumber;
};
extern NS_HTMLPARS nsresult NS_NewNavHTMLDTD(nsIDTD** aInstancePtrResult);

2
htmlparser/src/nsIParserNode.h
View File

@ -126,7 +126,7 @@ class nsIParserNode {
* @update gess7/24/98
* @return int containing the line number the token was found on
*/
virtual PRUint16 GetSourceLineNumber(void)=0;
virtual PRInt32 GetSourceLineNumber(void) const =0;
};

1
htmlparser/src/nsParser.h
View File

@ -301,6 +301,7 @@ protected:
nsIParserFilter* mParserFilter;
nsIDTDDebug* mDTDDebug;
};

7
htmlparser/src/nsParserNode.cpp
View File

@ -30,9 +30,10 @@ const nsAutoString nsCParserNode::mEmptyString("");
* @param aToken -- token to init internal token
* @return
*/
nsCParserNode::nsCParserNode(CToken* aToken): nsIParserNode() {
nsCParserNode::nsCParserNode(CToken* aToken,PRInt32 aLineNumber): nsIParserNode() {
NS_PRECONDITION(0!=aToken, "Null Token");
mAttributeCount=0;
mLineNumber=aLineNumber;
mToken=aToken;
memset(mAttributes,0,sizeof(mAttributes));
}
@ -209,7 +210,7 @@ PRInt32 nsCParserNode::TranslateToUnicodeStr(nsString& aString) const
* @update gess7/24/98
* @return int containing the line number the token was found on
*/
PRUint16 nsCParserNode::GetSourceLineNumber(void){
return mToken->GetSourceLineNumber();
PRInt32 nsCParserNode::GetSourceLineNumber(void) const {
return mLineNumber;
}

5
htmlparser/src/nsParserNode.h
View File

@ -51,7 +51,7 @@ class nsCParserNode : public nsIParserNode {
* @update gess5/11/98
* @param aToken is the token this node "refers" to
*/
nsCParserNode(CToken* aToken);
nsCParserNode(CToken* aToken,PRInt32 aLineNumber=1);
/**
* Destructor
@ -152,10 +152,11 @@ class nsCParserNode : public nsIParserNode {
* @update gess7/24/98
* @return int containing the line number the token was found on
*/
virtual PRUint16 GetSourceLineNumber(void);
virtual PRInt32 GetSourceLineNumber(void) const;
protected:
PRInt32 mAttributeCount;
PRInt32 mLineNumber;
CToken* mToken;
CToken* mAttributes[20]; // XXX Ack! This needs to be dynamic!
// nsAutoString mName;

13
htmlparser/src/nsToken.cpp
View File

@ -27,7 +27,6 @@
CToken::CToken(PRInt32 aTag) : mTextValue() {
mTypeID=aTag;
mStringInit=PR_FALSE;
mLineNumber=1;
mAttrCount=0;
}
@ -40,7 +39,6 @@ CToken::CToken(PRInt32 aTag) : mTextValue() {
CToken::CToken(const nsString& aName) : mTextValue(aName) {
mTypeID=0;
mStringInit=PR_TRUE;
mLineNumber=1;
mAttrCount=0;
}
@ -53,7 +51,6 @@ CToken::CToken(const nsString& aName) : mTextValue(aName) {
CToken::CToken(const char* aName) : mTextValue(aName) {
mTypeID=0;
mStringInit=PR_TRUE;
mLineNumber=1;
mAttrCount=0;
}
@ -204,16 +201,6 @@ const char* CToken::GetClassName(void) {
return "token";
}
/**
* This getter retrieves the line number from the input source where
* the token occured. Lines are interpreted as occuring between \n characters.
* @update gess7/24/98
* @return int containing the line number the token was found on
*/
PRUint16 CToken::GetSourceLineNumber(void){
return mLineNumber;
}
/**
*
* @update gess 3/25/98

10
htmlparser/src/nsToken.h
View File

@ -167,15 +167,6 @@ class CToken {
*/
virtual const char* GetClassName(void);
/**
* This getter retrieves the line number from the input source where
* the token occured. Lines are interpreted as occuring between \n characters.
* @update gess7/24/98
* @return int containing the line number the token was found on
*/
virtual PRUint16 GetSourceLineNumber(void);
/**
* perform self test.
* @update gess5/11/98
@ -186,7 +177,6 @@ protected:
PRInt32 mTypeID;
PRInt16 mAttrCount;
PRBool mStringInit;
PRUint16 mLineNumber;
nsAutoString mTextValue;
};

35
parser/htmlparser/src/CNavDTD.cpp
View File

@ -341,6 +341,7 @@ CNavDTD::CNavDTD() : nsIDTD(), mTokenDeque(gTokenKiller),
mParser=0;
mSink = nsnull;
mDTDDebug=0;
mLineNumber=1;
nsCRT::zero(mTokenHandlers,sizeof(mTokenHandlers));
mHasOpenForm=PR_FALSE;
mHasOpenMap=PR_FALSE;
@ -426,6 +427,7 @@ nsresult CNavDTD::WillBuildModel(nsString& aFilename,PRInt32 aLevel){
nsresult result=NS_OK;
mFilename=aFilename;
mLineNumber=1;
if((1==aLevel) && (mSink)) {
result = mSink->WillBuildModel();
@ -557,7 +559,7 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
eHTMLTags tokenTagType=(eHTMLTags)st->GetTypeID();
//Begin by gathering up attributes...
nsCParserNode attrNode((CHTMLToken*)aToken);
nsCParserNode attrNode((CHTMLToken*)aToken,mLineNumber);
PRInt16 attrCount=aToken->GetAttributeCount();
PRInt32 theCount;
nsresult result=(0==attrCount)
@ -575,7 +577,7 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
case eHTMLTag_title:
{
nsCParserNode theNode(st);
nsCParserNode theNode(st,mLineNumber);
result=OpenHead(theNode); //open the head...
if(NS_OK==result) {
result=mParser->CollectSkippedContent(attrNode,theCount);
@ -599,7 +601,7 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
case eHTMLTag_meta:
case eHTMLTag_link:
{
nsCParserNode theNode((CHTMLToken*)aToken);
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber);
result=OpenHead(theNode);
if(NS_OK==result)
result=AddLeaf(attrNode);
@ -610,7 +612,7 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
case eHTMLTag_style:
{
nsCParserNode theNode((CHTMLToken*)aToken);
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber);
result=OpenHead(theNode);
if(NS_OK==result) {
mParser->CollectSkippedContent(attrNode,theCount);
@ -654,6 +656,10 @@ nsresult CNavDTD::HandleStartToken(CToken* aToken) {
} //switch
} //if
} //if
if(eHTMLTag_newline==tokenTagType)
mLineNumber++;
return result;
}
@ -694,7 +700,7 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
return result;
}
nsCParserNode theNode((CHTMLToken*)aToken);
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber);
switch(tokenTagType) {
case eHTMLTag_style:
@ -708,14 +714,14 @@ nsresult CNavDTD::HandleEndToken(CToken* aToken) {
case eHTMLTag_map:
{
nsCParserNode aNode((CHTMLToken*)aToken);
nsCParserNode aNode((CHTMLToken*)aToken,mLineNumber);
result=CloseMap(aNode);
}
break;
case eHTMLTag_form:
{
nsCParserNode aNode((CHTMLToken*)aToken);
nsCParserNode aNode((CHTMLToken*)aToken,mLineNumber);
result=CloseForm(aNode);
}
break;
@ -755,7 +761,7 @@ nsresult CNavDTD::HandleEntityToken(CToken* aToken) {
eHTMLTags tokenTagType=(eHTMLTags)et->GetTypeID();
if(PR_FALSE==CanOmit(GetTopNode(),tokenTagType)) {
nsCParserNode aNode((CHTMLToken*)aToken);
nsCParserNode aNode((CHTMLToken*)aToken,mLineNumber);
result=AddLeaf(aNode);
}
return result;
@ -792,7 +798,7 @@ nsresult CNavDTD::HandleSkippedContentToken(CToken* aToken) {
nsresult result=NS_OK;
if(HasOpenContainer(eHTMLTag_body)) {
nsCParserNode aNode((CHTMLToken*)aToken);
nsCParserNode aNode((CHTMLToken*)aToken,mLineNumber);
result=AddLeaf(aNode);
}
return result;
@ -830,8 +836,6 @@ nsresult CNavDTD::HandleScriptToken(CToken* aToken, nsCParserNode& aNode) {
nsresult result=NS_OK;
PRInt32 pos=GetTopmostIndexOf(eHTMLTag_body);
// nsCParserNode theNode((CHTMLToken*)aToken);
// nsCParserNode attrNode((CHTMLToken*)aToken);
PRInt32 attrCount=aToken->GetAttributeCount();
if (kNotFound == pos) {
@ -1913,7 +1917,7 @@ nsresult CNavDTD::OpenTransientStyles(eHTMLTags aTag){
if(PR_FALSE==HasOpenContainer(theTag)) {
CStartToken token(theTag);
nsCParserNode theNode(&token);
nsCParserNode theNode(&token,mLineNumber);
switch(theTag) {
case eHTMLTag_secret_h1style: case eHTMLTag_secret_h2style:
@ -2053,7 +2057,7 @@ nsresult CNavDTD::OpenBody(const nsIParserNode& aNode){
result=CloseContainersTo(0,eHTMLTag_html,PR_TRUE); //close current stack containers.
CHTMLToken token(gEmpty);
nsCParserNode htmlNode(&token);
nsCParserNode htmlNode(&token,mLineNumber);
token.SetTypeID(eHTMLTag_html); //open the html container...
result=OpenHTML(htmlNode);
@ -2195,6 +2199,7 @@ CNavDTD::OpenContainer(const nsIParserNode& aNode,PRBool aUpdateStyleStack){
nsresult result=NS_OK;
eHTMLTags nodeType=(eHTMLTags)aNode.GetNodeType();
PRInt32 num=aNode.GetSourceLineNumber();
// CloseTransientStyles(nodeType);
@ -2302,7 +2307,7 @@ CNavDTD::CloseContainersTo(PRInt32 anIndex,eHTMLTags aTag,
nsresult result=NS_OK;
CEndToken aToken(gEmpty);
nsCParserNode theNode(&aToken);
nsCParserNode theNode(&aToken,mLineNumber);
if((anIndex<mContextStack.mCount) && (anIndex>=0)) {
while(mContextStack.mCount>anIndex) {
@ -2369,7 +2374,7 @@ nsresult CNavDTD::CloseTopmostContainer(){
CEndToken aToken(gEmpty);
eHTMLTags theTag=mContextStack.Last();
aToken.SetTypeID(theTag);
nsCParserNode theNode(&aToken);
nsCParserNode theNode(&aToken,mLineNumber);
return CloseContainer(theNode,theTag,PR_TRUE);
}

1
parser/htmlparser/src/CNavDTD.h
View File

@ -602,6 +602,7 @@ protected:
nsDeque mTokenDeque;
nsString mFilename;
nsIDTDDebug* mDTDDebug;
PRInt32 mLineNumber;
};
extern NS_HTMLPARS nsresult NS_NewNavHTMLDTD(nsIDTD** aInstancePtrResult);

2
parser/htmlparser/src/nsIParserNode.h
View File

@ -126,7 +126,7 @@ class nsIParserNode {
* @update gess7/24/98
* @return int containing the line number the token was found on
*/
virtual PRUint16 GetSourceLineNumber(void)=0;
virtual PRInt32 GetSourceLineNumber(void) const =0;
};

1
parser/htmlparser/src/nsParser.h
View File

@ -301,6 +301,7 @@ protected:
nsIParserFilter* mParserFilter;
nsIDTDDebug* mDTDDebug;
};

7
parser/htmlparser/src/nsParserNode.cpp
View File

@ -30,9 +30,10 @@ const nsAutoString nsCParserNode::mEmptyString("");
* @param aToken -- token to init internal token
* @return
*/
nsCParserNode::nsCParserNode(CToken* aToken): nsIParserNode() {
nsCParserNode::nsCParserNode(CToken* aToken,PRInt32 aLineNumber): nsIParserNode() {
NS_PRECONDITION(0!=aToken, "Null Token");
mAttributeCount=0;
mLineNumber=aLineNumber;
mToken=aToken;
memset(mAttributes,0,sizeof(mAttributes));
}
@ -209,7 +210,7 @@ PRInt32 nsCParserNode::TranslateToUnicodeStr(nsString& aString) const
* @update gess7/24/98
* @return int containing the line number the token was found on
*/
PRUint16 nsCParserNode::GetSourceLineNumber(void){
return mToken->GetSourceLineNumber();
PRInt32 nsCParserNode::GetSourceLineNumber(void) const {
return mLineNumber;
}

5
parser/htmlparser/src/nsParserNode.h
View File

@ -51,7 +51,7 @@ class nsCParserNode : public nsIParserNode {
* @update gess5/11/98
* @param aToken is the token this node "refers" to
*/
nsCParserNode(CToken* aToken);
nsCParserNode(CToken* aToken,PRInt32 aLineNumber=1);
/**
* Destructor
@ -152,10 +152,11 @@ class nsCParserNode : public nsIParserNode {
* @update gess7/24/98
* @return int containing the line number the token was found on
*/
virtual PRUint16 GetSourceLineNumber(void);
virtual PRInt32 GetSourceLineNumber(void) const;
protected:
PRInt32 mAttributeCount;
PRInt32 mLineNumber;
CToken* mToken;
CToken* mAttributes[20]; // XXX Ack! This needs to be dynamic!
// nsAutoString mName;

13
parser/htmlparser/src/nsToken.cpp
View File

@ -27,7 +27,6 @@
CToken::CToken(PRInt32 aTag) : mTextValue() {
mTypeID=aTag;
mStringInit=PR_FALSE;
mLineNumber=1;
mAttrCount=0;
}
@ -40,7 +39,6 @@ CToken::CToken(PRInt32 aTag) : mTextValue() {
CToken::CToken(const nsString& aName) : mTextValue(aName) {
mTypeID=0;
mStringInit=PR_TRUE;
mLineNumber=1;
mAttrCount=0;
}
@ -53,7 +51,6 @@ CToken::CToken(const nsString& aName) : mTextValue(aName) {
CToken::CToken(const char* aName) : mTextValue(aName) {
mTypeID=0;
mStringInit=PR_TRUE;
mLineNumber=1;
mAttrCount=0;
}
@ -204,16 +201,6 @@ const char* CToken::GetClassName(void) {
return "token";
}
/**
* This getter retrieves the line number from the input source where
* the token occured. Lines are interpreted as occuring between \n characters.
* @update gess7/24/98
* @return int containing the line number the token was found on
*/
PRUint16 CToken::GetSourceLineNumber(void){
return mLineNumber;
}
/**
*
* @update gess 3/25/98

10
parser/htmlparser/src/nsToken.h
View File

@ -167,15 +167,6 @@ class CToken {
*/
virtual const char* GetClassName(void);
/**
* This getter retrieves the line number from the input source where
* the token occured. Lines are interpreted as occuring between \n characters.
* @update gess7/24/98
* @return int containing the line number the token was found on
*/
virtual PRUint16 GetSourceLineNumber(void);
/**
* perform self test.
* @update gess5/11/98
@ -186,7 +177,6 @@ protected:
PRInt32 mTypeID;
PRInt16 mAttrCount;
PRBool mStringInit;
PRUint16 mLineNumber;
nsAutoString mTextValue;
};