#include "Parser.h"
+#include "utility.h"
+
#include <auto_ptr.h>
#include <fstream>
namespace loader {
+Parser::Parser(const string &file, ParsedSource &product)
+: file(file)
+, dirname(Dirname(file))
+, in(this->file.c_str())
+, tok(in)
+, product(product) {
+ if (!in) {
+ throw Error(file, 0, "unable to read file");
+ }
+}
+
void Parser::Parse() {
while (tok.HasMore()) {
ParseStatement();
void Parser::ParseIncludeDirective() {
Tokenizer::Token t(GetToken());
AssertTokenType(t.type, Tokenizer::Token::STRING);
- Parser sub(t.str.c_str(), product); // TODO: resolve path name
+ Parser sub(CatPath(dirname, t.str), product);
sub.Parse();
}
Tokenizer::Token t(GetToken());
tok.Putback(t);
if (BeginOfPropertyList(t)) {
- PropertyList *propertyList(ParsePropertyList());
- Definition *dfn(new Definition(typeName, identifier));
- dfn->SetValue(propertyList);
- return dfn;
+ 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)) {
- Literal *literal(ParseLiteral());
- Definition *dfn(new Definition(typeName, identifier));
- dfn->SetValue(literal);
- return dfn;
+ 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);
}
bool Parser::BeginningOfLiteral(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::CHEVRON_OPEN:
tok.Putback(t);
return ParseVector();
+ case Tokenizer::Token::COLON:
+ t = GetToken();
+ AssertTokenType(t.type, Tokenizer::Token::STRING);
+ return new Literal(dirname, t.str);
case Tokenizer::Token::BRACKET_OPEN:
tok.Putback(t);
return ParseArray();
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());