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

Cleanup BooleanFunctionCall and StringFunctionCall, fixes bugs in lang(), substring() and a few more.

Browse Source 
b=104758 r=Pike sr=jag


git-svn-id: svn://10.0.0.236/trunk@113036 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sicking%bigfoot.com
2002-01-28 14:46:39 +00:00
parent e8761882ab
commit 3f4f453c70
7 changed files with 380 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/extensions/transformiix/source/xpath/NumberFunctionCall.cpp
View File

@@ -68,22 +68,23 @@ NumberFunctionCall::NumberFunctionCall(NumberFunctions aType) {
* for evaluation
* @return the result of the evaluation
*/
ExprResult* NumberFunctionCall::evaluate(Node* context, ContextState* cs) {
ExprResult* NumberFunctionCall::evaluate(Node* aContext, ContextState* aCs)
{
ListIterator iter(&params);
if (mType == NUMBER) {
if (!requireParams(0, 1, cs))
if (!requireParams(0, 1, aCs))
return new StringResult("error");
}
else {
if (!requireParams(1, 1, cs))
if (!requireParams(1, 1, aCs))
return new StringResult("error");
}
switch (mType) {
case CEILING:
{
double dbl = evaluateToNumber((Expr*)iter.next(), context, cs);
double dbl = evaluateToNumber((Expr*)iter.next(), aContext, aCs);
if (Double::isNaN(dbl) || Double::isInfinite(dbl))
return new NumberResult(dbl);
@@ -94,7 +95,7 @@ ExprResult* NumberFunctionCall::evaluate(Node* context, ContextState* cs) {
}
case FLOOR:
{
double dbl = evaluateToNumber((Expr*)iter.next(), context, cs);
double dbl = evaluateToNumber((Expr*)iter.next(), aContext, aCs);
if (Double::isNaN(dbl) ||
Double::isInfinite(dbl) ||
(dbl == 0 && Double::isNeg(dbl)))
@@ -104,7 +105,7 @@ ExprResult* NumberFunctionCall::evaluate(Node* context, ContextState* cs) {
}
case ROUND:
{
double dbl = evaluateToNumber((Expr*)iter.next(), context, cs);
double dbl = evaluateToNumber((Expr*)iter.next(), aContext, aCs);
if (Double::isNaN(dbl) || Double::isInfinite(dbl))
return new NumberResult(dbl);
@@ -116,7 +117,7 @@ ExprResult* NumberFunctionCall::evaluate(Node* context, ContextState* cs) {
case SUM:
{
NodeSet* nodes;
nodes = evaluateToNodeSet((Expr*)iter.next(), context, cs);
nodes = evaluateToNodeSet((Expr*)iter.next(), aContext, aCs);
if (!nodes)
return new StringResult("error");
@@ -134,14 +135,18 @@ ExprResult* NumberFunctionCall::evaluate(Node* context, ContextState* cs) {
}
case NUMBER:
{
if (iter.hasNext())
if (iter.hasNext()) {
return new NumberResult(
evaluateToNumber((Expr*)iter.next(), context, cs));
evaluateToNumber((Expr*)iter.next(), aContext, aCs));
}
String resultStr;
XMLDOMUtils::getNodeValue(context, resultStr);
XMLDOMUtils::getNodeValue(aContext, resultStr);
return new NumberResult(Double::toDouble(resultStr));
}
}
String err("Internal error");
aCs->recieveError(err);
return new StringResult("error");
}