Modified: xerces/c/trunk/src/xercesc/util/regx/TokenFactory.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/TokenFactory.cpp?rev=678879&r1=678878&r2=678879&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/regx/TokenFactory.cpp (original) +++ xerces/c/trunk/src/xercesc/util/regx/TokenFactory.cpp Tue Jul 22 13:05:05 2008 @@ -41,18 +41,8 @@ fTokens(new (manager) RefVectorOf<Token> (16, true, manager)) , fEmpty(0) , fLineBegin(0) - , fLineBegin2(0) , fLineEnd(0) - , fStringBegin(0) - , fStringEnd(0) - , fStringEnd2(0) - , fWordEdge(0) - , fNotWordEdge(0) - , fWordEnd(0) - , fWordBegin(0) , fDot(0) - , fCombiningChar(0) - , fGrapheme(0) , fMemoryManager(manager) { @@ -60,8 +50,8 @@ TokenFactory::~TokenFactory() { - delete fTokens; - fTokens = 0; + delete fTokens; + fTokens = 0; } // --------------------------------------------------------------------------- @@ -69,121 +59,91 @@ // --------------------------------------------------------------------------- Token* TokenFactory::createToken(const Token::tokType tkType) { - if (tkType == Token::T_EMPTY && fEmpty != 0) - return fEmpty; + if (tkType == Token::T_EMPTY && fEmpty != 0) + return fEmpty; - Token* tmpTok = new (fMemoryManager) Token(tkType, fMemoryManager); + Token* tmpTok = new (fMemoryManager) Token(tkType, fMemoryManager); - if (tkType == Token::T_EMPTY) { - fEmpty = tmpTok; + if (tkType == Token::T_EMPTY) { + fEmpty = tmpTok; } - fTokens->addElement(tmpTok); + fTokens->addElement(tmpTok); - return tmpTok; + return tmpTok; } -ParenToken* TokenFactory::createLook(const Token::tokType tkType, - Token* const token) { - - ParenToken* tmpTok = new (fMemoryManager) ParenToken(tkType, token, 0, fMemoryManager); - - fTokens->addElement(tmpTok); - return tmpTok; -} - ParenToken* TokenFactory::createParenthesis(Token* const token, - const int noGroups) { + const int noGroups) { - ParenToken* tmpTok = new (fMemoryManager) ParenToken(Token::T_PAREN, token, noGroups, fMemoryManager); + ParenToken* tmpTok = new (fMemoryManager) ParenToken(Token::T_PAREN, token, noGroups, fMemoryManager); - fTokens->addElement(tmpTok); - return tmpTok; + fTokens->addElement(tmpTok); + return tmpTok; } ClosureToken* TokenFactory::createClosure(Token* const token, - bool isNonGreedy) { + bool isNonGreedy) { - ClosureToken* tmpTok = isNonGreedy ? new (fMemoryManager) ClosureToken(Token::T_NONGREEDYCLOSURE, token, fMemoryManager) - : new (fMemoryManager) ClosureToken(Token::T_CLOSURE, token, fMemoryManager); - - fTokens->addElement(tmpTok); - return tmpTok; + ClosureToken* tmpTok = isNonGreedy ? new (fMemoryManager) ClosureToken(Token::T_NONGREEDYCLOSURE, token, fMemoryManager) + : new (fMemoryManager) ClosureToken(Token::T_CLOSURE, token, fMemoryManager); + + fTokens->addElement(tmpTok); + return tmpTok; } ConcatToken* TokenFactory::createConcat(Token* const token1, Token* const token2) { ConcatToken* tmpTok = new (fMemoryManager) ConcatToken(token1, token2, fMemoryManager); - + fTokens->addElement(tmpTok); return tmpTok; } UnionToken* TokenFactory::createUnion(const bool isConcat) { - UnionToken* tmpTok = isConcat ? new (fMemoryManager) UnionToken(Token::T_CONCAT, fMemoryManager) - : new (fMemoryManager) UnionToken(Token::T_UNION, fMemoryManager); + UnionToken* tmpTok = isConcat ? new (fMemoryManager) UnionToken(Token::T_CONCAT, fMemoryManager) + : new (fMemoryManager) UnionToken(Token::T_UNION, fMemoryManager); - fTokens->addElement(tmpTok); - return tmpTok; + fTokens->addElement(tmpTok); + return tmpTok; } RangeToken* TokenFactory::createRange(const bool isNegRange){ - RangeToken* tmpTok = isNegRange ? new (fMemoryManager) RangeToken(Token::T_NRANGE, fMemoryManager) - : new (fMemoryManager) RangeToken(Token::T_RANGE, fMemoryManager); + RangeToken* tmpTok = isNegRange ? new (fMemoryManager) RangeToken(Token::T_NRANGE, fMemoryManager) + : new (fMemoryManager) RangeToken(Token::T_RANGE, fMemoryManager); - fTokens->addElement(tmpTok); - return tmpTok; + fTokens->addElement(tmpTok); + return tmpTok; } CharToken* TokenFactory::createChar(const XMLUInt32 ch, const bool isAnchor) { - CharToken* tmpTok = isAnchor ? new (fMemoryManager) CharToken(Token::T_ANCHOR, ch, fMemoryManager) - : new (fMemoryManager) CharToken(Token::T_CHAR, ch, fMemoryManager); + CharToken* tmpTok = isAnchor ? new (fMemoryManager) CharToken(Token::T_ANCHOR, ch, fMemoryManager) + : new (fMemoryManager) CharToken(Token::T_CHAR, ch, fMemoryManager); - fTokens->addElement(tmpTok); - return tmpTok; + fTokens->addElement(tmpTok); + return tmpTok; } StringToken* TokenFactory::createBackReference(const int noRefs) { - StringToken* tmpTok = new (fMemoryManager) StringToken(Token::T_BACKREFERENCE, 0, noRefs, fMemoryManager); + StringToken* tmpTok = new (fMemoryManager) StringToken(Token::T_BACKREFERENCE, 0, noRefs, fMemoryManager); - fTokens->addElement(tmpTok); - return tmpTok; + fTokens->addElement(tmpTok); + return tmpTok; } StringToken* TokenFactory::createString(const XMLCh* const literal) { - StringToken* tmpTok = new (fMemoryManager) StringToken(Token::T_STRING, literal, 0, fMemoryManager); - - fTokens->addElement(tmpTok); - return tmpTok; -} + StringToken* tmpTok = new (fMemoryManager) StringToken(Token::T_STRING, literal, 0, fMemoryManager); -ModifierToken* TokenFactory::createModifierGroup(Token* const child, - const int add, - const int mask) { - - ModifierToken* tmpTok = new (fMemoryManager) ModifierToken(child, add, mask, fMemoryManager); - - fTokens->addElement(tmpTok); - return tmpTok; -} - -ConditionToken* TokenFactory::createCondition(const int refNo, - Token* const condition, - Token* const yesFlow, - Token* const noFlow) { - - ConditionToken* tmpTok = new (fMemoryManager) ConditionToken(refNo, condition, yesFlow, - noFlow, fMemoryManager); - fTokens->addElement(tmpTok); - return tmpTok; + fTokens->addElement(tmpTok); + return tmpTok; } // --------------------------------------------------------------------------- @@ -192,160 +152,36 @@ RangeToken* TokenFactory::staticGetRange(const XMLCh* const keyword, const bool complement) { - return RangeTokenMap::instance()->getRange(keyword, complement); + return RangeTokenMap::instance()->getRange(keyword, complement); } Token* TokenFactory::getLineBegin() { - if (fLineBegin == 0) + if (fLineBegin == 0) fLineBegin = createChar(chCaret, true); return fLineBegin; } -Token* TokenFactory::getLineBegin2() { - - if (fLineBegin2 == 0) - fLineBegin2 = createChar(chAt, true); - - return fLineBegin2; -} - Token* TokenFactory::getLineEnd() { - if (fLineEnd == 0) + if (fLineEnd == 0) fLineEnd = createChar(chDollarSign, true); return fLineEnd; } -Token* TokenFactory::getStringBegin() { - - if (fStringBegin == 0) - fStringBegin = createChar(chLatin_A, true); - - return fStringBegin; -} - -Token* TokenFactory::getStringEnd() { - - if (fStringEnd == 0) - fStringEnd = createChar(chLatin_z, true); - - return fStringEnd; -} - -Token* TokenFactory::getStringEnd2() { - - if (fStringEnd2 == 0) - fStringEnd2 = createChar(chLatin_Z, true); - - return fStringEnd2; -} - -Token* TokenFactory::getWordEdge() { - - if (fWordEdge == 0) - fWordEdge = createChar(chLatin_b, true); - - return fWordEdge; -} - -Token* TokenFactory::getNotWordEdge(){ - - if (fNotWordEdge == 0) - fNotWordEdge = createChar(chLatin_B, true); - - return fNotWordEdge; -} - -Token* TokenFactory::getWordBegin() { - - if (fWordBegin == 0) - fWordBegin = createChar(chOpenAngle, true); - - return fWordBegin; -} - -Token* TokenFactory::getWordEnd() { - - if (fWordEnd == 0) - fWordEnd = createChar(chCloseAngle, true); - - return fWordEnd; -} - Token* TokenFactory::getDot() { - if (fDot == 0) + if (fDot == 0) fDot = createToken(Token::T_DOT); return fDot; } -Token* TokenFactory::getCombiningCharacterSequence() { - - if (fCombiningChar == 0) { - - Token* foo = createClosure(getRange(fgUniMark)); // \pM* - foo = createConcat(getRange(fgUniMark, true), foo); // \PM + \pM* - fCombiningChar = foo; - } - - return fCombiningChar; -} - - - -// static final String viramaString = - -Token* TokenFactory::getGraphemePattern() { - - if (fGrapheme == 0) { - - Token* base_char = createRange(); // [{ASSIGNED}]-[{M},{C}] - base_char->mergeRanges(getRange(fgUniAssigned)); - base_char->subtractRanges(getRange(fgUniMark)); - base_char->subtractRanges(getRange(fgUniControl)); - - Token* virama = createRange(); - virama->addRange(0x094D, 0x094D); - virama->addRange(0x09CD, 0x09CD); - virama->addRange(0x0A4D, 0x0A4D); - virama->addRange(0x0ACD, 0x0ACD); - virama->addRange(0x0B4D, 0x0B4D); - virama->addRange(0x0BCD, 0x0BCD); - virama->addRange(0x0C4D, 0x0C4D); - virama->addRange(0x0CCD, 0x0CCD); - virama->addRange(0x0D4D, 0x0D4D); - virama->addRange(0x0E3A, 0x0E3A); - virama->addRange(0x0F84, 0x0F84); - - Token* combiner_wo_virama = createRange(); - combiner_wo_virama->mergeRanges(getRange(fgUniMark)); - combiner_wo_virama->addRange(0x1160, 0x11FF); // hangul_medial and hangul_final - combiner_wo_virama->addRange(0xFF9F, 0xFF9F); // extras - - Token* left = TokenFactory::createUnion(); // base_char? - left->addChild(base_char, this); - left->addChild(createToken(Token::T_EMPTY), this); - - Token* foo = createUnion(); - foo->addChild(TokenFactory::createConcat(virama,getRange(fgUniLetter)), this); - foo->addChild(combiner_wo_virama, this); - - foo = createClosure(foo); - foo = createConcat(left, foo); - - fGrapheme = foo; - } - - return fGrapheme; -} - /* #if HAVE_CONFIG_H -# include <config.h> +# include <config.h> #endif #if XERCES_USE_TRANSCODER_ICU @@ -359,8 +195,8 @@ // // Write it out to a temp file to be read back into this source later. // - printf("Printing\n"); - //sprintf(msg, "Printing\n"); + printf("Printing\n"); + //sprintf(msg, "Printing\n"); FILE* outFl = fopen("table.out", "wt+"); fprintf(outFl, "const XMLByte fgUniCharsTable[0x10000] =\n{ "); for (unsigned int index = 0; index <= 0xFFFF; index += 16) @@ -375,11 +211,11 @@ , (unsigned int)u_charType(index+5) , (unsigned int)u_charType(index+6) , (unsigned int)u_charType(index+7) - , (unsigned int)u_charType(index+8) + , (unsigned int)u_charType(index+8) , (unsigned int)u_charType(index+9) , (unsigned int)u_charType(index+10) , (unsigned int)u_charType(index+11) - , (unsigned int)u_charType(index+12) + , (unsigned int)u_charType(index+12) , (unsigned int)u_charType(index+13) , (unsigned int)u_charType(index+14) , (unsigned int)u_charType(index+15));
Modified: xerces/c/trunk/src/xercesc/util/regx/TokenFactory.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/TokenFactory.hpp?rev=678879&r1=678878&r2=678879&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/regx/TokenFactory.hpp (original) +++ xerces/c/trunk/src/xercesc/util/regx/TokenFactory.hpp Tue Jul 22 13:05:05 2008 @@ -37,9 +37,7 @@ class RangeToken; class CharToken; class ClosureToken; -class ConditionToken; class ConcatToken; -class ModifierToken; class ParenToken; class StringToken; class UnionToken; @@ -48,7 +46,7 @@ { public: - // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- // Constructors and destructors // ----------------------------------------------------------------------- TokenFactory(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager); @@ -59,7 +57,6 @@ // ----------------------------------------------------------------------- Token* createToken(const Token::tokType tkType); - ParenToken* createLook(const Token::tokType tkType, Token* const token); ParenToken* createParenthesis(Token* const token, const int noGroups); ClosureToken* createClosure(Token* const token, bool isNonGreedy = false); ConcatToken* createConcat(Token* const token1, Token* const token2); @@ -68,13 +65,9 @@ CharToken* createChar(const XMLUInt32 ch, const bool isAnchor = false); StringToken* createBackReference(const int refNo); StringToken* createString(const XMLCh* const literal); - ModifierToken* createModifierGroup(Token* const child, - const int add, const int mask); - ConditionToken* createCondition(const int refNo, Token* const condition, - Token* const yesFlow, Token* const noFlow); - //static void printUnicode(); + //static void printUnicode(); // ----------------------------------------------------------------------- // Getter methods @@ -85,18 +78,8 @@ */ RangeToken* getRange(const XMLCh* const name,const bool complement=false); Token* getLineBegin(); - Token* getLineBegin2(); Token* getLineEnd(); - Token* getStringBegin(); - Token* getStringEnd(); - Token* getStringEnd2(); - Token* getWordEdge(); - Token* getNotWordEdge(); - Token* getWordBegin(); - Token* getWordEnd(); Token* getDot(); - Token* getCombiningCharacterSequence(); - Token* getGraphemePattern(); MemoryManager* getMemoryManager() const; static RangeToken* staticGetRange(const XMLCh* const name,const bool complement=false); @@ -104,7 +87,7 @@ // ----------------------------------------------------------------------- // Notification that lazy data has been deleted // ----------------------------------------------------------------------- - static void reinitTokenFactoryMutex(); + static void reinitTokenFactoryMutex(); private: // ----------------------------------------------------------------------- @@ -119,25 +102,15 @@ // fRangeInitialized // Indicates whether we have initialized the RangeFactory instance or // not - // + // // fToken // Contains user created Token objects. Used for memory cleanup. // ----------------------------------------------------------------------- RefVectorOf<Token>* fTokens; Token* fEmpty; Token* fLineBegin; - Token* fLineBegin2; Token* fLineEnd; - Token* fStringBegin; - Token* fStringEnd; - Token* fStringEnd2; - Token* fWordEdge; - Token* fNotWordEdge; - Token* fWordEnd; - Token* fWordBegin; Token* fDot; - Token* fCombiningChar; - Token* fGrapheme; MemoryManager* fMemoryManager; }; @@ -156,6 +129,6 @@ #endif /** - * End file TokenFactory + * End file TokenFactory */ Modified: xerces/c/trunk/src/xercesc/util/regx/TokenInc.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/TokenInc.hpp?rev=678879&r1=678878&r2=678879&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/regx/TokenInc.hpp (original) +++ xerces/c/trunk/src/xercesc/util/regx/TokenInc.hpp Tue Jul 22 13:05:05 2008 @@ -29,8 +29,6 @@ #include <xercesc/util/regx/CharToken.hpp> #include <xercesc/util/regx/ClosureToken.hpp> #include <xercesc/util/regx/ConcatToken.hpp> -#include <xercesc/util/regx/ConditionToken.hpp> -#include <xercesc/util/regx/ModifierToken.hpp> #include <xercesc/util/regx/ParenToken.hpp> #include <xercesc/util/regx/StringToken.hpp> #include <xercesc/util/regx/UnionToken.hpp> Modified: xerces/c/trunk/src/xercesc/util/regx/UnicodeRangeFactory.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/UnicodeRangeFactory.cpp?rev=678879&r1=678878&r2=678879&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/regx/UnicodeRangeFactory.cpp (original) +++ xerces/c/trunk/src/xercesc/util/regx/UnicodeRangeFactory.cpp Tue Jul 22 13:05:05 2008 @@ -119,7 +119,7 @@ ranges[XMLUniCharacter::UNASSIGNED]->addRange(0x10000, Token::UTF16_MAX); for (int k=0; k < UNICATEGSIZE; k++) { - tok = (RangeToken*) RangeToken::complementRanges(ranges[k], tokFactory); + tok = RangeToken::complementRanges(ranges[k], tokFactory); // build the internal map. tok->createMap(); rangeTokMap->setRangeToken(uniCategNames[k], ranges[k]); @@ -158,13 +158,13 @@ tok->createMap(); rangeTokMap->setRangeToken(fgUniIsWord, tok); - tok = (RangeToken*) RangeToken::complementRanges(tok, tokFactory); + tok = RangeToken::complementRanges(tok, tokFactory); // build the internal map. tok->createMap(); rangeTokMap->setRangeToken(fgUniIsWord, tok , true); // Create assigned range - tok = (RangeToken*)RangeToken::complementRanges( + tok = RangeToken::complementRanges( ranges[XMLUniCharacter::UNASSIGNED], tokFactory, tokFactory->getMemoryManager()); @@ -181,7 +181,7 @@ tok->createMap(); rangeTokMap->setRangeToken(fgUniIsSpace, tok); - tok = (RangeToken*) RangeToken::complementRanges(tok, tokFactory); + tok = RangeToken::complementRanges(tok, tokFactory); // build the internal map. tok->createMap(); rangeTokMap->setRangeToken(fgUniIsSpace, tok , true); Modified: xerces/c/trunk/src/xercesc/util/regx/UnionToken.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/UnionToken.hpp?rev=678879&r1=678878&r2=678879&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/regx/UnionToken.hpp (original) +++ xerces/c/trunk/src/xercesc/util/regx/UnionToken.hpp Tue Jul 22 13:05:05 2008 @@ -32,40 +32,40 @@ class XMLUTIL_EXPORT UnionToken : public Token { public: - // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- // Public Constructors and Destructor // ----------------------------------------------------------------------- - UnionToken(const tokType tkType + UnionToken(const tokType tkType , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager); ~UnionToken(); - // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- // Getter methods // ----------------------------------------------------------------------- XMLSize_t size() const; Token* getChild(const XMLSize_t index) const; - // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- // Children manipulation methods // ----------------------------------------------------------------------- void addChild(Token* const child, TokenFactory* const tokFactory); private: - // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- // Unimplemented constructors and operators // ----------------------------------------------------------------------- UnionToken(const UnionToken&); UnionToken& operator=(const UnionToken&); - // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- // Private Constants // ----------------------------------------------------------------------- - static const unsigned short INITIALSIZE; + static const unsigned short INITIALSIZE; - // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- // Private data members - // ----------------------------------------------------------------------- - RefVectorOf<Token>* fChildren; + // ----------------------------------------------------------------------- + RefVectorOf<Token>* fChildren; }; Modified: xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.cpp?rev=678879&r1=678878&r2=678879&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.cpp (original) +++ xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.cpp Tue Jul 22 13:05:05 2008 @@ -108,7 +108,7 @@ tok->createMap(); rangeTokMap->setRangeToken(fgXMLSpace, tok); - tok = (RangeToken*) RangeToken::complementRanges(tok, tokFactory); + tok = RangeToken::complementRanges(tok, tokFactory); // Build the internal map. tok->createMap(); rangeTokMap->setRangeToken(fgXMLSpace, tok , true); @@ -127,7 +127,7 @@ tok->createMap(); rangeTokMap->setRangeToken(fgXMLDigit, tok); - tok = (RangeToken*) RangeToken::complementRanges(tok, tokFactory); + tok = RangeToken::complementRanges(tok, tokFactory); // Build the internal map. tok->createMap(); rangeTokMap->setRangeToken(fgXMLDigit, tok , true); @@ -174,7 +174,7 @@ tok->createMap(); rangeTokMap->setRangeToken(fgXMLNameChar, tok); - tok = (RangeToken*) RangeToken::complementRanges(tok, tokFactory); + tok = RangeToken::complementRanges(tok, tokFactory); // Build the internal map. tok->createMap(); rangeTokMap->setRangeToken(fgXMLNameChar, tok , true); @@ -199,7 +199,7 @@ tok->createMap(); rangeTokMap->setRangeToken(fgXMLInitialNameChar, tok); - tok = (RangeToken*) RangeToken::complementRanges(tok, tokFactory); + tok = RangeToken::complementRanges(tok, tokFactory); // Build the internal map. tok->createMap(); rangeTokMap->setRangeToken(fgXMLInitialNameChar, tok , true); @@ -221,7 +221,7 @@ tok->createMap(); rangeTokMap->setRangeToken(fgXMLWord, tok , true); - tok = (RangeToken*) RangeToken::complementRanges(tok, tokFactory); + tok = RangeToken::complementRanges(tok, tokFactory); // Build the internal map. tok->createMap(); rangeTokMap->setRangeToken(fgXMLWord, tok); Modified: xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.hpp?rev=678879&r1=678878&r2=678879&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.hpp (original) +++ xerces/c/trunk/src/xercesc/util/regx/XMLRangeFactory.hpp Tue Jul 22 13:05:05 2008 @@ -41,16 +41,16 @@ // ----------------------------------------------------------------------- // Initialization methods // ----------------------------------------------------------------------- - void initializeKeywordMap(RangeTokenMap *rangeTokMap = 0); + void initializeKeywordMap(RangeTokenMap *rangeTokMap = 0); protected: // ----------------------------------------------------------------------- // Protected Helper methods // ----------------------------------------------------------------------- - void buildRanges(RangeTokenMap *rangeTokMap = 0); + void buildRanges(RangeTokenMap *rangeTokMap = 0); private: - // ----------------------------------------------------------------------- + // ----------------------------------------------------------------------- // Unimplemented constructors and operators // ----------------------------------------------------------------------- XMLRangeFactory(const XMLRangeFactory&); @@ -62,5 +62,5 @@ #endif /** - * End file XMLRangeFactory.hpp + * End file XMLRangeFactory.hpp */ Modified: xerces/c/trunk/src/xercesc/util/regx/XMLUniCharacter.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/XMLUniCharacter.cpp?rev=678879&r1=678878&r2=678879&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/regx/XMLUniCharacter.cpp (original) +++ xerces/c/trunk/src/xercesc/util/regx/XMLUniCharacter.cpp Tue Jul 22 13:05:05 2008 @@ -24,7 +24,7 @@ // Includes // --------------------------------------------------------------------------- #if HAVE_CONFIG_H -# include <config.h> +# include <config.h> #endif #include <xercesc/util/regx/XMLUniCharacter.hpp> @@ -43,9 +43,9 @@ unsigned short XMLUniCharacter::getType(const XMLCh ch) { #if XERCES_USE_TRANSCODER_ICU - return (unsigned short) u_charType(ch); + return (unsigned short) u_charType(ch); #else - return (unsigned short) fgUniCharsTable[ch]; + return (unsigned short) fgUniCharsTable[ch]; #endif } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
