s416496/musique
1
0
Fork 0
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

Human readable token type names for error reporting

Browse Source
This commit is contained in:
Robert Bendun 2022-05-29 22:46:20 +02:00
parent 605533de32
commit 9c4b57f217
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lexer.cc
View File

@ -240,3 +240,21 @@ std::ostream& operator<<(std::ostream& os, Token::Type type)
} }
unreachable(); unreachable();
} }
std::string_view type_name(Token::Type type)
{
switch (type) {
case Token::Type::Chord: return "chord";
case Token::Type::Close_Block: return "]";
case Token::Type::Close_Paren: return ")";
case Token::Type::Expression_Separator: return "|";
case Token::Type::Keyword: return "keyword";
case Token::Type::Numeric: return "numeric";
case Token::Type::Open_Block: return "[";
case Token::Type::Open_Paren: return "(";
case Token::Type::Operator: return "operator";
case Token::Type::Parameter_Separator: return "parameter separator";
case Token::Type::Symbol: return "symbol";
}
unreachable();
}

2
src/musique.hh
View File

@ -350,6 +350,8 @@ struct Token
Location location; Location location;
}; };
std::string_view type_name(Token::Type type);
/// Token debug printing /// Token debug printing
std::ostream& operator<<(std::ostream& os, Token const& tok); std::ostream& operator<<(std::ostream& os, Token const& tok);

4
src/parser.cc
View File

@ -66,7 +66,7 @@ Result<Ast> Parser::parse_variable_declaration()
Error error; Error error;
errors::Expected_Keyword kw { .keyword = "var" }; errors::Expected_Keyword kw { .keyword = "var" };
if (token_id >= tokens.size()) { if (token_id >= tokens.size()) {
kw.received_type = ""; // TODO Token type kw.received_type = type_name(peek()->type);
error.location = peek()->location; error.location = peek()->location;
} }
error.details = std::move(kw); error.details = std::move(kw);
@ -170,7 +170,7 @@ Result<Ast> Parser::parse_atomic_expression()
default: default:
return Error { return Error {
.details = errors::internal::Unexpected_Token { .details = errors::internal::Unexpected_Token {
.type = "", // TODO fill type .type = type_name(peek()->type),
.source = peek()->source, .source = peek()->source,
.when = "atomic expression parsing" .when = "atomic expression parsing"
}, },