You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2001/08/24 19:12:02 UTC
cvs commit: xml-xerces/c/src/validators/schema SchemaSymbols.cpp SchemaSymbols.hpp
knoaman 01/08/24 10:12:02
Modified: c/src/validators/datatype AnyURIDatatypeValidator.hpp
Base64BinaryDatatypeValidator.hpp
BooleanDatatypeValidator.hpp DatatypeValidator.hpp
DatatypeValidatorFactory.cpp
DecimalDatatypeValidator.hpp
DoubleDatatypeValidator.hpp
ENTITYDatatypeValidator.hpp
FloatDatatypeValidator.hpp
HexBinaryDatatypeValidator.hpp
IDDatatypeValidator.hpp IDREFDatatypeValidator.hpp
ListDatatypeValidator.hpp Makefile.in
NOTATIONDatatypeValidator.hpp
QNameDatatypeValidator.hpp
StringDatatypeValidator.hpp
UnionDatatypeValidator.hpp
c/src/validators/schema SchemaSymbols.cpp SchemaSymbols.hpp
Added: c/src/validators/datatype AnySimpleTypeDatatypeValidator.cpp
AnySimpleTypeDatatypeValidator.hpp
Log:
Add support for anySimpleType.
Remove parameter 'baseValidator' from the virtual method 'newInstance'.
Revision Changes Path
1.4 +8 -6 xml-xerces/c/src/validators/datatype/AnyURIDatatypeValidator.hpp
Index: AnyURIDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/AnyURIDatatypeValidator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AnyURIDatatypeValidator.hpp 2001/08/21 18:42:53 1.3
+++ AnyURIDatatypeValidator.hpp 2001/08/24 17:12:01 1.4
@@ -55,8 +55,12 @@
*/
/*
- * $Id: AnyURIDatatypeValidator.hpp,v 1.3 2001/08/21 18:42:53 peiyongz Exp $
+ * $Id: AnyURIDatatypeValidator.hpp,v 1.4 2001/08/24 17:12:01 knoaman Exp $
* $Log: AnyURIDatatypeValidator.hpp,v $
+ * Revision 1.4 2001/08/24 17:12:01 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.3 2001/08/21 18:42:53 peiyongz
* Bugzilla# 2816: cleanUp() declared with external linkage and called
* before defined as inline
@@ -147,8 +151,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -213,12 +216,11 @@
}
inline DatatypeValidator* AnyURIDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new AnyURIDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new AnyURIDatatypeValidator(this, facets, enums, finalSet);
}
inline void AnyURIDatatypeValidator::validate( const XMLCh* const content)
1.4 +4 -6 xml-xerces/c/src/validators/datatype/Base64BinaryDatatypeValidator.hpp
Index: Base64BinaryDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/Base64BinaryDatatypeValidator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Base64BinaryDatatypeValidator.hpp 2001/08/21 18:42:53 1.3
+++ Base64BinaryDatatypeValidator.hpp 2001/08/24 17:12:01 1.4
@@ -55,7 +55,7 @@
*/
/*
- * $Id: Base64BinaryDatatypeValidator.hpp,v 1.3 2001/08/21 18:42:53 peiyongz Exp $
+ * $Id: Base64BinaryDatatypeValidator.hpp,v 1.4 2001/08/24 17:12:01 knoaman Exp $
*/
#if !defined(BASE64BINARY_DATATYPEVALIDATOR_HPP)
@@ -134,8 +134,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -203,12 +202,11 @@
}
inline DatatypeValidator* Base64BinaryDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new Base64BinaryDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new Base64BinaryDatatypeValidator(this, facets, enums, finalSet);
}
inline void Base64BinaryDatatypeValidator::validate( const XMLCh* const content)
1.4 +4 -6 xml-xerces/c/src/validators/datatype/BooleanDatatypeValidator.hpp
Index: BooleanDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/BooleanDatatypeValidator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BooleanDatatypeValidator.hpp 2001/05/28 21:11:17 1.3
+++ BooleanDatatypeValidator.hpp 2001/08/24 17:12:01 1.4
@@ -55,7 +55,7 @@
*/
/*
- * $Id: BooleanDatatypeValidator.hpp,v 1.3 2001/05/28 21:11:17 tng Exp $
+ * $Id: BooleanDatatypeValidator.hpp,v 1.4 2001/08/24 17:12:01 knoaman Exp $
*/
#if !defined(BOOLEAN_DATATYPEVALIDATOR_HPP)
@@ -132,8 +132,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -170,12 +169,11 @@
// -----------------------------------------------------------------------
inline DatatypeValidator* BooleanDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new BooleanDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new BooleanDatatypeValidator(this, facets, enums, finalSet);
}
inline void BooleanDatatypeValidator::validate( const XMLCh* const content)
1.13 +4 -4 xml-xerces/c/src/validators/datatype/DatatypeValidator.hpp
Index: DatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/DatatypeValidator.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DatatypeValidator.hpp 2001/08/16 14:41:38 1.12
+++ DatatypeValidator.hpp 2001/08/24 17:12:01 1.13
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DatatypeValidator.hpp,v 1.12 2001/08/16 14:41:38 knoaman Exp $
+ * $Id: DatatypeValidator.hpp,v 1.13 2001/08/24 17:12:01 knoaman Exp $
*/
#if !defined(DATATYPEVALIDATOR_HPP)
@@ -138,7 +138,8 @@
ENTITY,
NOTATION,
List,
- Union
+ Union,
+ AnySimpleType
};
// -----------------------------------------------------------------------
@@ -247,8 +248,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- virtual DatatypeValidator* newInstance(DatatypeValidator* const,
- RefHashTableOf<KVStringPair>* const,
+ virtual DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const,
RefVectorOf<XMLCh>* const enums,
const int finalSet) = 0;
1.22 +7 -2 xml-xerces/c/src/validators/datatype/DatatypeValidatorFactory.cpp
Index: DatatypeValidatorFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/DatatypeValidatorFactory.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DatatypeValidatorFactory.cpp 2001/08/01 18:49:16 1.21
+++ DatatypeValidatorFactory.cpp 2001/08/24 17:12:01 1.22
@@ -56,6 +56,10 @@
/*
* $Log: DatatypeValidatorFactory.cpp,v $
+ * Revision 1.22 2001/08/24 17:12:01 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.21 2001/08/01 18:49:16 peiyongz
* AnyRUIDatatypeValidator
*
@@ -147,6 +151,7 @@
#include <validators/datatype/DoubleDatatypeValidator.hpp>
#include <validators/datatype/FloatDatatypeValidator.hpp>
#include <validators/datatype/AnyURIDatatypeValidator.hpp>
+#include <validators/datatype/AnySimpleTypeDatatypeValidator.hpp>
#include <util/PlatformUtils.hpp>
#include <util/XMLDeleterFor.hpp>
@@ -398,8 +403,9 @@
|| fBuiltInRegistry->get(SchemaSymbols::fgDT_STRING) == 0) {
initializeDTDRegistry();
}
-
+ fBuiltInRegistry->put((void*) SchemaSymbols::fgDT_ANYSIMPLETYPE,
+ new AnySimpleTypeDatatypeValidator());
fBuiltInRegistry->put((void*) SchemaSymbols::fgDT_BOOLEAN,
new BooleanDatatypeValidator());
fBuiltInRegistry->put((void*) SchemaSymbols::fgDT_DECIMAL,
@@ -675,7 +681,7 @@
}
}
- datatypeValidator = baseValidator->newInstance(baseValidator, facets, enums, finalSet);
+ datatypeValidator = baseValidator->newInstance(facets, enums, finalSet);
}
if (datatypeValidator != 0) {
1.6 +4 -6 xml-xerces/c/src/validators/datatype/DecimalDatatypeValidator.hpp
Index: DecimalDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/DecimalDatatypeValidator.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DecimalDatatypeValidator.hpp 2001/08/21 18:42:53 1.5
+++ DecimalDatatypeValidator.hpp 2001/08/24 17:12:01 1.6
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DecimalDatatypeValidator.hpp,v 1.5 2001/08/21 18:42:53 peiyongz Exp $
+ * $Id: DecimalDatatypeValidator.hpp,v 1.6 2001/08/24 17:12:01 knoaman Exp $
*/
#if !defined(DECIMAL_DATATYPEVALIDATOR_HPP)
@@ -125,8 +125,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -204,12 +203,11 @@
}
inline DatatypeValidator* DecimalDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new DecimalDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new DecimalDatatypeValidator(this, facets, enums, finalSet);
}
inline void DecimalDatatypeValidator::validate( const XMLCh* const content)
1.3 +8 -6 xml-xerces/c/src/validators/datatype/DoubleDatatypeValidator.hpp
Index: DoubleDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/DoubleDatatypeValidator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DoubleDatatypeValidator.hpp 2001/08/21 18:42:53 1.2
+++ DoubleDatatypeValidator.hpp 2001/08/24 17:12:01 1.3
@@ -55,8 +55,12 @@
*/
/*
- * $Id: DoubleDatatypeValidator.hpp,v 1.2 2001/08/21 18:42:53 peiyongz Exp $
+ * $Id: DoubleDatatypeValidator.hpp,v 1.3 2001/08/24 17:12:01 knoaman Exp $
* $Log: DoubleDatatypeValidator.hpp,v $
+ * Revision 1.3 2001/08/24 17:12:01 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.2 2001/08/21 18:42:53 peiyongz
* Bugzilla# 2816: cleanUp() declared with external linkage and called
* before defined as inline
@@ -133,8 +137,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -202,12 +205,11 @@
}
inline DatatypeValidator* DoubleDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new DoubleDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new DoubleDatatypeValidator(this, facets, enums, finalSet);
}
inline void DoubleDatatypeValidator::validate( const XMLCh* const content)
1.3 +7 -6 xml-xerces/c/src/validators/datatype/ENTITYDatatypeValidator.hpp
Index: ENTITYDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/ENTITYDatatypeValidator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ENTITYDatatypeValidator.hpp 2001/07/24 21:23:40 1.2
+++ ENTITYDatatypeValidator.hpp 2001/08/24 17:12:01 1.3
@@ -55,8 +55,12 @@
*/
/*
- * $Id: ENTITYDatatypeValidator.hpp,v 1.2 2001/07/24 21:23:40 tng Exp $
+ * $Id: ENTITYDatatypeValidator.hpp,v 1.3 2001/08/24 17:12:01 knoaman Exp $
* $Log: ENTITYDatatypeValidator.hpp,v $
+ * Revision 1.3 2001/08/24 17:12:01 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.2 2001/07/24 21:23:40 tng
* Schema: Use DatatypeValidator for ID/IDREF/ENTITY/ENTITIES/NOTATION.
*
@@ -131,8 +135,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -183,12 +186,11 @@
}
inline DatatypeValidator* ENTITYDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new ENTITYDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new ENTITYDatatypeValidator(this, facets, enums, finalSet);
}
// -----------------------------------------------------------------------
1.3 +8 -6 xml-xerces/c/src/validators/datatype/FloatDatatypeValidator.hpp
Index: FloatDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/FloatDatatypeValidator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FloatDatatypeValidator.hpp 2001/08/21 18:42:53 1.2
+++ FloatDatatypeValidator.hpp 2001/08/24 17:12:01 1.3
@@ -55,8 +55,12 @@
*/
/*
- * $Id: FloatDatatypeValidator.hpp,v 1.2 2001/08/21 18:42:53 peiyongz Exp $
+ * $Id: FloatDatatypeValidator.hpp,v 1.3 2001/08/24 17:12:01 knoaman Exp $
* $Log: FloatDatatypeValidator.hpp,v $
+ * Revision 1.3 2001/08/24 17:12:01 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.2 2001/08/21 18:42:53 peiyongz
* Bugzilla# 2816: cleanUp() declared with external linkage and called
* before defined as inline
@@ -134,8 +138,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -203,12 +206,11 @@
}
inline DatatypeValidator* FloatDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new FloatDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new FloatDatatypeValidator(this, facets, enums, finalSet);
}
inline void FloatDatatypeValidator::validate( const XMLCh* const content)
1.4 +4 -6 xml-xerces/c/src/validators/datatype/HexBinaryDatatypeValidator.hpp
Index: HexBinaryDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/HexBinaryDatatypeValidator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HexBinaryDatatypeValidator.hpp 2001/08/21 18:42:53 1.3
+++ HexBinaryDatatypeValidator.hpp 2001/08/24 17:12:01 1.4
@@ -55,7 +55,7 @@
*/
/*
- * $Id: HexBinaryDatatypeValidator.hpp,v 1.3 2001/08/21 18:42:53 peiyongz Exp $
+ * $Id: HexBinaryDatatypeValidator.hpp,v 1.4 2001/08/24 17:12:01 knoaman Exp $
*/
#if !defined(HEXBINARY_DATATYPEVALIDATOR_HPP)
@@ -134,8 +134,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -203,12 +202,11 @@
}
inline DatatypeValidator* HexBinaryDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new HexBinaryDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new HexBinaryDatatypeValidator(this, facets, enums, finalSet);
}
inline void HexBinaryDatatypeValidator::validate( const XMLCh* const content)
1.4 +7 -6 xml-xerces/c/src/validators/datatype/IDDatatypeValidator.hpp
Index: IDDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/IDDatatypeValidator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IDDatatypeValidator.hpp 2001/07/25 17:58:08 1.3
+++ IDDatatypeValidator.hpp 2001/08/24 17:12:01 1.4
@@ -55,8 +55,12 @@
*/
/*
- * $Id: IDDatatypeValidator.hpp,v 1.3 2001/07/25 17:58:08 tng Exp $
+ * $Id: IDDatatypeValidator.hpp,v 1.4 2001/08/24 17:12:01 knoaman Exp $
* $Log: IDDatatypeValidator.hpp,v $
+ * Revision 1.4 2001/08/24 17:12:01 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.3 2001/07/25 17:58:08 tng
* Fix compilation errors.
*
@@ -118,8 +122,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -156,12 +159,11 @@
}
inline DatatypeValidator* IDDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new IDDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new IDDatatypeValidator(this, facets, enums, finalSet);
}
inline void IDDatatypeValidator::setIDRefList(RefHashTableOf<XMLRefInfo>* newIDRefList)
1.4 +7 -6 xml-xerces/c/src/validators/datatype/IDREFDatatypeValidator.hpp
Index: IDREFDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/IDREFDatatypeValidator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IDREFDatatypeValidator.hpp 2001/07/25 17:58:08 1.3
+++ IDREFDatatypeValidator.hpp 2001/08/24 17:12:01 1.4
@@ -55,8 +55,12 @@
*/
/*
- * $Id: IDREFDatatypeValidator.hpp,v 1.3 2001/07/25 17:58:08 tng Exp $
+ * $Id: IDREFDatatypeValidator.hpp,v 1.4 2001/08/24 17:12:01 knoaman Exp $
* $Log: IDREFDatatypeValidator.hpp,v $
+ * Revision 1.4 2001/08/24 17:12:01 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.3 2001/07/25 17:58:08 tng
* Fix compilation errors.
*
@@ -117,8 +121,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -154,12 +157,11 @@
}
inline DatatypeValidator* IDREFDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new IDREFDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new IDREFDatatypeValidator(this, facets, enums, finalSet);
}
// -----------------------------------------------------------------------
1.6 +7 -6 xml-xerces/c/src/validators/datatype/ListDatatypeValidator.hpp
Index: ListDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/ListDatatypeValidator.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ListDatatypeValidator.hpp 2001/08/21 20:05:41 1.5
+++ ListDatatypeValidator.hpp 2001/08/24 17:12:01 1.6
@@ -55,8 +55,12 @@
*/
/*
- * $Id: ListDatatypeValidator.hpp,v 1.5 2001/08/21 20:05:41 peiyongz Exp $
+ * $Id: ListDatatypeValidator.hpp,v 1.6 2001/08/24 17:12:01 knoaman Exp $
* $Log: ListDatatypeValidator.hpp,v $
+ * Revision 1.6 2001/08/24 17:12:01 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.5 2001/08/21 20:05:41 peiyongz
* put back changes introduced in 1.3
*
@@ -149,8 +153,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -217,12 +220,11 @@
};
inline DatatypeValidator* ListDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new ListDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new ListDatatypeValidator(this, facets, enums, finalSet);
}
inline void ListDatatypeValidator::validate( const XMLCh* const content)
1.18 +7 -2 xml-xerces/c/src/validators/datatype/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.in 2001/08/01 18:49:16 1.17
+++ Makefile.in 2001/08/24 17:12:01 1.18
@@ -55,6 +55,10 @@
#
#
# $Log: Makefile.in,v $
+# Revision 1.18 2001/08/24 17:12:01 knoaman
+# Add support for anySimpleType.
+# Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+#
# Revision 1.17 2001/08/01 18:49:16 peiyongz
# AnyRUIDatatypeValidator
#
@@ -149,7 +153,8 @@
DoubleDatatypeValidator.hpp \
FloatDatatypeValidator.hpp \
AnyURIDatatypeValidator.hpp \
- IDREFDatatypeValidator.hpp
+ IDREFDatatypeValidator.hpp \
+ AnySimpleTypeDatatypeValidator.hpp
VALIDATORS_DATATYPE_CPP_PRIVHEADERS =
@@ -172,7 +177,8 @@
DoubleDatatypeValidator.$(TO) \
FloatDatatypeValidator.$(TO) \
AnyURIDatatypeValidator.$(TO) \
- IDREFDatatypeValidator.$(TO)
+ IDREFDatatypeValidator.$(TO) \
+ AnySimpleTypeDatatypeValidator.$(TO)
all:: includes $(VALIDATORS_DATATYPE_CPP_OBJECTS)
1.3 +8 -6 xml-xerces/c/src/validators/datatype/NOTATIONDatatypeValidator.hpp
Index: NOTATIONDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/NOTATIONDatatypeValidator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOTATIONDatatypeValidator.hpp 2001/08/21 18:42:53 1.2
+++ NOTATIONDatatypeValidator.hpp 2001/08/24 17:12:01 1.3
@@ -55,8 +55,12 @@
*/
/*
- * $Id: NOTATIONDatatypeValidator.hpp,v 1.2 2001/08/21 18:42:53 peiyongz Exp $
+ * $Id: NOTATIONDatatypeValidator.hpp,v 1.3 2001/08/24 17:12:01 knoaman Exp $
* $Log: NOTATIONDatatypeValidator.hpp,v $
+ * Revision 1.3 2001/08/24 17:12:01 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.2 2001/08/21 18:42:53 peiyongz
* Bugzilla# 2816: cleanUp() declared with external linkage and called
* before defined as inline
@@ -133,8 +137,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -198,12 +201,11 @@
}
inline DatatypeValidator* NOTATIONDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new NOTATIONDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new NOTATIONDatatypeValidator(this, facets, enums, finalSet);
}
inline void NOTATIONDatatypeValidator::validate( const XMLCh* const content)
1.3 +8 -6 xml-xerces/c/src/validators/datatype/QNameDatatypeValidator.hpp
Index: QNameDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/QNameDatatypeValidator.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- QNameDatatypeValidator.hpp 2001/08/21 18:42:53 1.2
+++ QNameDatatypeValidator.hpp 2001/08/24 17:12:01 1.3
@@ -55,8 +55,12 @@
*/
/*
- * $Id: QNameDatatypeValidator.hpp,v 1.2 2001/08/21 18:42:53 peiyongz Exp $
+ * $Id: QNameDatatypeValidator.hpp,v 1.3 2001/08/24 17:12:01 knoaman Exp $
* $Log: QNameDatatypeValidator.hpp,v $
+ * Revision 1.3 2001/08/24 17:12:01 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.2 2001/08/21 18:42:53 peiyongz
* Bugzilla# 2816: cleanUp() declared with external linkage and called
* before defined as inline
@@ -142,8 +146,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -211,12 +214,11 @@
}
inline DatatypeValidator* QNameDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new QNameDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new QNameDatatypeValidator(this, facets, enums, finalSet);
}
inline void QNameDatatypeValidator::validate( const XMLCh* const content)
1.5 +4 -6 xml-xerces/c/src/validators/datatype/StringDatatypeValidator.hpp
Index: StringDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/StringDatatypeValidator.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringDatatypeValidator.hpp 2001/08/21 18:42:53 1.4
+++ StringDatatypeValidator.hpp 2001/08/24 17:12:01 1.5
@@ -55,7 +55,7 @@
*/
/*
- * $Id: StringDatatypeValidator.hpp,v 1.4 2001/08/21 18:42:53 peiyongz Exp $
+ * $Id: StringDatatypeValidator.hpp,v 1.5 2001/08/24 17:12:01 knoaman Exp $
*/
#if !defined(STRING_DATATYPEVALIDATOR_HPP)
@@ -135,8 +135,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -206,12 +205,11 @@
}
inline DatatypeValidator* StringDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new StringDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new StringDatatypeValidator(this, facets, enums, finalSet);
}
inline void StringDatatypeValidator::validate( const XMLCh* const content)
1.6 +7 -6 xml-xerces/c/src/validators/datatype/UnionDatatypeValidator.hpp
Index: UnionDatatypeValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/datatype/UnionDatatypeValidator.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnionDatatypeValidator.hpp 2001/08/21 20:05:41 1.5
+++ UnionDatatypeValidator.hpp 2001/08/24 17:12:01 1.6
@@ -55,8 +55,12 @@
*/
/*
- * $Id: UnionDatatypeValidator.hpp,v 1.5 2001/08/21 20:05:41 peiyongz Exp $
+ * $Id: UnionDatatypeValidator.hpp,v 1.6 2001/08/24 17:12:01 knoaman Exp $
* $Log: UnionDatatypeValidator.hpp,v $
+ * Revision 1.6 2001/08/24 17:12:01 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.5 2001/08/21 20:05:41 peiyongz
* put back changes introduced in 1.3
*
@@ -178,8 +182,7 @@
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
- DatatypeValidator* newInstance(DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet);
@@ -216,12 +219,11 @@
};
inline DatatypeValidator* UnionDatatypeValidator::newInstance(
- DatatypeValidator* const baseValidator
- , RefHashTableOf<KVStringPair>* const facets
+ RefHashTableOf<KVStringPair>* const facets
, RefVectorOf<XMLCh>* const enums
, const int finalSet)
{
- return (DatatypeValidator*) new UnionDatatypeValidator(baseValidator, facets, enums, finalSet);
+ return (DatatypeValidator*) new UnionDatatypeValidator(this, facets, enums, finalSet);
}
inline void UnionDatatypeValidator::validate( const XMLCh* const content)
1.1 xml-xerces/c/src/validators/datatype/AnySimpleTypeDatatypeValidator.cpp
Index: AnySimpleTypeDatatypeValidator.cpp
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache\@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
/*
* $Log: AnySimpleTypeDatatypeValidator.cpp,v $
* Revision 1.1 2001/08/24 17:12:01 knoaman
* Add support for anySimpleType.
* Remove parameter 'baseValidator' from the virtual method 'newInstance'.
*
*/
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
#include <validators/datatype/AnySimpleTypeDatatypeValidator.hpp>
#include <validators/schema/SchemaSymbols.hpp>
#include <util/RuntimeException.hpp>
// ---------------------------------------------------------------------------
// AnySimpleTypeDatatypeValidator: Constructors and Destructor
// ---------------------------------------------------------------------------
AnySimpleTypeDatatypeValidator::AnySimpleTypeDatatypeValidator()
: DatatypeValidator(0, 0, SchemaSymbols::RESTRICTION, DatatypeValidator::AnySimpleType)
{
}
AnySimpleTypeDatatypeValidator::~AnySimpleTypeDatatypeValidator()
{
}
// ---------------------------------------------------------------------------
// AnySimpleTypeDatatypeValidator: Instance methods
// ---------------------------------------------------------------------------
DatatypeValidator*
AnySimpleTypeDatatypeValidator::newInstance(RefHashTableOf<KVStringPair>* const facets,
RefVectorOf<XMLCh>* const enums,
const int finalSet) {
// We own them, so we will delete them first
delete facets;
delete enums;
ThrowXML(RuntimeException, XMLExcepts::DV_InvalidOperation);
// to satisfy some compilers
return 0;
}
/**
* End of file AnySimpleTypeDatatypeValidator.cpp
*/
1.1 xml-xerces/c/src/validators/datatype/AnySimpleTypeDatatypeValidator.hpp
Index: AnySimpleTypeDatatypeValidator.hpp
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache\@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 2001, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
/*
* $Id: AnySimpleTypeDatatypeValidator.hpp,v 1.1 2001/08/24 17:12:01 knoaman Exp $
*/
#if !defined(ANYSIMPLETYPEDATATYPEVALIDATOR_HPP)
#define ANYSIMPLETYPEDATATYPEVALIDATOR_HPP
#include <validators/datatype/DatatypeValidator.hpp>
class VALIDATORS_EXPORT AnySimpleTypeDatatypeValidator : public DatatypeValidator
{
public:
// -----------------------------------------------------------------------
// Public Constructor
// -----------------------------------------------------------------------
/** @name Constructor */
//@{
AnySimpleTypeDatatypeValidator();
//@}
// -----------------------------------------------------------------------
// Public Destructor
// -----------------------------------------------------------------------
/** @name Destructor. */
//@{
virtual ~AnySimpleTypeDatatypeValidator();
//@}
// -----------------------------------------------------------------------
// Getter methods
// -----------------------------------------------------------------------
/** @name Getter Functions */
//@{
/**
* Returns default value (collapse) for whiteSpace facet.
* This function is overwritten in StringDatatypeValidator.
*/
short getWSFacet () const;
//@}
// -----------------------------------------------------------------------
// Validation methods
// -----------------------------------------------------------------------
/** @name Validation Function */
//@{
/**
* Checks that the "content" string is valid datatype.
* If invalid, a Datatype validation exception is thrown.
*
* @param content A string containing the content to be validated
*
*/
void validate(const XMLCh* const content);
/**
* Checks whether a given type can be used as a substitute
*
* @param toCheck A datatype validator of the type to be used as a
* substitute
*
*/
bool isSubstitutableBy(const DatatypeValidator* const toCheck);
//@}
// -----------------------------------------------------------------------
// Compare methods
// -----------------------------------------------------------------------
/** @name Compare Function */
//@{
/**
* Compares content in the Domain value vs. lexical value.
*
* @param value1 string to compare
*
* @param value2 string to compare
*
*/
int compare(const XMLCh* const value1, const XMLCh* const value2);
//@}
/**
* Returns an instance of the base datatype validator class
* Used by the DatatypeValidatorFactory.
*/
DatatypeValidator* newInstance(RefHashTableOf<KVStringPair>* const,
RefVectorOf<XMLCh>* const enums,
const int finalSet);
};
// ---------------------------------------------------------------------------
// DatatypeValidator: Getters
// ---------------------------------------------------------------------------
inline short AnySimpleTypeDatatypeValidator::getWSFacet() const {
return DatatypeValidator::PRESERVE;
}
// ---------------------------------------------------------------------------
// DatatypeValidators: Compare methods
// ---------------------------------------------------------------------------
inline int AnySimpleTypeDatatypeValidator::compare(const XMLCh* const lValue,
const XMLCh* const rValue)
{
return -1;
}
// ---------------------------------------------------------------------------
// DatatypeValidators: Validation methods
// ---------------------------------------------------------------------------
inline bool
AnySimpleTypeDatatypeValidator::isSubstitutableBy(const DatatypeValidator* const toCheck)
{
return true;
}
inline void
AnySimpleTypeDatatypeValidator::validate(const XMLCh* const content)
{
return;
}
#endif
/**
* End of file AnySimpleTypeDatatypeValidator.hpp
*/
1.11 +9 -0 xml-xerces/c/src/validators/schema/SchemaSymbols.cpp
Index: SchemaSymbols.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/schema/SchemaSymbols.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SchemaSymbols.cpp 2001/08/22 16:57:53 1.10
+++ SchemaSymbols.cpp 2001/08/24 17:12:02 1.11
@@ -56,6 +56,10 @@
/*
* $Log: SchemaSymbols.cpp,v $
+ * Revision 1.11 2001/08/24 17:12:02 knoaman
+ * Add support for anySimpleType.
+ * Remove parameter 'baseValidator' from the virtual method 'newInstance'.
+ *
* Revision 1.10 2001/08/22 16:57:53 tng
* typo in ##other.
*
@@ -1045,6 +1049,12 @@
chLatin_n, chLatin_o, chLatin_r, chLatin_m, chLatin_a, chLatin_l, chLatin_i,
chLatin_z, chLatin_e, chLatin_d, chLatin_S, chLatin_t, chLatin_r, chLatin_i,
chLatin_n, chLatin_g, chNull
+};
+
+const XMLCh SchemaSymbols::fgDT_ANYSIMPLETYPE[] =
+{
+ chLatin_a, chLatin_n, chLatin_y, chLatin_S, chLatin_i, chLatin_m, chLatin_p,
+ chLatin_l, chLatin_e, chLatin_T, chLatin_y, chLatin_p, chLatin_e, chNull
};
const XMLCh SchemaSymbols::fgRegEx_XOption[] =
1.11 +2 -1 xml-xerces/c/src/validators/schema/SchemaSymbols.hpp
Index: SchemaSymbols.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/schema/SchemaSymbols.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SchemaSymbols.hpp 2001/08/01 18:49:32 1.10
+++ SchemaSymbols.hpp 2001/08/24 17:12:02 1.11
@@ -55,7 +55,7 @@
*/
/*
- * $Id: SchemaSymbols.hpp,v 1.10 2001/08/01 18:49:32 peiyongz Exp $
+ * $Id: SchemaSymbols.hpp,v 1.11 2001/08/24 17:12:02 knoaman Exp $
*/
#if !defined(SCHEMASYMBOLS_HPP)
@@ -238,6 +238,7 @@
static const XMLCh fgDT_ANYURI[];
static const XMLCh fgDT_QNAME[];
static const XMLCh fgDT_NORMALIZEDSTRING[];
+ static const XMLCh fgDT_ANYSIMPLETYPE[];
static const XMLCh fgRegEx_XOption[];
static const int fgINT_MIN_VALUE;
static const int fgINT_MAX_VALUE;
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org