|
@@ -221,8 +221,8 @@ namespace sxt {
|
|
* such as readName() or isS().
|
|
* such as readName() or isS().
|
|
*
|
|
*
|
|
*/
|
|
*/
|
|
- //int XmlTokenizer::next() throw(XmlTokenizerException) {
|
|
|
|
- int next() throw(XmlTokenizerException) {
|
|
|
|
|
|
+ //int XmlTokenizer::next() {
|
|
|
|
+ int next() {
|
|
if(state == STATE_FINISHED)
|
|
if(state == STATE_FINISHED)
|
|
return END_DOCUMENT;
|
|
return END_DOCUMENT;
|
|
parsedContent = false;
|
|
parsedContent = false;
|
|
@@ -765,7 +765,7 @@ namespace sxt {
|
|
* If it is last character set internal flag reachedEnd.
|
|
* If it is last character set internal flag reachedEnd.
|
|
* If there are no more characters throw XmlTokenizerException.
|
|
* If there are no more characters throw XmlTokenizerException.
|
|
*/
|
|
*/
|
|
- SXT_CHAR more() throw ( XmlTokenizerException ) {
|
|
|
|
|
|
+ SXT_CHAR more() {
|
|
if(backtracking) {
|
|
if(backtracking) {
|
|
backtracking = false;
|
|
backtracking = false;
|
|
//++pos;
|
|
//++pos;
|
|
@@ -846,7 +846,7 @@ namespace sxt {
|
|
* Read name from input or throw exception ([4] NameChar, [5] Name).
|
|
* Read name from input or throw exception ([4] NameChar, [5] Name).
|
|
*/
|
|
*/
|
|
// TODO: make it fully complaint with XML spec
|
|
// TODO: make it fully complaint with XML spec
|
|
- char readName(char ch) throw (XmlTokenizerException) {
|
|
|
|
|
|
+ char readName(char ch) {
|
|
posNsColon = -1;
|
|
posNsColon = -1;
|
|
nsColonCount = 0;
|
|
nsColonCount = 0;
|
|
if(!(ch >= 'A' && ch <= 'Z') && !(ch >= 'a' && ch <= 'z')
|
|
if(!(ch >= 'A' && ch <= 'Z') && !(ch >= 'a' && ch <= 'z')
|
|
@@ -874,13 +874,13 @@ namespace sxt {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- char skipS(char ch) throw (XmlTokenizerException) {
|
|
|
|
|
|
+ char skipS(char ch) {
|
|
while(ch == ' ' || ch == '\n' || ch == '\t' || ch == '\r')
|
|
while(ch == ' ' || ch == '\n' || ch == '\t' || ch == '\r')
|
|
ch = more();
|
|
ch = more();
|
|
return ch;
|
|
return ch;
|
|
}
|
|
}
|
|
|
|
|
|
- char readS(char ch) throw (XmlTokenizerException) {
|
|
|
|
|
|
+ char readS(char ch) {
|
|
if(!isS(ch))
|
|
if(!isS(ch))
|
|
throw XmlTokenizerException("expected white space not ",
|
|
throw XmlTokenizerException("expected white space not ",
|
|
ch, getPosDesc(), getLineNumber(), getColumnNumber());
|
|
ch, getPosDesc(), getLineNumber(), getColumnNumber());
|