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

Minor cleanup

Browse Source
This commit is contained in:
Robert Bendun 2022-07-30 13:40:59 +02:00
parent 2ea507dde2
commit 0e796d5efc
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "lib/midi"]
path = lib/midi
url = git@engi.evolpe.it:pi/midi.git
url = https://git.wmi.amu.edu.pl/s416496/midi.git

2
src/interpreter.cc
View File

@ -217,6 +217,8 @@ static Result<Value> plus_minus_operator(Interpreter &interpreter, std::vector<V
}
// TODO Limit possibilities based on provided types
static_assert(std::is_same_v<std::plus<>, Binary_Operation> || std::is_same_v<std::minus<>, Binary_Operation>,
"Error message printing only supports operators given above");
return Error {
.details = errors::Unsupported_Types_For {
.type = errors::Unsupported_Types_For::Operator,

13
src/lexer.cc
View File

@ -23,6 +23,11 @@ static_assert(Keywords.size() == Keywords_Count, "Table above should contain all
void Lexer::skip_whitespace_and_comments()
{
// Comments in this language have two kinds:
// Single line comment that starts with either '--' or '#!' and ends with end of line
// Multiline comments that start with at least 3 '-' and ends with at least 3 '-'
// This function skips over all of them
for (;;) {
{ // Skip whitespace
bool done_something = false;
@ -37,7 +42,7 @@ void Lexer::skip_whitespace_and_comments()
}
}
// -- line and multiline coments
// Skip -- line and multiline coments
if (consume_if('-', '-')) {
if (!consume_if('-')) {
// skiping a single line comment requires advancing until newline
@ -97,6 +102,8 @@ auto Lexer::next_token() -> Result<std::variant<Token, End_Of_File>>
return Token { Token::Type::Parameter_Separator, finish(), token_location };
}
// Lex numeric literals
// They may have following forms: 0, 0.1
if (consume_if(unicode::is_digit)) {
while (consume_if(unicode::is_digit)) {}
if (peek() == '.') {
@ -112,7 +119,7 @@ auto Lexer::next_token() -> Result<std::variant<Token, End_Of_File>>
return Token { Token::Type::Numeric, finish(), token_location };
}
// lex chord declaration
// Lex chord declaration
if (consume_if(Notes_Symbols)) {
while (consume_if("#sfb")) {}
@ -127,6 +134,7 @@ auto Lexer::next_token() -> Result<std::variant<Token, End_Of_File>>
return Token { Token::Type::Chord, finish(), token_location };
}
// Lex symbol
using namespace std::placeholders;
if (consume_if(std::bind(unicode::is_identifier, _1, unicode::First_Character::Yes))) {
symbol_lexing:
@ -140,6 +148,7 @@ auto Lexer::next_token() -> Result<std::variant<Token, End_Of_File>>
return t;
}
// Lex operator
if (consume_if(Valid_Operator_Chars)) {
while (consume_if(Valid_Operator_Chars)) {}
return Token { Token::Type::Operator, finish(), token_location };