github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-23 04:08:33 +00:00
Code Issues Projects Releases Wiki Activity

revert example change, fmt tweaks

Browse source
This commit is contained in:
schaeff 2022-08-19 17:23:49 +02:00
parent 7bbfe68d3c
commit 4cde35ec80
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
zokrates_ast/src/typed/mod.rs
View file

@ -944,7 +944,7 @@ impl<E> EqExpression<E> {
impl<E: fmt::Display> fmt::Display for EqExpression<E> { impl<E: fmt::Display> fmt::Display for EqExpression<E> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{} == {}", self.left, self.right) write!(f, "({} == {})", self.left, self.right)
} }
} }
@ -1677,7 +1677,7 @@ impl<'ast, T: fmt::Display> fmt::Display for UExpression<'ast, T> {
UExpressionInner::Rem(ref lhs, ref rhs) => write!(f, "({} % {})", lhs, rhs), UExpressionInner::Rem(ref lhs, ref rhs) => write!(f, "({} % {})", lhs, rhs),
UExpressionInner::RightShift(ref e, ref by) => write!(f, "({} >> {})", e, by), UExpressionInner::RightShift(ref e, ref by) => write!(f, "({} >> {})", e, by),
UExpressionInner::LeftShift(ref e, ref by) => write!(f, "({} << {})", e, by), UExpressionInner::LeftShift(ref e, ref by) => write!(f, "({} << {})", e, by),
UExpressionInner::Not(ref e) => write!(f, "!({})", e), UExpressionInner::Not(ref e) => write!(f, "!{}", e),
UExpressionInner::Neg(ref e) => write!(f, "(-{})", e), UExpressionInner::Neg(ref e) => write!(f, "(-{})", e),
UExpressionInner::Pos(ref e) => write!(f, "(+{})", e), UExpressionInner::Pos(ref e) => write!(f, "(+{})", e),
UExpressionInner::Select(ref select) => write!(f, "{}", select), UExpressionInner::Select(ref select) => write!(f, "{}", select),
@ -1694,23 +1694,23 @@ impl<'ast, T: fmt::Display> fmt::Display for BooleanExpression<'ast, T> {
match *self { match *self {
BooleanExpression::Block(ref block) => write!(f, "{}", block,), BooleanExpression::Block(ref block) => write!(f, "{}", block,),
BooleanExpression::Identifier(ref var) => write!(f, "{}", var), BooleanExpression::Identifier(ref var) => write!(f, "{}", var),
BooleanExpression::FieldLt(ref lhs, ref rhs) => write!(f, "{} < {}", lhs, rhs), BooleanExpression::FieldLt(ref lhs, ref rhs) => write!(f, "({} < {})", lhs, rhs),
BooleanExpression::FieldLe(ref lhs, ref rhs) => write!(f, "{} <= {}", lhs, rhs), BooleanExpression::FieldLe(ref lhs, ref rhs) => write!(f, "({} <= {})", lhs, rhs),
BooleanExpression::FieldGe(ref lhs, ref rhs) => write!(f, "{} >= {}", lhs, rhs), BooleanExpression::FieldGe(ref lhs, ref rhs) => write!(f, "({} >= {})", lhs, rhs),
BooleanExpression::FieldGt(ref lhs, ref rhs) => write!(f, "{} > {}", lhs, rhs), BooleanExpression::FieldGt(ref lhs, ref rhs) => write!(f, "({} > {})", lhs, rhs),
BooleanExpression::UintLt(ref lhs, ref rhs) => write!(f, "{} < {}", lhs, rhs), BooleanExpression::UintLt(ref lhs, ref rhs) => write!(f, "({} < {})", lhs, rhs),
BooleanExpression::UintLe(ref lhs, ref rhs) => write!(f, "{} <= {}", lhs, rhs), BooleanExpression::UintLe(ref lhs, ref rhs) => write!(f, "({} <= {})", lhs, rhs),
BooleanExpression::UintGe(ref lhs, ref rhs) => write!(f, "{} >= {}", lhs, rhs), BooleanExpression::UintGe(ref lhs, ref rhs) => write!(f, "({} >= {})", lhs, rhs),
BooleanExpression::UintGt(ref lhs, ref rhs) => write!(f, "{} > {}", lhs, rhs), BooleanExpression::UintGt(ref lhs, ref rhs) => write!(f, "({} > {})", lhs, rhs),
BooleanExpression::FieldEq(ref e) => write!(f, "{}", e), BooleanExpression::FieldEq(ref e) => write!(f, "{}", e),
BooleanExpression::BoolEq(ref e) => write!(f, "{}", e), BooleanExpression::BoolEq(ref e) => write!(f, "{}", e),
BooleanExpression::ArrayEq(ref e) => write!(f, "{}", e), BooleanExpression::ArrayEq(ref e) => write!(f, "{}", e),
BooleanExpression::StructEq(ref e) => write!(f, "{}", e), BooleanExpression::StructEq(ref e) => write!(f, "{}", e),
BooleanExpression::TupleEq(ref e) => write!(f, "{}", e), BooleanExpression::TupleEq(ref e) => write!(f, "{}", e),
BooleanExpression::UintEq(ref e) => write!(f, "{}", e), BooleanExpression::UintEq(ref e) => write!(f, "{}", e),
BooleanExpression::Or(ref lhs, ref rhs) => write!(f, "{} || {}", lhs, rhs), BooleanExpression::Or(ref lhs, ref rhs) => write!(f, "({} || {})", lhs, rhs),
BooleanExpression::And(ref lhs, ref rhs) => write!(f, "{} && {}", lhs, rhs), BooleanExpression::And(ref lhs, ref rhs) => write!(f, "({} && {})", lhs, rhs),
BooleanExpression::Not(ref exp) => write!(f, "!({})", exp), BooleanExpression::Not(ref exp) => write!(f, "!{}", exp),
BooleanExpression::Value(b) => write!(f, "{}", b), BooleanExpression::Value(b) => write!(f, "{}", b),
BooleanExpression::FunctionCall(ref function_call) => write!(f, "{}", function_call), BooleanExpression::FunctionCall(ref function_call) => write!(f, "{}", function_call),
BooleanExpression::Conditional(ref c) => write!(f, "{}", c), BooleanExpression::Conditional(ref c) => write!(f, "{}", c),

4
zokrates_cli/examples/n_choose_k.zok
View file

@ -4,7 +4,7 @@ import "utils/casts/u32_to_field" as to_field;
def fac(field x) -> field { def fac(field x) -> field {
field mut f = 1; field mut f = 1;
field mut counter = 0; field mut counter = 0;
for u32 i in 1..3 { for u32 i in 1..100 {
f = counter == x ? f : f * to_field(i); f = counter == x ? f : f * to_field(i);
counter = counter == x ? counter : counter + 1; counter = counter == x ? counter : counter + 1;
} }
@ -12,5 +12,5 @@ def fac(field x) -> field {
} }
def main(field n, field k) -> field { def main(field n, field k) -> field {
return 1 / (fac(k) * fac(n - k)); return fac(n) / (fac(k) * fac(n - k));
} }