peiyongz 2003/06/25 10:25:34
Modified: c/src/xercesc/internal DGXMLScanner.cpp IGXMLScanner.cpp
IGXMLScanner2.cpp SGXMLScanner.cpp
Log:
Using GrammarPool::createDTDGrammar/createSchemaGrammar
Revision Changes Path
1.15 +4 -3 xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp
Index: DGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DGXMLScanner.cpp 18 May 2003 14:02:04 -0000 1.14
+++ DGXMLScanner.cpp 25 Jun 2003 17:25:33 -0000 1.15
@@ -71,6 +71,7 @@
#include <xercesc/framework/XMLDocumentHandler.hpp>
#include <xercesc/framework/XMLEntityHandler.hpp>
#include <xercesc/framework/XMLPScanToken.hpp>
+#include <xercesc/framework/XMLGrammarPool.hpp>
#include <xercesc/internal/EndOfEntityException.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
#include <xercesc/validators/DTD/DocTypeHandler.hpp>
@@ -1675,7 +1676,7 @@
if (fValidatorFromUser)
fValidator->reset();
- fDTDGrammar = new (fMemoryManager) DTDGrammar(fMemoryManager);
+ fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
fGrammarResolver->putGrammar(XMLUni::fgDTDEntityString, fDTDGrammar);
fGrammar = fDTDGrammar;
fValidator->setGrammar(fGrammar);
@@ -2029,7 +2030,7 @@
fGrammarResolver->cacheGrammarFromParse(fToCacheGrammar);
fGrammarResolver->useCachedGrammarInParse(fUseCachedGrammar);
- fDTDGrammar = new (fMemoryManager) DTDGrammar(fMemoryManager);
+ fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
fGrammarResolver->putGrammar(XMLUni::fgDTDEntityString, fDTDGrammar);
fGrammar = fDTDGrammar;
fRootGrammar = 0;
1.14 +3 -2 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- IGXMLScanner.cpp 18 May 2003 14:02:04 -0000 1.13
+++ IGXMLScanner.cpp 25 Jun 2003 17:25:33 -0000 1.14
@@ -71,6 +71,7 @@
#include <xercesc/framework/XMLPScanToken.hpp>
#include <xercesc/internal/EndOfEntityException.hpp>
#include <xercesc/framework/MemoryManager.hpp>
+#include <xercesc/framework/XMLGrammarPool.hpp>
#include <xercesc/validators/common/GrammarResolver.hpp>
#include <xercesc/validators/DTD/DocTypeHandler.hpp>
#include <xercesc/validators/DTD/DTDScanner.hpp>
@@ -2845,7 +2846,7 @@
}
}
- fDTDGrammar = new (fMemoryManager) DTDGrammar(fMemoryManager);
+ fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
fGrammarResolver->putGrammar(XMLUni::fgDTDEntityString, fDTDGrammar);
fGrammar = fDTDGrammar;
fGrammarType = fGrammar->getGrammarType();
1.23 +6 -4 xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp
Index: IGXMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- IGXMLScanner2.cpp 20 Jun 2003 18:53:15 -0000 1.22
+++ IGXMLScanner2.cpp 25 Jun 2003 17:25:33 -0000 1.23
@@ -77,6 +77,7 @@
#include <xercesc/framework/XMLEntityHandler.hpp>
#include <xercesc/framework/XMLPScanToken.hpp>
#include <xercesc/framework/XMLRefInfo.hpp>
+#include <xercesc/framework/XMLGrammarPool.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
#include <xercesc/validators/DTD/DTDGrammar.hpp>
#include <xercesc/validators/DTD/DTDValidator.hpp>
@@ -864,7 +865,7 @@
fGrammarResolver->cacheGrammarFromParse(fToCacheGrammar);
fGrammarResolver->useCachedGrammarInParse(fUseCachedGrammar);
- fDTDGrammar = new (fMemoryManager) DTDGrammar(fMemoryManager);
+ fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
fGrammarResolver->putGrammar(XMLUni::fgDTDEntityString, fDTDGrammar);
fGrammar = fDTDGrammar;
fGrammarType = fGrammar->getGrammarType();
@@ -1417,7 +1418,7 @@
}
}
- grammar = new (fMemoryManager) SchemaGrammar(fMemoryManager);
+ grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
TraverseSchema traverseSchema
(
root
@@ -1588,7 +1589,8 @@
DOMElement* root = document->getDocumentElement();// This is what we pass
to TraverserSchema
if (root != 0)
{
- SchemaGrammar* grammar = new (fMemoryManager)
SchemaGrammar(fMemoryManager);
+ SchemaGrammar* grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+
TraverseSchema traverseSchema
(
root
1.29 +6 -4 xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp
Index: SGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- SGXMLScanner.cpp 20 Jun 2003 18:53:16 -0000 1.28
+++ SGXMLScanner.cpp 25 Jun 2003 17:25:33 -0000 1.29
@@ -71,6 +71,7 @@
#include <xercesc/framework/XMLEntityHandler.hpp>
#include <xercesc/framework/XMLPScanToken.hpp>
#include <xercesc/framework/MemoryManager.hpp>
+#include <xercesc/framework/XMLGrammarPool.hpp>
#include <xercesc/internal/EndOfEntityException.hpp>
#include <xercesc/validators/common/ContentLeafNameTypeVector.hpp>
#include <xercesc/validators/schema/SchemaValidator.hpp>
@@ -1876,7 +1877,7 @@
fRawAttrList = new (fMemoryManager) RefVectorOf<KVStringPair>(32, true,
fMemoryManager);
// Create dummy schema grammar
- fSchemaGrammar = new (fMemoryManager) SchemaGrammar(fMemoryManager);
+ fSchemaGrammar = fGrammarResolver->getGrammarPool()->createSchemaGrammar();
// Create the Validator and init them
fSchemaValidator = new (fMemoryManager) SchemaValidator(0, fMemoryManager);
@@ -3172,7 +3173,8 @@
fElemStack.setValidationFlag(fValidate);
}
- grammar = new (fMemoryManager) SchemaGrammar(fMemoryManager);
+ grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+
TraverseSchema traverseSchema
(
root
@@ -3324,7 +3326,7 @@
DOMElement* root = document->getDocumentElement();// This is what we pass
to TraverserSchema
if (root != 0)
{
- SchemaGrammar* grammar = new (fMemoryManager)
SchemaGrammar(fMemoryManager);
+ SchemaGrammar* grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
TraverseSchema traverseSchema
(
root
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
