Removing DOMString/Cleaning up some whitespace. Not part of build yet. a=leaf.

git-svn-id: svn://10.0.0.236/trunk@71996 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Peter.VanderBeken%pandora.be
2000-06-11 11:43:12 +00:00
parent 486908c680
commit 02207eb7ac
23 changed files with 291 additions and 295 deletions

View File

@@ -24,7 +24,7 @@
* Marina Mechtcheriakova, mmarina@mindspring.com
* -- added lang() implementation
*
* $Id: BooleanFunctionCall.cpp,v 1.4 2000-05-23 08:24:33 kvisco%ziplink.net Exp $
* $Id: BooleanFunctionCall.cpp,v 1.5 2000-06-11 11:41:34 Peter.VanderBeken%pandora.be Exp $
*/
#include "FunctionLib.h"
@@ -32,7 +32,7 @@
/**
* Creates a default BooleanFunctionCall, which always evaluates to False
* @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
* @version $Revision: 1.4 $ $Date: 2000-05-23 08:24:33 $
* @version $Revision: 1.5 $ $Date: 2000-06-11 11:41:34 $
**/
BooleanFunctionCall::BooleanFunctionCall() : FunctionCall(XPathNames::FALSE_FN) {
this->type = TX_FALSE;
@@ -48,8 +48,8 @@ BooleanFunctionCall::BooleanFunctionCall(short type) : FunctionCall()
FunctionCall::setName(XPathNames::BOOLEAN_FN);
break;
case TX_LANG:
FunctionCall::setName(XPathNames::LANG_FN);
break;
FunctionCall::setName(XPathNames::LANG_FN);
break;
case TX_NOT :
FunctionCall::setName(XPathNames::NOT_FN);
break;
@@ -93,11 +93,11 @@ ExprResult* BooleanFunctionCall::evaluate(Node* context, ContextState* cs) {
String arg1, lang;
evaluateToString((Expr*)iter->next(),context, cs, arg1);
lang = ((Element*)context)->getAttribute(LANG_ATTR);
arg1.toUpperCase(); // case-insensitive comparison
lang.toUpperCase();
arg1.toUpperCase(); // case-insensitive comparison
lang.toUpperCase();
result->setValue((MBool)(lang.indexOf(arg1) == 0));
}
break;
}
break;
case TX_NOT :
if ( requireParams(1,1,cs) ) {
param = (Expr*)iter->next();

View File

@@ -21,13 +21,13 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
* $Id: BooleanResult.cpp,v 1.4 2000-04-13 14:14:02 Peter.VanderBeken%pandora.be Exp $
* $Id: BooleanResult.cpp,v 1.5 2000-06-11 11:41:38 Peter.VanderBeken%pandora.be Exp $
*/
/**
* Boolean Expression result
* @author <A href="mailto:kvisco@ziplink.net">Keith Visco</A>
* @version $Revision: 1.4 $ $Date: 2000-04-13 14:14:02 $
* @version $Revision: 1.5 $ $Date: 2000-06-11 11:41:38 $
**/
#include "ExprResult.h"
@@ -83,7 +83,7 @@ short BooleanResult::getResultType() {
return ExprResult::BOOLEAN;
} //-- getResultType
void BooleanResult::stringValue(DOMString& str) {
void BooleanResult::stringValue(String& str) {
if ( value ) str.append("true");
else str.append("false");
} //-- toString

View File

@@ -25,7 +25,7 @@
* - changed constant short declarations in many of the classes
* with enumerations, commented with //--LF
*
* $Id: Expr.h,v 1.4 2000-04-19 10:35:49 kvisco%ziplink.net Exp $
* $Id: Expr.h,v 1.5 2000-06-11 11:42:46 Peter.VanderBeken%pandora.be Exp $
*/
@@ -44,7 +44,7 @@
/*
XPath class definitions.
Much of this code was ported from XSL:P.
@version $Revision: 1.4 $ $Date: 2000-04-19 10:35:49 $
@version $Revision: 1.5 $ $Date: 2000-06-11 11:42:46 $
*/
#ifndef TRANSFRMX_EXPR_H
@@ -100,7 +100,7 @@ public:
* @param nodes the NodeSet to sort
* <BR />
* <B>Note:</B> I will be moving this functionality elsewhere soon
**/
**/
virtual void sortByDocumentOrder(NodeSet* nodes) = 0;
}; //-- ContextState

View File

@@ -29,13 +29,13 @@
* -- Fixed bug in parse method so that we make sure we check for
* axis identifier wild cards, such as ancestor::*
*
* $Id: ExprLexer.cpp,v 1.4 2000-05-16 09:34:00 kvisco%ziplink.net Exp $
* $Id: ExprLexer.cpp,v 1.5 2000-06-11 11:42:57 Peter.VanderBeken%pandora.be Exp $
*/
/**
* Lexical analyzer for XPath expressions
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.4 $ $Date: 2000-05-16 09:34:00 $
* @version $Revision: 1.5 $ $Date: 2000-06-11 11:42:57 $
**/
#include <iostream.h>
@@ -564,7 +564,7 @@ void ExprLexer::parse(const String& pattern) {
case TX_LF:
break;
case S_QUOTE :
case D_QUOTE :
case D_QUOTE :
matchToken(tokenBuffer, ch);
inLiteral = ch;
break;

View File

@@ -30,7 +30,7 @@
* -- fixed bug in ::parsePredicates,
* made sure we continue looking for more predicates.
*
* $Id: ExprParser.cpp,v 1.5 2000-05-23 08:30:09 kvisco%ziplink.net Exp $
* $Id: ExprParser.cpp,v 1.6 2000-06-11 11:43:02 Peter.VanderBeken%pandora.be Exp $
*/
/**
@@ -38,7 +38,7 @@
* This class is used to parse XSL Expressions
* @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
* @see ExprLexer
* @version $Revision: 1.5 $ $Date: 2000-05-23 08:30:09 $
* @version $Revision: 1.6 $ $Date: 2000-06-11 11:43:02 $
**/
#include "ExprParser.h"
@@ -676,11 +676,11 @@ PathExpr* ExprParser::createPathExpr(ExprLexer& lexer) {
case Token::R_PAREN:
case Token::R_BRACKET:
case Token::UNION_OP:
//Marina, addition start
// When parsing a list of parameters for a function comma should signal a spot
// without it further processing pathExpr was causing "invalid token" error
case Token::COMMA:
// Marina, addition ends
//Marina, addition start
// When parsing a list of parameters for a function comma should signal a spot
// without it further processing pathExpr was causing "invalid token" error
case Token::COMMA:
// Marina, addition ends
lexer.pushBack();
return pathExpr;
case Token::ANCESTOR_OP :

View File

@@ -23,7 +23,7 @@
* Larry Fitzpatrick, OpenText, lef@opentext.com
* -- changed constant short result types to enum
*
* $Id: ExprResult.h,v 1.5 2000-04-13 23:41:43 Peter.VanderBeken%pandora.be Exp $
* $Id: ExprResult.h,v 1.6 2000-06-11 11:43:07 Peter.VanderBeken%pandora.be Exp $
*/
#include "MITREObject.h"
@@ -42,7 +42,7 @@
* <BR/>
* Note: for NodeSet, see NodeSet.h <BR />
* @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
* @version $Revision: 1.5 $ $Date: 2000-04-13 23:41:43 $
* @version $Revision: 1.6 $ $Date: 2000-06-11 11:43:07 $
*/
class ExprResult : public MITREObject {
@@ -69,7 +69,7 @@ public:
* Creates a String representation of this ExprResult
* @param str the destination string to append the String representation to.
**/
virtual void stringValue(DOMString& str) = 0;
virtual void stringValue(String& str) = 0;
/**
* Converts this ExprResult to a Boolean (MBool) value
@@ -100,7 +100,7 @@ public:
void setValue(const BooleanResult& boolResult);
virtual short getResultType();
virtual void stringValue(DOMString& str);
virtual void stringValue(String& str);
virtual MBool booleanValue();
virtual double numberValue();
@@ -125,7 +125,7 @@ public:
MBool isNaN() const;
virtual short getResultType();
virtual void stringValue(DOMString& str);
virtual void stringValue(String& str);
virtual MBool booleanValue();
virtual double numberValue();
@@ -148,7 +148,7 @@ public:
void setValue(const String& str);
virtual short getResultType();
virtual void stringValue(DOMString& str);
virtual void stringValue(String& str);
virtual MBool booleanValue();
virtual double numberValue();

View File

@@ -27,7 +27,7 @@
* Marina Mechtcheriakova
* -- added support for lang function
*
* $Id: FunctionLib.h,v 1.6 2000-05-23 08:17:42 kvisco%ziplink.net Exp $
* $Id: FunctionLib.h,v 1.7 2000-06-11 11:43:12 Peter.VanderBeken%pandora.be Exp $
*/
#include "TxString.h"
@@ -345,9 +345,9 @@ public:
enum numberFunctions {
NUMBER = 1, //-- number()
ROUND, //-- round()
FLOOR, //-- floor()
CEILING //-- ceiling()
ROUND, //-- round()
FLOOR, //-- floor()
CEILING //-- ceiling()
};
/**