X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FParsedSource.h;h=28aca131d0d4afccd4e9ad282e592f36e7a3f316;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=5012729b93344e0f521b9fd79b1bf1803b384260;hpb=40233fc8eea1c80e6c57a004dfe7e55dabf06edb;p=l2e.git

diff --git a/src/loader/ParsedSource.h b/src/loader/ParsedSource.h
index 5012729..28aca13 100644
--- a/src/loader/ParsedSource.h
+++ b/src/loader/ParsedSource.h
@@ -1,13 +1,12 @@
-/*
- * ParsedSource.h
- *
- *  Created on: Aug 26, 2012
- *      Author: holy
- */
-
 #ifndef LOADER_PARSEDSOURCE_H_
 #define LOADER_PARSEDSOURCE_H_
 
+namespace loader {
+	class Literal;
+	class PropertyList;
+	class Value;
+}
+
 #include <iosfwd>
 #include <map>
 #include <set>
@@ -16,8 +15,39 @@
 
 namespace loader {
 
-class PropertyList;
-class Value;
+class ScriptToken {
+
+public:
+	enum Type {
+		COMMAND,
+		REGISTER,
+		IDENTIFIER,
+		LITERAL,
+		LABEL,
+	};
+
+	ScriptToken(const std::string &, Type);
+	explicit ScriptToken(Literal *);
+	~ScriptToken();
+private:
+	ScriptToken(const ScriptToken &);
+	ScriptToken &operator =(const ScriptToken &);
+
+public:
+	Type GetType() const { return type; }
+	const std::string &RegisterName() const;
+	const std::string &CommandName() const;
+	const std::string &Identifier() const;
+	const std::string &Label() const;
+	const Literal *GetLiteral() const;
+
+private:
+	Literal *literal;
+	std::string str;
+	Type type;
+
+};
+
 
 class Literal {
 
@@ -25,25 +55,40 @@ public:
 	enum Type {
 		ARRAY_VALUES,
 		ARRAY_PROPS,
+		ARRAY_IDENTS,
 		BOOLEAN,
 		COLOR,
 		NUMBER,
 		PATH,
 		STRING,
 		VECTOR,
-		OBJECT
+		OBJECT,
+		SCRIPT,
 	};
 
 public:
+	/// array of values
 	explicit Literal(const std::vector<Value *> &);
+	/// array of objects
 	Literal(const std::string &, const std::vector<PropertyList *> &);
+	/// array of identifiers
+	Literal(const std::string &, const std::vector<std::string> &);
+	/// boolean
 	explicit Literal(bool);
+	/// color
 	Literal(int r, int g, int b, int a = 255);
+	/// number
 	explicit Literal(int number);
+	/// path string
 	Literal(const std::string &dir, const std::string &path);
+	/// string
 	Literal(const std::string &);
+	/// vector
 	Literal(int x, int y);
+	/// object
 	Literal(const std::string &typeName, PropertyList *properties);
+	/// script
+	explicit Literal(const std::vector<ScriptToken *> &);
 	~Literal();
 private:
 	Literal(const Literal &);
@@ -51,12 +96,14 @@ private:
 
 public:
 	Type GetType() const { return type; }
-	bool IsArray() const { return GetType() == ARRAY_VALUES || GetType() == ARRAY_PROPS; }
+	bool IsArray() const { return GetType() == ARRAY_VALUES || GetType() == ARRAY_PROPS || GetType() == ARRAY_IDENTS; }
 	bool IsObject() const { return GetType() == OBJECT; }
-	int ArraySize() const { return GetType() == ARRAY_VALUES ? GetValues().size() : GetPropertyLists().size(); }
+	int ArraySize() const { return GetType() == ARRAY_VALUES ? GetValues().size()
+			: (GetType() == ARRAY_PROPS ? GetPropertyLists().size() : GetIdentifiers().size()); }
 
 	const std::vector<Value *> &GetValues() const;
 	const std::vector<PropertyList *> &GetPropertyLists() const;
+	const std::vector<std::string> &GetIdentifiers() const;
 	bool GetBoolean() const;
 	int GetRed() const;
 	int GetGreen() const;
@@ -68,12 +115,15 @@ public:
 	int GetY() const;
 	const std::string &GetTypeName() const;
 	const PropertyList *GetProperties() const;
+	const std::vector<ScriptToken *> &GetScript() const;
 
 private:
 	PropertyList *props;
 	std::string typeName, str;
 	std::vector<Value *> values;
 	std::vector<PropertyList *> propertyLists;
+	std::vector<std::string> identifiers;
+	std::vector<ScriptToken *> script;
 	int i1, i2, i3, i4;
 	bool b;
 	Type type;