marco
/
dc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixed bug related to register
dc / build (push) Successful in 15s Details

This commit is contained in:
Marco Cetica 2024-03-25 14:58:45 +01:00
parent 5997f06bd0
commit 5de860a089
Signed by: marco
GPG Key ID: 45060A949E90D0FD
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man.md
View File

@ -355,6 +355,8 @@ This overwrites the top of the stack and does **NOT** follow the LIFO policy.
Copy the value in top of the stack of register _r_ and push it onto the main stack.
The value 0 is retrieved if the register is uninitialized. This does not alter the contents of _r_.
The current register value is the top of the register's stack.
**S**`r`
Pop the value off the top of the (main) stack and push it onto the stack of register _r_.

25
src/eval.cpp
View File

@ -262,18 +262,20 @@ std::optional<std::string> Evaluate::parse_register_command(std::string token) {
auto reg_name = token.at(1);
auto head = this->stack.pop(true);
// Always discard previous instance of the register
// i.e., initialize a new instance of register 'reg_name'
this->regs.erase(reg_name);
this->regs.insert(
std::make_pair(reg_name, dc::Register{
dc::Stack<std::string>(),
std::unordered_map<int, std::string>()
})
);
// Populate register's 'reg_name' stack with top of main stack
this->regs[reg_name].stack.push(head);
// if register's stack exist, overwrite top of the stack
// Otherwise allocate a new instance of the register
auto it = this->regs.find(reg_name);
if(it != this->regs.end()) { // Register exist
auto head_idx = it->second.stack.size()-1;
it->second.stack[head_idx] = head;
} else { // Register does not exist
this->regs[reg_name] = dc::Register{
dc::Stack<std::string>(),
std::unordered_map<int, std::string>()
};
this->regs[reg_name].stack.push(head);
}
} else if(token.at(0) == 'S') {
// An uppercase 'S' pops the top of the main stack and
// pushes it onto the stack of selected register.
@ -299,6 +301,7 @@ std::optional<std::string> Evaluate::parse_register_command(std::string token) {
dc::Stack<std::string>(),
std::unordered_map<int, std::string>()
};
this->regs[reg_name].stack.push(head);
}
} else if(token.at(0) == 'L') {
// An uppercase 'L' pops the top of the register's stack