tng 2002/09/24 13:02:21
Modified: c/src/xercesc/internal ReaderMgr.cpp VecAttributesImpl.cpp
VecAttrListImpl.cpp XMLScanner.cpp XMLScanner2.cpp
Log:
Performance: use XMLString::equals instead of XMLString::compareString
Revision Changes Path
1.5 +2 -2 xml-xerces/c/src/xercesc/internal/ReaderMgr.cpp
Index: ReaderMgr.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/ReaderMgr.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ReaderMgr.cpp 22 Aug 2002 19:28:11 -0000 1.4
+++ ReaderMgr.cpp 24 Sep 2002 20:02:20 -0000 1.5
@@ -845,7 +845,7 @@
const XMLEntityDecl* curDecl = fEntityStack->elementAt(index);
if (curDecl)
{
- if (!XMLString::compareString(theName, curDecl->getName()))
+ if (XMLString::equals(theName, curDecl->getName()))
{
// Oops, already there so delete reader and return
delete reader;
1.2 +6 -3 xml-xerces/c/src/xercesc/internal/VecAttributesImpl.cpp
Index: VecAttributesImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/VecAttributesImpl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VecAttributesImpl.cpp 1 Feb 2002 22:21:58 -0000 1.1
+++ VecAttributesImpl.cpp 24 Sep 2002 20:02:20 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:21:58 peiyongz
- * Initial revision
+ * Revision 1.2 2002/09/24 20:02:20 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
+ * Revision 1.1.1.1 2002/02/01 22:21:58 peiyongz
+ * sane_include
*
* Revision 1.7 2001/10/05 17:57:39 peiyongz
* [BUG# 3831]: -1 returned from getIndex() needs to be checked
@@ -188,8 +191,8 @@
fScanner->getURIText(curElem->getURIId(), uriBuffer) ;
- if ( (!XMLString::compareString(curElem->getName(), localPart)) &&
- (!XMLString::compareString(uriBuffer.getRawBuffer(), uri)) )
+ if ( (XMLString::equals(curElem->getName(), localPart)) &&
+ (XMLString::equals(uriBuffer.getRawBuffer(), uri)) )
return index ;
}
return -1;
@@ -205,7 +208,7 @@
{
const XMLAttr* curElem = fVector->elementAt(index);
- if (!XMLString::compareString(curElem->getQName(), qName))
+ if (XMLString::equals(curElem->getQName(), qName))
return index ;
}
return -1;
1.4 +6 -3 xml-xerces/c/src/xercesc/internal/VecAttrListImpl.cpp
Index: VecAttrListImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/VecAttrListImpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VecAttrListImpl.cpp 5 Jul 2002 20:12:35 -0000 1.3
+++ VecAttrListImpl.cpp 24 Sep 2002 20:02:20 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/09/24 20:02:20 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
* Revision 1.3 2002/07/05 20:12:35 tng
* [Bug 9788] VecAttrListImpl::getValue skips prefix if SAX namespace validation is
on.
*
@@ -165,7 +168,7 @@
{
const XMLAttr* curElem = fVector->elementAt(index);
- if (!XMLString::compareString(curElem->getQName(), name))
+ if (XMLString::equals(curElem->getQName(), name))
return XMLAttDef::getAttTypeString(curElem->getType());
}
return 0;
@@ -181,7 +184,7 @@
{
const XMLAttr* curElem = fVector->elementAt(index);
- if (!XMLString::compareString(curElem->getQName(), name))
+ if (XMLString::equals(curElem->getQName(), name))
return curElem->getValue();
}
return 0;
@@ -201,7 +204,7 @@
{
const XMLAttr* curElem = fVector->elementAt(index);
- if (!XMLString::compareString(curElem->getQName(), wideName))
+ if (XMLString::equals(curElem->getQName(), wideName))
return curElem->getValue();
}
return 0;
1.22 +14 -14 xml-xerces/c/src/xercesc/internal/XMLScanner.cpp
Index: XMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XMLScanner.cpp 16 Sep 2002 20:37:33 -0000 1.21
+++ XMLScanner.cpp 24 Sep 2002 20:02:20 -0000 1.22
@@ -1775,7 +1775,7 @@
// Make sure that its the end of the element that we expect
XMLElementDecl* tempElement = topElem->fThisElement;
if (fDoNamespaces && fGrammarType == Grammar::SchemaGrammarType) {
- if ((topUri != uriId) ||
(XMLString::compareString(tempElement->getBaseName(), bbName.getRawBuffer())))
+ if ((topUri != uriId) || (!XMLString::equals(tempElement->getBaseName(),
bbName.getRawBuffer())))
{
emitError
(
@@ -1785,7 +1785,7 @@
}
}
else {
- if (XMLString::compareString(tempElement->getFullName(),
qnameBuf.getRawBuffer()))
+ if (!XMLString::equals(tempElement->getFullName(), qnameBuf.getRawBuffer()))
{
emitError
(
@@ -2701,7 +2701,7 @@
if (fValidate)
{
// If a DocType exists, then check if it matches the root name there.
- if (fRootElemName && XMLString::compareString(fQNameBuf.getRawBuffer(),
fRootElemName))
+ if (fRootElemName && !XMLString::equals(fQNameBuf.getRawBuffer(),
fRootElemName))
fValidator->emitError(XMLValid::RootElemNotLikeDocType);
// Some validators may also want to check the root, call the
@@ -3332,7 +3332,7 @@
{
const XMLCh* rawPtr = curDef.getFullName();
if (!XMLString::compareNString(rawPtr,
XMLUni::fgXMLNSColonString, 6)
- || !XMLString::compareString(rawPtr,
XMLUni::fgXMLNSString))
+ || XMLString::equals(rawPtr, XMLUni::fgXMLNSString))
updateNSMap(rawPtr, curDef.getValue());
}
}
@@ -3646,7 +3646,7 @@
if (fValidate)
{
// If a DocType exists, then check if it matches the root name there.
- if (fRootElemName && XMLString::compareString(qnameRawBuf,
fRootElemName))
+ if (fRootElemName && !XMLString::equals(qnameRawBuf, fRootElemName))
fValidator->emitError(XMLValid::RootElemNotLikeDocType);
// Some validators may also want to check the root, call the
@@ -3926,11 +3926,11 @@
emitError(XMLErrs::ExpectedDeclString);
// See if it matches any of our expected strings
- if (!XMLString::compareString(nameBuf.getRawBuffer(),
XMLUni::fgVersionString))
+ if (XMLString::equals(nameBuf.getRawBuffer(), XMLUni::fgVersionString))
curString = VersionString;
- else if (!XMLString::compareString(nameBuf.getRawBuffer(),
XMLUni::fgEncodingString))
+ else if (XMLString::equals(nameBuf.getRawBuffer(),
XMLUni::fgEncodingString))
curString = EncodingString;
- else if (!XMLString::compareString(nameBuf.getRawBuffer(),
XMLUni::fgStandaloneString))
+ else if (XMLString::equals(nameBuf.getRawBuffer(),
XMLUni::fgStandaloneString))
curString = StandaloneString;
else
curString = UnknownString;
@@ -3968,7 +3968,7 @@
const XMLCh* rawValue = buffers[curString]->getRawBuffer();
if (curString == VersionString)
{
- if (XMLString::compareString(rawValue, XMLUni::fgSupportedVersion))
+ if (!XMLString::equals(rawValue, XMLUni::fgSupportedVersion))
emitError(XMLErrs::UnsupportedXMLVersion, rawValue);
}
else if (curString == EncodingString)
@@ -3978,9 +3978,9 @@
}
else if (curString == StandaloneString)
{
- if (!XMLString::compareString(rawValue, XMLUni::fgYesString))
+ if (XMLString::equals(rawValue, XMLUni::fgYesString))
fStandalone = true;
- else if (!XMLString::compareString(rawValue, XMLUni::fgNoString))
+ else if (XMLString::equals(rawValue, XMLUni::fgNoString))
fStandalone = false;
else
{
@@ -4159,9 +4159,9 @@
// to map to by the NS spec. xmlns gets mapped to a special place holder
// URI that we define (so that it maps to something checkable.)
//
- if (!XMLString::compareString(prefixBuf.getRawBuffer(),
XMLUni::fgXMLNSString))
+ if (XMLString::equals(prefixBuf.getRawBuffer(), XMLUni::fgXMLNSString))
uriId = fXMLNSNamespaceId;
- else if (!XMLString::compareString(prefixBuf.getRawBuffer(),
XMLUni::fgXMLString))
+ else if (XMLString::equals(prefixBuf.getRawBuffer(), XMLUni::fgXMLString))
uriId = fXMLNamespaceId;
else
{
1.15 +16 -16 xml-xerces/c/src/xercesc/internal/XMLScanner2.cpp
Index: XMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner2.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XMLScanner2.cpp 22 Aug 2002 19:28:11 -0000 1.14
+++ XMLScanner2.cpp 24 Sep 2002 20:02:21 -0000 1.15
@@ -206,8 +206,8 @@
//
const bool isNSAttr = (uriId == fXMLNSNamespaceId)
|| (uriId == fXMLNamespaceId)
- || !XMLString::compareString(suffPtr,
XMLUni::fgXMLNSString)
- || !XMLString::compareString(getURIText(uriId),
SchemaSymbols::fgURI_XSI);
+ || XMLString::equals(suffPtr, XMLUni::fgXMLNSString)
+ || XMLString::equals(getURIText(uriId),
SchemaSymbols::fgURI_XSI);
//
@@ -836,9 +836,9 @@
// to map to by the NS spec. xmlns gets mapped to a special place holder
// URI that we define (so that it maps to something checkable.)
//
- if (!XMLString::compareString(prefix, XMLUni::fgXMLNSString))
+ if (XMLString::equals(prefix, XMLUni::fgXMLNSString))
return fXMLNSNamespaceId;
- else if (!XMLString::compareString(prefix, XMLUni::fgXMLString))
+ else if (XMLString::equals(prefix, XMLUni::fgXMLString))
return fXMLNamespaceId;
@@ -868,9 +868,9 @@
// to map to by the NS spec. xmlns gets mapped to a special place holder
// URI that we define (so that it maps to something checkable.)
//
- if (!XMLString::compareString(prefix, XMLUni::fgXMLNSString))
+ if (XMLString::equals(prefix, XMLUni::fgXMLNSString))
return fXMLNSNamespaceId;
- else if (!XMLString::compareString(prefix, XMLUni::fgXMLString))
+ else if (XMLString::equals(prefix, XMLUni::fgXMLString))
return fXMLNamespaceId;
//
@@ -1323,14 +1323,14 @@
// "xmlns", then use it to update the map.
//
if (!XMLString::compareNString(rawPtr, XMLUni::fgXMLNSColonString, 6)
- || !XMLString::compareString(rawPtr, XMLUni::fgXMLNSString))
+ || XMLString::equals(rawPtr, XMLUni::fgXMLNSString))
{
const XMLCh* valuePtr = curPair->getValue();
updateNSMap(rawPtr, valuePtr);
// if the schema URI is seen in the the valuePtr, set the boolean seeXsi
- if (!XMLString::compareString(valuePtr, SchemaSymbols::fgURI_XSI)) {
+ if (XMLString::equals(valuePtr, SchemaSymbols::fgURI_XSI)) {
fSeeXsi = true;
}
}
@@ -1361,17 +1361,17 @@
const XMLCh* valuePtr = curPair->getValue();
const XMLCh* suffPtr = attName.getLocalPart();
- if (!XMLString::compareString(suffPtr,
SchemaSymbols::fgXSI_SCHEMALOCACTION))
+ if (XMLString::equals(suffPtr,
SchemaSymbols::fgXSI_SCHEMALOCACTION))
parseSchemaLocation(valuePtr);
- else if (!XMLString::compareString(suffPtr,
SchemaSymbols::fgXSI_NONAMESPACESCHEMALOCACTION))
+ else if (XMLString::equals(suffPtr,
SchemaSymbols::fgXSI_NONAMESPACESCHEMALOCACTION))
resolveSchemaGrammar(valuePtr, XMLUni::fgZeroLenString);
- if (!XMLString::compareString(suffPtr, SchemaSymbols::fgXSI_TYPE)) {
+ if (XMLString::equals(suffPtr, SchemaSymbols::fgXSI_TYPE)) {
fXsiType.set(valuePtr);
}
- else if (!XMLString::compareString(suffPtr,
SchemaSymbols::fgATT_NILL)
+ else if (XMLString::equals(suffPtr, SchemaSymbols::fgATT_NILL)
&& fValidator && fValidator->handlesSchema()
- && !XMLString::compareString(valuePtr,
SchemaSymbols::fgATTVAL_TRUE)) {
+ && XMLString::equals(valuePtr,
SchemaSymbols::fgATTVAL_TRUE)) {
((SchemaValidator*)fValidator)->setNillable(true);
}
}
@@ -1501,7 +1501,7 @@
if (root != 0)
{
const XMLCh* newUri =
root->getAttribute(SchemaSymbols::fgATT_TARGETNAMESPACE);
- if (XMLString::compareString(newUri, uri)) {
+ if (!XMLString::equals(newUri, uri)) {
if (fValidate)
fValidator->emitError(XMLValid::WrongTargetNamespace, loc,
uri);
grammar = fGrammarResolver->getGrammar(newUri);
@@ -3095,7 +3095,7 @@
if (type == ContentSpecNode::Leaf) {
if (((uri == elementURI)
- && !XMLString::compareString(fElemMap->getLocalPart(),
element->getLocalPart()))
+ && XMLString::equals(fElemMap->getLocalPart(),
element->getLocalPart()))
|| comparator.isEquivalentTo(element, fElemMap)) {
nextState = cm->getNextState(currState, i);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
