waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix clippy

This commit is contained in:
microproofs 2023-08-07 19:08:18 -04:00
parent 367dabafb5
commit 252f68de17
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/aiken-lang/src/gen_uplc.rs
View File

@ -2708,7 +2708,7 @@ impl<'a> CodeGenerator<'a> {
if !params_empty { if !params_empty {
let recursive_nonstatics = if is_recursive { let recursive_nonstatics = if is_recursive {
modify_self_calls(&mut body, key, variant, &func_params) modify_self_calls(&mut body, key, variant, func_params)
} else { } else {
func_params.clone() func_params.clone()
}; };

14
crates/aiken-lang/src/gen_uplc/builder.rs
View File

@ -597,9 +597,7 @@ pub fn find_introduced_variables(air_tree: &AirTree) -> Vec<String> {
| AirTree::Expression(AirExpression::TupleClause { indices, .. }) => { | AirTree::Expression(AirExpression::TupleClause { indices, .. }) => {
indices.iter().map(|(_, name)| name).cloned().collect() indices.iter().map(|(_, name)| name).cloned().collect()
} }
AirTree::Expression(AirExpression::Fn { params, .. }) => { AirTree::Expression(AirExpression::Fn { params, .. }) => params.to_vec(),
params.iter().map(|name| name).cloned().collect()
}
AirTree::Statement { AirTree::Statement {
statement: AirStatement::ListAccessor { names, .. }, statement: AirStatement::ListAccessor { names, .. },
.. ..
@ -660,13 +658,13 @@ pub fn is_recursive_function_call<'a>(
} }
} }
} }
return (false, None); (false, None)
} }
pub fn identify_recursive_static_params( pub fn identify_recursive_static_params(
air_tree: &mut AirTree, air_tree: &mut AirTree,
tree_path: &TreePath, tree_path: &TreePath,
func_params: &Vec<String>, func_params: &[String],
func_key: &FunctionAccessKey, func_key: &FunctionAccessKey,
variant: &String, variant: &String,
shadowed_parameters: &mut HashMap<String, TreePath>, shadowed_parameters: &mut HashMap<String, TreePath>,
@ -715,9 +713,9 @@ pub fn modify_self_calls(
body: &mut AirTree, body: &mut AirTree,
func_key: &FunctionAccessKey, func_key: &FunctionAccessKey,
variant: &String, variant: &String,
func_params: &Vec<String>, func_params: &[String],
) -> Vec<String> { ) -> Vec<String> {
let mut potential_recursive_statics = func_params.clone(); let mut potential_recursive_statics = func_params.to_vec();
// identify which parameters are recursively nonstatic (i.e. get modified before the self-call) // identify which parameters are recursively nonstatic (i.e. get modified before the self-call)
// TODO: this would be a lot simpler if each `Var`, `Let`, function argument, etc. had a unique identifier // TODO: this would be a lot simpler if each `Var`, `Let`, function argument, etc. had a unique identifier
// rather than just a name; this would let us track if the Var passed to itself was the same value as the method argument // rather than just a name; this would let us track if the Var passed to itself was the same value as the method argument
@ -726,7 +724,7 @@ pub fn modify_self_calls(
identify_recursive_static_params( identify_recursive_static_params(
air_tree, air_tree,
tree_path, tree_path,
&func_params, func_params,
func_key, func_key,
variant, variant,
&mut shadowed_parameters, &mut shadowed_parameters,