You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by bo...@apache.org on 2010/03/18 15:57:13 UTC
svn commit: r924841 - in /xerces/c/trunk/src/xercesc/validators/schema:
SchemaGrammar.cpp SchemaGrammar.hpp SchemaInfo.cpp SchemaInfo.hpp
TraverseSchema.cpp
Author: borisk
Date: Thu Mar 18 14:57:13 2010
New Revision: 924841
URL: http://svn.apache.org/viewvc?rev=924841&view=rev
Log:
Set scanner object on validation context. Needed during QName validation.
Modified:
xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.cpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.hpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaInfo.cpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaInfo.hpp
xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.cpp?rev=924841&r1=924840&r2=924841&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.cpp Thu Mar 18 14:57:13 2010
@@ -32,7 +32,6 @@
#include <xercesc/framework/psvi/XSAnnotation.hpp>
#include <xercesc/internal/XTemplateSerializer.hpp>
-#include <xercesc/internal/ValidationContextImpl.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -52,7 +51,6 @@ SchemaGrammar::SchemaGrammar(MemoryManag
, fGroupInfoRegistry(0)
, fAttGroupInfoRegistry(0)
, fValidSubstitutionGroups(0)
- , fValidationContext(0)
, fMemoryManager(manager)
, fGramDesc(0)
, fAnnotations(0)
@@ -77,7 +75,6 @@ SchemaGrammar::SchemaGrammar(MemoryManag
// fElemNonDeclPool = new (fMemoryManager) RefHash3KeysIdPool<SchemaElementDecl>(29, true, 128, fMemoryManager);
fGroupElemDeclPool = new (fMemoryManager) RefHash3KeysIdPool<SchemaElementDecl>(109, false, 128, fMemoryManager);
fNotationDeclPool = new (fMemoryManager) NameIdPool<XMLNotationDecl>(109, 128, fMemoryManager);
- fValidationContext = new (fMemoryManager) ValidationContextImpl(fMemoryManager);
//REVISIT: use grammarPool to create
fGramDesc = new (fMemoryManager) XMLSchemaDescriptionImpl(XMLUni::fgXMLNSURIName, fMemoryManager);
@@ -205,7 +202,6 @@ void SchemaGrammar::cleanUp()
delete fGroupInfoRegistry;
delete fAttGroupInfoRegistry;
delete fValidSubstitutionGroups;
- delete fValidationContext;
delete fGramDesc;
delete fAnnotations;
}
@@ -251,8 +247,7 @@ void SchemaGrammar::serialize(XSerialize
{
/***
- * don't serialize ValidationContext* fValidationContext;
- * fElemNonDeclPool
+ * don't serialize fElemNonDeclPool
***/
Grammar::serialize(serEng);
Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.hpp?rev=924841&r1=924840&r2=924841&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.hpp Thu Mar 18 14:57:13 2010
@@ -32,7 +32,6 @@
#include <xercesc/validators/datatype/IDDatatypeValidator.hpp>
#include <xercesc/validators/datatype/DatatypeValidatorFactory.hpp>
#include <xercesc/framework/XMLSchemaDescription.hpp>
-#include <xercesc/framework/ValidationContext.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -170,9 +169,6 @@ public:
DatatypeValidatorFactory* getDatatypeRegistry();
RefHash2KeysTableOf<ElemVector>* getValidSubstitutionGroups() const;
- // @deprecated
- ValidationContext* getValidationContext() const;
-
// -----------------------------------------------------------------------
// Setter methods
// -----------------------------------------------------------------------
@@ -330,8 +326,6 @@ private:
RefHashTableOf<XercesGroupInfo>* fGroupInfoRegistry;
RefHashTableOf<XercesAttGroupInfo>* fAttGroupInfoRegistry;
RefHash2KeysTableOf<ElemVector>* fValidSubstitutionGroups;
- // @deprecated
- ValidationContext* fValidationContext;
MemoryManager* fMemoryManager;
XMLSchemaDescription* fGramDesc;
RefHashTableOf<XSAnnotation, PtrHasher>* fAnnotations;
@@ -393,12 +387,6 @@ SchemaGrammar::getValidSubstitutionGroup
return fValidSubstitutionGroups;
}
-// @deprecated
-inline ValidationContext* SchemaGrammar::getValidationContext() const {
-
- return fValidationContext;
-}
-
inline XMLGrammarDescription* SchemaGrammar::getGrammarDescription() const
{
return fGramDesc;
Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaInfo.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaInfo.cpp?rev=924841&r1=924840&r2=924841&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaInfo.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaInfo.cpp Thu Mar 18 14:57:13 2010
@@ -42,6 +42,7 @@ SchemaInfo::SchemaInfo(const unsigned sh
const XMLCh* const schemaURL,
const XMLCh* const targetNSURIString,
const DOMElement* const root,
+ XMLScanner* xmlScanner,
MemoryManager* const manager)
: fAdoptInclude(false)
, fProcessed(false)
@@ -78,6 +79,7 @@ SchemaInfo::SchemaInfo(const unsigned sh
fCurrentSchemaURL = XMLString::replicate(schemaURL, fMemoryManager);
fTargetNSURIString = XMLString::replicate(targetNSURIString, fMemoryManager);
+ fValidationContext->setScanner (xmlScanner);
fValidationContext->setNamespaceScope(fNamespaceScope);
}
Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaInfo.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaInfo.hpp?rev=924841&r1=924840&r2=924841&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/SchemaInfo.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/SchemaInfo.hpp Thu Mar 18 14:57:13 2010
@@ -48,6 +48,7 @@ XERCES_CPP_NAMESPACE_BEGIN
// ---------------------------------------------------------------------------
// Forward Declarations
// ---------------------------------------------------------------------------
+class XMLScanner;
class ValidationContext;
class NamespaceScope;
@@ -84,6 +85,7 @@ public:
const XMLCh* const schemaURL,
const XMLCh* const targetNSURIString,
const DOMElement* const root,
+ XMLScanner* xmlScanner,
MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
~SchemaInfo();
Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp?rev=924841&r1=924840&r2=924841&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Thu Mar 18 14:57:13 2010
@@ -379,6 +379,7 @@ void TraverseSchema::preprocessSchema(DO
fSchemaInfo?fSchemaInfo->getNamespaceScope():NULL,
schemaURL,
fTargetNSURIString, schemaRoot,
+ fScanner,
fGrammarPoolMemoryManager);
if (fSchemaInfo)
@@ -688,6 +689,7 @@ void TraverseSchema::preprocessInclude(c
fSchemaInfo->getNamespaceScope(),
includeURL,
fTargetNSURIString, root,
+ fScanner,
fGrammarPoolMemoryManager);
fSchemaInfoList->put((void*) fSchemaInfo->getCurrentSchemaURL(),
@@ -8240,6 +8242,7 @@ bool TraverseSchema::openRedefinedSchema
fSchemaInfo->getNamespaceScope(),
includeURL,
fTargetNSURIString, root,
+ fScanner,
fGrammarPoolMemoryManager));
fSchemaInfo = newSchemaInfo.get();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org