hasslesstech/pzks-labs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs and simplify code

Browse Source
This commit is contained in:
hasslesstech
2026-10-07 17:35:04 +03:00
parent afb4b5de20
commit 8bc359fed6
1 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/syntaxer.cpp
+4 -26
View File
@@ -13,7 +13,7 @@ static void highlight_issue(const std::vector<Expression::Token>& tv, const int
int start = location - 7 < 0 ? 0 : location - 7; int start = location - 7 < 0 ? 0 : location - 7;
int finish = location + 7 > tv.size() - 1 ? tv.size() - 1 : location + 7; int finish = location + 7 > tv.size() - 1 ? tv.size() - 1 : location + 7;
std::cout << " >>> "; std::cout << " >>> ";
for (int i = start; i <= finish; i++) for (int i = start; i <= finish; i++)
{ {
@@ -80,11 +80,11 @@ int check_syntax(std::vector<Expression::Token>& tv)
case Expression::Token::CPA: case Expression::Token::CPA:
break; break;
case Expression::Token::OPA: 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++; problem_cnt++;
break; break;
default: 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++; problem_cnt++;
break; break;
} }
@@ -812,29 +812,7 @@ Expression::TreeNode ov_to_tree(const std::vector<Expression::Token> tv, const s
{ {
Expression::TreeNode root; Expression::TreeNode root;
std::queue<std::pair<Expression::TreeNode *, int>> queued_ops; std::queue<std::pair<Expression::TreeNode *, int>> queued_ops;
queued_ops.emplace(&root, ov.size() - 1);
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;
}
while (queued_ops.size()) while (queued_ops.size())
{ {