Merged revisions 33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621,33623,33626-33627,33632-33633,33635,33637,33639-33640,33642-33645,33648,33654-33655,33664,33667-33670,33673-33674,33678,33682,33686-33691,33693,33696,33698,33700,33703,33708,33710,33712-33714,33716,33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766,33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919,33928,33930,33932-33936,33938-33940,33942-33943,33948,33950,33953,33967,33973,33976,33978,33980,33985,33991,33993,33999-34000,34006,34009,34011,34013,34015,34019,34021-34023,34025,34027-34028,34030,34032-34034,34036,34038-34039,34041,34046-34048,34050-34055,34057,34059-34065,34067,34072,34074,34076,34078-34081,34084,34086-34087,34089-34090,34093,34096-34102,34104,34107,34113,34116,34119,34122,34124,34126,34128,34131-34132,34135,34138,34141,34144,34146,34149,34152-34154,34156-34157,34160,34163-34164,34169,34173,34179-34194,34196-34198,34200-34201,34205-34206,34208-34217,34219-34225,34227-34228,34234-34237,34239-34249,34251-34279,34281-34284,34286-34288,34290-34320,34323-34324,34326,34328-34329,34332,34334,34336,34338-34340,34343-34353,34356-34357,34359-34371,34373,34375,34378,34381-34382,34384-34385,34389-34391,34393-34394,34396-34397,34399-34405,34407-34409,34411,34413,34415,34417-34420,34423-34426,34428-34438,34440-34454,34456-34458,34460,34462-34469,34472,34474,34479-34481,34483-34498,34501-34505,34508,34511-34518,34520-34524,34526-34563,34566-34569,34571-34590,34592,34595-34599,34602-34603,34605,34613-34615,34617,34619-34624,34627-34628,34630-34639,34642-34649 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r34654

1 files changed, 45 insertions, 26 deletions

diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp
index 900f2f81ab..b93a5205be 100644
--- a/common/xmlparser.cpp
+++ b/common/xmlparser.cpp
@@ -37,7 +37,8 @@ using namespace Graphics;
 bool XMLParser::parserError(const char *errorString, ...) {
 	_state = kParserError;
 
-	int pos = _pos;
+	int original_pos = _stream->pos();
+	int pos = original_pos;
 	int lineCount = 1;
 	int lineStart = 0;
 
@@ -46,18 +47,21 @@ bool XMLParser::parserError(const char *errorString, ...) {
 		lineCount = 0;
 	} else {
 		do {
-			if (_text[pos] == '\n' || _text[pos] == '\r') {
+			if (_char == '\n' || _char == '\r') {
 				lineCount++;
 		
 				if (lineStart == 0)
 					lineStart = MAX(pos + 1, _pos - 60);
 			}
-		} while (pos-- > 0);
+			
+			_stream->seek(-1, SEEK_CUR);
+
+		} while (_stream->pos() > 0);
 	}
 
 	char lineStr[70];
-	_text.stream()->seek(lineStart, SEEK_SET);
-	_text.stream()->readLine(lineStr, 70);
+	_stream->seek(original_pos - 35, SEEK_SET);
+	_stream->readLine_NEW(lineStr, 70);
 	
 	for (int i = 0; i < 70; ++i)
 		if (lineStr[i] == '\n')
@@ -70,7 +74,7 @@ bool XMLParser::parserError(const char *errorString, ...) {
 
 	printf("%s%s%s\n", startFull ? "" : "...", lineStr, endFull ? "" : "...");
 
-	int cursor = MIN(_pos - lineStart, 70);
+	int cursor = 35;
 
 	if (!startFull)
 		cursor += 3;
@@ -102,15 +106,16 @@ bool XMLParser::parseActiveKey(bool closed) {
 		key->layout = layout->children[key->name];
 	
 		Common::StringMap localMap = key->values;
+		int keyCount = localMap.size();
 	
 		for (Common::List<XMLKeyLayout::XMLKeyProperty>::const_iterator i = key->layout->properties.begin(); i != key->layout->properties.end(); ++i) {
-			if (localMap.contains(i->name))
-				localMap.erase(i->name);
-			else if (i->required)
+			if (i->required && !localMap.contains(i->name))
 				return parserError("Missing required property '%s' inside key '%s'", i->name.c_str(), key->name.c_str());
+			else if (localMap.contains(i->name))
+				keyCount--;
 		}
 	
-		if (localMap.empty() == false)
+		if (keyCount > 0)
 			return parserError("Unhandled property inside key '%s': '%s'", key->name.c_str(), localMap.begin()->_key.c_str());
 			
 	} else {
@@ -149,15 +154,20 @@ bool XMLParser::parseKeyValue(Common::String keyName) {
 	_token.clear();
 	char stringStart;
 
-	if (_text[_pos] == '"' || _text[_pos] == '\'') {
-		stringStart = _text[_pos++];
+	if (_char == '"' || _char == '\'') {
+		stringStart = _char;
+		_char = _stream->readByte();
 
-		while (_text[_pos] && _text[_pos] != stringStart)
-			_token += _text[_pos++];
+		while (_char && _char != stringStart) {
+			_token += _char;
+			_char = _stream->readByte();
+		}
 
-		if (_text[_pos++] == 0)
+		if (_char == 0)
 			return false;
 
+		_char = _stream->readByte();
+
 	} else if (!parseToken()) {
 		return false;
 	}
@@ -185,7 +195,7 @@ bool XMLParser::closeKey() {
 
 bool XMLParser::parse() {
 
-	if (_text.ready() == false)
+	if (_stream == 0)
 		return parserError("XML stream not ready for reading.");
 		
 	if (_XMLkeys == 0)
@@ -202,8 +212,10 @@ bool XMLParser::parse() {
 	_state = kParserNeedKey;
 	_pos = 0;
 	_activeKey.clear();
+
+	_char = _stream->readByte();
 	
-	while (_text[_pos] && _state != kParserError) {
+	while (_char && _state != kParserError) {
 		if (skipSpaces())
 			continue;
 
@@ -212,18 +224,18 @@ bool XMLParser::parse() {
 
 		switch (_state) {
 			case kParserNeedKey:
-				if (_text[_pos++] != '<') {
+				if (_char != '<') {
 					parserError("Parser expecting key start.");
 					break;
 				}
 
-				if (_text[_pos] == 0) {
+				if ((_char = _stream->readByte()) == 0) {
 					parserError("Unexpected end of file.");
 					break;
 				}
 
-				if (_text[_pos] == '/' && _text[_pos + 1] != '*') {
-					_pos++;
+				if (_char == '/') { // FIXME: What if it's a comment start
+					_char = _stream->readByte();
 					activeClosure = true;
 				}
 
@@ -262,19 +274,25 @@ bool XMLParser::parse() {
 
 					activeClosure = false;
 
-					if (_text[_pos++] != '>')
+					if (_char != '>')
 						parserError("Invalid syntax in key closure.");
 					else 
 						_state = kParserNeedKey;
 
+					_char = _stream->readByte();
 					break;
 				}
 
-				selfClosure = (_text[_pos] == '/');
+				selfClosure = false;
+
+				if (_char == '/') { // FIXME: comment start?
+					selfClosure = true;
+					_char = _stream->readByte();
+				}
 
-				if ((selfClosure && _text[_pos + 1] == '>') || _text[_pos] == '>') {
+				if (_char == '>') {
 					if (parseActiveKey(selfClosure)) {
-						_pos += selfClosure ? 2 : 1;
+						_char = _stream->readByte();
 						_state = kParserNeedKey;
 					}
 					break;
@@ -288,11 +306,12 @@ bool XMLParser::parse() {
 				break;
 
 			case kParserNeedPropertyOperator:
-				if (_text[_pos++] != '=') 
+				if (_char != '=') 
 					parserError("Syntax error after key name.");
 				else  
 					_state = kParserNeedPropertyValue;
 
+				_char = _stream->readByte();
 				break;
 
 			case kParserNeedPropertyValue: