sync up with mods to the parser

git-svn-id: svn://10.0.0.236/trunk@17435 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rickg%netscape.com 1999-01-09 01:11:37 +00:00
parent a8382eb7c5
commit 977421c9eb
5 changed files with 3 additions and 15 deletions

View File

@ -2646,10 +2646,6 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode)
typedef PRBool (*nsStringEnumFunc)(const nsString& aSubString, void *aData);
const PRUnichar kNullCh = PRUnichar('\0');
const PRUnichar kSingleQuote = PRUnichar('\'');
const PRUnichar kDoubleQuote = PRUnichar('\"');
const PRUnichar kComma = PRUnichar(',');
static PRBool EnumerateString(const nsString& aStringList, nsStringEnumFunc aFunc, void* aData)
{
@ -2670,7 +2666,7 @@ static PRBool EnumerateString(const nsString& aStringList, nsStringEnumFunc aFun
start++;
}
if ((kSingleQuote == *start) || (kDoubleQuote == *start)) { // quoted string
if ((kApostrophe == *start) || (kQuote == *start)) { // quoted string
PRUnichar quote = *start++;
quoted = PR_TRUE;
end = start;

View File

@ -54,8 +54,6 @@ static char kNameSpaceSeparator[] = ":";
static char kNameSpaceDef[] = "xmlns";
static char kStyleSheetPI[] = "<?xml-stylesheet";
static char kCSSType[] = "text/css";
static char kQuote = '\"';
static char kApostrophe = '\'';
#ifdef XSL
static char kXSLType[] = "text/xsl";

View File

@ -52,7 +52,7 @@ nsTransactionStack::Pop(nsTransactionItem **aTransaction)
/* nsDeque is a FIFO, so the top of our stack is actually
* the back of the deque.
*/
*aTransaction = (nsTransactionItem *)mQue.PopBack();
*aTransaction = (nsTransactionItem *)mQue.Pop();
return NS_OK;
}

View File

@ -2646,10 +2646,6 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode)
typedef PRBool (*nsStringEnumFunc)(const nsString& aSubString, void *aData);
const PRUnichar kNullCh = PRUnichar('\0');
const PRUnichar kSingleQuote = PRUnichar('\'');
const PRUnichar kDoubleQuote = PRUnichar('\"');
const PRUnichar kComma = PRUnichar(',');
static PRBool EnumerateString(const nsString& aStringList, nsStringEnumFunc aFunc, void* aData)
{
@ -2670,7 +2666,7 @@ static PRBool EnumerateString(const nsString& aStringList, nsStringEnumFunc aFun
start++;
}
if ((kSingleQuote == *start) || (kDoubleQuote == *start)) { // quoted string
if ((kApostrophe == *start) || (kQuote == *start)) { // quoted string
PRUnichar quote = *start++;
quoted = PR_TRUE;
end = start;

View File

@ -54,8 +54,6 @@ static char kNameSpaceSeparator[] = ":";
static char kNameSpaceDef[] = "xmlns";
static char kStyleSheetPI[] = "<?xml-stylesheet";
static char kCSSType[] = "text/css";
static char kQuote = '\"';
static char kApostrophe = '\'';
#ifdef XSL
static char kXSLType[] = "text/xsl";