ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-11-27 12:17:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up code gen

Browse Source
This commit is contained in:
Pranav Gaddamadugu 2022-10-03 10:45:26 -07:00
parent fef22d6d5a
commit e7e01b23a9
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/passes/src/code_generation/generator.rs
View File

@ -32,9 +32,8 @@ pub struct CodeGenerator<'a> {
/// The first element of the tuple indicate whether the composite is a record or not.
/// The second element of the tuple is a string modifier used for code generation.
pub(crate) composite_mapping: IndexMap<&'a Symbol, (bool, String)>,
/// Are we traversing a program function?
/// A "program function" is a function that can be invoked by a user or another program.
pub(crate) is_program_function: bool,
/// Are we traversing a transition function?
pub(crate) is_transition_function: bool,
/// Are we traversing a finalize block?
pub(crate) in_finalize: bool,
}
@ -49,7 +48,7 @@ impl<'a> CodeGenerator<'a> {
current_function: None,
variable_mapping: IndexMap::new(),
composite_mapping: IndexMap::new(),
is_program_function: false,
is_transition_function: false,
in_finalize: false,
}
}

21
compiler/passes/src/code_generation/visit_program.rs
View File

@ -16,7 +16,7 @@
use crate::CodeGenerator;
use leo_ast::{functions, Function, Identifier, Mapping, Mode, Program, Struct, Type};
use leo_ast::{functions, CallType, Function, Identifier, Mapping, Mode, Program, Struct, Type};
use indexmap::IndexMap;
use itertools::Itertools;
@ -76,16 +76,11 @@ impl<'a> CodeGenerator<'a> {
// Visit each `Function` in the Leo AST and produce Aleo instructions.
input.functions.values().for_each(|function| {
// If the function is annotated with `@program`, then it is a program function.
for annotation in function.annotations.iter() {
if annotation.identifier.name == sym::program {
self.is_program_function = true;
}
}
self.is_transition_function = matches!(function.call_type, CallType::Transition);
let function_string = self.visit_function(function);
if self.is_program_function {
if self.is_transition_function {
functions.push_str(&function_string);
functions.push('\n');
} else {
@ -93,8 +88,8 @@ impl<'a> CodeGenerator<'a> {
closures.push('\n');
}
// Unset the `is_program_function` flag.
self.is_program_function = false;
// Unset the `is_transition_function` flag.
self.is_transition_function = false;
});
// Closures must precede functions in the Aleo program.
@ -167,7 +162,7 @@ impl<'a> CodeGenerator<'a> {
// Construct the header of the function.
// If a function is a program function, generate an Aleo `function`, otherwise generate an Aleo `closure`.
let mut function_string = match self.is_program_function {
let mut function_string = match self.is_transition_function {
true => format!("function {}:\n", function.identifier),
false => format!("closure {}:\n", function.identifier),
};
@ -181,7 +176,7 @@ impl<'a> CodeGenerator<'a> {
functions::Input::Internal(input) => {
self.variable_mapping
.insert(&input.identifier.name, register_string.clone());
let visibility = match (self.is_program_function, input.mode) {
let visibility = match (self.is_transition_function, input.mode) {
(true, Mode::None) => Mode::Private,
_ => input.mode,
};
@ -226,7 +221,7 @@ impl<'a> CodeGenerator<'a> {
self.variable_mapping
.insert(&input.identifier.name, register_string.clone());
let visibility = match (self.is_program_function, input.mode) {
let visibility = match (self.is_transition_function, input.mode) {
(true, Mode::None) => Mode::Public,
_ => input.mode,
};

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

@ -54,7 +54,7 @@ impl<'a> CodeGenerator<'a> {
.map(|(operand, output)| {
match output {
Output::Internal(output) => {
let visibility = if self.is_program_function {
let visibility = if self.is_transition_function {
match self.in_finalize {
// If in finalize block, the default visibility is public.
true => match output.mode {