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

flattened expressions of a List

Browse source
This commit is contained in:
schaeff 2018-01-22 16:26:33 +01:00
parent 8d76c39ff6
commit 0ce804ea57
3 changed files with 35 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/no_args.code
View file

@ -1,3 +1,3 @@
def main():
def main(a):
c = 3 + a
return 3

53
src/flatten.rs
View file

@ -219,8 +219,15 @@ impl Flattener {
{
x.clone()
}
List(ref exprs) if exprs.iter().fold(true, |acc, x| acc && x.is_flattened()) => {
List(exprs.clone())
List(ref exprs) => {
let flattened_exprs = exprs.into_iter().map(|x|
self.flatten_expression(
functions_flattened,
arguments_flattened,
statements_flattened,
x.clone())
).collect();
List(flattened_exprs)
},
Add(box left, box right) => {
let left_flattened = self.flatten_expression(
@ -483,7 +490,10 @@ impl Flattener {
match x {
List(values) => {
let new_values = values.into_iter().map(|x| x.apply_substitution(&replacement_map)).collect::<Vec<_>>();
return List(new_values)
if new_values.len() == 1 {
return new_values[0].clone();
}
return List(new_values);
},
_ => panic!("should return a List")
}
@ -508,33 +518,7 @@ impl Flattener {
statements_flattened
.push(Statement::Condition(new_lhs, new_rhs));
},
Statement::For(..) => panic!("Not flattened!"),
// Statement::MultipleDefinition(e1, e2) => {
// let new_rhs = e2.apply_substitution(&replacement_map);
// match new_rhs {
// Expression::List(rhslist) => {
// match e1 {
// Expression::List(exprs) => {
// for (i, e) in exprs.into_iter().enumerate() {
// match e {
// Expression::Identifier(var) => {
// let new_var: String = format!("{}{}", prefix, var.clone());
// replacement_map.insert(var, new_var.clone());
// statements_flattened.push(
// Statement::Definition(new_var, rhslist[i].clone())
// );
// },
// _ => panic!("")
// }
// }
// },
// _ => panic!("")
// }
// },
// _ => panic!("")
// }
// },
_ => unimplemented!()
_ => panic!("Statement inside function not flattened when flattening function call")
}
}
}
@ -544,8 +528,7 @@ impl Flattener {
id,
param_expressions
);
},
_ => unimplemented!()
}
}
}
@ -587,6 +570,7 @@ impl Flattener {
if !(var == var_to_replace) && self.variables.contains(&var_to_replace) && !self.substitution.contains_key(&var_to_replace){
self.substitution.insert(var_to_replace.clone().to_string(),var.clone());
}
statements_flattened.push(Statement::Definition(var, rhs));
}
Statement::Condition(ref expr1, ref expr2) => {
@ -861,10 +845,13 @@ mod multiple_definition {
&statement,
);
println!("{:?}", statements_flattened);
assert_eq!(
statements_flattened[0]
,
Statement::Definition("a".to_string(), Expression::Number(FieldPrime::from(2)))
Statement::Definition("dup_1_param_0".to_string(), Expression::Number(FieldPrime::from(2)))
);
}

30
src/parser.rs
View file

@ -1586,10 +1586,19 @@ mod tests {
}
#[cfg(test)]
mod parse_destructure {
mod parse_comma_separated_list {
use super::*;
fn parse_comma_separated_list<T: Field>(
input: String,
pos: Position
) -> Result<(Vec<Expression<T>>, String, Position), Error<T>> {
let mut res = Vec::new();
parse_comma_separated_list_rec(input, pos, &mut res)
}
#[test]
fn destructure1() {
fn comma_separated_list1() {
let pos = Position { line: 45, col: 121 };
let string = String::from("b, c");
let expr = Expression::List::<FieldPrime>(vec![Expression::Identifier(String::from("a")),Expression::Identifier(String::from("b")),Expression::Identifier(String::from("c"))]);
@ -1600,7 +1609,7 @@ mod tests {
}
#[test]
fn destructure() {
fn comma_separated_list() {
let pos = Position { line: 45, col: 121 };
let string = String::from("b, c");
let expr = Expression::List::<FieldPrime>(vec![Expression::Identifier(String::from("b")),Expression::Identifier(String::from("c"))]);
@ -1611,7 +1620,7 @@ mod tests {
}
#[test]
fn destructure_single() {
fn comma_separated_list_single() {
let pos = Position { line: 45, col: 121 };
let string = String::from("a");
let exprs = vec![Expression::Identifier(String::from("a"))];
@ -1622,18 +1631,7 @@ mod tests {
}
#[test]
fn destructure_two() {
let pos = Position { line: 45, col: 121 };
let string = String::from("a, b");
let exprs = vec![Expression::Identifier(String::from("a")),Expression::Identifier(String::from("b"))];
assert_eq!(
Ok((exprs, String::from(""), pos.col(string.len() as isize))),
parse_comma_separated_list::<FieldPrime>(string, pos)
)
}
#[test]
fn destructure_three() {
fn comma_separated_list_three() {
let pos = Position { line: 45, col: 121 };
let string = String::from("a, b, c");
let exprs = vec![Expression::Identifier(String::from("a")),Expression::Identifier(String::from("b")),Expression::Identifier(String::from("c"))];