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

Resolve name conflict.

Browse Source 
Not part of build yet. a=leaf


git-svn-id: svn://10.0.0.236/trunk@65913 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Peter.VanderBeken%pandora.be
2000-04-14 02:05:21 +00:00
parent 2deda51d30
commit 05110da058
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp
View File

@@ -21,7 +21,7 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
* $Id: BooleanFunctionCall.cpp,v 1.1 2000-04-06 07:44:53 kvisco%ziplink.net Exp $
* $Id: BooleanFunctionCall.cpp,v 1.2 2000-04-14 02:04:43 Peter.VanderBeken%pandora.be Exp $
*/
#include "FunctionLib.h"
@@ -29,7 +29,7 @@
/**
* Creates a default BooleanFunctionCall, which always evaluates to False
* @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
* @version $Revision: 1.1 $ $Date: 2000-04-06 07:44:53 $
* @version $Revision: 1.2 $ $Date: 2000-04-14 02:04:43 $
**/
BooleanFunctionCall::BooleanFunctionCall() : FunctionCall(XPathNames::FALSE_FN) {
this->type = FALSE;
@@ -41,13 +41,13 @@ BooleanFunctionCall::BooleanFunctionCall() : FunctionCall(XPathNames::FALSE_FN)
BooleanFunctionCall::BooleanFunctionCall(short type) : FunctionCall()
{
switch ( type ) {
case BOOLEAN :
case TX_BOOLEAN :
FunctionCall::setName(XPathNames::BOOLEAN_FN);
break;
case NOT :
case TX_NOT :
FunctionCall::setName(XPathNames::NOT_FN);
break;
case TRUE :
case TX_TRUE :
FunctionCall::setName(XPathNames::TRUE_FN);
break;
default:
@@ -74,7 +74,7 @@ ExprResult* BooleanFunctionCall::evaluate(Node* context, ContextState* cs) {
switch ( type ) {
case BOOLEAN :
case TX_BOOLEAN :
if ( requireParams(1,1,cs) ) {
param = (Expr*)iter->next();
ExprResult* exprResult = param->evaluate(context, cs);
@@ -82,7 +82,7 @@ ExprResult* BooleanFunctionCall::evaluate(Node* context, ContextState* cs) {
delete exprResult;
}
break;
case NOT :
case TX_NOT :
if ( requireParams(1,1,cs) ) {
param = (Expr*)iter->next();
ExprResult* exprResult = param->evaluate(context, cs);
@@ -90,7 +90,7 @@ ExprResult* BooleanFunctionCall::evaluate(Node* context, ContextState* cs) {
delete exprResult;
}
break;
case TRUE :
case TX_TRUE :
result->setValue(MB_TRUE);
break;
default:

10
mozilla/extensions/transformiix/source/xpath/ExprParser.cpp
View File

@@ -26,7 +26,7 @@
* -- fixed bug in ::parsePredicates,
* made sure we continue looking for more predicates.
*
* $Id: ExprParser.cpp,v 1.2 2000-04-13 09:13:22 kvisco%ziplink.net Exp $
* $Id: ExprParser.cpp,v 1.3 2000-04-14 02:04:50 Peter.VanderBeken%pandora.be Exp $
*/
/**
@@ -34,7 +34,7 @@
* This class is used to parse XSL Expressions
* @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
* @see ExprLexer
* @version $Revision: 1.2 $ $Date: 2000-04-13 09:13:22 $
* @version $Revision: 1.3 $ $Date: 2000-04-14 02:04:50 $
**/
#include "ExprParser.h"
@@ -397,7 +397,7 @@ FunctionCall* ExprParser::createFunctionCall(ExprLexer& lexer) {
//-- * we should hash these names for speed
if ( XPathNames::BOOLEAN_FN.isEqual(tok->value) ) {
fnCall = new BooleanFunctionCall(BooleanFunctionCall::BOOLEAN);
fnCall = new BooleanFunctionCall(BooleanFunctionCall::TX_BOOLEAN);
}
else if ( XPathNames::CONCAT_FN.isEqual(tok->value) ) {
fnCall = new StringFunctionCall(StringFunctionCall::CONCAT);
@@ -424,7 +424,7 @@ FunctionCall* ExprParser::createFunctionCall(ExprLexer& lexer) {
fnCall = new NodeSetFunctionCall(NodeSetFunctionCall::NAMESPACE_URI);
}
else if ( XPathNames::NOT_FN.isEqual(tok->value) ) {
fnCall = new BooleanFunctionCall(BooleanFunctionCall::NOT);
fnCall = new BooleanFunctionCall(BooleanFunctionCall::TX_NOT);
}
else if ( XPathNames::POSITION_FN.isEqual(tok->value) ) {
fnCall = new NodeSetFunctionCall(NodeSetFunctionCall::POSITION);
@@ -451,7 +451,7 @@ FunctionCall* ExprParser::createFunctionCall(ExprLexer& lexer) {
fnCall = new StringFunctionCall(StringFunctionCall::TRANSLATE);
}
else if ( XPathNames::TRUE_FN.isEqual(tok->value) ) {
fnCall = new BooleanFunctionCall(BooleanFunctionCall::TRUE);
fnCall = new BooleanFunctionCall(BooleanFunctionCall::TX_TRUE);
}
// OG+
else if ( XPathNames::NUMBER_FN.isEqual(tok->value) ) {

4
mozilla/extensions/transformiix/source/xpath/FunctionLib.h
View File

@@ -24,7 +24,7 @@
* Olivier Gerardin, ogerardin@vo.lu
* -- added number functions
*
* $Id: FunctionLib.h,v 1.3 2000-04-12 22:33:21 nisheeth%netscape.com Exp $
* $Id: FunctionLib.h,v 1.4 2000-04-14 02:05:21 Peter.VanderBeken%pandora.be Exp $
*/
@@ -187,7 +187,7 @@ class BooleanFunctionCall : public FunctionCall {
public:
enum _BooleanFunctions { BOOLEAN = 1, FALSE, NOT, TRUE };
enum BooleanFunctions { TX_BOOLEAN = 1, TX_FALSE, TX_NOT, TX_TRUE };
/**
* Creates a default BooleanFunctionCall, which always evaluates to False