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 2008/06/27 15:57:01 UTC
svn commit: r672273 [1/2] - in /xerces/c/trunk/src/xercesc: framework/
framework/psvi/ internal/ parsers/ sax/ validators/schema/ xinclude/
Author: borisk
Date: Fri Jun 27 06:57:00 2008
New Revision: 672273
URL: http://svn.apache.org/viewvc?rev=672273&view=rev
Log:
Use XMLFileLoc consistently to represent line/column. Clean up the SAX interface to use XMLSize_t instead of int/long.
Modified:
xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp
xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp
xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp
xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp
xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.cpp
xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.hpp
xerces/c/trunk/src/xercesc/internal/XMLReader.cpp
xerces/c/trunk/src/xercesc/internal/XMLReader.hpp
xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp
xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp
xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp
xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp
xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp
xerces/c/trunk/src/xercesc/sax/AttributeList.hpp
xerces/c/trunk/src/xercesc/sax/Locator.hpp
xerces/c/trunk/src/xercesc/sax/SAXParseException.cpp
xerces/c/trunk/src/xercesc/sax/SAXParseException.hpp
xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp
xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp
xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.cpp
xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.hpp
xerces/c/trunk/src/xercesc/xinclude/XIncludeUtils.cpp
Modified: xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLErrorReporter.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -121,8 +121,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const unsigned long lineNum
- , const unsigned long colNum
+ , const XMLFileLoc lineNum
+ , const XMLFileLoc colNum
) = 0;
/** Called before a new parse event to allow the handler to reset
Modified: xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/psvi/XSAnnotation.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
* This class describes all properties of a Schema Annotation
* component.
* This is *always* owned by the validator /parser object from which
- * it is obtained.
+ * it is obtained.
*/
// forward declarations
@@ -60,7 +60,7 @@
//@{
/**
- * The default constructor
+ * The default constructor
*
* @param contents The string that is to be the content of this XSAnnotation
* @param manager The configurable memory manager
@@ -84,24 +84,24 @@
//@{
/**
- * Write contents of the annotation to the specified DOM object. In-scope
- * namespace declarations for <code>annotation</code> element are added as
- * attribute nodes of the serialized <code>annotation</code>.
+ * Write contents of the annotation to the specified DOM object. In-scope
+ * namespace declarations for <code>annotation</code> element are added as
+ * attribute nodes of the serialized <code>annotation</code>.
* @param node A target pointer to the annotation target object, i.e.
- * either <code>DOMDocument</code> or <code>DOMElement</code> cast as
- * <code>DOMNode</code>.
- * @param targetType A target type.
+ * either <code>DOMDocument</code> or <code>DOMElement</code> cast as
+ * <code>DOMNode</code>.
+ * @param targetType A target type.
*/
-
- void writeAnnotation(DOMNode* node, ANNOTATION_TARGET targetType);
+
+ void writeAnnotation(DOMNode* node, ANNOTATION_TARGET targetType);
/**
- * Write contents of the annotation to the specified object.
- * The corresponding events for all in-scope namespace declarations are
- * sent via the specified document handler.
- * @param handler A target pointer to the annotation target object, i.e.
+ * Write contents of the annotation to the specified object.
+ * The corresponding events for all in-scope namespace declarations are
+ * sent via the specified document handler.
+ * @param handler A target pointer to the annotation target object, i.e.
* <code>ContentHandler</code>.
- */
+ */
void writeAnnotation(ContentHandler* handler);
/**
@@ -122,15 +122,15 @@
//-----------------------------
/** Getter */
//@{
- inline void getLineCol(unsigned long& line, unsigned long& col) const;
- inline const XMLCh* getSystemId() const;
+ inline void getLineCol(XMLFileLoc& line, XMLFileLoc& col) const;
+ inline const XMLCh* getSystemId() const;
//@}
//-----------------------------
/** Setter */
//@{
- inline void setLineCol(unsigned long line, unsigned long col);
- void setSystemId(const XMLCh* const systemId);
+ inline void setLineCol(XMLFileLoc line, XMLFileLoc col);
+ void setSystemId(const XMLCh* const systemId);
//@}
/***
@@ -158,8 +158,8 @@
private:
XMLCh* fSystemId;
- unsigned long fLine;
- unsigned long fCol;
+ XMLFileLoc fLine;
+ XMLFileLoc fCol;
};
@@ -173,7 +173,7 @@
return fContents;
}
-inline void XSAnnotation::getLineCol(unsigned long& line, unsigned long& col) const
+inline void XSAnnotation::getLineCol(XMLFileLoc& line, XMLFileLoc& col) const
{
line = fLine;
col = fCol;
@@ -184,7 +184,7 @@
return fSystemId;
}
-inline void XSAnnotation::setLineCol(unsigned long line, unsigned long col)
+inline void XSAnnotation::setLineCol(XMLFileLoc line, XMLFileLoc col)
{
fLine = line;
fCol = col;
Modified: xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/ReaderMgr.cpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -352,7 +352,7 @@
XMLReader* ReaderMgr::createReader( const InputSource& src
- , const bool
+ , const bool
, const XMLReader::RefFrom refFrom
, const XMLReader::Types type
, const XMLReader::Sources source
@@ -444,7 +444,7 @@
, const bool calcSrcOfs
, const bool disableDefaultEntityResolution)
{
- //Normalize sysId
+ //Normalize sysId
XMLBuffer normalizedSysId(1023, fMemoryManager);
if(sysId)
XMLString::removeChar(sysId, 0xFFFF, normalizedSysId);
@@ -493,7 +493,7 @@
// Keep this #if 0 block as it was exposing a threading problem on AIX.
// Got rid of the problem by changing XMLURL to not throw malformedurl
-// exceptions.
+// exceptions.
#if 0
try
{
@@ -545,14 +545,14 @@
);
}
else
- ThrowXMLwithMemMgr(MalformedURLException, XMLExcepts::URL_MalformedURL, fMemoryManager);
+ ThrowXMLwithMemMgr(MalformedURLException, XMLExcepts::URL_MalformedURL, fMemoryManager);
}
else
{
if (fStandardUriConformant && urlTmp.hasInvalidChar())
ThrowXMLwithMemMgr(MalformedURLException, XMLExcepts::URL_MalformedURL, fMemoryManager);
srcToFill = new (fMemoryManager) URLInputSource(urlTmp, fMemoryManager);
- }
+ }
#endif
}
@@ -597,7 +597,7 @@
, const bool calcSrcOfs
, const bool disableDefaultEntityResolution)
{
- //Normalize sysId
+ //Normalize sysId
XMLBuffer normalizedSysId(1023, fMemoryManager);
XMLString::removeChar(sysId, 0xFFFF, normalizedSysId);
const XMLCh* normalizedURI = normalizedSysId.getRawBuffer();
@@ -664,14 +664,14 @@
);
}
else
- ThrowXMLwithMemMgr(MalformedURLException, XMLExcepts::URL_MalformedURL, fMemoryManager);
+ ThrowXMLwithMemMgr(MalformedURLException, XMLExcepts::URL_MalformedURL, fMemoryManager);
}
else
{
if (fStandardUriConformant && urlTmp.hasInvalidChar())
ThrowXMLwithMemMgr(MalformedURLException, XMLExcepts::URL_MalformedURL, fMemoryManager);
srcToFill = new (fMemoryManager) URLInputSource(urlTmp, fMemoryManager);
- }
+ }
}
// Put a janitor on the input source
@@ -950,7 +950,7 @@
return getLastExtEntity(theEntity)->getSystemId();
}
-unsigned long ReaderMgr::getColumnNumber() const
+XMLFileLoc ReaderMgr::getColumnNumber() const
{
if (!fReaderStack && !fCurReader)
return 0;
@@ -959,7 +959,7 @@
return getLastExtEntity(theEntity)->getColumnNumber();
}
-unsigned long ReaderMgr::getLineNumber() const
+XMLFileLoc ReaderMgr::getLineNumber() const
{
if (!fReaderStack && !fCurReader)
return 0;
Modified: xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/ReaderMgr.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,7 +45,7 @@
// talks to the reader manager, which handles the stack and popping off
// used up readers.
// ---------------------------------------------------------------------------
-class XMLPARSER_EXPORT ReaderMgr : public XMemory
+class XMLPARSER_EXPORT ReaderMgr : public XMemory
, public Locator
{
public :
@@ -56,8 +56,8 @@
{
const XMLCh* systemId;
const XMLCh* publicId;
- unsigned long lineNumber;
- unsigned long colNumber;
+ XMLFileLoc lineNumber;
+ XMLFileLoc colNumber;
};
@@ -185,8 +185,8 @@
// -----------------------------------------------------------------------
virtual const XMLCh* getPublicId() const;
virtual const XMLCh* getSystemId() const;
- virtual unsigned long getLineNumber() const;
- virtual unsigned long getColumnNumber() const;
+ virtual XMLFileLoc getLineNumber() const;
+ virtual XMLFileLoc getColumnNumber() const;
private :
@@ -353,7 +353,7 @@
{
// Get chars until we find the one to skip
nextCh = getNextChar();
- }
+ }
// Break out at end of input or the char to skip
while((nextCh != toSkipTo) && nextCh!=0);
}
@@ -365,7 +365,7 @@
{
// Get chars until we find the one to skip
nextCh = getNextChar();
- }
+ }
while((nextCh != toSkipPast) && nextCh!=0);
}
@@ -412,7 +412,7 @@
private :
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
- // -----------------------------------------------------------------------
+ // -----------------------------------------------------------------------
ThrowEOEJanitor(const ThrowEOEJanitor&);
ThrowEOEJanitor& operator=(const ThrowEOEJanitor&);
Modified: xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.cpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.cpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -53,12 +53,12 @@
// ---------------------------------------------------------------------------
// Implementation of the attribute list interface
// ---------------------------------------------------------------------------
-unsigned int VecAttrListImpl::getLength() const
+XMLSize_t VecAttrListImpl::getLength() const
{
return fCount;
}
-const XMLCh* VecAttrListImpl::getName(const unsigned int index) const
+const XMLCh* VecAttrListImpl::getName(const XMLSize_t index) const
{
if (index >= fCount) {
return 0;
@@ -66,7 +66,7 @@
return fVector->elementAt(index)->getQName();
}
-const XMLCh* VecAttrListImpl::getType(const unsigned int index) const
+const XMLCh* VecAttrListImpl::getType(const XMLSize_t index) const
{
if (index >= fCount) {
return 0;
@@ -74,7 +74,7 @@
return XMLAttDef::getAttTypeString(fVector->elementAt(index)->getType(), fVector->getMemoryManager());
}
-const XMLCh* VecAttrListImpl::getValue(const unsigned int index) const
+const XMLCh* VecAttrListImpl::getValue(const XMLSize_t index) const
{
if (index >= fCount) {
return 0;
@@ -88,7 +88,7 @@
// Search the vector for the attribute with the given name and return
// its type.
//
- for (unsigned int index = 0; index < fCount; index++)
+ for (XMLSize_t index = 0; index < fCount; index++)
{
const XMLAttr* curElem = fVector->elementAt(index);
@@ -104,7 +104,7 @@
// Search the vector for the attribute with the given name and return
// its type.
//
- for (unsigned int index = 0; index < fCount; index++)
+ for (XMLSize_t index = 0; index < fCount; index++)
{
const XMLAttr* curElem = fVector->elementAt(index);
@@ -124,7 +124,7 @@
// Search the vector for the attribute with the given name and return
// its type.
//
- for (unsigned int index = 0; index < fCount; index++)
+ for (XMLSize_t index = 0; index < fCount; index++)
{
const XMLAttr* curElem = fVector->elementAt(index);
@@ -140,7 +140,7 @@
// Setter methods
// ---------------------------------------------------------------------------
void VecAttrListImpl::setVector(const RefVectorOf<XMLAttr>* const srcVec
- , const unsigned int count
+ , const XMLSize_t count
, const bool adopt)
{
//
Modified: xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/VecAttrListImpl.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,10 +41,10 @@
// -----------------------------------------------------------------------
// Implementation of the attribute list interface
// -----------------------------------------------------------------------
- virtual unsigned int getLength() const;
- virtual const XMLCh* getName(const unsigned int index) const;
- virtual const XMLCh* getType(const unsigned int index) const;
- virtual const XMLCh* getValue(const unsigned int index) const;
+ virtual XMLSize_t getLength() const;
+ virtual const XMLCh* getName(const XMLSize_t index) const;
+ virtual const XMLCh* getType(const XMLSize_t index) const;
+ virtual const XMLCh* getValue(const XMLSize_t index) const;
virtual const XMLCh* getType(const XMLCh* const name) const;
virtual const XMLCh* getValue(const XMLCh* const name) const;
virtual const XMLCh* getValue(const char* const name) const;
@@ -56,7 +56,7 @@
void setVector
(
const RefVectorOf<XMLAttr>* const srcVec
- , const unsigned int count
+ , const XMLSize_t count
, const bool adopt = false
);
@@ -87,7 +87,7 @@
// The vector that provides the backing for the list.
// -----------------------------------------------------------------------
bool fAdopt;
- unsigned int fCount;
+ XMLSize_t fCount;
const RefVectorOf<XMLAttr>* fVector;
};
Modified: xerces/c/trunk/src/xercesc/internal/XMLReader.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLReader.cpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLReader.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLReader.cpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -111,7 +111,7 @@
, fSource(source)
, fSrcOfsBase(0)
, fSrcOfsSupported(false)
- , fCalculateSrcOfs(calculateSrcOfs)
+ , fCalculateSrcOfs(calculateSrcOfs)
, fSystemId(XMLString::replicate(sysId, manager))
, fStream(streamToAdopt)
, fSwapped(false)
@@ -192,7 +192,7 @@
, fSource(source)
, fSrcOfsBase(0)
, fSrcOfsSupported(false)
- , fCalculateSrcOfs(calculateSrcOfs)
+ , fCalculateSrcOfs(calculateSrcOfs)
, fSystemId(XMLString::replicate(sysId, manager))
, fStream(streamToAdopt)
, fSwapped(false)
@@ -366,7 +366,7 @@
, fSource(source)
, fSrcOfsBase(0)
, fSrcOfsSupported(false)
- , fCalculateSrcOfs(calculateSrcOfs)
+ , fCalculateSrcOfs(calculateSrcOfs)
, fSystemId(XMLString::replicate(sysId, manager))
, fStream(streamToAdopt)
, fSwapped(false)
@@ -461,7 +461,7 @@
}
if( fCharIndex < fCharsAvail ) {
-
+
return (fSrcOfsBase + fCharOfsBuf[fCharIndex]);
}
@@ -665,7 +665,7 @@
break;
fCharIndex += 2;
- }
+ }
else
{
if (!isNameChar(fCharBuf[fCharIndex]))
@@ -687,7 +687,7 @@
// we have to copy the accepted character(s), and update column
if (fCharIndex != charIndex_start)
{
- fCurCol += (unsigned long)(fCharIndex - charIndex_start);
+ fCurCol += (XMLFileLoc)(fCharIndex - charIndex_start);
toFill.append(&fCharBuf[charIndex_start], fCharIndex - charIndex_start);
}
@@ -729,7 +729,7 @@
// Lets check the first char for being a first name char. If not, then
// what's the point in living mannnn? Just give up now. We only do this
// if its a name and not a name token that they want.
- if (fXMLVersion == XMLV1_1
+ if (fXMLVersion == XMLV1_1
&& ((fCharBuf[fCharIndex] >= 0xD800) && (fCharBuf[fCharIndex] <= 0xDB7F))) {
// make sure one more char is in the buffer, the transcoder
// should put only a complete surrogate pair into the buffer
@@ -777,7 +777,7 @@
// we have to copy the accepted character(s), and update column
if (fCharIndex != charIndex_start)
{
- fCurCol += (unsigned long)(fCharIndex - charIndex_start);
+ fCurCol += (XMLFileLoc)(fCharIndex - charIndex_start);
toFill.append(&fCharBuf[charIndex_start], fCharIndex - charIndex_start);
}
@@ -966,8 +966,8 @@
bool XMLReader::skipSpaces(bool& skippedSomething, bool inDecl)
{
// Remember the current line and column
- unsigned long orgLine = fCurLine;
- unsigned long orgCol = fCurCol;
+ XMLFileLoc orgLine = fCurLine;
+ XMLFileLoc orgCol = fCurCol;
// We enter a loop where we skip over spaces until we hit the end of
// this reader or a non-space value. The return indicates whether we
@@ -1110,7 +1110,7 @@
const XMLSize_t srcLen = XMLString::stringLen(toSkip);
XMLSize_t charsLeft = charsLeftInBuffer();
- if (srcLen <= fCharsAvail) {
+ if (srcLen <= fCharsAvail) {
//
// See if the current reader has enough chars to test against this
// string. If not, then ask it to reload its buffer. If that does not
@@ -1119,7 +1119,7 @@
// NOTE: This works because strings never have to cross a reader! And
// a string to skip will never have a new line in it, so we will never
// miss adjusting the current line.
- //
+ //
while (charsLeft < srcLen)
{
refreshCharBuffer();
@@ -1143,7 +1143,7 @@
// source len to it.
//
fCharIndex += srcLen;
- }
+ }
else {
if (charsLeft == 0) {
refreshCharBuffer();
@@ -1155,7 +1155,7 @@
return false;
fCharIndex += charsLeft;
-
+
XMLSize_t offset = charsLeft;
XMLSize_t remainingLen = srcLen - charsLeft;
@@ -1177,7 +1177,7 @@
}
// Add the source length to the current column to get it back right
- fCurCol += (unsigned long)srcLen;
+ fCurCol += (XMLFileLoc)srcLen;
return true;
}
@@ -1330,7 +1330,7 @@
if (newBaseEncoding == XMLRecognizer::OtherEncoding)
{
//
- // We already know it's none of those non-endian special cases,
+ // We already know it's none of those non-endian special cases,
// so just replicate the new name and use it directly to create the transcoder
//
fMemoryManager->deallocate(fEncodingStr);
@@ -1658,7 +1658,7 @@
default :
// It should never be anything else here
fMemoryManager->deallocate(fPublicId);
- fMemoryManager->deallocate(fEncodingStr);
+ fMemoryManager->deallocate(fEncodingStr);
fMemoryManager->deallocate(fSystemId);
ThrowXMLwithMemMgr(TranscodingException, XMLExcepts::Reader_BadAutoEncoding, fMemoryManager);
break;
@@ -1672,7 +1672,7 @@
//
if ((fType == Type_PE) && (fRefFrom == RefFrom_NonLiteral))
fCharBuf[fCharsAvail++] = chSpace;
-
+
// Calculate fCharOfsBuf buffer using the elements from fCharBufSize
if (fCalculateSrcOfs)
{
@@ -1724,7 +1724,7 @@
// trancoded character buffer. We transcode up to another maxChars chars
// from the
//
-XMLSize_t
+XMLSize_t
XMLReader::xcodeMoreChars( XMLCh* const bufToFill
, unsigned char* const charSizes
, const XMLSize_t maxChars)
@@ -1775,13 +1775,13 @@
*
* 2.11 End-of-Line Handling
*
- * XML parsed entities are often stored in computer files which, for editing
- * convenience, are organized into lines. These lines are typically separated
+ * XML parsed entities are often stored in computer files which, for editing
+ * convenience, are organized into lines. These lines are typically separated
* by some combination of the characters CARRIAGE RETURN (#xD) and LINE FEED (#xA).
*
- * To simplify the tasks of applications, the XML processor MUST behave as if
- * it normalized all line breaks in external parsed entities (including the document
- * entity) on input, before parsing, by translating all of the following to a single
+ * To simplify the tasks of applications, the XML processor MUST behave as if
+ * it normalized all line breaks in external parsed entities (including the document
+ * entity) on input, before parsing, by translating all of the following to a single
* #xA character:
*
* 1. the two-character sequence #xD #xA
@@ -1811,7 +1811,7 @@
{
if ((fCharIndex < fCharsAvail) || refreshCharBuffer())
{
- if ( fCharBuf[fCharIndex] == chLF ||
+ if ( fCharBuf[fCharIndex] == chLF ||
((fCharBuf[fCharIndex] == chNEL) && fNEL) )
{
fCharIndex++;
@@ -1838,10 +1838,10 @@
*
* 2.11 End-of-Line Handling
* ...
- * The characters #x85 and #x2028 cannot be reliably recognized and translated
- * until an entity's encoding declaration (if present) has been read.
- * Therefore, it is a fatal error to use them within the XML declaration or
- * text declaration.
+ * The characters #x85 and #x2028 cannot be reliably recognized and translated
+ * until an entity's encoding declaration (if present) has been read.
+ * Therefore, it is a fatal error to use them within the XML declaration or
+ * text declaration.
*
***/
ThrowXMLwithMemMgr1
Modified: xerces/c/trunk/src/xercesc/internal/XMLReader.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLReader.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLReader.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLReader.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -100,7 +100,7 @@
bool isXMLLetter(const XMLCh toCheck) const;
bool isFirstNameChar(const XMLCh toCheck) const;
- bool isNameChar(const XMLCh toCheck) const;
+ bool isNameChar(const XMLCh toCheck) const;
bool isPlainContentChar(const XMLCh toCheck) const;
bool isSpecialStartTagChar(const XMLCh toCheck) const;
bool isXMLChar(const XMLCh toCheck) const;
@@ -108,7 +108,7 @@
bool isControlChar(const XMLCh toCheck) const;
bool isPublicIdChar(const XMLCh toCheck) const;
bool isFirstNCNameChar(const XMLCh toCheck) const;
- bool isNCNameChar(const XMLCh toCheck) const;
+ bool isNCNameChar(const XMLCh toCheck) const;
// -----------------------------------------------------------------------
// Constructors and Destructor
@@ -189,9 +189,9 @@
// -----------------------------------------------------------------------
// Getter methods
// -----------------------------------------------------------------------
- unsigned long getColumnNumber() const;
+ XMLFileLoc getColumnNumber() const;
const XMLCh* getEncodingStr() const;
- unsigned long getLineNumber() const;
+ XMLFileLoc getLineNumber() const;
bool getNoMoreFlag() const;
const XMLCh* getPublicId() const;
unsigned int getReaderNum() const;
@@ -430,8 +430,8 @@
XMLSize_t fCharsAvail;
unsigned char fCharSizeBuf[kCharBufSize];
unsigned int fCharOfsBuf[kCharBufSize];
- unsigned long fCurCol;
- unsigned long fCurLine;
+ XMLFileLoc fCurCol;
+ XMLFileLoc fCurLine;
XMLRecognizer::Encodings fEncoding;
XMLCh* fEncodingStr;
bool fForcedEncoding;
@@ -486,7 +486,7 @@
inline bool XMLReader::isFirstNCNameChar(const XMLCh toCheck) const
{
- return (((fgCharCharsTable[toCheck] & gFirstNameCharMask) != 0)
+ return (((fgCharCharsTable[toCheck] & gFirstNameCharMask) != 0)
&& (toCheck != chColon));
}
@@ -528,7 +528,7 @@
// ---------------------------------------------------------------------------
// XMLReader: Getter methods
// ---------------------------------------------------------------------------
-inline unsigned long XMLReader::getColumnNumber() const
+inline XMLFileLoc XMLReader::getColumnNumber() const
{
return fCurCol;
}
@@ -538,7 +538,7 @@
return fEncodingStr;
}
-inline unsigned long XMLReader::getLineNumber() const
+inline XMLFileLoc XMLReader::getLineNumber() const
{
return fCurLine;
}
@@ -633,7 +633,7 @@
{
dest.append(&fCharBuf[fCharIndex], count);
fCharIndex += count;
- fCurCol += (unsigned long)count;
+ fCurCol += (XMLFileLoc)count;
}
}
Modified: xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp Fri Jun 27 06:57:00 2008
@@ -719,7 +719,7 @@
// fUIntPoolRow
// current row in fUIntPool
// fUIntPoolCol
- // current column i row
+ // current column in row
// fUIntPoolRowTotal
// total number of rows in table
//
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp Fri Jun 27 06:57:00 2008
@@ -789,8 +789,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const
- , const unsigned long lineNum
- , const unsigned long colNum)
+ , const XMLFileLoc lineNum
+ , const XMLFileLoc colNum)
{
if (fErrorHandler) {
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp Fri Jun 27 06:57:00 2008
@@ -432,8 +432,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const unsigned long lineNum
- , const unsigned long colNum
+ , const XMLFileLoc lineNum
+ , const XMLFileLoc colNum
);
/** Reset any error data before a new parse
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -138,13 +138,13 @@
fAdvDHListSize * sizeof(XMLDocumentHandler*)
);//new XMLDocumentHandler*[fAdvDHListSize];
memset(fAdvDHList, 0, sizeof(void*) * fAdvDHListSize);
-
+
// SAX2 default is for namespaces (feature http://xml.org/sax/features/namespaces) to be on
setDoNamespaces(true) ;
// default: schema is on
setDoSchema(true);
-
+
fPrefixesStorage = new (fMemoryManager) XMLStringPool(109, fMemoryManager) ;
fPrefixes = new (fMemoryManager) ValueStackOf<unsigned int> (30, fMemoryManager) ;
fTempAttrVec = new (fMemoryManager) RefVectorOf<XMLAttr> (10, false, fMemoryManager) ;
@@ -335,10 +335,10 @@
{
fPSVIHandler = handler;
if (fPSVIHandler) {
- fScanner->setPSVIHandler(fPSVIHandler);
+ fScanner->setPSVIHandler(fPSVIHandler);
}
else {
- fScanner->setPSVIHandler(0);
+ fScanner->setPSVIHandler(0);
}
}
@@ -885,7 +885,7 @@
(
XMLUni::fgZeroLenString,
baseName,
- elemQName
+ elemQName
);
}
}
@@ -1188,14 +1188,14 @@
// return a null pointer to cause the default resolution.
//
if (fEntityResolver)
- return fEntityResolver->resolveEntity(resourceIdentifier->getPublicId(),
+ return fEntityResolver->resolveEntity(resourceIdentifier->getPublicId(),
resourceIdentifier->getSystemId());
if (fXMLEntityResolver)
return fXMLEntityResolver->resolveEntity(resourceIdentifier);
return 0;
}
-
+
void SAX2XMLReaderImpl::startInputSource(const InputSource&)
{
// Nothing to do for this one
@@ -1217,8 +1217,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const unsigned long lineNum
- , const unsigned long colNum)
+ , const XMLFileLoc lineNum
+ , const XMLFileLoc colNum)
{
SAXParseException toThrow = SAXParseException
(
@@ -1256,7 +1256,7 @@
if (fParseInProgress)
throw SAXNotSupportedException("Feature modification is not supported during parse.", fMemoryManager);
-
+
if (XMLString::compareIStringASCII(name, XMLUni::fgSAX2CoreNameSpaces) == 0)
{
setDoNamespaces(value);
@@ -1614,4 +1614,3 @@
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -74,10 +74,10 @@
/** The default constructor */
SAX2XMLReaderImpl(
MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
- , XMLGrammarPool* const gramPool = 0
+ , XMLGrammarPool* const gramPool = 0
);
- /** The destructor */
+ /** The destructor */
~SAX2XMLReaderImpl() ;
//@}
@@ -218,7 +218,7 @@
* @see DefaultHandler#DefaultHandler
*/
virtual void setEntityResolver(EntityResolver* const resolver) ;
-
+
/** Set the entity resolver
*
* This method allows applications to install their own entity
@@ -279,9 +279,9 @@
* <br>http://apache.org/xml/features/validation/schema (default: true)
* <br>http://apache.org/xml/features/validation/schema-full-checking (default: false)
* <br>http://apache.org/xml/features/validating/load-schema (default: true)
- * <br>http://apache.org/xml/features/nonvalidating/load-external-dtd (default: true)
+ * <br>http://apache.org/xml/features/nonvalidating/load-external-dtd (default: true)
* <br>http://apache.org/xml/features/continue-after-fatal-error (default: false)
- * <br>http://apache.org/xml/features/validation-error-as-fatal (default: false)
+ * <br>http://apache.org/xml/features/validation-error-as-fatal (default: false)
*
* @param name The unique identifier (URI) of the feature.
* @param value The requested state of the feature (true or false).
@@ -393,7 +393,7 @@
(
const char* const systemId
) ;
-
+
//@}
// -----------------------------------------------------------------------
@@ -1193,8 +1193,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const unsigned long lineNum
- , const unsigned long colNum
+ , const XMLFileLoc lineNum
+ , const XMLFileLoc colNum
);
/**
@@ -1261,7 +1261,7 @@
*
* This method allows a user installed entity handler to further
* process any pointers to external entities. The applications can
- * implement 'redirection' via this callback.
+ * implement 'redirection' via this callback.
*
* @param resourceIdentifier An object containing the type of
* resource to be resolved and the associated data members
@@ -1668,7 +1668,7 @@
XMLValidator* fValidator;
MemoryManager* fMemoryManager;
XMLGrammarPool* fGrammarPool;
-
+
// -----------------------------------------------------------------------
// internal function used to set the state of the parser
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -670,10 +670,10 @@
{
fPSVIHandler = handler;
if (fPSVIHandler) {
- fScanner->setPSVIHandler(fPSVIHandler);
+ fScanner->setPSVIHandler(fPSVIHandler);
}
else {
- fScanner->setPSVIHandler(0);
+ fScanner->setPSVIHandler(0);
}
}
@@ -1178,8 +1178,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const unsigned long lineNum
- , const unsigned long colNum)
+ , const XMLFileLoc lineNum
+ , const XMLFileLoc colNum)
{
SAXParseException toThrow = SAXParseException
(
@@ -1232,7 +1232,7 @@
{
// Just map to the SAX entity resolver handler
if (fEntityResolver)
- return fEntityResolver->resolveEntity(resourceIdentifier->getPublicId(),
+ return fEntityResolver->resolveEntity(resourceIdentifier->getPublicId(),
resourceIdentifier->getSystemId());
if (fXMLEntityResolver)
return fXMLEntityResolver->resolveEntity(resourceIdentifier);
@@ -1338,4 +1338,3 @@
}
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -72,7 +72,7 @@
, public XMLDocumentHandler
, public XMLErrorReporter
, public XMLEntityHandler
- , public DocTypeHandler
+ , public DocTypeHandler
{
public :
// -----------------------------------------------------------------------
@@ -111,7 +111,7 @@
(
XMLValidator* const valToAdopt = 0
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
- , XMLGrammarPool* const gramPool = 0
+ , XMLGrammarPool* const gramPool = 0
);
/**
@@ -349,14 +349,14 @@
/** Get the SecurityManager instance attached to this parser.
*
- * This method returns the security manager
+ * This method returns the security manager
* that was specified using setSecurityManager.
*
- * The SecurityManager instance must have been specified by the application;
+ * The SecurityManager instance must have been specified by the application;
* this should not be deleted until after the parser has been deleted (or
* a new SecurityManager instance has been supplied to the parser).
- *
- * @return a pointer to the SecurityManager instance
+ *
+ * @return a pointer to the SecurityManager instance
* specified externally. A null pointer is returned if nothing
* was specified externally.
*
@@ -471,7 +471,7 @@
XMLFilePos getSrcOffset() const;
/** Get the 'generate synthetic annotations' flag
- *
+ *
* @return true, if the parser is currently configured to
* generate synthetic annotations, false otherwise.
* A synthetic XSAnnotation is created when a schema
@@ -484,7 +484,7 @@
bool getGenerateSyntheticAnnotations() const;
/** Get the 'validate annotations' flag
- *
+ *
* @return true, if the parser is currently configured to
* validate annotations, false otherwise.
*
@@ -493,7 +493,7 @@
bool getValidateAnnotations() const;
/** Get the 'ignore cached DTD grammar' flag
- *
+ *
* @return true, if the parser is currently configured to
* ignore cached DTD, false otherwise.
*
@@ -502,7 +502,7 @@
bool getIgnoreCachedDTD() const;
/** Get the 'ignore annotations' flag
- *
+ *
* @return true, if the parser is currently configured to
* ignore annotations, false otherwise.
*
@@ -511,7 +511,7 @@
bool getIgnoreAnnotations() const;
/** Get the 'disable default entity resolution' flag
- *
+ *
* @return true, if the parser is currently configured to
* not perform default entity resolution, false otherwise.
*
@@ -520,7 +520,7 @@
bool getDisableDefaultEntityResolution() const;
/** Get the 'skip DTD validation' flag
- *
+ *
* @return true, if the parser is currently configured to
* skip DTD validation, false otherwise.
*
@@ -546,7 +546,7 @@
/** @name Setter methods */
//@{
/** set the 'generate synthetic annotations' flag
- *
+ *
* @param newValue The value for specifying whether Synthetic Annotations
* should be generated or not.
* A synthetic XSAnnotation is created when a schema
@@ -558,7 +558,7 @@
void setGenerateSyntheticAnnotations(const bool newValue);
/** set the 'validate annotations' flag
- *
+ *
* @param newValue The value for specifying whether annotations
* should be validate or not.
*
@@ -915,7 +915,7 @@
* parser will try to resolve the entity on its own. When this option
* is set to true, the parser will not attempt to resolve the entity
* when the resolveEntity method returns NULL.
- *
+ *
* The parser's default state is false
*
* @param newValue The state to set
@@ -926,7 +926,7 @@
/** Set the 'skip DTD validation' flag
*
- * This method gives users the option to skip DTD validation only when
+ * This method gives users the option to skip DTD validation only when
* schema validation is on (i.e. when performing validation, we will
* ignore the DTD, except for entities, when schema validation is enabled).
*
@@ -1652,8 +1652,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const unsigned long lineNum
- , const unsigned long colNum
+ , const XMLFileLoc lineNum
+ , const XMLFileLoc colNum
);
/**
@@ -1720,7 +1720,7 @@
*
* This method allows a user installed entity handler to further
* process any pointers to external entities. The applications can
- * implement 'redirection' via this callback.
+ * implement 'redirection' via this callback.
*
* @param resourceIdentifier An object containing the type of
* resource to be resolved and the associated data members
Modified: xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -182,8 +182,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const unsigned long lineNum
- , const unsigned long colNum)
+ , const XMLFileLoc lineNum
+ , const XMLFileLoc colNum)
{
SAXParseException toThrow = SAXParseException
(
@@ -230,7 +230,7 @@
// return a null pointer to cause the default resolution.
//
if (fEntityResolver)
- return fEntityResolver->resolveEntity(resourceIdentifier->getPublicId(),
+ return fEntityResolver->resolveEntity(resourceIdentifier->getPublicId(),
resourceIdentifier->getSystemId());
if (fXMLEntityResolver)
return fXMLEntityResolver->resolveEntity(resourceIdentifier);
@@ -258,7 +258,7 @@
try
{
setParseInProgress(true);
- if (grammarType == Grammar::DTDGrammarType)
+ if (grammarType == Grammar::DTDGrammarType)
getScanner()->setDocTypeHandler(0);
grammar = getScanner()->loadGrammar(systemId, grammarType, toCache);
}
@@ -287,7 +287,7 @@
try
{
setParseInProgress(true);
- if (grammarType == Grammar::DTDGrammarType)
+ if (grammarType == Grammar::DTDGrammarType)
getScanner()->setDocTypeHandler(0);
grammar = getScanner()->loadGrammar(systemId, grammarType, toCache);
}
@@ -316,7 +316,7 @@
try
{
setParseInProgress(true);
- if (grammarType == Grammar::DTDGrammarType)
+ if (grammarType == Grammar::DTDGrammarType)
getScanner()->setDocTypeHandler(0);
grammar = getScanner()->loadGrammar(source, grammarType, toCache);
}
@@ -346,4 +346,3 @@
}
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -59,7 +59,7 @@
* validation. If you don't provide a validator, a default one will
* be created for you in the scanner.
*
- * @param gramPool Pointer to the grammar pool instance from
+ * @param gramPool Pointer to the grammar pool instance from
* external application.
* The parser does NOT own it.
*
@@ -72,7 +72,7 @@
(
XMLValidator* const valToAdopt = 0
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
- , XMLGrammarPool* const gramPool = 0
+ , XMLGrammarPool* const gramPool = 0
);
/**
@@ -135,7 +135,7 @@
* @return The pointer to the installed entity resolver object.
*/
XMLEntityResolver* getXMLEntityResolver();
-
+
/**
* Get a const pointer to the entity resolver
*
@@ -202,7 +202,7 @@
XMLFilePos getSrcOffset() const;
/** Get the 'ignore cached DTD grammar' flag
- *
+ *
* @return true, if the parser is currently configured to
* ignore cached DTD, false otherwise.
*
@@ -401,8 +401,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const unsigned long lineNum
- , const unsigned long colNum
+ , const XMLFileLoc lineNum
+ , const XMLFileLoc colNum
);
/** Reset any error data before a new parse
@@ -473,7 +473,7 @@
*
* This method allows a user installed entity handler to further
* process any pointers to external entities. The applications can
- * implement 'redirection' via this callback.
+ * implement 'redirection' via this callback.
*
* @param resourceIdentifier An object containing the type of
* resource to be resolved and the associated data members
Modified: xerces/c/trunk/src/xercesc/sax/AttributeList.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/sax/AttributeList.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/sax/AttributeList.hpp (original)
+++ xerces/c/trunk/src/xercesc/sax/AttributeList.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,7 +47,7 @@
*
* <code>
* public void startElement (String name, AttributeList atts) {<br>
- * for (int i = 0; i < atts.getLength(); i++) {<br>
+ * for (XMLSize_t i = 0; i < atts.getLength(); i++) {<br>
* String name = atts.getName(i);<br>
* String type = atts.getType(i);<br>
* String value = atts.getValue(i);<br>
@@ -108,7 +108,7 @@
*
* @return The number of attributes in the list.
*/
- virtual unsigned int getLength() const = 0;
+ virtual XMLSize_t getLength() const = 0;
/**
* Return the name of an attribute in this list (by position).
@@ -126,7 +126,7 @@
* if the index is out of range.
* @see #getLength
*/
- virtual const XMLCh* getName(const unsigned int index) const = 0;
+ virtual const XMLCh* getName(const XMLSize_t index) const = 0;
/**
* Return the type of an attribute in the list (by position).
@@ -149,7 +149,7 @@
* @see #getLength
* @see #getType
*/
- virtual const XMLCh* getType(const unsigned int index) const = 0;
+ virtual const XMLCh* getType(const XMLSize_t index) const = 0;
/**
* Return the value of an attribute in the list (by position).
@@ -164,13 +164,13 @@
* @see #getLength
* @see #getValue
*/
- virtual const XMLCh* getValue(const unsigned int index) const = 0;
+ virtual const XMLCh* getValue(const XMLSize_t index) const = 0;
/**
* Return the type of an attribute in the list (by name).
*
* The return value is the same as the return value for
- * getType(int).
+ * getType(XMLSize_t).
*
* If the attribute name has a namespace prefix in the document,
* the application must include the prefix here.
@@ -186,7 +186,7 @@
* Return the value of an attribute in the list (by name).
*
* The return value is the same as the return value for
- * getValue(int).
+ * getValue(XMLSize_t).
*
* If the attribute name has a namespace prefix in the document,
* the application must include the prefix here.
@@ -202,7 +202,7 @@
* Return the value of an attribute in the list (by name).
*
* The return value is the same as the return value for
- * getValue(int).
+ * getValue(XMLSize_t).
*
* If the attribute name has a namespace prefix in the document,
* the application must include the prefix here.
Modified: xerces/c/trunk/src/xercesc/sax/Locator.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/sax/Locator.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/sax/Locator.hpp (original)
+++ xerces/c/trunk/src/xercesc/sax/Locator.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -96,20 +96,20 @@
* Return the line number where the current document event ends.
* Note that this is the line position of the first character
* after the text associated with the document event.
- * @return The line number, or -1 if none is available.
+ * @return The line number, or 0 if none is available.
* @see #getColumnNumber
*/
- virtual unsigned long getLineNumber() const = 0;
+ virtual XMLFileLoc getLineNumber() const = 0;
/**
* Return the column number where the current document event ends.
* Note that this is the column number of the first
* character after the text associated with the document
* event. The first column in a line is position 1.
- * @return The column number, or -1 if none is available.
+ * @return The column number, or 0 if none is available.
* @see #getLineNumber
*/
- virtual unsigned long getColumnNumber() const = 0;
+ virtual XMLFileLoc getColumnNumber() const = 0;
//@}
private :
Modified: xerces/c/trunk/src/xercesc/sax/SAXParseException.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/sax/SAXParseException.cpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/sax/SAXParseException.cpp (original)
+++ xerces/c/trunk/src/xercesc/sax/SAXParseException.cpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,8 +46,8 @@
SAXParseException::SAXParseException(const XMLCh* const message
, const XMLCh* const publicId
, const XMLCh* const systemId
- , const unsigned long lineNumber
- , const unsigned long columnNumber
+ , const XMLFileLoc lineNumber
+ , const XMLFileLoc columnNumber
, MemoryManager* const manager) :
SAXException(message, manager)
, fColumnNumber(columnNumber)
@@ -112,15 +112,14 @@
return fSystemId;
}
-unsigned long SAXParseException::getLineNumber() const
+XMLFileLoc SAXParseException::getLineNumber() const
{
return fLineNumber;
}
-unsigned long SAXParseException::getColumnNumber() const
+XMLFileLoc SAXParseException::getColumnNumber() const
{
return fColumnNumber;
}
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/sax/SAXParseException.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/sax/SAXParseException.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/sax/SAXParseException.hpp (original)
+++ xerces/c/trunk/src/xercesc/sax/SAXParseException.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -94,8 +94,8 @@
const XMLCh* const message
, const XMLCh* const publicId
, const XMLCh* const systemId
- , const unsigned long lineNumber
- , const unsigned long columnNumber
+ , const XMLFileLoc lineNumber
+ , const XMLFileLoc columnNumber
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
@@ -135,7 +135,7 @@
* if none is available.
* @see Locator#getColumnNumber
*/
- unsigned long getColumnNumber() const;
+ XMLFileLoc getColumnNumber() const;
/**
* The line number of the end of the text where the exception occurred.
*
@@ -143,7 +143,7 @@
* if none is available.
* @see Locator#getLineNumber
*/
- unsigned long getLineNumber() const;
+ XMLFileLoc getLineNumber() const;
/**
* Get the public identifier of the entity where the exception occurred.
*
@@ -169,9 +169,9 @@
/* Data Members */
/* The column in the source text where the error occured. */
- unsigned long fColumnNumber;
+ XMLFileLoc fColumnNumber;
/* The line in the source text where the error occured. */
- unsigned long fLineNumber;
+ XMLFileLoc fLineNumber;
/* The public id of the file where the error occured. */
XMLCh* fPublicId;
/* The system id of the file where the error occured. */
Modified: xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -48,13 +48,13 @@
, fInnerAnnotationDepth(-1)
, fDepth(-1)
, fUserErrorReporter(0)
- , fUserEntityHandler(0)
+ , fUserEntityHandler(0)
, fURIs(0)
, fAnnotationBuf(1023, manager)
{
fURIs = new (manager) ValueVectorOf<unsigned int>(16, manager);
- fXSDErrorReporter.setErrorReporter(this);
+ fXSDErrorReporter.setErrorReporter(this);
setValidationScheme(XercesDOMParser::Val_Never);
setDoNamespaces(true);
}
@@ -97,7 +97,7 @@
for (unsigned int i=0; i < attrCount; i++) {
const XMLAttr* oneAttrib = attrList.elementAt(i);
- const XMLCh* attrValue = oneAttrib->getValue();
+ const XMLCh* attrValue = oneAttrib->getValue();
if (XMLString::equals(oneAttrib->getName(), XMLUni::fgXMLNSString))
fURIs->addElement(fScanner->getPrefixId(XMLUni::fgZeroLenString));
@@ -238,7 +238,7 @@
fAnnotationDepth = fDepth;
startAnnotation(elemDecl, attrList, attrCount);
- }
+ }
}
else if (fDepth == fAnnotationDepth+1)
{
@@ -389,12 +389,12 @@
fInnerAnnotationDepth = -1;
endAnnotationElement(elemDecl, false);
}
- else if (fAnnotationDepth == fDepth)
+ else if (fAnnotationDepth == fDepth)
{
fAnnotationDepth = -1;
endAnnotationElement(elemDecl, true);
}
- else
+ else
{ // inside a child of annotation
endAnnotationElement(elemDecl, false);
fDepth--;
@@ -501,8 +501,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const unsigned long lineNum
- , const unsigned long colNum)
+ , const XMLFileLoc lineNum
+ , const XMLFileLoc colNum)
{
if (errType >= XMLErrorReporter::ErrType_Fatal)
fSawFatal = true;
Modified: xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,7 +52,7 @@
* validation. If you don't provide a validator, a default one will
* be created for you in the scanner.
*
- * @param gramPool Pointer to the grammar pool instance from
+ * @param gramPool Pointer to the grammar pool instance from
* external application.
* The parser does NOT own it.
*
@@ -63,7 +63,7 @@
(
XMLValidator* const valToAdopt = 0
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
- , XMLGrammarPool* const gramPool = 0
+ , XMLGrammarPool* const gramPool = 0
);
/**
@@ -252,8 +252,8 @@
, const XMLCh* const errorText
, const XMLCh* const systemId
, const XMLCh* const publicId
- , const unsigned long lineNum
- , const unsigned long colNum
+ , const XMLFileLoc lineNum
+ , const XMLFileLoc colNum
);
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.cpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.cpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,7 +45,8 @@
// ---------------------------------------------------------------------------
void XSDLocator::setValues(const XMLCh* const systemId,
const XMLCh* const publicId,
- const unsigned long lineNo, const unsigned long columnNo)
+ const XMLFileLoc lineNo,
+ const XMLFileLoc columnNo)
{
fLineNo = lineNo;
fColumnNo = columnNo;
Modified: xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.hpp?rev=672273&r1=672272&r2=672273&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/XSDLocator.hpp Fri Jun 27 06:57:00 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -74,20 +74,20 @@
* Return the line number where the current document event ends.
* Note that this is the line position of the first character
* after the text associated with the document event.
- * @return The line number, or -1 if none is available.
+ * @return The line number, or 0 if none is available.
* @see #getColumnNumber
*/
- virtual unsigned long getLineNumber() const;
+ virtual XMLFileLoc getLineNumber() const;
/**
* Return the column number where the current document event ends.
* Note that this is the column number of the first
* character after the text associated with the document
* event. The first column in a line is position 1.
- * @return The column number, or -1 if none is available.
+ * @return The column number, or 0 if none is available.
* @see #getLineNumber
*/
- virtual unsigned long getColumnNumber() const;
+ virtual XMLFileLoc getColumnNumber() const;
//@}
// -----------------------------------------------------------------------
@@ -95,7 +95,7 @@
// -----------------------------------------------------------------------
void setValues(const XMLCh* const systemId,
const XMLCh* const publicId,
- const unsigned long lineNo, const unsigned long columnNo);
+ const XMLFileLoc lineNo, const XMLFileLoc columnNo);
private :
// -----------------------------------------------------------------------
@@ -107,8 +107,8 @@
// -----------------------------------------------------------------------
// Private data members
// -----------------------------------------------------------------------
- unsigned long fLineNo;
- unsigned long fColumnNo;
+ XMLFileLoc fLineNo;
+ XMLFileLoc fColumnNo;
const XMLCh* fSystemId;
const XMLCh* fPublicId;
};
@@ -116,12 +116,12 @@
// ---------------------------------------------------------------------------
// XSDLocator: Getter methods
// ---------------------------------------------------------------------------
-inline unsigned long XSDLocator::getLineNumber() const
+inline XMLFileLoc XSDLocator::getLineNumber() const
{
return fLineNo;
}
-inline unsigned long XSDLocator::getColumnNumber() const
+inline XMLFileLoc XSDLocator::getColumnNumber() const
{
return fColumnNo;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org