diff --git a/changelogs/unreleased/1121-dark64 b/changelogs/unreleased/1121-dark64 new file mode 100644 index 00000000..0ab2551a --- /dev/null +++ b/changelogs/unreleased/1121-dark64 @@ -0,0 +1 @@ +Use curly braces to enclose blocks \ No newline at end of file diff --git a/zokrates_cli/tests/code/simple_add.zok b/zokrates_cli/tests/code/simple_add.zok index ddd78b78..4ee36df2 100644 --- a/zokrates_cli/tests/code/simple_add.zok +++ b/zokrates_cli/tests/code/simple_add.zok @@ -1,4 +1,4 @@ // only using add, no need to flatten def main(field a, field b) -> field { - return a + b: + return a + b; } diff --git a/zokrates_core/src/semantics.rs b/zokrates_core/src/semantics.rs index e2fbd139..2f078785 100644 --- a/zokrates_core/src/semantics.rs +++ b/zokrates_core/src/semantics.rs @@ -2492,7 +2492,7 @@ impl<'ast, T: Field> Checker<'ast, T> { Ok(StructExpression::conditional(condition, consequence, alternative).into()) }, (TypedExpression::Tuple(consequence), TypedExpression::Tuple(alternative)) => { - Ok(TupleExpression::conditional(condition, consequence, alternative, kind).into()) + Ok(TupleExpression::conditional(condition, consequence, alternative).into()) }, (TypedExpression::Uint(consequence), TypedExpression::Uint(alternative)) => { Ok(UExpression::conditional(condition, consequence, alternative).into()) diff --git a/zokrates_core_test/tests/tests/range_check/assert_lt_u8.zok b/zokrates_core_test/tests/tests/range_check/assert_lt_u8.zok index 44b4d4ce..cba29894 100644 --- a/zokrates_core_test/tests/tests/range_check/assert_lt_u8.zok +++ b/zokrates_core_test/tests/tests/range_check/assert_lt_u8.zok @@ -1,3 +1,4 @@ -def main(field x): - assert(x < 2) - return \ No newline at end of file +def main(field x) { + assert(x < 2); + return; +} \ No newline at end of file diff --git a/zokrates_core_test/tests/tests/tuples/conditional.zok b/zokrates_core_test/tests/tests/tuples/conditional.zok index fd8dfe76..5ada9311 100644 --- a/zokrates_core_test/tests/tests/tuples/conditional.zok +++ b/zokrates_core_test/tests/tests/tuples/conditional.zok @@ -1,3 +1,4 @@ -def main(bool flag) -> ((field, field)): - (field, field) a = if flag then (1f, 2f) else (2f, 1f) fi - return a \ No newline at end of file +def main(bool flag) -> ((field, field)) { + (field, field) a = flag ? (1f, 2f) : (2f, 1f); + return a; +} \ No newline at end of file