tng 2002/09/24 12:48:39
Modified: c/src/xercesc/validators/common AllContentModel.cpp
DFAContentModel.cpp GrammarResolver.cpp
MixedContentModel.cpp SimpleContentModel.cpp
Log:
Performance: use XMLString::equals instead of XMLString::compareString
Revision Changes Path
1.2 +4 -1 xml-xerces/c/src/xercesc/validators/common/AllContentModel.cpp
Index: AllContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/AllContentModel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AllContentModel.cpp 1 Feb 2002 22:22:37 -0000 1.1
+++ AllContentModel.cpp 24 Sep 2002 19:48:39 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:37 peiyongz
- * Initial revision
+ * Revision 1.2 2002/09/24 19:48:39 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:37 peiyongz
+ * sane_include
*
* Revision 1.3 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
@@ -177,7 +180,7 @@
{
const QName* inChild = fChildren[inIndex];
if ((inChild->getURI() == curChild->getURI()) &&
- (!XMLString::compareString(inChild->getLocalPart(),
curChild->getLocalPart()))) {
+ (XMLString::equals(inChild->getLocalPart(),
curChild->getLocalPart()))) {
// found it
// If this element was seen already, indicate an error was
// found at the duplicate index.
1.3 +11 -8 xml-xerces/c/src/xercesc/validators/common/DFAContentModel.cpp
Index: DFAContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/DFAContentModel.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DFAContentModel.cpp 25 Feb 2002 21:18:53 -0000 1.2
+++ DFAContentModel.cpp 24 Sep 2002 19:48:39 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/09/24 19:48:39 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
* Revision 1.2 2002/02/25 21:18:53 tng
* Schema Fix: Ensure no invalid uri index for UPA checking.
*
@@ -331,7 +334,7 @@
{
const QName* inElem = fElemMap[elemIndex];
if (fDTD) {
- if (!XMLString::compareString(inElem->getRawName(),
curElemRawName)) {
+ if (XMLString::equals(inElem->getRawName(), curElemRawName)) {
nextState = fTransTable[curState][elemIndex];
if (nextState != XMLContentModel::gInvalidTrans)
break;
@@ -342,7 +345,7 @@
if (type == ContentSpecNode::Leaf)
{
if ((inElem->getURI() == curElem->getURI()) &&
- (!XMLString::compareString(inElem->getLocalPart(),
curElem->getLocalPart()))) {
+ (XMLString::equals(inElem->getLocalPart(),
curElem->getLocalPart()))) {
nextState = fTransTable[curState][elemIndex];
if (nextState != XMLContentModel::gInvalidTrans)
break;
@@ -626,14 +629,14 @@
{
const QName* inElem = fElemMap[inIndex];
if (fDTD) {
- if (!XMLString::compareString(inElem->getRawName(),
elementRawName)) {
+ if (XMLString::equals(inElem->getRawName(), elementRawName)) {
break;
}
}
else {
if ((fElemMapType[inIndex] == fLeafListType[outIndex]) &&
(inElem->getURI() == element->getURI()) &&
- (!XMLString::compareString(inElem->getLocalPart(),
element->getLocalPart()))) {
+ (XMLString::equals(inElem->getLocalPart(),
element->getLocalPart()))) {
break;
}
}
@@ -675,14 +678,14 @@
const QName* leaf = fLeafList[leafIndex]->getElement();
const int leafType = fLeafListType[leafIndex];
if (fDTD) {
- if (!XMLString::compareString(leaf->getRawName(), elementRawName)) {
+ if (XMLString::equals(leaf->getRawName(), elementRawName)) {
fLeafSorter[fSortCount++] = leafIndex;
}
}
else {
if ((fElemMapType[elemIndex] == fLeafListType[leafIndex]) &&
(leaf->getURI() == element->getURI()) &&
- (!XMLString::compareString(leaf->getLocalPart(),
element->getLocalPart()))) {
+ (XMLString::equals(leaf->getLocalPart(),
element->getLocalPart()))) {
fLeafSorter[fSortCount++] = leafIndex;
}
}
@@ -796,13 +799,13 @@
const QName* leaf = fLeafList[leafIndex]->getElement();
const QName* element = fElemMap[elemIndex];
if (fDTD) {
- if (!XMLString::compareString(leaf->getRawName(),
element->getRawName())) {
+ if (XMLString::equals(leaf->getRawName(),
element->getRawName())) {
*newSet |= *fFollowList[leafIndex];
}
}
else {
if ((leaf->getURI() == element->getURI()) &&
- (!XMLString::compareString(leaf->getLocalPart(),
element->getLocalPart()))) {
+ (XMLString::equals(leaf->getLocalPart(),
element->getLocalPart()))) {
*newSet |= *fFollowList[leafIndex];
}
}
1.4 +5 -2 xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp
Index: GrammarResolver.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GrammarResolver.cpp 12 Jul 2002 14:35:37 -0000 1.3
+++ GrammarResolver.cpp 24 Sep 2002 19:48:39 -0000 1.4
@@ -57,6 +57,9 @@
/*
* $Log$
+ * Revision 1.4 2002/09/24 19:48:39 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
* Revision 1.3 2002/07/12 14:35:37 knoaman
* Add an error message and use it in the scanner.
*
@@ -118,7 +121,7 @@
DatatypeValidator* dv = 0;
- if (XMLString::compareString(uriStr, SchemaSymbols::fgURI_SCHEMAFORSCHEMA) ==
0) {
+ if (XMLString::equals(uriStr, SchemaSymbols::fgURI_SCHEMAFORSCHEMA)) {
if (!fDataTypeReg) {
@@ -212,7 +215,7 @@
keys.addElement(grammarKey);
keyCount++;
}
-
+
if (!fCachedGrammarRegistry)
fCachedGrammarRegistry = new RefHashTableOf<Grammar>(29, true);
1.2 +9 -6 xml-xerces/c/src/xercesc/validators/common/MixedContentModel.cpp
Index: MixedContentModel.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/MixedContentModel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MixedContentModel.cpp 1 Feb 2002 22:22:39 -0000 1.1
+++ MixedContentModel.cpp 24 Sep 2002 19:48:39 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log$
- * Revision 1.1 2002/02/01 22:22:39 peiyongz
- * Initial revision
+ * Revision 1.2 2002/09/24 19:48:39 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:39 peiyongz
+ * sane_include
*
* Revision 1.13 2001/08/24 12:48:48 tng
* Schema: AllContentModel
@@ -207,13 +210,13 @@
continue;
if (fDTD) {
- if (!XMLString::compareString(curVal->getRawName(),
fChildren[iIndex]->getRawName())) {
+ if (XMLString::equals(curVal->getRawName(),
fChildren[iIndex]->getRawName())) {
return true;
}
}
else {
if ((curVal->getURI() == fChildren[iIndex]->getURI()) &&
- (!XMLString::compareString(curVal->getLocalPart(),
fChildren[iIndex]->getLocalPart()))) {
+ (XMLString::equals(curVal->getLocalPart(),
fChildren[iIndex]->getLocalPart()))) {
return true;
}
}
@@ -254,13 +257,13 @@
if (type == ContentSpecNode::Leaf) {
if (fDTD) {
- if (XMLString::compareString(inChild->getRawName(),
curChild->getRawName())) {
+ if (!XMLString::equals(inChild->getRawName(),
curChild->getRawName())) {
return outIndex;
}
}
else {
if ((inChild->getURI() != curChild->getURI()) ||
- (XMLString::compareString(inChild->getLocalPart(),
curChild->getLocalPart()))) {
+ (!XMLString::equals(inChild->getLocalPart(),
curChild->getLocalPart()))) {
return outIndex;
}
}
@@ -300,13 +303,13 @@
if (type == ContentSpecNode::Leaf) {
if (fDTD) {
- if (!XMLString::compareString(inChild->getRawName(),
curChild->getRawName())) {
+ if (XMLString::equals(inChild->getRawName(),
curChild->getRawName())) {
break;
}
}
else {
if ((inChild->getURI() == curChild->getURI()) &&
- (!XMLString::compareString(inChild->getLocalPart(),
curChild->getLocalPart()))) {
+ (XMLString::equals(inChild->getLocalPart(),
curChild->getLocalPart()))) {
break;
}
}
1.3 +27 -24
xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.cpp
Index: SimpleContentModel.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleContentModel.cpp 25 Feb 2002 21:18:53 -0000 1.2
+++ SimpleContentModel.cpp 24 Sep 2002 19:48:39 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/09/24 19:48:39 tng
+ * Performance: use XMLString::equals instead of XMLString::compareString
+ *
* Revision 1.2 2002/02/25 21:18:53 tng
* Schema Fix: Ensure no invalid uri index for UPA checking.
*
@@ -158,13 +161,13 @@
// If the 0th child is not the right kind, report an error at 0
if (fDTD) {
- if (XMLString::compareString(children[0]->getRawName(),
fFirstChild->getRawName())!=0) {
+ if (!XMLString::equals(children[0]->getRawName(),
fFirstChild->getRawName())) {
return 0;
}
}
else {
if ((children[0]->getURI() != fFirstChild->getURI()) ||
- (XMLString::compareString(children[0]->getLocalPart(),
fFirstChild->getLocalPart())!=0)) {
+ !XMLString::equals(children[0]->getLocalPart(),
fFirstChild->getLocalPart())) {
return 0;
}
}
@@ -181,13 +184,13 @@
//
if (childCount == 1) {
if (fDTD) {
- if (XMLString::compareString(children[0]->getRawName(),
fFirstChild->getRawName())!=0) {
+ if (!XMLString::equals(children[0]->getRawName(),
fFirstChild->getRawName())) {
return 0;
}
}
else {
if ((children[0]->getURI() != fFirstChild->getURI()) ||
- (XMLString::compareString(children[0]->getLocalPart(),
fFirstChild->getLocalPart())!=0)) {
+ (!XMLString::equals(children[0]->getLocalPart(),
fFirstChild->getLocalPart()))) {
return 0;
}
}
@@ -208,7 +211,7 @@
{
if (fDTD) {
for (index = 0; index < childCount; index++) {
- if (XMLString::compareString(children[index]->getRawName(),
fFirstChild->getRawName())!=0) {
+ if (!XMLString::equals(children[index]->getRawName(),
fFirstChild->getRawName())) {
return index;
}
}
@@ -216,7 +219,7 @@
else {
for (index = 0; index < childCount; index++) {
if ((children[index]->getURI() != fFirstChild->getURI()) ||
-
(XMLString::compareString(children[index]->getLocalPart(),
fFirstChild->getLocalPart())!=0)) {
+ !XMLString::equals(children[index]->getLocalPart(),
fFirstChild->getLocalPart())) {
return index;
}
}
@@ -235,7 +238,7 @@
if (fDTD) {
for (index = 0; index < childCount; index++) {
- if (XMLString::compareString(children[index]->getRawName(),
fFirstChild->getRawName())!=0) {
+ if (!XMLString::equals(children[index]->getRawName(),
fFirstChild->getRawName())) {
return index;
}
}
@@ -243,7 +246,7 @@
else {
for (index = 0; index < childCount; index++) {
if ((children[index]->getURI() != fFirstChild->getURI()) ||
- (XMLString::compareString(children[index]->getLocalPart(),
fFirstChild->getLocalPart())!=0)) {
+ !XMLString::equals(children[index]->getLocalPart(),
fFirstChild->getLocalPart())) {
return index;
}
}
@@ -259,16 +262,16 @@
return 0;
if (fDTD) {
- if ((XMLString::compareString(children[0]->getRawName(),
fFirstChild->getRawName())!=0) &&
- (XMLString::compareString(children[0]->getRawName(),
fSecondChild->getRawName())!=0)) {
+ if (!XMLString::equals(children[0]->getRawName(),
fFirstChild->getRawName()) &&
+ !XMLString::equals(children[0]->getRawName(),
fSecondChild->getRawName())) {
return 0;
}
}
else {
if (((children[0]->getURI() != fFirstChild->getURI()) ||
- (XMLString::compareString(children[0]->getLocalPart(),
fFirstChild->getLocalPart())!=0)) &&
+ !XMLString::equals(children[0]->getLocalPart(),
fFirstChild->getLocalPart())) &&
((children[0]->getURI() != fSecondChild->getURI()) ||
- (XMLString::compareString(children[0]->getLocalPart(),
fSecondChild->getLocalPart())!=0))) {
+ !XMLString::equals(children[0]->getLocalPart(),
fSecondChild->getLocalPart()))) {
return 0;
}
}
@@ -289,21 +292,21 @@
if (childCount == 2) {
if (fDTD) {
- if (XMLString::compareString(children[0]->getRawName(),
fFirstChild->getRawName())!=0) {
+ if (!XMLString::equals(children[0]->getRawName(),
fFirstChild->getRawName())) {
return 0;
}
- if (XMLString::compareString(children[1]->getRawName(),
fSecondChild->getRawName())!=0) {
+ if (!XMLString::equals(children[1]->getRawName(),
fSecondChild->getRawName())) {
return 1;
}
}
else {
if ((children[0]->getURI() != fFirstChild->getURI()) ||
- (XMLString::compareString(children[0]->getLocalPart(),
fFirstChild->getLocalPart())!=0)) {
+ !XMLString::equals(children[0]->getLocalPart(),
fFirstChild->getLocalPart())) {
return 0;
}
if ((children[1]->getURI() != fSecondChild->getURI()) ||
- (XMLString::compareString(children[1]->getLocalPart(),
fSecondChild->getLocalPart())!=0)) {
+ !XMLString::equals(children[1]->getLocalPart(),
fSecondChild->getLocalPart())) {
return 1;
}
}
@@ -349,7 +352,7 @@
return 0;
if ((children[0]->getURI() != fFirstChild->getURI()) ||
- (XMLString::compareString(children[0]->getLocalPart(),
fFirstChild->getLocalPart())!=0))
+ !XMLString::equals(children[0]->getLocalPart(),
fFirstChild->getLocalPart()))
{
if (!comparator.isEquivalentTo(children[0], fFirstChild))
return 0;
@@ -367,7 +370,7 @@
//
if ((childCount == 1) &&
((children[0]->getURI() != fFirstChild->getURI()) ||
- (XMLString::compareString(children[0]->getLocalPart(),
fFirstChild->getLocalPart())!=0)))
+ !XMLString::equals(children[0]->getLocalPart(),
fFirstChild->getLocalPart())))
{
if(!comparator.isEquivalentTo(children[0], fFirstChild))
return 0;
@@ -388,7 +391,7 @@
for (index = 0; index < childCount; index++)
{
if ((children[index]->getURI() != fFirstChild->getURI()) ||
- (XMLString::compareString(children[index]->getLocalPart(),
fFirstChild->getLocalPart())!=0))
+ !XMLString::equals(children[index]->getLocalPart(),
fFirstChild->getLocalPart()))
{
if (!comparator.isEquivalentTo(children[index],
fFirstChild))
return index;
@@ -409,7 +412,7 @@
for (index = 0; index < childCount; index++)
{
if ((children[index]->getURI() != fFirstChild->getURI()) ||
- (XMLString::compareString(children[index]->getLocalPart(),
fFirstChild->getLocalPart())!=0))
+ !XMLString::equals(children[index]->getLocalPart(),
fFirstChild->getLocalPart()))
{
if (!comparator.isEquivalentTo(children[index],
fFirstChild))
return index;
@@ -426,9 +429,9 @@
return 0;
if (((children[0]->getURI() != fFirstChild->getURI()) ||
- (XMLString::compareString(children[0]->getLocalPart(),
fFirstChild->getLocalPart())!=0)) &&
+ !XMLString::equals(children[0]->getLocalPart(),
fFirstChild->getLocalPart())) &&
((children[0]->getURI() != fSecondChild->getURI()) ||
- (XMLString::compareString(children[0]->getLocalPart(),
fSecondChild->getLocalPart())!=0)))
+ !XMLString::equals(children[0]->getLocalPart(),
fSecondChild->getLocalPart())))
{
if (!comparator.isEquivalentTo(children[0], fFirstChild) &&
@@ -453,14 +456,14 @@
if (childCount == 2)
{
if ((children[0]->getURI() != fFirstChild->getURI()) ||
- (XMLString::compareString(children[0]->getLocalPart(),
fFirstChild->getLocalPart())!=0))
+ !XMLString::equals(children[0]->getLocalPart(),
fFirstChild->getLocalPart()))
{
if(!comparator.isEquivalentTo(children[0], fFirstChild))
return 0;
}
if ((children[1]->getURI() != fSecondChild->getURI()) ||
- (XMLString::compareString(children[1]->getLocalPart(),
fSecondChild->getLocalPart())!=0))
+ !XMLString::equals(children[1]->getLocalPart(),
fSecondChild->getLocalPart()))
{
if (!comparator.isEquivalentTo(children[1], fSecondChild))
return 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
