Changed XMLParser comment syntax to conform to XML standards (<!-- * -->)

Changed STX version string to 0.2.

svn-id: r34807

1 files changed, 18 insertions, 15 deletions

diff --git a/common/xmlparser.h b/common/xmlparser.h
index 89df048395..f7a3c664e9 100644
--- a/common/xmlparser.h
+++ b/common/xmlparser.h
@@ -349,32 +349,35 @@ protected:
 	 * or to change the commenting syntax.
 	 */
 	virtual bool skipComments() {
-		char endComment1 = 0, endComment2 = 0;
-
-		if (_char == '/') {
+		if (_char == '<') {
 			_char = _stream->readByte();
 
-			if (_char != '*') {
+			if (_char != '!') {
 				_stream->seek(-1, SEEK_CUR);
-				_char = '/';
+				_char = '<';
 				return false;
 			}
 			
+			if (_stream->readByte() != '-' || _stream->readByte() != '-')
+				return parserError("Malformed comment syntax.");
+				
 			_char = _stream->readByte();
+			bool dash = false;
 
 			while (_char) {
-				endComment1 = endComment2;
-				endComment2 = _char;
+				if (_char == '-') {
+					if (dash && _stream->readByte() == '>') {
+						_char = _stream->readByte();
+						return true;
+					}
+						
+					dash = !dash;
+				}
+						
 				_char = _stream->readByte();
-
-				if (endComment1 == '*' && endComment2 == '/')
-					break;
-
-				if (_char == 0)
-					return parserError("Comment has no closure.");
 			}
-			_char = _stream->readByte();
-			return true;
+			
+			return parserError("Comment has no closure.");
 		}
 
 		return false;