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

Bug 162398: Make XPath lexer look at entire qname when checking for operators.

Browse Source 
r=Pike sr=bz
This commit is contained in:
sicking%bigfoot.com 2005-11-02 07:38:30 +00:00
parent cecab4e362
commit 5bfbe3e246
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content/xslt/src/xpath/txExprLexer.cpp
View File

@ -278,7 +278,6 @@ void ExprLexer::parse(const String& pattern)
start = iter;
while (++iter < size &&
XMLUtils::isNCNameChar(pattern.charAt(iter))) /* just go */ ;
PRUint32 end = iter;
if (iter < size && pattern.charAt(iter)==COLON) {
// try QName or wildcard, might need to step back for axis
if (++iter < size)
@ -292,13 +291,13 @@ void ExprLexer::parse(const String& pattern)
iter--; // step back
}
if (nextIsOperatorToken(prevToken)) {
if (pattern.subString(start,end,subStr).isEqual(AND))
if (pattern.subString(start,iter,subStr).isEqual(AND))
defType = Token::AND_OP;
else if (pattern.subString(start,end,subStr).isEqual(OR))
else if (pattern.subString(start,iter,subStr).isEqual(OR))
defType = Token::OR_OP;
else if (pattern.subString(start,end,subStr).isEqual(MODULUS))
else if (pattern.subString(start,iter,subStr).isEqual(MODULUS))
defType = Token::MODULUS_OP;
else if (pattern.subString(start,end,subStr).isEqual(DIVIDE))
else if (pattern.subString(start,iter,subStr).isEqual(DIVIDE))
defType = Token::DIVIDE_OP;
else {
// Error "operator expected"