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

lab2 feat: add constant folding

Browse Source
This commit is contained in:
hasslesstech
2026-10-14 15:16:08 +03:00
parent 35e38127e7
commit 433ee2bb2e
2 changed files with 87 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
inc/expression.hpp
+6 -1
View File
@@ -186,17 +186,22 @@ public:
std::shared_ptr<std::string> to_math_str(void) const
{
char buffer[128] = {0};
switch (t)
{
case VAR:
return v.s;
case CONST:
{
char buffer[128] = {0};
return std::make_shared<std::string>((std::ostringstream() << v.d).str());
}
case OPERATOR:
return std::make_shared<std::string>(op_math_str());
case CV:
return std::make_shared<std::string>((std::ostringstream() << "t" << v.cv.i).str());
case NAT:
return std::make_shared<std::string>("");
default:
return std::make_shared<std::string>("Not a valid token!");
}
src/syntaxer.cpp
+64 -35
View File
@@ -5,6 +5,7 @@
#include <queue>
#include <stack>
#include <vector>
#include <cmath>
namespace Syntax {
@@ -439,7 +440,7 @@ static int get_max_index(const std::vector<int>& v)
static void write_operation(
std::vector<Expression::Operation>& ov,
const std::vector<Expression::Token>& tv,
std::vector<Expression::Token>& cv,
std::vector<Expression::Token>& mv,
std::vector<int>& mp,
int position)
@@ -448,10 +449,54 @@ static void write_operation(
int left_location = get_left_location(mv, location);
int right_location = get_right_location(mv, location);
std::vector<int> hl;
hl.emplace_back(left_location);
hl.emplace_back(location);
hl.emplace_back(right_location);
Parser::print_math_vector(mv, hl);
Expression::Token &o = mv[location],
&l = mv[left_location],
&r = mv[right_location];
#if LAB2_EXCLUDE_COMPTIME_OP_WRITES == 1
if (l.t == Expression::Token::CONST && r.t == Expression::Token::CONST)
{
pr_debug("CONST folding");
switch (o.v.o)
{
case Expression::Token::ADD:
o.v.d = l.v.d + r.v.d;
break;
case Expression::Token::SUB:
o.v.d = l.v.d - r.v.d;
break;
case Expression::Token::MUL:
o.v.d = l.v.d * r.v.d;
break;
case Expression::Token::DIV:
o.v.d = l.v.d / r.v.d;
break;
case Expression::Token::POW:
o.v.d = std::pow(l.v.d, r.v.d);
break;
default:
pr_warn("Impossible operator, this is a bug!");
break;
}
l.t = Expression::Token::NAT;
r.t = Expression::Token::NAT;
o.t = Expression::Token::CONST;
// sync &cv operator
cv[location].t = Expression::Token::CONST;
cv[location].v.d = o.v.d;
}
else
{
#endif
int this_op_weight = get_operator_weight(mv, location) + 1;
int il = l.t == Expression::Token::CV ? l.v.cv.i : left_location;
@@ -472,6 +517,9 @@ static void write_operation(
o.t = Expression::Token::CV;
o.v.cv.w = this_op_weight;
o.v.cv.i = this_ov_index;
#if LAB2_EXCLUDE_COMPTIME_OP_WRITES == 1
}
#endif
// update mp
mp.erase(mp.begin() + position, mp.begin() + position + 1);
@@ -789,15 +837,14 @@ std::vector<Expression::Operation> build_op_vector(const std::vector<Expression:
std::vector<int> g_prios;
create_prios_vector(tv, g_prios);
for (int i = 0, l = g_prios.size(); i < l; i++)
{
pr_debug("prio=" << g_prios[i]);
}
pr_debug("Building operation vector");
std::vector<Expression::Token> cv = tv; // Constant sync Vector
// build operation vector
std::vector<Expression::Operation> ov;
{
std::vector<Expression::Token> mv = tv;
std::vector<Expression::Token> mv = tv; // Modifiable Vector
std::vector<int> mp = g_prios;
while (mp.size())
@@ -814,15 +861,20 @@ std::vector<Expression::Operation> build_op_vector(const std::vector<Expression:
std::vector<int> operator_weights;
weight_operators(operator_weights, mv, inner_top_ops, start);
write_operation(ov, tv, mv, mp, start + inner_top_ops[get_min_index(operator_weights)]);
write_operation(ov, cv, mv, mp, start + inner_top_ops[get_min_index(operator_weights)]);
finish--;
}
// process final operation w/out running selection algorithm
write_operation(ov, tv, mv, mp, start);
write_operation(ov, cv, mv, mp, start);
}
pr_debug("Final value:");
Parser::print_math_vector(mv);
}
pr_debug("Resulting operation vector:");
for (int i = 0, l = ov.size(); i < l; i++)
{
const Expression::Operation &o = ov[i];
@@ -831,16 +883,8 @@ std::vector<Expression::Operation> build_op_vector(const std::vector<Expression:
if (o.tl == Expression::Operation::NORMAL)
{
const Expression::Token &real_value = tv[o.il];
if (real_value.t == Expression::Token::VAR)
{
pri_debug(*real_value.v.s);
}
else
{
pri_debug(real_value.v.d);
}
const Expression::Token &real_value = cv[o.il];
pri_debug(*real_value.to_math_str());
}
else
{
@@ -851,16 +895,8 @@ std::vector<Expression::Operation> build_op_vector(const std::vector<Expression:
if (o.tr == Expression::Operation::NORMAL)
{
const Expression::Token &real_value = tv[o.ir];
if (real_value.t == Expression::Token::VAR)
{
pri_debug(*real_value.v.s);
}
else
{
pri_debug(real_value.v.d);
}
const Expression::Token &real_value = cv[o.ir];
pri_debug(*real_value.to_math_str());
}
else
{
@@ -917,13 +953,6 @@ Expression::TreeNode ov_to_tree(const std::vector<Expression::Token> tv, const s
return root;
}
#if 0
static int get_tree_depth(const Expression::TreeNode& root)
{
retur
}
#endif
void print_op_tree(const Expression::TreeNode& root)
{
std::vector<std::pair<Expression::TreeNode *, int>> items_to_display;