Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-31 11:01:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

another fix for entities

Browse Source
This commit is contained in:
rickg%netscape.com 1999-03-25 01:27:41 +00:00
parent dd619c3450
commit 2ad00ba13e
6 changed files with 104 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htmlparser/src/nsElementTable.cpp
View File

@ -465,7 +465,7 @@ nsHTMLElement gHTMLElements[] = {
{ /*tag*/ eHTMLTag_embed,
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
/*autoclose starttags and endtags*/ 0,0,0,
/*parent,incl,exclgroups*/ kFlow, kInline, kNone,
/*parent,incl,exclgroups*/ kFlow, kNone, kNone,
/*special properties*/ 0,
/*special parents,kids,skip*/ 0,&gContainsParam,eHTMLTag_unknown},
@ -1095,7 +1095,7 @@ PRBool nsHTMLElement::IsContainer(eHTMLTags aChild) {
static eHTMLTags gNonContainers[]={
eHTMLTag_unknown,
eHTMLTag_area, eHTMLTag_base, eHTMLTag_basefont,
eHTMLTag_br, eHTMLTag_col,
eHTMLTag_br, eHTMLTag_col, eHTMLTag_embed,
eHTMLTag_frame, eHTMLTag_hr, eHTMLTag_whitespace,
eHTMLTag_input, eHTMLTag_link, eHTMLTag_isindex,
eHTMLTag_meta, eHTMLTag_param, eHTMLTag_plaintext,

4
htmlparser/src/nsHTMLTokenizer.cpp
View File

@ -532,7 +532,7 @@ nsresult nsHTMLTokenizer::ConsumeEntity(PRUnichar aChar,CToken*& aToken,nsScanne
}
else if(kHashsign==theChar) {
aToken = theRecycler->CreateTokenOfType(eToken_entity,eHTMLTag_entity);
result=aToken->Consume(0,aScanner);
result=aToken->Consume(theChar,aScanner);
}
else {
//oops, we're actually looking at plain text...
@ -544,7 +544,7 @@ nsresult nsHTMLTokenizer::ConsumeEntity(PRUnichar aChar,CToken*& aToken,nsScanne
char cbuf[30];
nsString& theStr=aToken->GetStringValueXXX();
theStr.ToCString(cbuf, sizeof(cbuf)-1);
if(-1==NS_EntityToUnicode(cbuf)){
if((kHashsign!=theChar) && (-1==NS_EntityToUnicode(cbuf))){
//if you're here we have a bogus entity.
//convert it into a text token.
nsAutoString temp("&");

79
htmlparser/src/nsHTMLTokens.cpp
View File

@ -205,6 +205,12 @@ nsString& GetIdentChars(void) {
return gIdentChars;
}
static
nsString& GetNumericChars(void) {
static nsString gNumChars("0123456789ABCDEFabcdef");
return gNumChars;
}
/*
* Consume the identifier portion of the start tag
*
@ -1280,31 +1286,40 @@ PRInt32 CEntityToken::GetTokenType(void) {
* @return error result
*/
PRInt32 CEntityToken::ConsumeEntity(PRUnichar aChar,nsString& aString,nsScanner& aScanner){
PRInt32 result=aScanner.Peek(aChar);
PRUnichar theChar=0;
PRInt32 result=aScanner.Peek(theChar);
if(NS_OK==result) {
if(kLeftBrace==aChar) {
if(kLeftBrace==theChar) {
//you're consuming a script entity...
static nsAutoString terminals("}>");
result=aScanner.ReadUntil(aString,terminals,PR_FALSE,PR_FALSE);
if(NS_OK==result) {
result=aScanner.Peek(aChar);
result=aScanner.Peek(theChar);
if(NS_OK==result) {
if(kRightBrace==aChar) {
if(kRightBrace==theChar) {
aString+=kRightBrace; //append rightbrace, and...
result=aScanner.GetChar(aChar);//yank the closing right-brace
result=aScanner.GetChar(theChar);//yank the closing right-brace
}
}
}
} //if
else {
result=aScanner.ReadWhile(aString,GetIdentChars(),PR_TRUE,PR_FALSE);
if(kHashsign==aChar) {
if('X'==(toupper((char)theChar))) {
result=aScanner.GetChar(theChar);
aString+=theChar;
}
if(NS_OK==result){
result=aScanner.ReadWhile(aString,GetNumericChars(),PR_TRUE,PR_FALSE);
}
}
else result=aScanner.ReadWhile(aString,GetIdentChars(),PR_TRUE,PR_FALSE);
if(NS_OK==result) {
result=aScanner.Peek(aChar);
result=aScanner.Peek(theChar);
if(NS_OK==result) {
if (kSemicolon == aChar) {
if (kSemicolon == theChar) {
// consume semicolon that stopped the scan
result=aScanner.GetChar(aChar);
result=aScanner.GetChar(theChar);
}
}
}//if
@ -1375,28 +1390,30 @@ PRInt32 CEntityToken::TranslateToUnicodeStr(nsString& aString) {
PRUnichar theChar0=mTextValue[0];
PRBool isDigit0=nsString::IsDigit(theChar0);
char cbuf[30];
mTextValue.ToCString(cbuf, sizeof(cbuf)-1);
value = NS_EntityToUnicode(cbuf);
if(-1<value) {
//we found a named entity...
aString=PRUnichar(value);
}
else {
if(isDigit0 || ('x'==theChar0) || ('X'==theChar0)) {
PRInt32 err=0;
value=mTextValue.ToInteger(&err,theRadix[isDigit0]);
if(0==err) {
#ifdef PA_REMAP_128_TO_160_ILLEGAL_NCR
/* for some illegal, but popular usage */
if ((value >= 0x0080) && (value <= 0x009f)) {
value = PA_HackTable[value - 0x0080];
}
#endif
aString.Append(PRUnichar(value));
}//if
if(kHashsign==theChar0) {
PRInt32 err=0;
PRUnichar theChar1=mTextValue[1];
PRBool isDigit1=nsString::IsDigit(theChar1);
value=mTextValue.ToInteger(&err,theRadix[isDigit1]);
if(0==err) {
#ifdef PA_REMAP_128_TO_160_ILLEGAL_NCR
/* for some illegal, but popular usage */
if ((value >= 0x0080) && (value <= 0x009f)) {
value = PA_HackTable[value - 0x0080];
}
#endif
aString.Append(PRUnichar(value));
}//if
}
else{
char cbuf[30];
mTextValue.ToCString(cbuf, sizeof(cbuf)-1);
value = NS_EntityToUnicode(cbuf);
if(-1<value) {
//we found a named entity...
aString=PRUnichar(value);
}
}//else
}//if

4
parser/htmlparser/src/nsElementTable.cpp
View File

@ -465,7 +465,7 @@ nsHTMLElement gHTMLElements[] = {
{ /*tag*/ eHTMLTag_embed,
/*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
/*autoclose starttags and endtags*/ 0,0,0,
/*parent,incl,exclgroups*/ kFlow, kInline, kNone,
/*parent,incl,exclgroups*/ kFlow, kNone, kNone,
/*special properties*/ 0,
/*special parents,kids,skip*/ 0,&gContainsParam,eHTMLTag_unknown},
@ -1095,7 +1095,7 @@ PRBool nsHTMLElement::IsContainer(eHTMLTags aChild) {
static eHTMLTags gNonContainers[]={
eHTMLTag_unknown,
eHTMLTag_area, eHTMLTag_base, eHTMLTag_basefont,
eHTMLTag_br, eHTMLTag_col,
eHTMLTag_br, eHTMLTag_col, eHTMLTag_embed,
eHTMLTag_frame, eHTMLTag_hr, eHTMLTag_whitespace,
eHTMLTag_input, eHTMLTag_link, eHTMLTag_isindex,
eHTMLTag_meta, eHTMLTag_param, eHTMLTag_plaintext,

4
parser/htmlparser/src/nsHTMLTokenizer.cpp
View File

@ -532,7 +532,7 @@ nsresult nsHTMLTokenizer::ConsumeEntity(PRUnichar aChar,CToken*& aToken,nsScanne
}
else if(kHashsign==theChar) {
aToken = theRecycler->CreateTokenOfType(eToken_entity,eHTMLTag_entity);
result=aToken->Consume(0,aScanner);
result=aToken->Consume(theChar,aScanner);
}
else {
//oops, we're actually looking at plain text...
@ -544,7 +544,7 @@ nsresult nsHTMLTokenizer::ConsumeEntity(PRUnichar aChar,CToken*& aToken,nsScanne
char cbuf[30];
nsString& theStr=aToken->GetStringValueXXX();
theStr.ToCString(cbuf, sizeof(cbuf)-1);
if(-1==NS_EntityToUnicode(cbuf)){
if((kHashsign!=theChar) && (-1==NS_EntityToUnicode(cbuf))){
//if you're here we have a bogus entity.
//convert it into a text token.
nsAutoString temp("&");

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

@ -205,6 +205,12 @@ nsString& GetIdentChars(void) {
return gIdentChars;
}
static
nsString& GetNumericChars(void) {
static nsString gNumChars("0123456789ABCDEFabcdef");
return gNumChars;
}
/*
* Consume the identifier portion of the start tag
*
@ -1280,31 +1286,40 @@ PRInt32 CEntityToken::GetTokenType(void) {
* @return error result
*/
PRInt32 CEntityToken::ConsumeEntity(PRUnichar aChar,nsString& aString,nsScanner& aScanner){
PRInt32 result=aScanner.Peek(aChar);
PRUnichar theChar=0;
PRInt32 result=aScanner.Peek(theChar);
if(NS_OK==result) {
if(kLeftBrace==aChar) {
if(kLeftBrace==theChar) {
//you're consuming a script entity...
static nsAutoString terminals("}>");
result=aScanner.ReadUntil(aString,terminals,PR_FALSE,PR_FALSE);
if(NS_OK==result) {
result=aScanner.Peek(aChar);
result=aScanner.Peek(theChar);
if(NS_OK==result) {
if(kRightBrace==aChar) {
if(kRightBrace==theChar) {
aString+=kRightBrace; //append rightbrace, and...
result=aScanner.GetChar(aChar);//yank the closing right-brace
result=aScanner.GetChar(theChar);//yank the closing right-brace
}
}
}
} //if
else {
result=aScanner.ReadWhile(aString,GetIdentChars(),PR_TRUE,PR_FALSE);
if(kHashsign==aChar) {
if('X'==(toupper((char)theChar))) {
result=aScanner.GetChar(theChar);
aString+=theChar;
}
if(NS_OK==result){
result=aScanner.ReadWhile(aString,GetNumericChars(),PR_TRUE,PR_FALSE);
}
}
else result=aScanner.ReadWhile(aString,GetIdentChars(),PR_TRUE,PR_FALSE);
if(NS_OK==result) {
result=aScanner.Peek(aChar);
result=aScanner.Peek(theChar);
if(NS_OK==result) {
if (kSemicolon == aChar) {
if (kSemicolon == theChar) {
// consume semicolon that stopped the scan
result=aScanner.GetChar(aChar);
result=aScanner.GetChar(theChar);
}
}
}//if
@ -1375,28 +1390,30 @@ PRInt32 CEntityToken::TranslateToUnicodeStr(nsString& aString) {
PRUnichar theChar0=mTextValue[0];
PRBool isDigit0=nsString::IsDigit(theChar0);
char cbuf[30];
mTextValue.ToCString(cbuf, sizeof(cbuf)-1);
value = NS_EntityToUnicode(cbuf);
if(-1<value) {
//we found a named entity...
aString=PRUnichar(value);
}
else {
if(isDigit0 || ('x'==theChar0) || ('X'==theChar0)) {
PRInt32 err=0;
value=mTextValue.ToInteger(&err,theRadix[isDigit0]);
if(0==err) {
#ifdef PA_REMAP_128_TO_160_ILLEGAL_NCR
/* for some illegal, but popular usage */
if ((value >= 0x0080) && (value <= 0x009f)) {
value = PA_HackTable[value - 0x0080];
}
#endif
aString.Append(PRUnichar(value));
}//if
if(kHashsign==theChar0) {
PRInt32 err=0;
PRUnichar theChar1=mTextValue[1];
PRBool isDigit1=nsString::IsDigit(theChar1);
value=mTextValue.ToInteger(&err,theRadix[isDigit1]);
if(0==err) {
#ifdef PA_REMAP_128_TO_160_ILLEGAL_NCR
/* for some illegal, but popular usage */
if ((value >= 0x0080) && (value <= 0x009f)) {
value = PA_HackTable[value - 0x0080];
}
#endif
aString.Append(PRUnichar(value));
}//if
}
else{
char cbuf[30];
mTextValue.ToCString(cbuf, sizeof(cbuf)-1);
value = NS_EntityToUnicode(cbuf);
if(-1<value) {
//we found a named entity...
aString=PRUnichar(value);
}
}//else
}//if