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

unwound changes to skipped content consumption

Browse Source
This commit is contained in:
rickg%netscape.com 1998-07-28 04:00:38 +00:00
parent 393a3c4392
commit 168527845e
2 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htmlparser/src/nsHTMLTokens.cpp
View File

@ -1369,29 +1369,15 @@ PRInt32 CSkippedContentToken::GetTokenType(void) {
*/
nsresult CSkippedContentToken::Consume(PRUnichar,CScanner& aScanner) {
PRBool done=PR_FALSE;
nsresult result=NS_OK;
PRInt32 result=kNoError;
nsString temp;
int parens=0;
char lastChar;
static nsAutoString terminals(">()");
while((!done) && (NS_OK==result)) {
while((!done) && (kNoError==result)) {
static nsAutoString terminals(">");
result=aScanner.ReadUntil(temp,terminals,PR_TRUE);
int len=temp.Length();
lastChar=char(temp[len-1]);
switch(lastChar){
case kLeftParen:
parens++; break;
case kRightParen:
parens--; break;
default:
break;
}
if((0==parens) && (kGreaterThan==lastChar))
done=PRBool(kNotFound!=temp.RFind(mTextValue,PR_TRUE));
done=PRBool(kNotFound!=temp.RFind(mTextValue,PR_TRUE));
}
mTextValue=temp;
mStringInit=PR_TRUE;
return result;
}

22
parser/htmlparser/src/nsHTMLTokens.cpp
View File

@ -1369,29 +1369,15 @@ PRInt32 CSkippedContentToken::GetTokenType(void) {
*/
nsresult CSkippedContentToken::Consume(PRUnichar,CScanner& aScanner) {
PRBool done=PR_FALSE;
nsresult result=NS_OK;
PRInt32 result=kNoError;
nsString temp;
int parens=0;
char lastChar;
static nsAutoString terminals(">()");
while((!done) && (NS_OK==result)) {
while((!done) && (kNoError==result)) {
static nsAutoString terminals(">");
result=aScanner.ReadUntil(temp,terminals,PR_TRUE);
int len=temp.Length();
lastChar=char(temp[len-1]);
switch(lastChar){
case kLeftParen:
parens++; break;
case kRightParen:
parens--; break;
default:
break;
}
if((0==parens) && (kGreaterThan==lastChar))
done=PRBool(kNotFound!=temp.RFind(mTextValue,PR_TRUE));
done=PRBool(kNotFound!=temp.RFind(mTextValue,PR_TRUE));
}
mTextValue=temp;
mStringInit=PR_TRUE;
return result;
}