You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by pe...@apache.org on 2004/01/13 22:18:18 UTC
cvs commit: xml-xerces/c/src/xercesc/validators/datatype AbstractStringValidator.cpp DateTimeValidator.cpp DecimalDatatypeValidator.cpp ListDatatypeValidator.cpp UnionDatatypeValidator.cpp
peiyongz 2004/01/13 13:18:18
Modified: c/src/xercesc/validators/datatype
AbstractStringValidator.cpp DateTimeValidator.cpp
DecimalDatatypeValidator.cpp
ListDatatypeValidator.cpp
UnionDatatypeValidator.cpp
Log:
revert code back to previous version
Revision Changes Path
1.21 +5 -4 xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp
Index: AbstractStringValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AbstractStringValidator.cpp 12 Jan 2004 16:25:09 -0000 1.20
+++ AbstractStringValidator.cpp 13 Jan 2004 21:18:18 -0000 1.21
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.21 2004/01/13 21:18:18 peiyongz
+ * revert code back to previous version
+ *
* Revision 1.20 2004/01/12 16:25:09 neilg
* remove use of static buffers
*
@@ -700,9 +703,7 @@
if (getRegex() ==0) {
try {
// REVISIT: cargillmem fMemoryManager or manager?
- RegularExpression* regEx = new (fMemoryManager) RegularExpression(fMemoryManager);
- regEx->setPattern(getPattern(), SchemaSymbols::fgRegEx_XOption);
- setRegex(regEx);
+ setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
}
catch (XMLException &e)
{
1.16 +7 -6 xml-xerces/c/src/xercesc/validators/datatype/DateTimeValidator.cpp
Index: DateTimeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DateTimeValidator.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DateTimeValidator.cpp 12 Jan 2004 16:25:49 -0000 1.15
+++ DateTimeValidator.cpp 13 Jan 2004 21:18:18 -0000 1.16
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.16 2004/01/13 21:18:18 peiyongz
+ * revert code back to previous version
+ *
* Revision 1.15 2004/01/12 16:25:49 neilg
* remove use of static buffers
*
@@ -199,10 +202,8 @@
{
// lazy construction
if (getRegex() ==0) {
- try {
- RegularExpression* regEx = new (fMemoryManager) RegularExpression(fMemoryManager);
- regEx->setPattern(getPattern(), SchemaSymbols::fgRegEx_XOption);
- setRegex(regEx);
+ try {
+ setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
}
catch (XMLException &e)
{
1.26 +14 -22 xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
Index: DecimalDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DecimalDatatypeValidator.cpp 12 Jan 2004 16:25:09 -0000 1.25
+++ DecimalDatatypeValidator.cpp 13 Jan 2004 21:18:18 -0000 1.26
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.26 2004/01/13 21:18:18 peiyongz
+ * revert code back to previous version
+ *
* Revision 1.25 2004/01/12 16:25:09 neilg
* remove use of static buffers
*
@@ -243,10 +246,8 @@
, const XMLCh* const rValue
, MemoryManager* const manager)
{
- XMLBigDecimal lObj(manager);
- lObj.parseContent(lValue);
- XMLBigDecimal rObj(manager);
- rObj.parseContent(rValue);
+ XMLBigDecimal lObj(lValue, manager);
+ XMLBigDecimal rObj(rValue, manager);
return compareValues(&lObj, &rObj);
}
@@ -485,26 +486,22 @@
void DecimalDatatypeValidator::setMaxInclusive(const XMLCh* const value)
{
- fMaxInclusive = new (fMemoryManager) XMLBigDecimal(fMemoryManager);
- fMaxInclusive->parseContent(value);
+ fMaxInclusive = new (fMemoryManager) XMLBigDecimal(value, fMemoryManager);
}
void DecimalDatatypeValidator::setMaxExclusive(const XMLCh* const value)
{
- fMaxExclusive = new (fMemoryManager) XMLBigDecimal(fMemoryManager);
- fMaxExclusive->parseContent(value);
+ fMaxExclusive = new (fMemoryManager) XMLBigDecimal(value, fMemoryManager);
}
void DecimalDatatypeValidator::setMinInclusive(const XMLCh* const value)
{
- fMinInclusive = new (fMemoryManager) XMLBigDecimal(fMemoryManager);
- fMinInclusive->parseContent(value);
+ fMinInclusive = new (fMemoryManager) XMLBigDecimal(value, fMemoryManager);
}
void DecimalDatatypeValidator::setMinExclusive(const XMLCh* const value)
{
- fMinExclusive = new (fMemoryManager) XMLBigDecimal(fMemoryManager);
- fMinExclusive->parseContent(value);
+ fMinExclusive = new (fMemoryManager) XMLBigDecimal(value, fMemoryManager);
}
void DecimalDatatypeValidator::setEnumeration(MemoryManager* const manager)
@@ -552,9 +549,7 @@
for ( i = 0; i < enumLength; i++)
{
- XMLBigDecimal *data = new (manager) XMLBigDecimal(manager);
- data->parseContent(fStrEnumeration->elementAt(i));
- fEnumeration->insertElementAt(data, i);
+ fEnumeration->insertElementAt(new (manager) XMLBigDecimal(fStrEnumeration->elementAt(i), manager), i);
}
}
@@ -581,9 +576,7 @@
if (getRegex() ==0) {
try {
// REVISIT: cargillmem fMemoryManager vs manager
- RegularExpression* regEx = new (fMemoryManager) RegularExpression(fMemoryManager);
- regEx->setPattern(getPattern(), SchemaSymbols::fgRegEx_XOption);
- setRegex(regEx);
+ setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
}
catch (XMLException &e)
{
@@ -607,9 +600,8 @@
return;
XMLCh *errorMsg = 0;
try {
- XMLBigDecimal compareDataValue (manager);
- compareDataValue.parseContent(content);
- XMLBigDecimal* compareData = &compareDataValue;
+ XMLBigDecimal compareDataValue(content, manager);
+ XMLBigDecimal* compareData = &compareDataValue;
if (getEnumeration())
{
1.21 +6 -5 xml-xerces/c/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
Index: ListDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/ListDatatypeValidator.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ListDatatypeValidator.cpp 12 Jan 2004 16:25:09 -0000 1.20
+++ ListDatatypeValidator.cpp 13 Jan 2004 21:18:18 -0000 1.21
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.21 2004/01/13 21:18:18 peiyongz
+ * revert code back to previous version
+ *
* Revision 1.20 2004/01/12 16:25:09 neilg
* remove use of static buffers
*
@@ -283,9 +286,7 @@
if (getRegex() == 0)
{
try {
- RegularExpression* regEx = new (fMemoryManager) RegularExpression(fMemoryManager);
- regEx->setPattern(getPattern(), SchemaSymbols::fgRegEx_XOption);
- setRegex(regEx);
+ setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
}
catch (XMLException &e)
{
1.25 +6 -5 xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
Index: UnionDatatypeValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- UnionDatatypeValidator.cpp 12 Jan 2004 16:25:09 -0000 1.24
+++ UnionDatatypeValidator.cpp 13 Jan 2004 21:18:18 -0000 1.25
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.25 2004/01/13 21:18:18 peiyongz
+ * revert code back to previous version
+ *
* Revision 1.24 2004/01/12 16:25:09 neilg
* remove use of static buffers
*
@@ -413,9 +416,7 @@
if (getRegex() == 0)
{
try {
- RegularExpression* regEx = new (fMemoryManager) RegularExpression(fMemoryManager);
- regEx->setPattern(getPattern(), SchemaSymbols::fgRegEx_XOption);
- setRegex(regEx);
+ setRegex(new (fMemoryManager) RegularExpression(getPattern(), SchemaSymbols::fgRegEx_XOption, fMemoryManager));
}
catch (XMLException &e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org