Skip to content

Add columns to error messages #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NoahGJAC wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add columns to error messages #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/parser.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ class Parser {

void error_expected(const std::string& msg) const
{
std::cerr << "[Parse Error] Expected " << msg << " on line " << peek(-1).value().line << std::endl;
const Token tok = peek(-1).value();
std::cerr << "[Parse Error] Expected " << msg << " on line " << tok.line << " at column " << tok.col << std::endl;
exit(EXIT_FAILURE);
}

Expand Down Expand Up @@ -161,7 +162,7 @@ class Parser {
else {
break;
}
const auto [type, line, value] = consume();
const auto [type, line, col, value] = consume();
const int next_min_prec = prec.value() + 1;
auto expr_rhs = parse_expr(next_min_prec);
if (!expr_rhs.has_value()) {
Expand Down
39 changes: 22 additions & 17 deletions src/tokenization.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ inline std::optional<int> bin_prec(const TokenType type)
struct Token {
TokenType type;
int line;
int col;
std::optional<std::string> value {};
};

Expand All @@ -103,27 +104,27 @@ class Tokenizer {
buf.push_back(consume());
}
if (buf == "exit") {
tokens.push_back({ TokenType::exit, line_count });
tokens.push_back({ TokenType::exit, line_count, column_count });
buf.clear();
}
else if (buf == "let") {
tokens.push_back({ TokenType::let, line_count });
tokens.push_back({ TokenType::let, line_count, column_count });
buf.clear();
}
else if (buf == "if") {
tokens.push_back({ TokenType::if_, line_count });
tokens.push_back({ TokenType::if_, line_count, column_count });
buf.clear();
}
else if (buf == "elif") {
tokens.push_back({ TokenType::elif, line_count });
tokens.push_back({ TokenType::elif, line_count, column_count });
buf.clear();
}
else if (buf == "else") {
tokens.push_back({ TokenType::else_, line_count });
tokens.push_back({ TokenType::else_, line_count, column_count });
buf.clear();
}
else {
tokens.push_back({ TokenType::ident, line_count, buf });
tokens.push_back({ TokenType::ident, line_count, column_count, buf });
buf.clear();
}
}
Expand All @@ -132,7 +133,7 @@ class Tokenizer {
while (peek().has_value() && std::isdigit(peek().value())) {
buf.push_back(consume());
}
tokens.push_back({ TokenType::int_lit, line_count, buf });
tokens.push_back({ TokenType::int_lit, line_count, column_count, buf });
buf.clear();
}
else if (peek().value() == '/' && peek(1).has_value() && peek(1).value() == '/') {
Expand Down Expand Up @@ -160,47 +161,48 @@ class Tokenizer {
}
else if (peek().value() == '(') {
consume();
tokens.push_back({ TokenType::open_paren, line_count });
tokens.push_back({ TokenType::open_paren, line_count, column_count });
}
else if (peek().value() == ')') {
consume();
tokens.push_back({ TokenType::close_paren, line_count });
tokens.push_back({ TokenType::close_paren, line_count, column_count });
}
else if (peek().value() == ';') {
consume();
tokens.push_back({ TokenType::semi, line_count });
tokens.push_back({ TokenType::semi, line_count, column_count });
}
else if (peek().value() == '=') {
consume();
tokens.push_back({ TokenType::eq, line_count });
tokens.push_back({ TokenType::eq, line_count, column_count });
}
else if (peek().value() == '+') {
consume();
tokens.push_back({ TokenType::plus, line_count });
tokens.push_back({ TokenType::plus, line_count, column_count });
}
else if (peek().value() == '*') {
consume();
tokens.push_back({ TokenType::star, line_count });
tokens.push_back({ TokenType::star, line_count, column_count });
}
else if (peek().value() == '-') {
consume();
tokens.push_back({ TokenType::minus, line_count });
tokens.push_back({ TokenType::minus, line_count, column_count });
}
else if (peek().value() == '/') {
consume();
tokens.push_back({ TokenType::fslash, line_count });
tokens.push_back({ TokenType::fslash, line_count, column_count });
}
else if (peek().value() == '{') {
consume();
tokens.push_back({ TokenType::open_curly, line_count });
tokens.push_back({ TokenType::open_curly, line_count, column_count });
}
else if (peek().value() == '}') {
consume();
tokens.push_back({ TokenType::close_curly, line_count });
tokens.push_back({ TokenType::close_curly, line_count, column_count });
}
else if (peek().value() == '\n') {
consume();
line_count++;
column_count = 1;
}
else if (std::isspace(peek().value())) {
consume();
Expand All @@ -223,8 +225,11 @@ class Tokenizer {
return m_src.at(m_index + offset);
}

int column_count = 1;

char consume()
{
column_count++;
return m_src.at(m_index++);
}

Expand Down