can now parse prefix expressions!
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "token/token.hpp"
|
||||
#include "token/type.hpp"
|
||||
|
||||
namespace ast::error {
|
||||
@@ -12,6 +13,14 @@ namespace ast::error {
|
||||
explicit parser_error(const std::string& message): error(message) {}
|
||||
};
|
||||
|
||||
struct unkown_prefix : parser_error {
|
||||
token::token prefix;
|
||||
|
||||
explicit unkown_prefix(token::token prefix, const std::string& message)
|
||||
: parser_error(message),
|
||||
prefix(prefix) {}
|
||||
};
|
||||
|
||||
struct expected_next : parser_error {
|
||||
token::type expected_type;
|
||||
|
||||
|
19
src/ast/expressions/prefix.cpp
Normal file
19
src/ast/expressions/prefix.cpp
Normal file
@@ -0,0 +1,19 @@
|
||||
#include "prefix.hpp"
|
||||
|
||||
#include "token/token.hpp"
|
||||
|
||||
namespace ast {
|
||||
|
||||
prefix_expr::prefix_expr(token::token token, std::string op)
|
||||
: token(std::move(token)),
|
||||
op(op),
|
||||
right(nullptr) {}
|
||||
|
||||
std::string prefix_expr::token_literal() const {
|
||||
return token.literal;
|
||||
}
|
||||
|
||||
std::string prefix_expr::str() const {
|
||||
return token.literal + right->str();
|
||||
}
|
||||
} // namespace ast
|
16
src/ast/expressions/prefix.hpp
Normal file
16
src/ast/expressions/prefix.hpp
Normal file
@@ -0,0 +1,16 @@
|
||||
#pragma once
|
||||
|
||||
#include "ast/ast.hpp"
|
||||
#include "token/token.hpp"
|
||||
|
||||
namespace ast {
|
||||
struct prefix_expr : expression {
|
||||
prefix_expr(token::token token, std::string op);
|
||||
token::token token;
|
||||
std::string op;
|
||||
expression* right;
|
||||
|
||||
std::string token_literal() const override;
|
||||
std::string str() const override;
|
||||
};
|
||||
} // namespace ast
|
@@ -1,7 +1,10 @@
|
||||
#include "parser.hpp"
|
||||
|
||||
#include "ast/errors/error.hpp"
|
||||
#include "ast/expressions/identifier.hpp"
|
||||
#include "ast/expressions/integer.hpp"
|
||||
#include "ast/expressions/prefix.hpp"
|
||||
#include "token/token.hpp"
|
||||
#include "token/type.hpp"
|
||||
|
||||
#include <sstream>
|
||||
@@ -23,6 +26,16 @@ namespace parser {
|
||||
token::type::INT,
|
||||
std::bind(&parser::parse_integer, this)
|
||||
);
|
||||
|
||||
register_prefix(
|
||||
token::type::BANG,
|
||||
std::bind(&parser::parse_prefix_expr, this)
|
||||
);
|
||||
|
||||
register_prefix(
|
||||
token::type::MINUS,
|
||||
std::bind(&parser::parse_prefix_expr, this)
|
||||
);
|
||||
}
|
||||
|
||||
void parser::next_token() {
|
||||
@@ -61,8 +74,10 @@ namespace parser {
|
||||
|
||||
ast::expression* parser::parse_expression(precedence) {
|
||||
auto it = prefix_parse_fns.find(current.type);
|
||||
if (it == prefix_parse_fns.end())
|
||||
if (it == prefix_parse_fns.end()) {
|
||||
unkown_prefix_error(current);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
prefix_parse_fn func = it->second;
|
||||
return func();
|
||||
@@ -130,6 +145,12 @@ namespace parser {
|
||||
errors.push_back(new ast::error::expected_next(t, ss.str()));
|
||||
}
|
||||
|
||||
void parser::unkown_prefix_error(token::token tok) {
|
||||
std::stringstream ss;
|
||||
ss << "No prefix parse function for token " << tok;
|
||||
errors.push_back(new ast::error::unkown_prefix(tok, ss.str()));
|
||||
}
|
||||
|
||||
parser::~parser() {
|
||||
for (const auto& e : errors)
|
||||
delete e;
|
||||
@@ -150,4 +171,11 @@ namespace parser {
|
||||
ast::expression* parser::parse_integer() {
|
||||
return new ast::integer_literal(current, std::stoi(current.literal));
|
||||
};
|
||||
|
||||
ast::expression* parser::parse_prefix_expr() {
|
||||
ast::prefix_expr* ret = new ast::prefix_expr(current, current.literal);
|
||||
next_token();
|
||||
ret->right = parse_expression(precedence::PREFIX);
|
||||
return ret;
|
||||
};
|
||||
} // namespace parser
|
||||
|
@@ -41,11 +41,13 @@ namespace parser {
|
||||
ast::expression_stmt* parse_expression_stmt();
|
||||
bool expect_next(token::type);
|
||||
void next_error(token::type);
|
||||
void unkown_prefix_error(token::token);
|
||||
|
||||
void register_prefix(token::type, prefix_parse_fn);
|
||||
void register_infix(token::type, infix_parse_fn);
|
||||
|
||||
ast::expression* parse_identifier();
|
||||
ast::expression* parse_integer();
|
||||
ast::expression* parse_prefix_expr();
|
||||
};
|
||||
} // namespace parser
|
||||
|
Reference in New Issue
Block a user