fix bugs and simplify code
This commit is contained in:
+3
-25
@@ -80,11 +80,11 @@ int check_syntax(std::vector<Expression::Token>& tv)
|
||||
case Expression::Token::CPA:
|
||||
break;
|
||||
case Expression::Token::OPA:
|
||||
pr_warn("Expected value or closing bracket at token 0, got opening bracket");
|
||||
pr_warn("Expected value or closing bracket at token " << tv.size() - 1 << ", got opening bracket");
|
||||
problem_cnt++;
|
||||
break;
|
||||
default:
|
||||
pr_warn("Expected value or closing bracket at token 0, got operator");
|
||||
pr_warn("Expected value or closing bracket at token " << tv.size() - 1 << ", got operator");
|
||||
problem_cnt++;
|
||||
break;
|
||||
}
|
||||
@@ -812,29 +812,7 @@ Expression::TreeNode ov_to_tree(const std::vector<Expression::Token> tv, const s
|
||||
{
|
||||
Expression::TreeNode root;
|
||||
std::queue<std::pair<Expression::TreeNode *, int>> queued_ops;
|
||||
|
||||
const Expression::Operation &root_op = ov[ov.size() - 1];
|
||||
root.o = root_op.o;
|
||||
|
||||
switch (root_op.tl)
|
||||
{
|
||||
case Expression::Operation::DERIVED:
|
||||
queued_ops.emplace(root.l = new Expression::TreeNode(), root_op.il);
|
||||
break;
|
||||
case Expression::Operation::NORMAL:
|
||||
root.l = new Expression::TreeNode(tv[root_op.il]);
|
||||
break;
|
||||
}
|
||||
|
||||
switch (root_op.tr)
|
||||
{
|
||||
case Expression::Operation::DERIVED:
|
||||
queued_ops.emplace(root.r = new Expression::TreeNode(), root_op.ir);
|
||||
break;
|
||||
case Expression::Operation::NORMAL:
|
||||
root.r = new Expression::TreeNode(tv[root_op.ir]);
|
||||
break;
|
||||
}
|
||||
queued_ops.emplace(&root, ov.size() - 1);
|
||||
|
||||
while (queued_ops.size())
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user