Author: amassari
Date: Tue Oct 6 07:52:59 2009
New Revision: 822158
URL: http://svn.apache.org/viewvc?rev=822158&view=rev
Log:
Place the creation of token in the main function to avoid misalignments
Modified:
xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp
xerces/c/trunk/src/xercesc/util/regx/RegularExpression.hpp
Modified: xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp?rev=822158&r1=822157&r2=822158&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp Tue Oct 6
07:52:59 2009
@@ -1446,14 +1446,32 @@
switch(tokenType) {
case Token::T_DOT:
+ ret = fOpFactory.createDotOp();
+ ret->setNextOp(next);
+ break;
case Token::T_CHAR:
+ ret = fOpFactory.createCharOp(token->getChar());
+ ret->setNextOp(next);
+ break;
case Token::T_ANCHOR:
+ ret = fOpFactory.createAnchorOp(token->getChar());
+ ret->setNextOp(next);
+ break;
case Token::T_RANGE:
case Token::T_NRANGE:
+ ret = fOpFactory.createRangeOp(token);
+ ret->setNextOp(next);
+ break;
case Token::T_STRING:
+ ret = fOpFactory.createStringOp(token->getString());
+ ret->setNextOp(next);
+ break;
case Token::T_BACKREFERENCE:
+ ret = fOpFactory.createBackReferenceOp(token->getReferenceNo());
+ ret->setNextOp(next);
+ break;
case Token::T_EMPTY:
- ret = compileSingle(token, next, tokenType);
+ ret = next;
break;
case Token::T_CONCAT:
ret = compileConcat(token, next, reverse);
Modified: xerces/c/trunk/src/xercesc/util/regx/RegularExpression.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RegularExpression.hpp?rev=822158&r1=822157&r2=822158&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegularExpression.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegularExpression.hpp Tue Oct 6
07:52:59 2009
@@ -565,8 +565,6 @@
/**
* Helper methods used by compile
*/
- Op* compileSingle(const Token* const token, Op* const next,
- const Token::tokType tkType);
Op* compileUnion(const Token* const token, Op* const next,
const bool reverse);
Op* compileParenthesis(const Token* const token, Op* const next,
@@ -628,45 +626,6 @@
return (options & flag) == flag;
}
- inline Op* RegularExpression::compileSingle(const Token* const token,
- Op* const next,
- const Token::tokType tkType) {
-
- Op* ret = 0;
-
- switch (tkType) {
- case Token::T_DOT:
- ret = fOpFactory.createDotOp();
- break;
- case Token::T_CHAR:
- ret = fOpFactory.createCharOp(token->getChar());
- break;
- case Token::T_ANCHOR:
- ret = fOpFactory.createAnchorOp(token->getChar());
- break;
- case Token::T_RANGE:
- case Token::T_NRANGE:
- ret = fOpFactory.createRangeOp(token);
- break;
- case Token::T_EMPTY:
- ret = next;
- break;
- case Token::T_STRING:
- ret = fOpFactory.createStringOp(token->getString());
- break;
- case Token::T_BACKREFERENCE:
- ret = fOpFactory.createBackReferenceOp(token->getReferenceNo());
- break;
- default:
- break;
- }
-
- if (tkType != Token::T_EMPTY)
- ret->setNextOp(next);
-
- return ret;
- }
-
inline Op* RegularExpression::compileUnion(const Token* const token,
Op* const next,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
