X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FParser.cpp;h=52585c4cdd0f11ba40829a7a039456a390674e6f;hb=3a30342daecdb9ee050ab20fcb50819a599d6343;hp=183accbbb728f1cdca9c672b33a2a454c43d94e6;hpb=40233fc8eea1c80e6c57a004dfe7e55dabf06edb;p=l2e.git

diff --git a/src/loader/Parser.cpp b/src/loader/Parser.cpp
index 183accb..52585c4 100644
--- a/src/loader/Parser.cpp
+++ b/src/loader/Parser.cpp
@@ -112,6 +112,7 @@ bool Parser::BeginningOfLiteral(const Tokenizer::Token &t) const {
 		case Tokenizer::Token::BRACKET_OPEN:
 		case Tokenizer::Token::PARENTHESIS_OPEN:
 		case Tokenizer::Token::NUMBER:
+		case Tokenizer::Token::SCRIPT_BEGIN:
 		case Tokenizer::Token::STRING:
 		case Tokenizer::Token::KEYWORD_FALSE:
 		case Tokenizer::Token::KEYWORD_TRUE:
@@ -142,6 +143,10 @@ bool Parser::BeginOfPropertyList(const Tokenizer::Token &t) const {
 	return t.type == Tokenizer::Token::ANGLE_BRACKET_OPEN;
 }
 
+bool Parser::BeginningOfScriptLiteral(const Tokenizer::Token &t) const {
+	return t.type == Tokenizer::Token::SCRIPT_BEGIN;
+}
+
 Definition *Parser::ParseDefinition() {
 	string typeName(ParseTypeName());
 	string identifier(ParseIdentifier());
@@ -218,7 +223,10 @@ Literal *Parser::ParseLiteral() {
 	if (t.type == Tokenizer::Token::TYPE_NAME) {
 		PropertyList *props(ParsePropertyList());
 		return new Literal(t.str, props);
-	} else if (BeginningOfLiteral(t)) {
+	} else if (BeginningOfScriptLiteral(t)) {
+		tok.Putback(t);
+		return ParseScript();
+	} else if (BeginningOfPrimitiveLiteral(t)) {
 		switch (t.type) {
 			case Tokenizer::Token::CHEVRON_OPEN:
 				tok.Putback(t);
@@ -340,6 +348,51 @@ Literal *Parser::ParseVector() {
 	return new Literal(x.number, y.number);
 }
 
+Literal *Parser::ParseScript() {
+	std::string msg("error parsing script");
+	Tokenizer::Token t(GetToken());
+	AssertTokenType(t.type, Tokenizer::Token::SCRIPT_BEGIN, msg);
+
+	vector<ScriptToken *> script;
+	try {
+		while (t.type != Tokenizer::Token::SCRIPT_END) {
+			if (BeginningOfPrimitiveLiteral(t)) {
+				tok.Putback(t);
+				script.push_back(new ScriptToken(ParseLiteral()));
+			} else {
+				switch (t.type) {
+					case Tokenizer::Token::COMMAND: {
+						Tokenizer::Token t2(GetToken());
+						AssertTokenType(t.type, Tokenizer::Token::IDENTIFIER, msg);
+						script.push_back(new ScriptToken(t2.str, ScriptToken::COMMAND));
+						break;
+					}
+					case Tokenizer::Token::IDENTIFIER: {
+						script.push_back(new ScriptToken(t.str, ScriptToken::IDENTIFIER));
+						break;
+					}
+					case Tokenizer::Token::REGISTER: {
+						Tokenizer::Token t2(GetToken());
+						AssertTokenType(t.type, Tokenizer::Token::IDENTIFIER, msg);
+						script.push_back(new ScriptToken(t2.str, ScriptToken::REGISTER));
+						break;
+					}
+					default:
+						throw Error(file, tok.Line(), string("unexpected token in script: ") + TokenTypeToString(t.type));
+				}
+			}
+			t = GetToken();
+		}
+	} catch (...) {
+		for (vector<ScriptToken *>::const_iterator i(script.begin()), end(script.end()); i != end; ++i) {
+			delete *i;
+		}
+		throw;
+	}
+	return new Literal(script);
+}
+
+
 void Parser::AssertTokenType(Tokenizer::Token::Type actual, Tokenizer::Token::Type expected) {
 	if (expected != actual) {
 		throw Error(file, tok.Line(), string("unexpected token ") + TokenTypeToString(actual) + ", expected " + TokenTypeToString(expected));