add changelog, fix merge

changelogs/unreleased/1121-dark64

@@ -0,0 +1 @@
+Use curly braces to enclose blocks

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;
 }

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())

zokrates_core_test/tests/tests/range_check/assert_lt_u8.zok

@@ -1,3 +1,4 @@
-def main(field x):
-    assert(x < 2)
-    return
+def main(field x) {
+    assert(x < 2);
+    return;
+}

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
+def main(bool flag) -> ((field, field)) {
+    (field, field) a = flag ? (1f, 2f) : (2f, 1f);
+    return a;
+}