More support for negative numbers

This commit is contained in:
2025-11-22 23:02:49 -07:00
parent 6e7e5ba9f1
commit c3adcf57f5
2 changed files with 51 additions and 2 deletions

View File

@@ -192,7 +192,7 @@ fn with_return_statement() -> anyhow::Result<()> {
doSomething: doSomething:
pop r8 #arg1 pop r8 #arg1
push ra push ra
move r15 456 move r15 456 #returnValue
sub r0 sp 1 sub r0 sp 1
get ra db r0 get ra db r0
sub sp sp 1 sub sp sp 1
@@ -207,3 +207,37 @@ fn with_return_statement() -> anyhow::Result<()> {
Ok(()) Ok(())
} }
#[test]
fn with_negative_return_literal() -> anyhow::Result<()> {
let compiled = compile! {
debug
"
fn doSomething() {
return -1;
};
let i = doSomething();
"
};
assert_eq!(
compiled,
indoc! {
"
j main
doSomething:
push ra
move r15 -1 #returnValue
sub r0 sp 1
get ra db r0
sub sp sp 1
j ra
main:
jal doSomething
move r8 r15 #i
"
}
);
Ok(())
}

View File

@@ -327,6 +327,17 @@ impl<'a, W: std::io::Write> Compiler<'a, W> {
expr: Expression, expr: Expression,
scope: &mut VariableScope<'v>, scope: &mut VariableScope<'v>,
) -> Result<(), Error> { ) -> Result<(), Error> {
if let Expression::Negation(neg_expr) = &expr
&& let Expression::Literal(Literal::Number(neg_num)) = &**neg_expr
{
self.emit_variable_assignment(
"returnValue",
VariableLocation::Persistant(VariableScope::RETURN_REGISTER),
format!("-{neg_num}"),
)?;
return Ok(());
};
match expr { match expr {
Expression::Variable(var_name) => match scope.get_location_of(var_name)? { Expression::Variable(var_name) => match scope.get_location_of(var_name)? {
VariableLocation::Temporary(reg) | VariableLocation::Persistant(reg) => { VariableLocation::Temporary(reg) | VariableLocation::Persistant(reg) => {
@@ -349,7 +360,11 @@ impl<'a, W: std::io::Write> Compiler<'a, W> {
} }
}, },
Expression::Literal(Literal::Number(num)) => { Expression::Literal(Literal::Number(num)) => {
self.write_output(format!("move r{} {}", VariableScope::RETURN_REGISTER, num))?; self.emit_variable_assignment(
"returnValue",
VariableLocation::Persistant(VariableScope::RETURN_REGISTER),
num,
)?;
} }
_ => return Err(Error::Unknown("Unsupported `return` statement.".into())), _ => return Err(Error::Unknown("Unsupported `return` statement.".into())),
} }