You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ar...@locus.apache.org on 2000/07/26 00:33:07 UTC
cvs commit: xml-xerces/c/src/internal ReaderMgr.cpp XMLReader.cpp XMLReader.hpp XMLScanner.cpp XMLScanner2.cpp
aruna1 00/07/25 15:33:07
Modified: c/src/internal ReaderMgr.cpp XMLReader.cpp XMLReader.hpp
XMLScanner.cpp XMLScanner2.cpp
Log:
Char definitions in XMLUni moved to XMLUniDefs
Revision Changes Path
1.12 +2 -48 xml-xerces/c/src/internal/ReaderMgr.cpp
Index: ReaderMgr.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/ReaderMgr.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ReaderMgr.cpp 2000/03/20 19:12:23 1.11
+++ ReaderMgr.cpp 2000/07/25 22:33:04 1.12
@@ -55,59 +55,7 @@
*/
/*
- * $Log: ReaderMgr.cpp,v $
- * Revision 1.11 2000/03/20 19:12:23 roddey
- * Fixed bug in getLastExtEntityInfo(), to avoid null pointer problem
- * if an error is thrown very early in the parsing process (e.g. before
- * any file can get opened.
- *
- * Revision 1.10 2000/03/02 19:54:28 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.9 2000/02/24 02:12:54 aruna1
- * ReaderMgr:;getReaderDepth() added
- *
- * Revision 1.8 2000/02/22 00:36:50 roddey
- * Added a new 'native XMLCh' transcoder to correctly handle
- * internal entities now that XMLCh isn't always UTF-16.
- *
- * Revision 1.7 2000/02/06 07:47:53 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.6 2000/01/25 01:04:21 roddey
- * Fixes a bogus error about ]]> in char data.
- *
- * Revision 1.5 2000/01/15 01:26:16 rahulj
- * Added support for HTTP to the parser using libWWW 5.2.8.
- * Renamed URL.[ch]pp to XMLURL.[ch]pp and like wise for the class name.
- * Only tested under NT 4.0 SP 5.
- * Removed URL.hpp from files where it was not used.
- *
- * Revision 1.4 2000/01/13 22:50:29 aruna1
- * For unix made additional check for relative url path
- *
- * Revision 1.3 2000/01/12 00:15:03 roddey
- * Changes to deal with multiply nested, relative pathed, entities and to deal
- * with the new URL class changes.
- *
- * Revision 1.2 1999/12/18 00:20:00 roddey
- * More changes to support the new, completely orthagonal, support for
- * intrinsic encodings.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:11 twl
- * Initial checkin
- *
- * Revision 1.4 1999/11/08 20:56:54 droddey
- * If the main xml entity does not exist, we need to get the error handling for that
- * inside the main XMLScanner::scanDocument() try block so that it gets reported
- * in the normal way. We have to add a little extra safety code because, when this
- * happens, there is no reader on the reader stack to get position ino from.
- *
- * Revision 1.3 1999/11/08 20:44:43 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id: ReaderMgr.cpp,v 1.12 2000/07/25 22:33:04 aruna1 Exp $
*/
// ---------------------------------------------------------------------------
@@ -119,6 +67,7 @@
#include <util/RuntimeException.hpp>
#include <util/UnexpectedEOFException.hpp>
#include <util/XMLURL.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <sax/InputSource.hpp>
#include <framework/LocalFileInputSource.hpp>
1.19 +2 -69 xml-xerces/c/src/internal/XMLReader.cpp
Index: XMLReader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLReader.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XMLReader.cpp 2000/07/08 00:17:13 1.18
+++ XMLReader.cpp 2000/07/25 22:33:05 1.19
@@ -55,79 +55,7 @@
*/
/*
- * $Log: XMLReader.cpp,v $
- * Revision 1.18 2000/07/08 00:17:13 andyh
- * Cleanup of yesterday's speedup changes. Merged new bit into the
- * scanner character properties table.
- *
- * Revision 1.17 2000/07/07 01:08:44 andyh
- * Parser speed up in scan of XML content.
- *
- * Revision 1.16 2000/07/06 21:00:51 jpolast
- * inlined getNextCharIfNot() for better performance
- *
- * Revision 1.15 2000/05/15 22:31:15 andyh
- * Replace #include<memory.h> with <string.h> everywhere.
- *
- * Revision 1.14 2000/05/11 23:11:33 andyh
- * Add missing validity checks for stand-alone documents, character range
- * and Well-formed parsed entities. Changes contributed by Sean MacRoibeaird
- * <se...@ireland.sun.com>
- *
- * Revision 1.13 2000/05/11 00:41:48 rahulj
- * Defect reported by SHOGO SAWAKI <sh...@mx.nasw.mhi.co.jp>
- *
- * Revision 1.12 2000/03/28 19:43:18 roddey
- * Fixes for signed/unsigned warnings. New work for two way transcoding
- * stuff.
- *
- * Revision 1.11 2000/03/17 23:59:53 roddey
- * Initial updates for two way transcoding support
- *
- * Revision 1.10 2000/03/02 19:54:29 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.9 2000/02/14 19:27:07 roddey
- * Make an EBCDIC file without an encoding="" string an error.
- *
- * Revision 1.8 2000/02/06 07:47:53 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.7 2000/01/25 22:49:54 roddey
- * Moved the supportsSrcOfs() method from the individual transcoder to the
- * transcoding service, where it should have been to begin with.
- *
- * Revision 1.6 2000/01/25 01:04:21 roddey
- * Fixes a bogus error about ]]> in char data.
- *
- * Revision 1.5 2000/01/22 00:01:07 roddey
- * Simple change to get rid of two hard coded 'x' type characters, which won't
- * work on EBCDIC systems.
- *
- * Revision 1.4 2000/01/12 23:52:45 roddey
- * These are trivial changes required to get the C++ and Java versions
- * of error messages more into sync. Mostly it was where the Java version
- * was passing out one or more parameter than the C++ version was. In
- * some cases the change just required an extra parameter to get the
- * needed info to the place where the error was issued.
- *
- * Revision 1.3 1999/12/18 00:20:00 roddey
- * More changes to support the new, completely orthagonal, support for
- * intrinsic encodings.
- *
- * Revision 1.2 1999/12/15 19:48:03 roddey
- * Changed to use new split of transcoder interfaces into XML transcoders and
- * LCP transcoders, and implementation of intrinsic transcoders as pluggable
- * transcoders, and addition of Latin1 intrinsic support.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:20 twl
- * Initial checkin
- *
- * Revision 1.4 1999/11/08 20:44:45 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id: XMLReader.cpp,v 1.19 2000/07/25 22:33:05 aruna1 Exp $
*/
// ---------------------------------------------------------------------------
@@ -142,6 +70,7 @@
#include <util/UTFDataFormatException.hpp>
#include <util/XMLEBCDICTranscoder.hpp>
#include <util/XMLString.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <sax/InputSource.hpp>
#include <framework/XMLBuffer.hpp>
1.13 +5 -0 xml-xerces/c/src/internal/XMLReader.hpp
Index: XMLReader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLReader.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLReader.hpp 2000/07/08 00:17:13 1.12
+++ XMLReader.hpp 2000/07/25 22:33:05 1.13
@@ -56,6 +56,9 @@
/*
* $Log: XMLReader.hpp,v $
+ * Revision 1.13 2000/07/25 22:33:05 aruna1
+ * Char definitions in XMLUni moved to XMLUniDefs
+ *
* Revision 1.12 2000/07/08 00:17:13 andyh
* Cleanup of yesterday's speedup changes. Merged new bit into the
* scanner character properties table.
@@ -109,6 +112,7 @@
#if !defined(XMLREADER_HPP)
#define XMLREADER_HPP
+#include <util/XMLUniDefs.hpp>
#include <framework/XMLRecognizer.hpp>
#include <framework/XMLBuffer.hpp>
1.22 +2 -99 xml-xerces/c/src/internal/XMLScanner.cpp
Index: XMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XMLScanner.cpp 2000/07/20 18:46:29 1.21
+++ XMLScanner.cpp 2000/07/25 22:33:05 1.22
@@ -55,109 +55,7 @@
*/
/*
- * $Log: XMLScanner.cpp,v $
- * Revision 1.21 2000/07/20 18:46:29 jpolast
- * bug fix: call startDocument() at beginning of scan.
- * submitted by Erik Schroeder
- *
- * Revision 1.20 2000/07/17 22:47:40 jpolast
- * switched scanMisc() with endDoc() in scanNext()
- * pointed out by Dean Roddey
- *
- * Revision 1.19 2000/07/17 19:11:20 jpolast
- * fix for uninitialized variable gotData bug and endDocument bug.
- * Submitted by Jim Reitz (jereitz@home.com)
- *
- * Revision 1.18 2000/05/11 23:11:33 andyh
- * Add missing validity checks for stand-alone documents, character range
- * and Well-formed parsed entities. Changes contributed by Sean MacRoibeaird
- * <se...@ireland.sun.com>
- *
- * Revision 1.17 2000/05/09 00:22:36 andyh
- * Memory Cleanup. XMLPlatformUtils::Terminate() deletes all lazily
- * allocated memory; memory leak checking tools will no longer report
- * that leaks exist. (DOM GetElementsByTagID temporarily removed
- * as part of this.)
- *
- * Revision 1.16 2000/05/05 01:44:29 rahulj
- * Fixed defect in progressive parsing 'parseNext()' reported by Tim
- * Johnston <ti...@gntsoftware.com>. Fix provided by Dean Roddey.
- *
- * Revision 1.15 2000/04/19 00:04:33 roddey
- * Don't allow spaces before PI target. Bug #42
- *
- * Revision 1.14 2000/04/12 22:58:28 roddey
- * Added support for 'auto validate' mode.
- *
- * Revision 1.13 2000/03/03 22:32:51 roddey
- * Fixed a bug in SimpleContentModel that allowed an <a/> to be taken
- * as valid for a content model of (a,b).
- *
- * Revision 1.12 2000/03/03 01:29:32 roddey
- * Added a scanReset()/parseReset() method to the scanner and
- * parsers, to allow for reset after early exit from a progressive parse.
- * Added calls to new Terminate() call to all of the samples. Improved
- * documentation in SAX and DOM parsers.
- *
- * Revision 1.11 2000/03/02 19:54:30 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.10 2000/02/29 22:54:46 aruna1
- * MultiThreaded problem for solaris with CC compiler resolved in
- * scanXMLDecl() function.
- *
- * Revision 1.9 2000/02/06 07:47:54 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.8 2000/01/19 00:55:45 roddey
- * Changes to get rid of dependence on old utils standard streams classes
- * and a small fix in the progressive parseFirst() call.
- *
- * Revision 1.7 2000/01/15 01:26:16 rahulj
- * Added support for HTTP to the parser using libWWW 5.2.8.
- * Renamed URL.[ch]pp to XMLURL.[ch]pp and like wise for the class name.
- * Only tested under NT 4.0 SP 5.
- * Removed URL.hpp from files where it was not used.
- *
- * Revision 1.6 2000/01/12 23:52:46 roddey
- * These are trivial changes required to get the C++ and Java versions
- * of error messages more into sync. Mostly it was where the Java version
- * was passing out one or more parameter than the C++ version was. In
- * some cases the change just required an extra parameter to get the
- * needed info to the place where the error was issued.
- *
- * Revision 1.5 2000/01/12 00:15:04 roddey
- * Changes to deal with multiply nested, relative pathed, entities and to
- * deal with the new URL class changes.
- *
- * Revision 1.4 1999/12/08 00:15:06 roddey
- * Some small last minute fixes to get into the 3.0.1 build that is going to
- * be going out anyway for platform fixes.
- *
- * Revision 1.3 1999/12/02 19:02:57 roddey
- * Get rid of a few statically defined XMLMutex objects, and lazy eval them
- * using atomic compare and swap. I somehow let it get by me that we don't
- * want any static/global objects at all.
- *
- * Revision 1.2 1999/11/30 20:23:13 roddey
- * Added changes to handle exceptions thrown from the user's handlers for
- * emitError().
- *
- * Revision 1.1.1.1 1999/11/09 01:08:22 twl
- * Initial checkin
- *
- * Revision 1.7 1999/11/08 20:56:54 droddey
- * If the main xml entity does not exist, we need to get the error handling
- * for that inside the main XMLScanner::scanDocument() try block so that it
- * gets reported in the normal way. We have to add a little extra safety
- * code because, when this happens, there is no reader on the reader stack
- * to get position ino from.
- *
- * Revision 1.6 1999/11/08 20:44:51 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id: XMLScanner.cpp,v 1.22 2000/07/25 22:33:05 aruna1 Exp $
*/
@@ -172,6 +70,7 @@
#include <util/UnexpectedEOFException.hpp>
#include <util/XMLDeleterFor.hpp>
#include <util/XMLMsgLoader.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <util/XMLURL.hpp>
#include <sax/InputSource.hpp>
1.16 +2 -67 xml-xerces/c/src/internal/XMLScanner2.cpp
Index: XMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner2.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XMLScanner2.cpp 2000/07/08 00:17:13 1.15
+++ XMLScanner2.cpp 2000/07/25 22:33:05 1.16
@@ -55,77 +55,7 @@
*/
/*
- * $Log: XMLScanner2.cpp,v $
- * Revision 1.15 2000/07/08 00:17:13 andyh
- * Cleanup of yesterday's speedup changes. Merged new bit into the
- * scanner character properties table.
- *
- * Revision 1.14 2000/07/07 01:08:44 andyh
- * Parser speed up in scan of XML content.
- *
- * Revision 1.13 2000/05/11 23:11:33 andyh
- * Add missing validity checks for stand-alone documents, character range
- * and Well-formed parsed entities. Changes contributed by Sean MacRoibeaird
- * <se...@ireland.sun.com>
- *
- * Revision 1.12 2000/04/12 22:58:28 roddey
- * Added support for 'auto validate' mode.
- *
- * Revision 1.11 2000/03/02 19:54:30 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.10 2000/02/06 07:47:54 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.9 2000/01/28 19:09:19 roddey
- * The API is no in place to allow client code to make sense of start/end entity
- * ref calls from attribute values. So supress them for now.
- *
- * Revision 1.8 2000/01/27 23:20:33 roddey
- * If an entity ends on the last > of some markup, then the end of entity
- * won't be sent because the end of entity is not sensed.
- *
- * Revision 1.7 2000/01/25 01:04:21 roddey
- * Fixes a bogus error about ]]> in char data.
- *
- * Revision 1.6 2000/01/15 01:26:16 rahulj
- * Added support for HTTP to the parser using libWWW 5.2.8.
- * Renamed URL.[ch]pp to XMLURL.[ch]pp and like wise for the class name.
- * Only tested under NT 4.0 SP 5.
- * Removed URL.hpp from files where it was not used.
- *
- * Revision 1.5 2000/01/12 23:52:46 roddey
- * These are trivial changes required to get the C++ and Java versions
- * of error messages more into sync. Mostly it was where the Java version
- * was passing out one or more parameter than the C++ version was. In
- * some cases the change just required an extra parameter to get the
- * needed info to the place where the error was issued.
- *
- * Revision 1.4 2000/01/12 00:15:04 roddey
- * Changes to deal with multiply nested, relative pathed, entities and to deal
- * with the new URL class changes.
- *
- * Revision 1.3 1999/12/18 00:20:24 roddey
- * Fixed a small reported memory leak
- *
- * Revision 1.2 1999/12/08 00:15:07 roddey
- * Some small last minute fixes to get into the 3.0.1 build that is going to be
- * going out anyway for platform fixes.
- *
- * Revision 1.1.1.1 1999/11/09 01:08:24 twl
- * Initial checkin
- *
- * Revision 1.6 1999/11/08 20:56:55 droddey
- * If the main xml entity does not exist, we need to get the error handling for that
- * inside the main XMLScanner::scanDocument() try block so that it gets reported
- * in the normal way. We have to add a little extra safety code because, when this
- * happens, there is no reader on the reader stack to get position ino from.
- *
- * Revision 1.5 1999/11/08 20:44:52 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
+ * $Id: XMLScanner2.cpp,v 1.16 2000/07/25 22:33:05 aruna1 Exp $
*/
@@ -142,6 +72,7 @@
#include <util/Janitor.hpp>
#include <util/PlatformUtils.hpp>
#include <util/UnexpectedEOFException.hpp>
+#include <util/XMLUniDefs.hpp>
#include <util/XMLUni.hpp>
#include <sax/InputSource.hpp>
#include <framework/XMLErrorReporter.hpp>