You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/02/27 19:32:38 UTC
cvs commit: xml-xerces/c/src/validators/common DFAContentModel.cpp DFAContentModel.hpp MixedContentModel.cpp MixedContentModel.hpp
tng 01/02/27 10:32:37
Modified: c/src/validators/common DFAContentModel.cpp
DFAContentModel.hpp MixedContentModel.cpp
MixedContentModel.hpp
Log:
Schema: Use XMLElementDecl instead of DTDElementDecl in Content Model.
Revision Changes Path
1.4 +5 -2 xml-xerces/c/src/validators/common/DFAContentModel.cpp
Index: DFAContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/DFAContentModel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DFAContentModel.cpp 2001/02/27 14:48:51 1.3
+++ DFAContentModel.cpp 2001/02/27 18:32:31 1.4
@@ -56,6 +56,9 @@
/*
* $Log: DFAContentModel.cpp,v $
+ * Revision 1.4 2001/02/27 18:32:31 tng
+ * Schema: Use XMLElementDecl instead of DTDElementDecl in Content Model.
+ *
* Revision 1.3 2001/02/27 14:48:51 tng
* Schema: Add CMAny and ContentLeafNameTypeVector, by Pei Yong Zhang
*
@@ -98,12 +101,12 @@
// ---------------------------------------------------------------------------
#include <util/RuntimeException.hpp>
#include <framework/XMLValidator.hpp>
+#include <framework/XMLElementDecl.hpp>
#include <validators/common/CMBinaryOp.hpp>
#include <validators/common/CMLeaf.hpp>
#include <validators/common/CMUnaryOp.hpp>
#include <validators/common/DFAContentModel.hpp>
#include <validators/common/ContentSpecNode.hpp>
-#include <validators/DTD/DTDElementDecl.hpp>
// ---------------------------------------------------------------------------
@@ -127,7 +130,7 @@
// ---------------------------------------------------------------------------
// DFAContentModel: Constructors and Destructor
// ---------------------------------------------------------------------------
-DFAContentModel::DFAContentModel(const DTDElementDecl& elemDecl) :
+DFAContentModel::DFAContentModel(const XMLElementDecl& elemDecl) :
fElemDecl(elemDecl)
, fElemMap(0)
1.3 +6 -3 xml-xerces/c/src/validators/common/DFAContentModel.hpp
Index: DFAContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/DFAContentModel.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DFAContentModel.hpp 2001/02/27 14:48:52 1.2
+++ DFAContentModel.hpp 2001/02/27 18:32:32 1.3
@@ -56,6 +56,9 @@
/*
* $Log: DFAContentModel.hpp,v $
+ * Revision 1.3 2001/02/27 18:32:32 tng
+ * Schema: Use XMLElementDecl instead of DTDElementDecl in Content Model.
+ *
* Revision 1.2 2001/02/27 14:48:52 tng
* Schema: Add CMAny and ContentLeafNameTypeVector, by Pei Yong Zhang
*
@@ -93,7 +96,7 @@
class CMLeaf;
class CMNode;
class CMStateSet;
-class DTDElementDecl;
+class XMLElementDecl;
//
// DFAContentModel is the heavy weight derivative of ContentModel that does
@@ -113,7 +116,7 @@
// -----------------------------------------------------------------------
// Constructors and Destructor
// -----------------------------------------------------------------------
- DFAContentModel(const DTDElementDecl& elemDecl);
+ DFAContentModel(const XMLElementDecl& elemDecl);
virtual ~DFAContentModel();
@@ -241,7 +244,7 @@
// fTransTableSize is the number of valid entries in the transition
// table, and in the other related tables such as fFinalStateFlags.
// -----------------------------------------------------------------------
- const DTDElementDecl& fElemDecl;
+ const XMLElementDecl& fElemDecl;
unsigned int* fElemMap;
unsigned int fElemMapSize;
bool fEmptyOk;
1.4 +4 -2 xml-xerces/c/src/validators/common/MixedContentModel.cpp
Index: MixedContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/MixedContentModel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MixedContentModel.cpp 2001/02/27 14:48:54 1.3
+++ MixedContentModel.cpp 2001/02/27 18:32:32 1.4
@@ -56,6 +56,9 @@
/*
* $Log: MixedContentModel.cpp,v $
+ * Revision 1.4 2001/02/27 18:32:32 tng
+ * Schema: Use XMLElementDecl instead of DTDElementDecl in Content Model.
+ *
* Revision 1.3 2001/02/27 14:48:54 tng
* Schema: Add CMAny and ContentLeafNameTypeVector, by Pei Yong Zhang
*
@@ -98,7 +101,6 @@
#include <framework/XMLElementDecl.hpp>
#include <framework/XMLValidator.hpp>
#include <validators/common/ContentSpecNode.hpp>
-#include <validators/DTD/DTDElementDecl.hpp>
#include <validators/common/MixedContentModel.hpp>
#include <validators/common/CMStateSet.hpp>
@@ -106,7 +108,7 @@
// ---------------------------------------------------------------------------
// MixedContentModel: Constructors and Destructor
// ---------------------------------------------------------------------------
-MixedContentModel::MixedContentModel(const DTDElementDecl& parentElem)
+MixedContentModel::MixedContentModel(const XMLElementDecl& parentElem)
{
//
// Create a vector of unsigned ints that will be filled in with the
1.3 +5 -2 xml-xerces/c/src/validators/common/MixedContentModel.hpp
Index: MixedContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/MixedContentModel.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MixedContentModel.hpp 2001/02/27 14:48:55 1.2
+++ MixedContentModel.hpp 2001/02/27 18:32:33 1.3
@@ -56,6 +56,9 @@
/*
* $Log: MixedContentModel.hpp,v $
+ * Revision 1.3 2001/02/27 18:32:33 tng
+ * Schema: Use XMLElementDecl instead of DTDElementDecl in Content Model.
+ *
* Revision 1.2 2001/02/27 14:48:55 tng
* Schema: Add CMAny and ContentLeafNameTypeVector, by Pei Yong Zhang
*
@@ -86,7 +89,7 @@
#include <validators/common/ContentLeafNameTypeVector.hpp>
class ContentSpecNode;
-class DTDElementDecl;
+class XMLElementDecl;
//
@@ -110,7 +113,7 @@
// -----------------------------------------------------------------------
MixedContentModel
(
- const DTDElementDecl& parentElem
+ const XMLElementDecl& parentElem
);
~MixedContentModel();