peiyongz 2003/07/10 12:48:25
Modified: c/src/xercesc/parsers AbstractDOMParser.cpp
SAX2XMLReaderImpl.cpp SAXParser.cpp
Log:
Stateless Grammar: Initialize scanner with grammarResolver,
Revision Changes Path
1.46 +3 -4 xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp
Index: AbstractDOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- AbstractDOMParser.cpp 20 Jun 2003 18:55:54 -0000 1.45
+++ AbstractDOMParser.cpp 10 Jul 2003 19:48:24 -0000 1.46
@@ -156,10 +156,9 @@
// Create a scanner and tell it what validator to use. Then set us
// as the document event handler so we can fill the DOM document.
- fScanner = XMLScannerResolver::getDefaultScanner(fValidator, fMemoryManager);
+ fScanner = XMLScannerResolver::getDefaultScanner(fValidator, fGrammarResolver,
fMemoryManager);
fScanner->setDocHandler(this);
fScanner->setDocTypeHandler(this);
- fScanner->setGrammarResolver(fGrammarResolver);
fScanner->setURIStringPool(fURIStringPool);
fNodeStack = new (fMemoryManager) ValueStackOf<DOMNode*>(64, fMemoryManager);
@@ -411,13 +410,13 @@
(
scannerName
, fValidator
+ , fGrammarResolver
, fMemoryManager
);
if (tempScanner) {
tempScanner->setParseSettings(fScanner);
- tempScanner->setGrammarResolver(fGrammarResolver);
tempScanner->setURIStringPool(fURIStringPool);
delete fScanner;
fScanner = tempScanner;
1.24 +5 -3 xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
Index: SAX2XMLReaderImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAX2XMLReaderImpl.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SAX2XMLReaderImpl.cpp 25 Jun 2003 22:36:46 -0000 1.23
+++ SAX2XMLReaderImpl.cpp 10 Jul 2003 19:48:24 -0000 1.24
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.24 2003/07/10 19:48:24 peiyongz
+ * Stateless Grammar: Initialize scanner with grammarResolver,
+ *
* Revision 1.23 2003/06/25 22:36:46 peiyongz
* to use new GrammarResolver::getGrammar()
*
@@ -357,8 +360,7 @@
// Create a scanner and tell it what validator to use. Then set us
// as the document event handler so we can fill the DOM document.
- fScanner = XMLScannerResolver::getDefaultScanner(0, fMemoryManager);
- fScanner->setGrammarResolver(fGrammarResolver);
+ fScanner = XMLScannerResolver::getDefaultScanner(0, fGrammarResolver,
fMemoryManager);
fScanner->setURIStringPool(fURIStringPool);
// Create the initial advanced handler list array and zero it out
@@ -1560,13 +1562,13 @@
(
(const XMLCh*) value
, fValidator
+ , fGrammarResolver
, fMemoryManager
);
if (tempScanner) {
tempScanner->setParseSettings(fScanner);
- tempScanner->setGrammarResolver(fGrammarResolver);
tempScanner->setURIStringPool(fURIStringPool);
delete fScanner;
fScanner = tempScanner;
1.22 +5 -3 xml-xerces/c/src/xercesc/parsers/SAXParser.cpp
Index: SAXParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/SAXParser.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SAXParser.cpp 25 Jun 2003 22:36:46 -0000 1.21
+++ SAXParser.cpp 10 Jul 2003 19:48:24 -0000 1.22
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.22 2003/07/10 19:48:24 peiyongz
+ * Stateless Grammar: Initialize scanner with grammarResolver,
+ *
* Revision 1.21 2003/06/25 22:36:46 peiyongz
* to use new GrammarResolver::getGrammar()
*
@@ -308,8 +311,7 @@
fURIStringPool = new (fMemoryManager) XMLStringPool(109, fMemoryManager);
// Create our scanner and tell it what validator to use
- fScanner = XMLScannerResolver::getDefaultScanner(fValidator,fMemoryManager);
- fScanner->setGrammarResolver(fGrammarResolver);
+ fScanner = XMLScannerResolver::getDefaultScanner(fValidator, fGrammarResolver,
fMemoryManager);
fScanner->setURIStringPool(fURIStringPool);
// Create the initial advanced handler list array and zero it out
@@ -643,13 +645,13 @@
(
scannerName
, fValidator
+ , fGrammarResolver
, fMemoryManager
);
if (tempScanner) {
tempScanner->setParseSettings(fScanner);
- tempScanner->setGrammarResolver(fGrammarResolver);
tempScanner->setURIStringPool(fURIStringPool);
delete fScanner;
fScanner = tempScanner;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
