Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 190628: Make some string-functions behave according to spec when second argument is an empty-string.

Browse Source 
r=Pike sr=peterv a=asa


git-svn-id: svn://10.0.0.236/trunk@137100 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sicking%bigfoot.com
2003-01-30 01:01:05 +00:00
parent 43c72e8503
commit d7cc2320cf
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/extensions/transformiix/source/xpath/StringFunctionCall.cpp
View File

@@ -72,8 +72,12 @@ ExprResult* StringFunctionCall::evaluate(txIEvalContext* aContext)
return new StringResult(NS_LITERAL_STRING("error"));
nsAutoString arg1, arg2;
evaluateToString((Expr*)iter.next(), aContext, arg1);
Expr* arg1Expr = (Expr*)iter.next();
evaluateToString((Expr*)iter.next(), aContext, arg2);
if (arg2.IsEmpty())
return new BooleanResult(PR_TRUE);
evaluateToString(arg1Expr, aContext, arg1);
return new BooleanResult(arg1.Find(arg2) >= 0);
}
case NORMALIZE_SPACE:
@@ -116,8 +120,12 @@ ExprResult* StringFunctionCall::evaluate(txIEvalContext* aContext)
return new StringResult(NS_LITERAL_STRING("error"));
nsAutoString arg1, arg2;
evaluateToString((Expr*)iter.next(), aContext, arg1);
Expr* arg1Expr = (Expr*)iter.next();
evaluateToString((Expr*)iter.next(), aContext, arg2);
if (arg2.IsEmpty())
return new BooleanResult(PR_TRUE);
evaluateToString(arg1Expr, aContext, arg1);
return new BooleanResult(arg1.Find(arg2) == 0);
}
case STRING_LENGTH:
@@ -182,6 +190,9 @@ ExprResult* StringFunctionCall::evaluate(txIEvalContext* aContext)
nsAutoString arg1, arg2;
evaluateToString((Expr*)iter.next(), aContext, arg1);
evaluateToString((Expr*)iter.next(), aContext, arg2);
if (arg2.IsEmpty())
return new StringResult(arg1);
PRInt32 idx = arg1.Find(arg2);
if (idx != kNotFound) {
PRUint32 len = arg2.Length();
@@ -196,8 +207,13 @@ ExprResult* StringFunctionCall::evaluate(txIEvalContext* aContext)
return new StringResult(NS_LITERAL_STRING("error"));
nsAutoString arg1, arg2;
evaluateToString((Expr*)iter.next(), aContext, arg1);
Expr* arg1Expr = (Expr*)iter.next();
evaluateToString((Expr*)iter.next(), aContext, arg2);
if (arg2.IsEmpty())
return new StringResult();
evaluateToString(arg1Expr, aContext, arg1);
PRInt32 idx = arg1.Find(arg2);
if (idx != kNotFound) {
return new StringResult(Substring(arg1, 0, idx));