AleoHQ/leo
1
1
Fork 0
mirror of https://github.com/AleoHQ/leo.git synced 2024-11-11 04:49:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes code generation for ExpressionStatements (#2192)

Browse Source 
* Fix codegen for call instruction

* Cleanup
This commit is contained in:
d0cd 2022-11-29 16:36:37 -08:00 committed by GitHub
parent 8986be33e8
commit 23615c6858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/passes/src/code_generation/visit_expressions.rs
View File

@ -280,14 +280,14 @@ impl<'a> CodeGenerator<'a> {
// TODO: Cleanup
fn visit_call(&mut self, input: &'a CallExpression) -> (String, String) {
let mut call_instruction = match &input.external {
Some(external) => format!(" call {external}.aleo/{} ", input.function),
None => format!(" call {} ", input.function),
Some(external) => format!(" call {external}.aleo/{}", input.function),
None => format!(" call {}", input.function),
};
let mut instructions = String::new();
for argument in input.arguments.iter() {
let (argument, argument_instructions) = self.visit_expression(argument);
write!(call_instruction, "{argument} ").expect("failed to write to string");
write!(call_instruction, " {argument}").expect("failed to write to string");
instructions.push_str(&argument_instructions);
}
@ -304,7 +304,11 @@ impl<'a> CodeGenerator<'a> {
.unwrap()
.output_type;
match return_type {
Type::Unit => (String::new(), instructions), // Do nothing
Type::Unit => {
call_instruction.push(';');
instructions.push_str(&call_instruction);
(String::new(), instructions)
} // Do nothing
Type::Tuple(tuple) => match tuple.len() {
0 | 1 => unreachable!("Parsing guarantees that a tuple type has at least two elements"),
len => {
@ -315,17 +319,17 @@ impl<'a> CodeGenerator<'a> {
self.next_register += 1;
}
let destinations = destinations.join(" ");
writeln!(call_instruction, "into {destinations};", destinations = destinations)
writeln!(call_instruction, " into {destinations};", destinations = destinations)
.expect("failed to write to string");
instructions.push_str(&call_instruction);
(destinations, call_instruction)
(destinations, instructions)
}
},
_ => {
// Push destination register to call instruction.
let destination_register = format!("r{}", self.next_register);
writeln!(call_instruction, "into {destination_register};").expect("failed to write to string");
writeln!(call_instruction, " into {destination_register};").expect("failed to write to string");
instructions.push_str(&call_instruction);
// Increment the register counter.

6
compiler/passes/src/code_generation/visit_statements.rs
View File

@ -128,9 +128,11 @@ impl<'a> CodeGenerator<'a> {
}
fn visit_expression_statement(&mut self, input: &'a ExpressionStatement) -> String {
println!("ExpressionStatement: {:?}", input);
match input.expression {
Expression::Call(_) => self.visit_expression(&input.expression).1,
Expression::Call(_) => {
// Note that codegen for CallExpression in an expression statement does not return any destination registers.
self.visit_expression(&input.expression).1
}
_ => unreachable!("ExpressionStatement's can only contain CallExpression's."),
}
}