TITANIC: Implemented CStringParser class

3 files changed, 174 insertions, 0 deletions

diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index a3afc7e4a4..65e7367ed1 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -468,6 +468,7 @@ MODULE_OBJS := \
 	support/screen_manager.o \
 	support/simple_file.o \
 	support/string.o \
+	support/string_parser.o \
 	support/text_cursor.o \
 	support/time_event_info.o \
 	support/video_surface.o \
diff --git a/engines/titanic/support/string_parser.cpp b/engines/titanic/support/string_parser.cpp
new file mode 100644
index 0000000000..496440a973
--- /dev/null
+++ b/engines/titanic/support/string_parser.cpp
@@ -0,0 +1,97 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "titanic/support/string_parser.h"
+#include "common/util.h"
+
+namespace Titanic {
+
+void CStringParser::skipSeperators(const CString &seperatorChars) {
+	for (; _index < size(); ++_index) {
+		char c = (*this)[_index];
+		if (seperatorChars.indexOf(c) == -1)
+			break;
+	}
+}
+
+bool CStringParser::parse(CString &resultStr, const CString &seperatorChars, bool allowQuotes) {
+	if (_index >= size())
+		return false;
+
+	resultStr.clear();
+	bool quoteFlag = false;
+	while (_index < size()) {
+		char c = (*this)[_index];
+		if (!quoteFlag && seperatorChars.indexOf(c) >= 0)
+			break;
+
+		if (allowQuotes) {
+			if (quoteFlag) {
+				if (c == '"') {
+					// End of quoted string
+					++_index;
+					break;
+				}
+			} else {
+				if (c == '"') {
+					// Start of quoted string
+					++_index;
+					quoteFlag = true;
+					continue;
+				}
+			}
+		}
+
+		resultStr += c;
+		++_index;
+	}
+
+	return true;
+}
+
+uint CStringParser::readInt() {
+	// Get digits from the string
+	CString numStr;
+	while (Common::isDigit(currentChar()))
+		numStr += getNextChar();
+
+	// Throw a wobbly if there wasn't a number
+	if (numStr.empty())
+		error("ReadInt(): No number to read");
+
+	return atoi(numStr.c_str());
+}
+
+char CStringParser::currentChar() const {
+	return (_index >= size()) ? '\0' : (*this)[_index];
+}
+
+char CStringParser::getNextChar() {
+	return (_index >= size()) ? '\0' : (*this)[_index++];
+}
+
+void CStringParser::skipSpaces() {
+	while (_index < size() && Common::isSpace(currentChar()))
+		++_index;
+}
+
+} // End of namespace Titanic
diff --git a/engines/titanic/support/string_parser.h b/engines/titanic/support/string_parser.h
new file mode 100644
index 0000000000..f89caacfb5
--- /dev/null
+++ b/engines/titanic/support/string_parser.h
@@ -0,0 +1,76 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef TITANIC_STRING_PARSER_H
+#define TITANIC_STRING_PARSER_H
+
+#include "titanic/support/string.h"
+
+namespace Titanic {
+
+class CStringParser : public CString {
+private:
+	uint _index;
+private:
+	/**
+	 * Gets the character at the current index
+	 */
+	char currentChar() const;
+
+	/**
+	 * Gets the next character, and increments the parsing index
+	 */
+	char getNextChar();
+
+	/**
+	 * Skips over any spaces
+	 */
+	void skipSpaces();
+public:
+	CStringParser() : CString(), _index(0) {}
+	CStringParser(const CString &str) : CString(str), _index(0) {}
+
+	/**
+	 * Skips over any specified seperator characters in our string
+	 * at the current index
+	 */
+	void skipSeperators(const CString &seperatorChars);
+
+	/**
+	 * Parses out a string from a source string at the current index
+	 * @param resultStr			String to hold the resulting sring
+	 * @param seperatorChras	List of characters that seperate string values
+	 * @param allowQuotes		If true, handles double-quoted substrings
+	 * @returns		True if a string entry was extracted
+	 */
+	bool parse(CString &resultStr, const CString &seperatorChars, bool allowQuotes = false);
+
+	/**
+	 * Reads an integer from the string
+	 */
+	uint readInt();
+
+};
+
+} // End of namespace Titanic
+
+#endif /* TITANIC_STRING_PARSER_H */