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

diff --git a/src/loader/Parser.cpp b/src/loader/Parser.cpp
index 6e5cbe0..183accb 100644
--- a/src/loader/Parser.cpp
+++ b/src/loader/Parser.cpp
@@ -85,23 +85,24 @@ Declaration *Parser::ProbeDefinition() {
 	string typeName(ParseTypeName());
 	string identifier(ParseIdentifier());
 
-	Tokenizer::Token t(GetToken());
-	tok.Putback(t);
-	if (BeginOfPropertyList(t)) {
-		auto_ptr<PropertyList> propertyList(ParsePropertyList());
-		auto_ptr<Definition> dfn(new Definition(typeName, identifier));
-		dfn->SetValue(propertyList.release());
-		product.AddDefinition(dfn.get());
-		return dfn.release();
-	} else if (BeginningOfLiteral(t)) {
-		auto_ptr<Literal> literal(ParseLiteral());
-		auto_ptr<Definition> dfn(new Definition(typeName, identifier));
-		dfn->SetValue(literal.release());
-		product.AddDefinition(dfn.get());
-		return dfn.release();
-	} else {
-		return new Declaration(typeName, identifier);
+	if (tok.HasMore()) {
+		Tokenizer::Token t(GetToken());
+		tok.Putback(t);
+		if (BeginOfPropertyList(t)) {
+			auto_ptr<PropertyList> propertyList(ParsePropertyList());
+			auto_ptr<Definition> dfn(new Definition(typeName, identifier));
+			dfn->SetValue(propertyList.release());
+			product.AddDefinition(dfn.get());
+			return dfn.release();
+		} else if (BeginningOfPrimitiveLiteral(t)) {
+			auto_ptr<Literal> literal(ParseLiteral());
+			auto_ptr<Definition> dfn(new Definition(typeName, identifier));
+			dfn->SetValue(literal.release());
+			product.AddDefinition(dfn.get());
+			return dfn.release();
+		}
 	}
+	return new Declaration(typeName, identifier);
 }
 
 bool Parser::BeginningOfLiteral(const Tokenizer::Token &t) const {
@@ -121,6 +122,22 @@ bool Parser::BeginningOfLiteral(const Tokenizer::Token &t) const {
 	}
 }
 
+bool Parser::BeginningOfPrimitiveLiteral(const Tokenizer::Token &t) const {
+	switch (t.type) {
+		case Tokenizer::Token::CHEVRON_OPEN:
+		case Tokenizer::Token::COLON:
+		case Tokenizer::Token::BRACKET_OPEN:
+		case Tokenizer::Token::PARENTHESIS_OPEN:
+		case Tokenizer::Token::NUMBER:
+		case Tokenizer::Token::STRING:
+		case Tokenizer::Token::KEYWORD_FALSE:
+		case Tokenizer::Token::KEYWORD_TRUE:
+			return true;
+		default:
+			return false;
+	}
+}
+
 bool Parser::BeginOfPropertyList(const Tokenizer::Token &t) const {
 	return t.type == Tokenizer::Token::ANGLE_BRACKET_OPEN;
 }
@@ -237,9 +254,8 @@ Literal *Parser::ParseArray() {
 	AssertTokenType(t.type, Tokenizer::Token::BRACKET_OPEN);
 
 	Tokenizer::Token probe(GetToken());
-	tok.Putback(probe);
 
-	if (probe.type == Tokenizer::Token::ANGLE_BRACKET_OPEN) {
+	if (probe.type == Tokenizer::Token::TYPE_NAME) {
 		vector<PropertyList *> values;
 		while (t.type != Tokenizer::Token::BRACKET_CLOSE) {
 			PropertyList *value(ParsePropertyList());
@@ -250,8 +266,10 @@ Literal *Parser::ParseArray() {
 				throw Error(file, tok.Line(), string("unexpected token ") + TokenTypeToString(t.type) + ", expected , or ]");
 			}
 		}
-		return new Literal(values);
+		return new Literal(probe.str, values);
 	} else {
+		tok.Putback(probe);
+
 		vector<Value *> values;
 		while (t.type != Tokenizer::Token::BRACKET_CLOSE) {
 			Value *value(ParseValue());
@@ -287,7 +305,7 @@ Literal *Parser::ParseColor() {
 	AssertTokenType(blue.type, Tokenizer::Token::NUMBER, "error parsing blue component of color");
 
 	t = GetToken();
-	if (t.type == Tokenizer::Token::BRACKET_CLOSE) {
+	if (t.type == Tokenizer::Token::PARENTHESIS_CLOSE) {
 		return new Literal(red.number, green.number, blue.number);
 	} else if (t.type != Tokenizer::Token::COMMA) {
 		Tokenizer::Token alpha(GetToken());