202608280153

This commit is contained in:
starcells committed 2026-08-28 01:53:22 +08:00
1 parent 68e6006fa5
commit a96e7ffa87
1 file changed
+14 -24
+14 -24
View File
@@ -1,6 +1,7 @@
#include "r8asm/r8asm.hh"
#include <algorithm>
#include <cctype>
#include <functional>
#include <iostream>
#include <list>
#include <stack>
@@ -472,6 +473,16 @@ r8asm::ast_node r8asm::parse_single_arg(const token_line &line) {
std::stack<ast_node> symbol_stack;
depth_t right_assoc_depth = 0;
auto deal_with_assoc = [&data_stack, &symbol_stack, &right_assoc_depth] {
while (right_assoc_depth) {
auto unary_op = symbol_stack.top();
symbol_stack.pop();
unary_op.children.push_back(data_stack.top());
data_stack.pop();
data_stack.push(unary_op);
right_assoc_depth--;
}
};
for (auto it = line.tokens.begin(); it < line.tokens.end(); it++) {
switch (it->type) {
@@ -487,14 +498,7 @@ r8asm::ast_node r8asm::parse_single_arg(const token_line &line) {
buffer.tokens.push_back(*it);
}
data_stack.push(parse_single_arg(buffer));
while (right_assoc_depth) {
auto unary_op = symbol_stack.top();
symbol_stack.pop();
unary_op.children.push_back(data_stack.top());
data_stack.pop();
data_stack.push(unary_op);
right_assoc_depth--;
}
deal_with_assoc();
} break;
case token_t::STRING: {
{
@@ -503,25 +507,11 @@ r8asm::ast_node r8asm::parse_single_arg(const token_line &line) {
else
data_stack.push({r8asm::ast_node_t::VARIABLE, it->value, {}});
}
while (right_assoc_depth) {
auto unary_op = symbol_stack.top();
symbol_stack.pop();
unary_op.children.push_back(data_stack.top());
data_stack.pop();
data_stack.push(unary_op);
right_assoc_depth--;
}
deal_with_assoc();
} break;
case token_t::PARAMETER: {
data_stack.push({r8asm::ast_node_t::PARAMETER, (it->value), {}});
while (right_assoc_depth) {
auto unary_op = symbol_stack.top();
symbol_stack.pop();
unary_op.children.push_back(data_stack.top());
data_stack.pop();
data_stack.push(unary_op);
right_assoc_depth--;
}
deal_with_assoc();
} break;
case token_t::OPERATOR:
// precedence: NEG = NOT