cargilld 2004/12/14 08:16:36
Modified: c/src/xercesc/internal DGXMLScanner.hpp IGXMLScanner.hpp
SGXMLScanner.hpp XMLScanner.hpp
Log:
Fix for xercesc-684: Add accessor to XMLScanner to get the current grammar
type.
Revision Changes Path
1.16 +9 -0 xml-xerces/c/src/xercesc/internal/DGXMLScanner.hpp
Index: DGXMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/DGXMLScanner.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DGXMLScanner.hpp 3 Dec 2004 19:40:30 -0000 1.15
+++ DGXMLScanner.hpp 14 Dec 2004 16:16:36 -0000 1.16
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.16 2004/12/14 16:16:36 cargilld
+ * Fix for xercesc-684: Add accessor to XMLScanner to get the current
grammar type.
+ *
* Revision 1.15 2004/12/03 19:40:30 cargilld
* Change call to resolveEntity to pass in public id so that only one call
to resolveEntity is needed (a follow-on to Alberto's fix).
*
@@ -130,6 +133,8 @@
, const bool toCache = false
);
+ virtual Grammar::GrammarType getCurrentGrammarType() const;
+
private :
//
-----------------------------------------------------------------------
// Unimplemented constructors and operators
@@ -242,6 +247,10 @@
return XMLUni::fgDGXMLScanner;
}
+inline Grammar::GrammarType DGXMLScanner::getCurrentGrammarType() const
+{
+ return Grammar::DTDGrammarType;
+}
XERCES_CPP_NAMESPACE_END
1.25 +10 -0 xml-xerces/c/src/xercesc/internal/IGXMLScanner.hpp
Index: IGXMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- IGXMLScanner.hpp 3 Dec 2004 19:40:30 -0000 1.24
+++ IGXMLScanner.hpp 14 Dec 2004 16:16:36 -0000 1.25
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.25 2004/12/14 16:16:36 cargilld
+ * Fix for xercesc-684: Add accessor to XMLScanner to get the current
grammar type.
+ *
* Revision 1.24 2004/12/03 19:40:30 cargilld
* Change call to resolveEntity to pass in public id so that only one call
to resolveEntity is needed (a follow-on to Alberto's fix).
*
@@ -169,6 +172,8 @@
, const bool toCache = false
);
+ virtual Grammar::GrammarType getCurrentGrammarType() const;
+
private :
//
-----------------------------------------------------------------------
// Unimplemented constructors and operators
@@ -368,6 +373,11 @@
inline bool IGXMLScanner::toCheckIdentityConstraint() const
{
return fValidate && fIdentityConstraintChecking && fICHandler;
+}
+
+inline Grammar::GrammarType IGXMLScanner::getCurrentGrammarType() const
+{
+ return fGrammarType;
}
XERCES_CPP_NAMESPACE_END
1.23 +9 -0 xml-xerces/c/src/xercesc/internal/SGXMLScanner.hpp
Index: SGXMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SGXMLScanner.hpp 3 Dec 2004 19:40:30 -0000 1.22
+++ SGXMLScanner.hpp 14 Dec 2004 16:16:36 -0000 1.23
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.23 2004/12/14 16:16:36 cargilld
+ * Fix for xercesc-684: Add accessor to XMLScanner to get the current
grammar type.
+ *
* Revision 1.22 2004/12/03 19:40:30 cargilld
* Change call to resolveEntity to pass in public id so that only one call
to resolveEntity is needed (a follow-on to Alberto's fix).
*
@@ -161,6 +164,7 @@
, const short grammarType
, const bool toCache = false
);
+ virtual Grammar::GrammarType getCurrentGrammarType() const;
protected:
//
-----------------------------------------------------------------------
@@ -361,6 +365,11 @@
inline bool SGXMLScanner::toCheckIdentityConstraint() const
{
return fValidate && fIdentityConstraintChecking && fICHandler;
+}
+
+inline Grammar::GrammarType SGXMLScanner::getCurrentGrammarType() const
+{
+ return fGrammarType;
}
XERCES_CPP_NAMESPACE_END
1.47 +11 -0 xml-xerces/c/src/xercesc/internal/XMLScanner.hpp
Index: XMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner.hpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- XMLScanner.hpp 9 Dec 2004 20:31:39 -0000 1.46
+++ XMLScanner.hpp 14 Dec 2004 16:16:36 -0000 1.47
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.47 2004/12/14 16:16:36 cargilld
+ * Fix for xercesc-684: Add accessor to XMLScanner to get the current
grammar type.
+ *
* Revision 1.46 2004/12/09 20:31:39 knoaman
* DOM L3: pass schema normalized value only when datatype-normalization
feature
* is enabled.
@@ -465,6 +468,8 @@
return true;
}
+ virtual Grammar::GrammarType getCurrentGrammarType() const;
+
//
-----------------------------------------------------------------------
// Public pure virtual methods
//
-----------------------------------------------------------------------
@@ -1610,6 +1615,11 @@
}
}
+}
+
+inline Grammar::GrammarType XMLScanner::getCurrentGrammarType() const
+{
+ return Grammar::UnKnown;
}
XERCES_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
