You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2006/09/19 12:49:26 UTC
svn commit: r447812 - in /xerces/c/trunk/src/xercesc/util/regx:
ParserForXMLSchema.cpp RegxParser.cpp RegxParser.hpp
Author: amassari
Date: Tue Sep 19 03:49:25 2006
New Revision: 447812
URL: http://svn.apache.org/viewvc?view=rev&rev=447812
Log:
Renamed enum values, as S_NORMAL is defined in the Windows SDK
Modified:
xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp
xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp
xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp
Modified: xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp?view=diff&rev=447812&r1=447811&r2=447812
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/ParserForXMLSchema.cpp Tue Sep 19 03:49:25 2006
@@ -99,7 +99,7 @@
RangeToken* ParserForXMLSchema::parseCharacterClass(const bool) {
- setParseContext(Regex_S_INBRACKETS);
+ setParseContext(regexParserStateInBrackets);
processNext();
RangeToken* base = 0;
@@ -274,7 +274,7 @@
tok->sortRanges();
tok->compactRanges();
- setParseContext(Regex_S_NORMAL);
+ setParseContext(regexParserStateNormal);
processNext();
return tok;
Modified: xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp?view=diff&rev=447812&r1=447811&r2=447812
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegxParser.cpp Tue Sep 19 03:49:25 2006
@@ -35,9 +35,8 @@
// ---------------------------------------------------------------------------
// Static member data initialization
// ---------------------------------------------------------------------------
-const unsigned short RegxParser::Regex_S_NORMAL = 0;
-const unsigned short RegxParser::Regex_S_INBRACKETS = 1;
-const unsigned short RegxParser::Regex_S_INXBRACKETS = 2;
+const unsigned short RegxParser::regexParserStateNormal = 0;
+const unsigned short RegxParser::regexParserStateInBrackets = 1;
// ---------------------------------------------------------------------------
// RegxParser::ReferencePostion: Constructors and Destructor
@@ -59,7 +58,7 @@
fOptions(0),
fOffset(0),
fNoGroups(1),
- fParseContext(Regex_S_NORMAL),
+ fParseContext(regexParserStateNormal),
fStringLen(0),
fState(0),
fCharData(0),
@@ -90,7 +89,7 @@
fOffset = 0;
fNoGroups = 1;
fHasBackReferences = false;
- setParseContext(Regex_S_NORMAL);
+ setParseContext(regexParserStateNormal);
if (fString)
fMemoryManager->deallocate(fString);//delete [] fString;
fString = XMLString::replicate(regxStr, fMemoryManager);
@@ -143,7 +142,7 @@
XMLCh ch = fString[fOffset++];
fCharData = ch;
- if (fParseContext == Regex_S_INBRACKETS) {
+ if (fParseContext == regexParserStateInBrackets) {
switch (ch) {
case chBackSlash:
@@ -1011,7 +1010,7 @@
RangeToken* RegxParser::parseCharacterClass(const bool useNRange) {
- setParseContext(Regex_S_INBRACKETS);
+ setParseContext(regexParserStateInBrackets);
processNext();
RangeToken* base = 0;
@@ -1184,7 +1183,7 @@
tok->getCaseInsensitiveToken(fTokenFactory);
}
- setParseContext(Regex_S_NORMAL);
+ setParseContext(regexParserStateNormal);
processNext();
return tok;
Modified: xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp?view=diff&rev=447812&r1=447811&r2=447812
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegxParser.hpp Tue Sep 19 03:49:25 2006
@@ -75,9 +75,8 @@
REGX_T_XMLSCHEMA_CC_SUBTRACTION = 24
};
- static const unsigned short Regex_S_NORMAL;
- static const unsigned short Regex_S_INBRACKETS;
- static const unsigned short Regex_S_INXBRACKETS;
+ static const unsigned short regexParserStateNormal;
+ static const unsigned short regexParserStateInBrackets;
// -----------------------------------------------------------------------
// Public Constructors and Destructor
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org