thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rewrote XMLParser error() function for the 5th time.

Browse source 
Bugfix: Ambiguous error message when parsing an unexpected header.

svn-id: r34819
This commit is contained in:
Vicent Marti 2008-10-18 10:11:35 +00:00
parent 1cc3ae04cd
commit a67c16c6f2
2 changed files with 34 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

72
common/xmlparser.cpp
View file

@ -38,12 +38,9 @@ bool XMLParser::parserError(const char *errorString, ...) {
_state = kParserError;
const int startPosition = _stream->pos();
const int middle = kErrorMessageWidth / 2;
int currentPosition = startPosition;
int lineCount = 1, realMiddle = 0;
char errorBuffer[kErrorMessageWidth];
char c, *errorKeyStart = 0;
int lineCount = 1;
char c = 0;
_stream->seek(0, SEEK_SET);
@ -54,46 +51,40 @@ bool XMLParser::parserError(const char *errorString, ...) {
lineCount++;
}
_stream->seek(-MIN(middle, startPosition), SEEK_CUR);
for (int i = 0, j = 0; i < kErrorMessageWidth; ++i, ++j) {
assert(_stream->pos() == startPosition);
currentPosition = startPosition;
int keyOpening = 0;
int keyClosing = 0;
while (currentPosition-- && keyOpening == 0) {
_stream->seek(-2, SEEK_CUR);
c = _stream->readByte();
if (c == '\n' || c == '\r') {
errorBuffer[i++] = ' ';
j++;
while (c && isspace(c)) {
c = _stream->readByte();
j++;
}
}
errorBuffer[i] = c;
if (!realMiddle && j >= middle)
realMiddle = i;
if (c == '<')
keyOpening = currentPosition - 1;
else if (c == '>')
keyClosing = currentPosition;
}
_stream->seek(startPosition, SEEK_SET);
currentPosition = startPosition;
while (keyClosing == 0 && c && currentPosition++) {
c = _stream->readByte();
if (c == '>')
keyClosing = currentPosition;
}
for (int i = realMiddle; i >= 0; --i)
if (errorBuffer[i] == '<') {
errorKeyStart = &errorBuffer[i];
break;
}
for (int i = realMiddle; i < kErrorMessageWidth; ++i)
if (errorBuffer[i] == '>') {
errorBuffer[i + 1] = 0;
break;
}
fprintf(stderr, "\n File <%s>, line %d:\n", _fileName.c_str(), lineCount);
if (!errorKeyStart)
fprintf(stderr, "...%s%s\n", errorBuffer, errorBuffer[strlen(errorBuffer) - 1] == '>' ? "" : "...");
else
fprintf(stderr, "%s%s\n", errorKeyStart, errorBuffer[strlen(errorBuffer) - 1] == '>' ? "" : "...");
currentPosition = (keyClosing - keyOpening);
_stream->seek(keyOpening, SEEK_SET);
fprintf(stderr, "\nParser error: ");
while (currentPosition--)
fprintf(stderr, "%c", _stream->readByte());
fprintf(stderr, "\n\nParser error: ");
va_list args;
va_start(args, errorString);
@ -277,6 +268,9 @@ bool XMLParser::parse() {
} else if (_char == '/') {
_char = _stream->readByte();
activeClosure = true;
} else if (_char == '?') {
parserError("Unexpected header. There may only be one XML header per file.");
break;
}
_state = kParserNeedKeyName;