github/ValueScript
1
1
Fork 0
mirror of https://github.com/voltrevo/ValueScript.git synced 2026-01-14 07:57:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace register strings with Register throughout function_compiler

Browse Source
This commit is contained in:
Andrew Morris
2023-03-06 13:21:54 +11:00
parent 6be70c189b
commit 082591da5c
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
valuescript_compiler/src/function_compiler.rs
View File

@@ -50,11 +50,12 @@ impl FunctionCompiler {
let mut reg_allocator = NameAllocator::default();
reg_allocator.allocate(&"return".to_string());
reg_allocator.allocate(&"this".to_string());
reg_allocator.allocate(&"ignore".to_string());
return FunctionCompiler {
definition: Vec::new(),
definition_allocator: definition_allocator,
reg_allocator: reg_allocator,
definition_allocator,
reg_allocator,
label_allocator: NameAllocator::default(),
queue: Queue::new(),
loop_labels: vec![],
@@ -110,9 +111,9 @@ impl FunctionCompiler {
.queue
.add(QueuedFunction {
definition_name: definition_name.clone(),
fn_name: fn_name,
fn_name,
capture_params: Vec::new(),
functionish: functionish,
functionish,
})
.expect("Failed to queue function");
@@ -839,20 +840,20 @@ impl FunctionCompiler {
// from the condition
let condition_asm = self.use_(condition);
let cond_reg = self.reg_allocator.allocate_numbered(&"_cond".to_string());
let cond_reg = self.allocate_numbered_reg(&"_cond".to_string());
// TODO: Add negated jmpif instruction to avoid this
self
.definition
.push(std::format!(" op! {} %{}", condition_asm, cond_reg));
.push(std::format!(" op! {} {}", condition_asm, cond_reg));
let mut jmpif_instr = " jmpif %".to_string();
jmpif_instr += &cond_reg;
let mut jmpif_instr = " jmpif ".to_string();
jmpif_instr += &format!("{}", cond_reg);
jmpif_instr += " :";
jmpif_instr += &end_label;
self.definition.push(jmpif_instr);
self.reg_allocator.release(&cond_reg);
self.release_reg(&cond_reg);
self.statement(&*while_.body, false, scope);
self.definition.push(std::format!(" jmp :{}", start_label));
@@ -957,20 +958,20 @@ impl FunctionCompiler {
// from the condition
let condition_asm = self.use_(condition);
let cond_reg = self.reg_allocator.allocate_numbered(&"_cond".to_string());
let cond_reg = self.allocate_numbered_reg("_cond");
// TODO: Add negated jmpif instruction to avoid this
self
.definition
.push(std::format!(" op! {} %{}", condition_asm, cond_reg));
.push(std::format!(" op! {} {}", condition_asm, cond_reg));
let mut jmpif_instr = " jmpif %".to_string();
jmpif_instr += &cond_reg;
let mut jmpif_instr = " jmpif ".to_string();
jmpif_instr += &format!("{}", cond_reg);
jmpif_instr += " :";
jmpif_instr += &for_end_label;
self.definition.push(jmpif_instr);
self.reg_allocator.release(&cond_reg);
self.release_reg(&cond_reg);
}
None => {}
}