tng 2002/09/24 13:12:48
Modified: c/src/xercesc/validators/schema ComplexTypeInfo.hpp
SchemaInfo.cpp SchemaValidator.cpp
SubstitutionGroupComparator.cpp
XercesAttGroupInfo.cpp XSDErrorReporter.cpp
XUtil.cpp
Log:
Performance: use XMLString::equals instead of XMLString::compareString
Revision Changes Path
1.5 +2 -3 xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.hpp
Index: ComplexTypeInfo.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComplexTypeInfo.hpp 1 Apr 2002 15:47:06 -0000 1.4
+++ ComplexTypeInfo.hpp 24 Sep 2002 20:12:48 -0000 1.5
@@ -510,8 +510,7 @@
while (enumDefs.hasMoreElements()) {
- if (XMLString::compareString(attName,
- enumDefs.nextElement().getAttName()->getLocalPart()) == 0) {
+ if (XMLString::equals(attName,
enumDefs.nextElement().getAttName()->getLocalPart())) {
return true;
}
}
1.8 +10 -7 xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.cpp
Index: SchemaInfo.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SchemaInfo.cpp 21 Jun 2002 11:52:24 -0000 1.7
+++ SchemaInfo.cpp 24 Sep 2002 20:12:48 -0000 1.8
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2002/09/24 20:12:48 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
* Revision 1.7 2002/06/21 11:52:24 knoaman
* cleanup
*
@@ -237,7 +240,7 @@
for (unsigned int i= 0; i < listLen; i++) {
child = compList->elementAt(i);
- if
(!XMLString::compareString(child->getAttribute(SchemaSymbols::fgATT_NAME), name))
+ if (XMLString::equals(child->getAttribute(SchemaSymbols::fgATT_NAME),
name))
return child;
}
}
@@ -245,19 +248,19 @@
DOMElement* redefParent = (DOMElement*) child->getParentNode();
// Parent is not "redefine"
- if
(XMLString::compareString(redefParent->getLocalName(),SchemaSymbols::fgELT_REDEFINE))
+ if
(!XMLString::equals(redefParent->getLocalName(),SchemaSymbols::fgELT_REDEFINE))
redefParent = 0;
while (child != 0) {
- if (!XMLString::compareString(child->getLocalName(), compName)) {
+ if (XMLString::equals(child->getLocalName(), compName)) {
compList->addElement(child);
- if
(!XMLString::compareString(child->getAttribute(SchemaSymbols::fgATT_NAME), name))
+ if (XMLString::equals(child->getAttribute(SchemaSymbols::fgATT_NAME),
name))
return child;
}
- else if
(!XMLString::compareString(child->getLocalName(),SchemaSymbols::fgELT_REDEFINE)
+ else if
(XMLString::equals(child->getLocalName(),SchemaSymbols::fgELT_REDEFINE)
&& (!fFailedRedefineList ||
!fFailedRedefineList->containsElement(child))) { // if redefine
DOMElement* redefineChild = XUtil::getFirstChildElement(child);
@@ -265,11 +268,11 @@
while (redefineChild != 0) {
if ((!fFailedRedefineList ||
!fFailedRedefineList->containsElement(redefineChild))
- && !XMLString::compareString(redefineChild->getLocalName(),
compName)) {
+ && XMLString::equals(redefineChild->getLocalName(), compName)) {
compList->addElement(redefineChild);
- if
(!XMLString::compareString(redefineChild->getAttribute(SchemaSymbols::fgATT_NAME),
name))
+ if
(XMLString::equals(redefineChild->getAttribute(SchemaSymbols::fgATT_NAME), name))
return redefineChild;
}
1.16 +11 -8 xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.cpp
Index: SchemaValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SchemaValidator.cpp 16 Sep 2002 20:37:08 -0000 1.15
+++ SchemaValidator.cpp 24 Sep 2002 20:12:48 -0000 1.16
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.16 2002/09/24 20:12:48 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
* Revision 1.15 2002/09/16 20:37:08 tng
* Infinite loop for malformed xml (e.g. simple has "XXXX") w/
setexitonfirstfatal(false).
*
@@ -272,7 +275,7 @@
// character or element information item [children].
//
if (fNil) {
- if (childCount > 0 ||
XMLString::compareString(fDatatypeBuffer.getRawBuffer(), XMLUni::fgZeroLenString))
+ if (childCount > 0 ||
!XMLString::equals(fDatatypeBuffer.getRawBuffer(), XMLUni::fgZeroLenString))
emitError(XMLValid::NilAttrNotEmpty, elemDecl->getFullName());
}
@@ -318,7 +321,7 @@
if (fNil)
emitError(XMLValid::NilAttrNotEmpty,
elemDecl->getFullName());
- if (!XMLString::compareString(value,
XMLUni::fgZeroLenString)) {
+ if (XMLString::equals(value, XMLUni::fgZeroLenString)) {
// if this element didn't specified any value
// use default value
if (getScanner()->getDocHandler())
@@ -341,7 +344,7 @@
}
else {
// no default value, then check nillable
- if (!XMLString::compareString(value,
XMLUni::fgZeroLenString)) {
+ if (XMLString::equals(value, XMLUni::fgZeroLenString)) {
if ((((SchemaElementDecl*)elemDecl)->getMiscFlags() &
SchemaSymbols::NILLABLE) == 0)
fCurrentDV->validate(value);
}
@@ -436,7 +439,7 @@
if ((defType == XMLAttDef::Fixed || defType == XMLAttDef::Required_And_Fixed)
&& !preValidation)
{
const XMLCh* const valueText = attDef->getValue();
- if (XMLString::compareString(attrValue, valueText))
+ if (!XMLString::equals(attrValue, valueText))
emitError(XMLValid::NotSameAsFixedValue, fullName, attrValue,
valueText);
}
@@ -563,7 +566,7 @@
if (!sGrammar) {
// Check built-in simple types
- if (!XMLString::compareString(uriStr,
SchemaSymbols::fgURI_SCHEMAFORSCHEMA)) {
+ if (XMLString::equals(uriStr,
SchemaSymbols::fgURI_SCHEMAFORSCHEMA)) {
fXsiTypeValidator =
fGrammarResolver->getDatatypeValidator(uriStr, localPart);
@@ -622,7 +625,7 @@
if (destType) {
while (tempType) {
- if
(!XMLString::compareString(tempType->getTypeName(), destType->getTypeName()))
+ if (XMLString::equals(tempType->getTypeName(),
destType->getTypeName()))
break;
tempType = tempType->getBaseComplexTypeInfo();
}
@@ -1407,7 +1410,7 @@
const XMLCh* derivedName = derivedSpecNode->getElement()->getLocalPart();
const XMLCh* baseName = baseSpecNode->getElement()->getLocalPart();
- if (XMLString::compareString(derivedName, baseName) || derivedURI != baseURI) {
+ if (!XMLString::equals(derivedName, baseName) || derivedURI != baseURI) {
ThrowXML(RuntimeException, XMLExcepts::PD_NameTypeOK1);
}
@@ -1458,7 +1461,7 @@
if (baseDefVal && (baseFlags & SchemaSymbols::FIXED) != 0 &&
((derivedFlags & SchemaSymbols::FIXED) == 0 ||
- XMLString::compareString(derivedDefVal, baseDefVal))) {
+ !XMLString::equals(derivedDefVal, baseDefVal))) {
ThrowXML1(RuntimeException, XMLExcepts::PD_NameTypeOK3, derivedName);
}
1.4 +6 -2
xml-xerces/c/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp
Index: SubstitutionGroupComparator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SubstitutionGroupComparator.cpp 12 Jul 2002 15:17:48 -0000 1.3
+++ SubstitutionGroupComparator.cpp 24 Sep 2002 20:12:48 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/09/24 20:12:48 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
* Revision 1.3 2002/07/12 15:17:48 knoaman
* For a given global element, store info about a substitution group element
* as a SchemaElementDecl and not as a string.
@@ -119,7 +122,7 @@
return false;
- if ((XMLString::compareString(anElement->getLocalPart(),
exemplar->getLocalPart()) == 0) &&
+ if (XMLString::equals(anElement->getLocalPart(), exemplar->getLocalPart()) &&
(anElement->getURI() == exemplar->getURI()))
return true; // they're the same!
@@ -161,7 +164,7 @@
while (pElemDecl) //(substitutionGroupFullName)
{
- if ((XMLString::compareString(pElemDecl->getBaseName(),
exemplar->getLocalPart()) == 0) &&
+ if (XMLString::equals(pElemDecl->getBaseName(), exemplar->getLocalPart()) &&
(pElemDecl->getURI() == exemplar->getURI()))
{
// time to check for block value on element
1.2 +5 -2
xml-xerces/c/src/xercesc/validators/schema/XercesAttGroupInfo.cpp
Index: XercesAttGroupInfo.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/XercesAttGroupInfo.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XercesAttGroupInfo.cpp 1 Feb 2002 22:22:50 -0000 1.1
+++ XercesAttGroupInfo.cpp 24 Sep 2002 20:12:48 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:50 peiyongz
- * Initial revision
+ * Revision 1.2 2002/09/24 20:12:48 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:50 peiyongz
+ * sane_include
*
* Revision 1.4 2001/11/20 20:21:49 knoaman
* Add check for attribute derviation ok when redefining attribute group by
restriction.
@@ -113,7 +116,7 @@
QName* attName = fAttributes->elementAt(i)->getAttName();
if (attName->getURI() == uri &&
- !XMLString::compareString(attName->getLocalPart(),name)) {
+ XMLString::equals(attName->getLocalPart(),name)) {
return true;
}
}
@@ -141,7 +144,7 @@
QName* attName = attDef->getAttName();
if (uriId == (int) attName->getURI() &&
- !XMLString::compareString(baseName, attName->getLocalPart())) {
+ XMLString::equals(baseName, attName->getLocalPart())) {
return attDef;
}
1.3 +9 -2 xml-xerces/c/src/xercesc/validators/schema/XSDErrorReporter.cpp
Index: XSDErrorReporter.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XSDErrorReporter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSDErrorReporter.cpp 22 May 2002 20:54:14 -0000 1.2
+++ XSDErrorReporter.cpp 24 Sep 2002 20:12:48 -0000 1.3
@@ -56,6 +56,9 @@
/**
* $Log$
+ * Revision 1.3 2002/09/24 20:12:48 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
* Revision 1.2 2002/05/22 20:54:14 knoaman
* Prepare for DOM L3 :
* - Make use of the XMLEntityHandler/XMLErrorReporter interfaces, instead of using
@@ -197,7 +200,7 @@
XMLMsgLoader* msgLoader = gErrMsgLoader;
XMLErrorReporter::ErrTypes errType = XMLErrs::errorType((XMLErrs::Codes)
toEmit);
- if (!XMLString::compareString(msgDomain, XMLUni::fgValidityDomain)) {
+ if (XMLString::equals(msgDomain, XMLUni::fgValidityDomain)) {
errType = XMLValid::errorType((XMLValid::Codes) toEmit);
msgLoader = gValidMsgLoader;
@@ -244,7 +247,7 @@
XMLMsgLoader* msgLoader = gErrMsgLoader;
XMLErrorReporter::ErrTypes errType = XMLErrs::errorType((XMLErrs::Codes)
toEmit);
- if (!XMLString::compareString(msgDomain, XMLUni::fgValidityDomain)) {
+ if (XMLString::equals(msgDomain, XMLUni::fgValidityDomain)) {
errType = XMLValid::errorType((XMLValid::Codes) toEmit);
msgLoader = gValidMsgLoader;
1.4 +7 -4 xml-xerces/c/src/xercesc/validators/schema/XUtil.cpp
Index: XUtil.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/XUtil.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XUtil.cpp 21 May 2002 19:31:45 -0000 1.3
+++ XUtil.cpp 24 Sep 2002 20:12:48 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/09/24 20:12:48 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
* Revision 1.3 2002/05/21 19:31:45 tng
* DOM Reorganization: modify to use the new DOM interface and remove obsolete code
in XUtil.
*
@@ -130,8 +133,8 @@
{
for (unsigned int i = 0; i < length; i++)
{
- if (!XMLString::compareString(child->getNamespaceURI(), uriStr) &&
- !XMLString::compareString(child->getLocalName(), elemNames[i]))
+ if (XMLString::equals(child->getNamespaceURI(), uriStr) &&
+ XMLString::equals(child->getLocalName(), elemNames[i]))
return (DOMElement*)child;
}
}
@@ -174,8 +177,8 @@
{
for (unsigned int i = 0; i < length; i++)
{
- if (!XMLString::compareString(sibling->getNamespaceURI(), uriStr) &&
- !XMLString::compareString(sibling->getLocalName(),
elemNames[i]))
+ if (XMLString::equals(sibling->getNamespaceURI(), uriStr) &&
+ XMLString::equals(sibling->getLocalName(), elemNames[i]))
return (DOMElement*)sibling;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
