Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added token append to string

Browse Source 
Improved handling of bad strings
Improved handling of escapes
This commit is contained in:
peterl%netscape.com 1999-02-07 21:47:48 +00:00
parent 473ea4fe44
commit 02a4a1f333
6 changed files with 234 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
content/html/style/src/nsCSSScanner.cpp
View File

@ -77,6 +77,64 @@ nsCSSToken::nsCSSToken()
mType = eCSSToken_Symbol;
}
void
nsCSSToken::AppendToString(nsString& aBuffer)
{
switch (mType) {
case eCSSToken_AtKeyword:
aBuffer.Append(PRUnichar('@')); // fall through intentional
case eCSSToken_Ident:
case eCSSToken_WhiteSpace:
case eCSSToken_Function:
case eCSSToken_URL:
case eCSSToken_InvalidURL:
case eCSSToken_HTMLComment:
aBuffer.Append(mIdent);
break;
case eCSSToken_Number:
if (mIntegerValid) {
aBuffer.Append(mInteger, 10);
}
else {
aBuffer.Append(mNumber);
}
break;
case eCSSToken_Percentage:
if (mIntegerValid) {
aBuffer.Append(mInteger, 10);
}
else {
aBuffer.Append(mNumber);
}
aBuffer.Append(PRUnichar('%'));
break;
case eCSSToken_Dimension:
if (mIntegerValid) {
aBuffer.Append(mInteger, 10);
}
else {
aBuffer.Append(mNumber);
}
aBuffer.Append(mIdent);
break;
case eCSSToken_String:
aBuffer.Append(mSymbol);
aBuffer.Append(mIdent); // fall through intentional
case eCSSToken_Symbol:
aBuffer.Append(mSymbol);
break;
case eCSSToken_ID:
aBuffer.Append(PRUnichar('#'));
aBuffer.Append(mIdent);
break;
default:
NS_ERROR("invalid token type");
break;
}
}
nsCSSScanner::nsCSSScanner()
{
if (nsnull == gLexTable) {
@ -424,7 +482,9 @@ PRBool nsCSSScanner::NextURL(PRInt32& aErrorCode, nsCSSToken& aToken)
if (ch < 0) break;
if (ch == CSS_ESCAPE) {
ch = ParseEscape(aErrorCode);
ident.Append(PRUnichar(ch));
if (0 < ch) {
ident.Append(PRUnichar(ch));
}
} else if ((ch == '"') || (ch == '\'') || (ch == '(')) {
// This is an invalid URL spec
ok = PR_FALSE;
@ -494,7 +554,12 @@ PRInt32 nsCSSScanner::ParseEscape(PRInt32& aErrorCode)
// "Any character except a hexidecimal digit can be escaped to
// remove its special meaning by putting a backslash in front"
// -- CSS1 spec section 7.1
(void) Read(aErrorCode);
if (EatNewline(aErrorCode)) { // skip escaped newline
ch = 0;
}
else {
(void) Read(aErrorCode);
}
return ch;
}
}
@ -517,7 +582,9 @@ PRBool nsCSSScanner::GatherIdent(PRInt32& aErrorCode, PRInt32 aChar,
if (aChar < 0) break;
if (aChar == CSS_ESCAPE) {
aChar = ParseEscape(aErrorCode);
aIdent.Append(PRUnichar(aChar));
if (0 < aChar) {
aIdent.Append(PRUnichar(aChar));
}
} else if ((aChar <= 255) && ((gLexTable[aChar] & IS_IDENT) != 0)) {
aIdent.Append(PRUnichar(aChar));
} else {
@ -667,6 +734,9 @@ PRBool nsCSSScanner::GatherString(PRInt32& aErrorCode, PRInt32 aStop,
nsString& aBuffer)
{
for (;;) {
if (EatNewline(aErrorCode)) {
break;
}
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
return PR_FALSE;
@ -680,7 +750,9 @@ PRBool nsCSSScanner::GatherString(PRInt32& aErrorCode, PRInt32 aStop,
return PR_FALSE;
}
}
aBuffer.Append(PRUnichar(ch));
if (0 < ch) {
aBuffer.Append(PRUnichar(ch));
}
}
return PR_TRUE;
}

2
content/html/style/src/nsCSSScanner.h
View File

@ -71,6 +71,8 @@ struct nsCSSToken {
((eCSSToken_Dimension == mType) ||
((eCSSToken_Number == mType) && (mNumber == 0.0f)));
}
void AppendToString(nsString& aBuffer);
};
// CSS Scanner API. Used to tokenize an input stream using the CSS

80
layout/html/style/src/nsCSSScanner.cpp
View File

@ -77,6 +77,64 @@ nsCSSToken::nsCSSToken()
mType = eCSSToken_Symbol;
}
void
nsCSSToken::AppendToString(nsString& aBuffer)
{
switch (mType) {
case eCSSToken_AtKeyword:
aBuffer.Append(PRUnichar('@')); // fall through intentional
case eCSSToken_Ident:
case eCSSToken_WhiteSpace:
case eCSSToken_Function:
case eCSSToken_URL:
case eCSSToken_InvalidURL:
case eCSSToken_HTMLComment:
aBuffer.Append(mIdent);
break;
case eCSSToken_Number:
if (mIntegerValid) {
aBuffer.Append(mInteger, 10);
}
else {
aBuffer.Append(mNumber);
}
break;
case eCSSToken_Percentage:
if (mIntegerValid) {
aBuffer.Append(mInteger, 10);
}
else {
aBuffer.Append(mNumber);
}
aBuffer.Append(PRUnichar('%'));
break;
case eCSSToken_Dimension:
if (mIntegerValid) {
aBuffer.Append(mInteger, 10);
}
else {
aBuffer.Append(mNumber);
}
aBuffer.Append(mIdent);
break;
case eCSSToken_String:
aBuffer.Append(mSymbol);
aBuffer.Append(mIdent); // fall through intentional
case eCSSToken_Symbol:
aBuffer.Append(mSymbol);
break;
case eCSSToken_ID:
aBuffer.Append(PRUnichar('#'));
aBuffer.Append(mIdent);
break;
default:
NS_ERROR("invalid token type");
break;
}
}
nsCSSScanner::nsCSSScanner()
{
if (nsnull == gLexTable) {
@ -424,7 +482,9 @@ PRBool nsCSSScanner::NextURL(PRInt32& aErrorCode, nsCSSToken& aToken)
if (ch < 0) break;
if (ch == CSS_ESCAPE) {
ch = ParseEscape(aErrorCode);
ident.Append(PRUnichar(ch));
if (0 < ch) {
ident.Append(PRUnichar(ch));
}
} else if ((ch == '"') || (ch == '\'') || (ch == '(')) {
// This is an invalid URL spec
ok = PR_FALSE;
@ -494,7 +554,12 @@ PRInt32 nsCSSScanner::ParseEscape(PRInt32& aErrorCode)
// "Any character except a hexidecimal digit can be escaped to
// remove its special meaning by putting a backslash in front"
// -- CSS1 spec section 7.1
(void) Read(aErrorCode);
if (EatNewline(aErrorCode)) { // skip escaped newline
ch = 0;
}
else {
(void) Read(aErrorCode);
}
return ch;
}
}
@ -517,7 +582,9 @@ PRBool nsCSSScanner::GatherIdent(PRInt32& aErrorCode, PRInt32 aChar,
if (aChar < 0) break;
if (aChar == CSS_ESCAPE) {
aChar = ParseEscape(aErrorCode);
aIdent.Append(PRUnichar(aChar));
if (0 < aChar) {
aIdent.Append(PRUnichar(aChar));
}
} else if ((aChar <= 255) && ((gLexTable[aChar] & IS_IDENT) != 0)) {
aIdent.Append(PRUnichar(aChar));
} else {
@ -667,6 +734,9 @@ PRBool nsCSSScanner::GatherString(PRInt32& aErrorCode, PRInt32 aStop,
nsString& aBuffer)
{
for (;;) {
if (EatNewline(aErrorCode)) {
break;
}
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
return PR_FALSE;
@ -680,7 +750,9 @@ PRBool nsCSSScanner::GatherString(PRInt32& aErrorCode, PRInt32 aStop,
return PR_FALSE;
}
}
aBuffer.Append(PRUnichar(ch));
if (0 < ch) {
aBuffer.Append(PRUnichar(ch));
}
}
return PR_TRUE;
}

2
layout/html/style/src/nsCSSScanner.h
View File

@ -71,6 +71,8 @@ struct nsCSSToken {
((eCSSToken_Dimension == mType) ||
((eCSSToken_Number == mType) && (mNumber == 0.0f)));
}
void AppendToString(nsString& aBuffer);
};
// CSS Scanner API. Used to tokenize an input stream using the CSS

80
layout/style/nsCSSScanner.cpp
View File

@ -77,6 +77,64 @@ nsCSSToken::nsCSSToken()
mType = eCSSToken_Symbol;
}
void
nsCSSToken::AppendToString(nsString& aBuffer)
{
switch (mType) {
case eCSSToken_AtKeyword:
aBuffer.Append(PRUnichar('@')); // fall through intentional
case eCSSToken_Ident:
case eCSSToken_WhiteSpace:
case eCSSToken_Function:
case eCSSToken_URL:
case eCSSToken_InvalidURL:
case eCSSToken_HTMLComment:
aBuffer.Append(mIdent);
break;
case eCSSToken_Number:
if (mIntegerValid) {
aBuffer.Append(mInteger, 10);
}
else {
aBuffer.Append(mNumber);
}
break;
case eCSSToken_Percentage:
if (mIntegerValid) {
aBuffer.Append(mInteger, 10);
}
else {
aBuffer.Append(mNumber);
}
aBuffer.Append(PRUnichar('%'));
break;
case eCSSToken_Dimension:
if (mIntegerValid) {
aBuffer.Append(mInteger, 10);
}
else {
aBuffer.Append(mNumber);
}
aBuffer.Append(mIdent);
break;
case eCSSToken_String:
aBuffer.Append(mSymbol);
aBuffer.Append(mIdent); // fall through intentional
case eCSSToken_Symbol:
aBuffer.Append(mSymbol);
break;
case eCSSToken_ID:
aBuffer.Append(PRUnichar('#'));
aBuffer.Append(mIdent);
break;
default:
NS_ERROR("invalid token type");
break;
}
}
nsCSSScanner::nsCSSScanner()
{
if (nsnull == gLexTable) {
@ -424,7 +482,9 @@ PRBool nsCSSScanner::NextURL(PRInt32& aErrorCode, nsCSSToken& aToken)
if (ch < 0) break;
if (ch == CSS_ESCAPE) {
ch = ParseEscape(aErrorCode);
ident.Append(PRUnichar(ch));
if (0 < ch) {
ident.Append(PRUnichar(ch));
}
} else if ((ch == '"') || (ch == '\'') || (ch == '(')) {
// This is an invalid URL spec
ok = PR_FALSE;
@ -494,7 +554,12 @@ PRInt32 nsCSSScanner::ParseEscape(PRInt32& aErrorCode)
// "Any character except a hexidecimal digit can be escaped to
// remove its special meaning by putting a backslash in front"
// -- CSS1 spec section 7.1
(void) Read(aErrorCode);
if (EatNewline(aErrorCode)) { // skip escaped newline
ch = 0;
}
else {
(void) Read(aErrorCode);
}
return ch;
}
}
@ -517,7 +582,9 @@ PRBool nsCSSScanner::GatherIdent(PRInt32& aErrorCode, PRInt32 aChar,
if (aChar < 0) break;
if (aChar == CSS_ESCAPE) {
aChar = ParseEscape(aErrorCode);
aIdent.Append(PRUnichar(aChar));
if (0 < aChar) {
aIdent.Append(PRUnichar(aChar));
}
} else if ((aChar <= 255) && ((gLexTable[aChar] & IS_IDENT) != 0)) {
aIdent.Append(PRUnichar(aChar));
} else {
@ -667,6 +734,9 @@ PRBool nsCSSScanner::GatherString(PRInt32& aErrorCode, PRInt32 aStop,
nsString& aBuffer)
{
for (;;) {
if (EatNewline(aErrorCode)) {
break;
}
PRInt32 ch = Read(aErrorCode);
if (ch < 0) {
return PR_FALSE;
@ -680,7 +750,9 @@ PRBool nsCSSScanner::GatherString(PRInt32& aErrorCode, PRInt32 aStop,
return PR_FALSE;
}
}
aBuffer.Append(PRUnichar(ch));
if (0 < ch) {
aBuffer.Append(PRUnichar(ch));
}
}
return PR_TRUE;
}

2
layout/style/nsCSSScanner.h
View File

@ -71,6 +71,8 @@ struct nsCSSToken {
((eCSSToken_Dimension == mType) ||
((eCSSToken_Number == mType) && (mNumber == 0.0f)));
}
void AppendToString(nsString& aBuffer);
};
// CSS Scanner API. Used to tokenize an input stream using the CSS