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

";" input does not raise an error anymore. Missing '=' precedanse

Browse Source
This commit is contained in:
Robert Bendun 2022-09-17 11:49:09 +02:00
parent cb13dc9591
commit 98a88c3acc
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/common-array-operations.mq Normal file
View File

@ -0,0 +1,4 @@
var map = [fn array | var result = []; for array [v | result = result & [fn v] ]; result];
var drop = [n arr | arr.(range n (len arr))];
var take = [n arr | arr.(up n)];
var filter = [predicate arr | arr.(map predicate arr)];

12
src/builtin_operators.cc
View File

@ -206,13 +206,9 @@ static Result<Value> multiplication_operator(Interpreter &i, std::vector<Value>
using Operator_Entry = std::tuple<char const*, Intrinsic>; using Operator_Entry = std::tuple<char const*, Intrinsic>;
struct pow_operator using power = decltype([](Number lhs, Number rhs) -> Result<Number> {
{ return lhs.pow(rhs);
inline Result<Number> operator()(Number lhs, Number rhs) });
{
return lhs.pow(rhs);
}
};
/// Operators definition table /// Operators definition table
static constexpr auto Operators = std::array { static constexpr auto Operators = std::array {
@ -221,7 +217,7 @@ static constexpr auto Operators = std::array {
Operator_Entry { "*", multiplication_operator }, Operator_Entry { "*", multiplication_operator },
Operator_Entry { "/", binary_operator<std::divides<>, '/'> }, Operator_Entry { "/", binary_operator<std::divides<>, '/'> },
Operator_Entry { "%", binary_operator<std::modulus<>, '%'> }, Operator_Entry { "%", binary_operator<std::modulus<>, '%'> },
Operator_Entry { "**", binary_operator<pow_operator, '*', '*'> }, Operator_Entry { "**", binary_operator<power, '*', '*'> },
Operator_Entry { "!=", comparison_operator<std::not_equal_to<>> }, Operator_Entry { "!=", comparison_operator<std::not_equal_to<>> },
Operator_Entry { "<", comparison_operator<std::less<>> }, Operator_Entry { "<", comparison_operator<std::less<>> },

10
src/parser.cc
View File

@ -379,8 +379,15 @@ static Result<std::vector<Ast>> parse_many(
std::vector<Ast> trees; std::vector<Ast> trees;
Result<Ast> expr; Result<Ast> expr;
if (at_least == At_Least::Zero && p.token_id >= p.tokens.size()) // Consume random separators laying before sequence. This was added to prevent
// an error when input is only expression separator ";"
while (separator && at_least == At_Least::Zero && p.expect(*separator)) {
p.consume();
}
if (at_least == At_Least::Zero && p.token_id >= p.tokens.size()) {
return {}; return {};
}
while ((expr = (p.*parser)()).has_value()) { while ((expr = (p.*parser)()).has_value()) {
trees.push_back(std::move(expr).value()); trees.push_back(std::move(expr).value());
@ -524,6 +531,7 @@ static usize precedense(std::string_view op)
// Exclusion of them is marked by subtracting total number of excluded operators. // Exclusion of them is marked by subtracting total number of excluded operators.
static_assert(Operators_Count - 1 == 15, "Ensure that all operators have defined precedense below"); static_assert(Operators_Count - 1 == 15, "Ensure that all operators have defined precedense below");
if (one_of(op, "=")) return 0;
if (one_of(op, "or")) return 100; if (one_of(op, "or")) return 100;
if (one_of(op, "and")) return 150; if (one_of(op, "and")) return 150;
if (one_of(op, "<", ">", "<=", ">=", "==", "!=")) return 200; if (one_of(op, "<", ">", "<=", ">=", "==", "!=")) return 200;