jessebrault/deimos-lang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete forgotten todo.

Browse Source
This commit is contained in:
Jesse Brault 2026-03-08 13:16:04 -05:00
parent 12174c9cf6
commit 2e33936842
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dmc-lib/src/ir/ir_expression.rs
View File

@ -105,7 +105,7 @@ impl IrExpression {
}
}
pub fn return_operand(&self) -> ReturnOperand {
pub fn return_operand(&self, constants_table: &mut ConstantsTable) -> ReturnOperand {
match self {
IrExpression::Parameter(ir_parameter) => {
ReturnOperand::Location(Location::StackFrameOffset(ir_parameter.stack_offset()))
@ -122,7 +122,8 @@ impl IrExpression {
},
IrExpression::Int(i) => ReturnOperand::Int(*i),
IrExpression::String(s) => {
todo!("String constants")
let constant_name = constants_table.get_or_insert(s);
ReturnOperand::String(constant_name)
}
}
}

6
dmc-lib/src/ir/ir_return.rs
View File

@ -51,9 +51,11 @@ impl VrUser for IrReturn {
}
impl Assemble for IrReturn {
fn assemble(&self, builder: &mut InstructionsBuilder, _constants_table: &mut ConstantsTable) {
fn assemble(&self, builder: &mut InstructionsBuilder, constants_table: &mut ConstantsTable) {
if let Some(ir_expression) = self.value.as_ref() {
builder.push(Instruction::SetReturnValue(ir_expression.return_operand()));
builder.push(Instruction::SetReturnValue(
ir_expression.return_operand(constants_table),
));
}
builder.push(Instruction::Return);
}