peiyongz 2003/06/26 09:56:42
Modified: c/src/xercesc/internal SGXMLScanner.cpp IGXMLScanner.cpp
IGXMLScanner2.cpp DGXMLScanner.cpp
Log:
Roll back Grammar creation
Revision Changes Path
1.31 +7 -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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- SGXMLScanner.cpp 25 Jun 2003 22:36:00 -0000 1.30
+++ SGXMLScanner.cpp 26 Jun 2003 16:56:41 -0000 1.31
@@ -1878,7 +1878,8 @@
fRawAttrList = new (fMemoryManager) RefVectorOf<KVStringPair>(32, true,
fMemoryManager);
// Create dummy schema grammar
- fSchemaGrammar = fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+ //fSchemaGrammar = fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+ fSchemaGrammar = new (fMemoryManager) SchemaGrammar(fMemoryManager);
// Create the Validator and init them
fSchemaValidator = new (fMemoryManager) SchemaValidator(0, fMemoryManager);
@@ -3180,7 +3181,8 @@
fElemStack.setValidationFlag(fValidate);
}
- grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+ //grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+ grammar = new (fMemoryManager) SchemaGrammar(fMemoryManager);
TraverseSchema traverseSchema
(
@@ -3333,7 +3335,8 @@
DOMElement* root = document->getDocumentElement();// This is what we pass
to TraverserSchema
if (root != 0)
{
- SchemaGrammar* grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+ //SchemaGrammar* grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+ SchemaGrammar* grammar = new (fMemoryManager)
SchemaGrammar(fMemoryManager);
TraverseSchema traverseSchema
(
root
1.18 +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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- IGXMLScanner.cpp 25 Jun 2003 22:35:59 -0000 1.17
+++ IGXMLScanner.cpp 26 Jun 2003 16:56:41 -0000 1.18
@@ -2851,7 +2851,8 @@
}
}
- fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
+ //fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
+ fDTDGrammar = new (fMemoryManager) DTDGrammar(fMemoryManager);
XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
fGrammarResolver->putGrammar(gramDesc, fDTDGrammar);
fGrammar = fDTDGrammar;
1.26 +7 -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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- IGXMLScanner2.cpp 25 Jun 2003 22:35:59 -0000 1.25
+++ IGXMLScanner2.cpp 26 Jun 2003 16:56:41 -0000 1.26
@@ -869,7 +869,8 @@
fGrammarResolver->cacheGrammarFromParse(fToCacheGrammar);
fGrammarResolver->useCachedGrammarInParse(fUseCachedGrammar);
- fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
+ //fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
+ fDTDGrammar = new (fMemoryManager) DTDGrammar(fMemoryManager);
XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
fGrammarResolver->putGrammar(gramDesc, fDTDGrammar);
fGrammar = fDTDGrammar;
@@ -1427,7 +1428,8 @@
}
}
- grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+ //grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+ grammar = new (fMemoryManager) SchemaGrammar(fMemoryManager);
TraverseSchema traverseSchema
(
root
@@ -1598,7 +1600,8 @@
DOMElement* root = document->getDocumentElement();// This is what we pass
to TraverserSchema
if (root != 0)
{
- SchemaGrammar* grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+ //SchemaGrammar* grammar =
fGrammarResolver->getGrammarPool()->createSchemaGrammar();
+ SchemaGrammar* grammar = new (fMemoryManager)
SchemaGrammar(fMemoryManager);
TraverseSchema traverseSchema
(
1.19 +5 -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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DGXMLScanner.cpp 25 Jun 2003 22:35:58 -0000 1.18
+++ DGXMLScanner.cpp 26 Jun 2003 16:56:41 -0000 1.19
@@ -1681,7 +1681,8 @@
if (fValidatorFromUser)
fValidator->reset();
- fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
+ //fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
+ fDTDGrammar = new (fMemoryManager) DTDGrammar(fMemoryManager);
XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
fGrammarResolver->putGrammar(gramDesc, fDTDGrammar);
fGrammar = fDTDGrammar;
@@ -2038,7 +2039,8 @@
fGrammarResolver->cacheGrammarFromParse(fToCacheGrammar);
fGrammarResolver->useCachedGrammarInParse(fUseCachedGrammar);
- fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
+ //fDTDGrammar = fGrammarResolver->getGrammarPool()->createDTDGrammar();
+ fDTDGrammar = new (fMemoryManager) DTDGrammar(fMemoryManager);
XMLDTDDescription* gramDesc =
fGrammarResolver->getGrammarPool()->createDTDDescription(XMLUni::fgDTDEntityString);
fGrammarResolver->putGrammar(gramDesc, fDTDGrammar);
fGrammar = fDTDGrammar;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
