github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-24 04:40:05 +00:00
Code Issues Projects Releases Wiki Activity

reanable inliner

Browse source
This commit is contained in:
schaeff 2019-07-03 16:34:48 +02:00
parent 6672ffb56a
commit 54fed2176f
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
zokrates_core/src/static_analysis/inline.rs
View file

@ -23,11 +23,11 @@ use zokrates_field::field::Field;
#[derive(Debug)]
pub struct Inliner<'ast, T: Field> {
modules: TypedModules<'ast, T>, // the modules to look for functions in when inlining
module_id: TypedModuleId, // the current module we're visiting
statement_buffer: Vec<TypedStatement<'ast, T>>, // a buffer of statements to be added to the inlined statements
stack: Vec<(String, FunctionKey<'ast>, usize)>, // the current call stack
call_count: HashMap<(String, FunctionKey<'ast>), usize>, // the call count for each function
modules: TypedModules<'ast, T>, // the modules to look for functions in when inlining
module_id: TypedModuleId, // the current module we're visiting
statement_buffer: Vec<TypedStatement<'ast, T>>, // a buffer of statements to be added to the inlined statements
stack: Vec<(String, FunctionKey<'ast>, usize)>, // the current call stack
call_count: HashMap<(String, FunctionKey<'ast>), usize>, // the call count for each function
}
impl<'ast, T: Field> Inliner<'ast, T> {
@ -58,10 +58,7 @@ impl<'ast, T: Field> Inliner<'ast, T> {
.unwrap();
// initialize an inliner over all modules, starting from the main module
let mut inliner = Inliner::with_modules_and_module_id(
p.modules,
main_module_id,
);
let mut inliner = Inliner::with_modules_and_module_id(p.modules, main_module_id);
// inline all calls in the main function, recursively
let main = inliner.fold_function_symbol(main);

6
zokrates_core/src/static_analysis/mod.rs
View file

@ -5,12 +5,12 @@
//! @date 2018
mod flat_propagation;
// mod inline;
mod inline;
mod power_check;
mod propagation;
mod unroll;
// use self::inline::Inliner;
use self::inline::Inliner;
use self::power_check::PowerChecker;
use self::propagation::Propagator;
use self::unroll::Unroller;
@ -28,7 +28,7 @@ impl<'ast, T: Field> Analyse for TypedProgram<'ast, T> {
// unroll
let r = Unroller::unroll(r);
// inline
// let r = Inliner::inline(r);
let r = Inliner::inline(r);
// propagate
let r = Propagator::propagate(r);
r