************************************************************

* Merged Source Code from Development Trunk: Revision 4063 * ************************************************************ - Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP - This will be the Source for the Beta 2011 Test git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2026-09-02 14:36:06 +02:00 · 2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
@@ -2,15 +2,61 @@
 #define _XML_PARSER_H_

 #include "expat.h"
-#include "XML.h"
+//#include "XML.h"
+#include <string>
+
+template<typename OperandType>
+class LazyCondition
+{
+public:
+	typedef bool (*cond_fct)(OperandType op1, OperandType op2);
+	LazyCondition(OperandType op1, OperandType op2, cond_fct fct)
+		: _op1(op1), _op2(op2), _fct(fct)
+	{};
+	bool check()
+	{
+		return _fct(_op1,_op2);
+	}
+private:
+	OperandType	_op1;
+	OperandType	_op2;
+	cond_fct	_fct;
+};
+
+inline bool lazyStrEqual(const char* str1, const char* str2)
+{
+	return strcmp(str1,str2) == 0;
+}
+
+class LazyStrEqual : public LazyCondition<const char*>
+{
+public:
+	LazyStrEqual(const char* str1, const char* str2)
+		: LazyCondition<const char*>(str1, str2, lazyStrEqual)
+	{};
+};
+
+class LazyTrue : public LazyCondition<bool>
+{
+	static bool True(bool a, bool b){return true;};
+public:
+	LazyTrue() : LazyCondition<bool>(true,true,LazyTrue::True) {};
+};
+

 class IXMLParser
 {
 public:
 	const XML_Char* ElementName;
 public:
-	IXMLParser(const XML_Char *element_name, XML_Parser &parser, IXMLParser* caller=NULL) 
-		: _parser(parser), _caller(caller), ElementName(element_name) {};
+	IXMLParser(const XML_Char *element_name, XML_Parser* parser, IXMLParser* caller=NULL) 
+		: _caller(caller), ElementName(element_name)
+	{
+		if(parser)
+		{
+			this->setParser(parser);
+		}
+	};
 	~IXMLParser() {};

 	/**
@@ -35,9 +81,9 @@ public:
 	}
 	void grabParser()
 	{
-		XML_SetUserData(_parser,this);
-		XML_SetElementHandler(_parser, IXMLParser::onStartCallback, IXMLParser::onEndCallback);
-		XML_SetCharacterDataHandler(_parser, IXMLParser::onTextCallback);
+		XML_SetUserData(*_parser,this);
+		XML_SetElementHandler(*_parser, IXMLParser::onStartCallback, IXMLParser::onEndCallback);
+		XML_SetCharacterDataHandler(*_parser, IXMLParser::onTextCallback);
 	}

 	/**
@@ -48,8 +94,88 @@ public:
 	virtual void onEndElement(const XML_Char* name)
 	{};
 	virtual void onTextElement(const XML_Char *str, int len)
-	{};
+	{
+	};
+
+	class Attributes
+	{
+	public:
+		Attributes(const XML_Char** atts) : _atts(atts) {};
+		XML_Char const* get(const XML_Char* attr_name) const
+		{
+			const XML_Char** atts = _atts;
+			while(*atts)
+			{
+				if(strcmp(*atts++,attr_name) == 0)
+				{
+					return *atts;
+				}
+				atts++;
+			}
+			return "";
+		}
+		bool getLong(const XML_Char* attr_name, long& attr) const
+		{
+			XML_Char const* result = this->get(attr_name);
+			if( strcmp(result,"") != 0)
+			{
+				attr = (int)atol(result);
+				return true;
+			}
+			return false;
+		}
+		bool getDouble(const XML_Char* attr_name, double &attr) const
+		{
+			XML_Char const* result = this->get(attr_name);
+			if( strcmp(result,"") != 0)
+			{
+				attr = atof(result);
+				return true;
+			}
+			return false;
+		}
+	private:
+		const XML_Char** _atts;
+	};
+
+	template<typename StateType>
+	class ParserState
+	{
+	public:
+		ParserState(const StateType start_state)
+			: _my_state(start_state)
+		{};
+
+		StateType const& state()
+		{
+			return _my_state;
+		}
+
+		template<typename ConditionOperandType>
+		bool stateTransition(const StateType current_state, LazyCondition<ConditionOperandType> condition, const StateType next_state)
+		{
+			if(_my_state == current_state && condition.check() )
+			{
+				_my_state = next_state;
+				return true;
+			}
+			return false;
+		}
+	private:
+		StateType _my_state;
+	};
+
+	XML_Parser& getParser()
+	{
+		return *_parser;
+	}
 protected:
+	void setParser(XML_Parser* parser)
+	{
+		_parser = parser;
+		// grabParser(); ???
+	}
+
 	XML_Char const* getAttribute(const XML_Char* attr_name, const XML_Char** atts)
 	{
 		while(*atts)
@@ -85,12 +211,12 @@ protected:

 	int getCurrentLineNumber()
 	{
-		return XML_GetCurrentLineNumber(this->_parser);
+		return XML_GetCurrentLineNumber(*this->_parser);
 	}
 protected:
 	std::string		sCharData;

-	XML_Parser&		_parser;
+	XML_Parser*		_parser;
 	IXMLParser*		_caller;
 };