fix syntax

Author: foxfriends

trilogy/src/stdlib/array.tri

@@ -112,7 +112,7 @@ func reduce f [x, ..xs] = fold f x xs
 
 test "array reduce" {
   assert reduce (+) [1, 2, 3, 4] == 10
-  assert with (reduce (+) []; false) { when 'mia cancel true }
+  assert with { reduce (+) []; false } { when 'mia cancel true }
   assert reduce (:) [1, 2, 3] == (1:2):3
 }
 
@@ -121,7 +121,7 @@ func rreduce f [..xs, x] = rfold f x xs
 
 test "array rreduce" {
   assert rreduce (+) [1, 2, 3, 4] == 10
-  assert with (rreduce (+) []; false) { when 'mia cancel true }
+  assert with { rreduce (+) []; false } { when 'mia cancel true }
   assert rreduce (:) [1, 2, 3] == (3:2):1
 }
 
@@ -168,31 +168,31 @@ func first [x, .._] = x
 
 test "array first" {
   assert first [1, 2, 3] == 1
-  assert with (first []; false) { when 'mia cancel true }
+  assert with { first []; false } { when 'mia cancel true }
 }
 
 func last [] = yield 'mia
 func last [.._, x] = x
 
 test "array last" {
   assert last [1, 2, 3] == 3
-  assert with (last []; false) { when 'mia cancel true }
+  assert with { last []; false } { when 'mia cancel true }
 }
 
 func tail [] = yield 'mia
 func tail [_, ..xs] = xs
 
 test "array tail" {
   assert tail [1, 2, 3] == [2, 3]
-  assert with (tail []; false) { when 'mia cancel true }
+  assert with { tail []; false } { when 'mia cancel true }
 }
 
 func head [] = yield 'mia
 func head [..xs, _] = xs
 
 test "array head" {
   assert head [1, 2, 3] == [1, 2]
-  assert with (head []; false) { when 'mia cancel true }
+  assert with { head []; false } { when 'mia cancel true }
 }
 
 func slice i fin (arr and typeof 'array) = core::slice i fin arr
@@ -202,10 +202,10 @@ test "array slice" {
   assert slice 1 2 [1, 2, 3] == [2]
   assert slice 1 1 [1, 2, 3] == []
   assert slice 1 3 [1, 2, 3] == [2, 3]
-  assert with (slice (-1) 2 [1, 2, 3]; false) { when 'arg cancel true }
-  assert with (slice 2 1 [1, 2, 3]; false) { when 'arg cancel true }
-  assert with (slice 0 5 [1, 2, 3]; false) { when 'mia cancel true }
-  assert with (slice 5 5 [1, 2, 3]; false) { when 'mia cancel true }
+  assert with { slice (-1) 2 [1, 2, 3]; false } { when 'arg cancel true }
+  assert with { slice 2 1 [1, 2, 3]; false } { when 'arg cancel true }
+  assert with { slice 0 5 [1, 2, 3]; false } { when 'mia cancel true }
+  assert with { slice 5 5 [1, 2, 3]; false } { when 'mia cancel true }
 }
 
 func take n (arr and typeof 'array) =
@@ -219,7 +219,7 @@ test "array take" {
   assert take 2 [1, 2, 3] == [1, 2]
   assert take 3 [1, 2, 3] == [1, 2, 3]
   assert take 12 [1, 2, 3] == [1, 2, 3]
-  assert with (take (-1) [1, 2, 3]; false) { when 'arg cancel true }
+  assert with { take (-1) [1, 2, 3]; false } { when 'arg cancel true }
 }
 
 func skip n (arr and typeof 'array) =
@@ -233,7 +233,7 @@ test "array skip" {
   assert skip 2 [1, 2, 3] == [3]
   assert skip 3 [1, 2, 3] == []
   assert skip 12 [1, 2, 3] == []
-  assert with (skip (-1) [1, 2, 3]; false) { when 'arg cancel true }
+  assert with { skip (-1) [1, 2, 3]; false } { when 'arg cancel true }
 }
 
 func drop n (arr and typeof 'array) =
@@ -247,12 +247,12 @@ test "array drop" {
   assert drop 2 [1, 2, 3] == [1]
   assert drop 3 [1, 2, 3] == []
   assert drop 12 [1, 2, 3] == []
-  assert with (drop (-1) [1, 2, 3]; false) { when 'arg cancel true }
+  assert with { drop (-1) [1, 2, 3]; false } { when 'arg cancel true }
 }
 
 func collect iterator =
   let arr = [],
-  with (iterator!(); arr) {
+  with { iterator!(); arr } {
     when 'next(val) then {
       push!(arr, val)
       become unit

trilogy/src/stdlib/debug.tri

@@ -61,6 +61,7 @@ proc dbg!(value) {
   return value
 }
 
-func trace label value =
-  core::print!("${to_string label}: ${to_string value}\n");
+func trace label value = {
+  core::print!("${to_string label}: ${to_string value}\n")
   value
+}

trilogy/src/stdlib/heap.tri

@@ -23,7 +23,10 @@ type heap cmp {
     }
   }
 
-  func append val [..heap] = push!(heap, val); heap
+  func append val [..heap] = {
+    push!(heap, val)
+    heap
+  }
 
   proc pop!(heap) {
     swap!(heap, 0, length heap - 1)
@@ -52,7 +55,7 @@ type heap cmp {
 
   func collect iterator =
     let heap = [],
-    with (iterator!(); heap) {
+    with { iterator!(); heap } {
       when 'next(val) then {
         push!(heap, val)
         become unit

trilogy/src/stdlib/iterator.tri

@@ -192,7 +192,7 @@ test "iterator scan" {
 
 func fold f a it =
   let mut state = a,
-  with it!(); state {
+  with { it!(); state } {
     when 'next(val) then {
       state = f state val
       become unit
@@ -205,13 +205,13 @@ test "iterator fold" {
 
 func reduce f it =
   let mut state = 'none,
-  with
-    it!();
+  with {
+    it!()
     match state {
       case 'some(v) then v
       else yield 'mia
     }
-  {
+  } {
     when 'next(val) then {
       state = match state {
         case 'some(prev) then 'some(f prev val)
@@ -239,7 +239,7 @@ test "iterator count" {
 }
 
 func any predicate it = 
-  with it!(); false {
+  with { it!(); false } {
     when 'next(val) then {
       if predicate val {
         return true
@@ -255,7 +255,7 @@ test "iterator any" {
 }
 
 func all predicate it = 
-  with it!(); true {
+  with { it!(); true } {
     when 'next(val) then {
       if !(predicate val) {
         return false
@@ -286,7 +286,7 @@ test "iterator enumerate" {
 }
 
 func find p it = 
-  with it!(); yield 'mia {
+  with { it!(); yield 'mia } {
     when 'next(v) then {
       if p v {
         return v
@@ -313,7 +313,7 @@ test "iterator choose" {
 }
 
 func for_each f it =
-  with it!(); unit {
+  with { it!(); unit } {
     when 'next(v) then {
       f v
       become unit

trilogy/src/stdlib/parsec.tri

@@ -248,7 +248,7 @@ proc digit!() {
 
 test "parsec digit" {
   assert parse digit "123" == '1'
-  assert with parse digit "A"; false { when 'reject(_) cancel true else cancel false }
+  assert with { parse digit "A"; false } { when 'reject(_) cancel true else cancel false }
 }
 
 ## A parser for any base-16 digit.
@@ -259,7 +259,7 @@ proc hex_digit!() {
 test "parsec hex_digit" {
   assert parse hex_digit "123" == '1'
   assert parse hex_digit "abc" == 'a'
-  assert with parse hex_digit "Z"; false { when 'reject(_) cancel true else cancel false }
+  assert with { parse hex_digit "Z"; false } { when 'reject(_) cancel true else cancel false }
 }
 
 ## Parses a base-10 integer from a string, returning the value as a number. A leading `-` sign
@@ -300,7 +300,7 @@ proc letter!() {
 
 test "parsec letter" {
   assert parse letter "a" == 'a'
-  assert with parse letter "1"; false { when 'reject(_) cancel true else cancel false }
+  assert with { parse letter "1"; false } { when 'reject(_) cancel true else cancel false }
 }
 
 ## A parser for any ASCII whitespace.
@@ -310,7 +310,7 @@ proc whitespace!() {
 
 test "parsec whitespace" {
   assert parse whitespace " " == ' '
-  assert with parse whitespace "1"; false { when 'reject(_) cancel true else cancel false }
+  assert with { parse whitespace "1"; false } { when 'reject(_) cancel true else cancel false }
 }
 
 ## A parser for any word (a sequence of word characters `[A-Za-z0-9_]`).

trilogy/src/stdlib/record.tri

@@ -29,7 +29,7 @@ test "record contains_key" {
 
 func collect iterator =
   let record = {||},
-  with (iterator!(); record) {
+  with { iterator!(); record } {
     when 'next(key:val) then {
       record.key = val
       become unit

trilogy/src/stdlib/set.tri

@@ -51,7 +51,7 @@ test "set contains" {
 
 func collect iterator =
   let set = [||],
-  with (iterator!(); set) {
+  with { iterator!(); set } {
     when 'next(val) then {
       push!(set, val)
       become unit

trilogy/src/stdlib/string.tri

@@ -43,10 +43,10 @@ test "string slice" {
   assert slice 1 2 "123" == "2"
   assert slice 1 1 "123" == ""
   assert slice 1 3 "123" == "23"
-  assert with (slice (-1) 2 "123"; false) { when 'arg cancel true }
-  assert with (slice 2 1 "123"; false) { when 'arg cancel true }
-  assert with (slice 0 5 "123"; false) { when 'mia cancel true }
-  assert with (slice 5 5 "123"; false) { when 'mia cancel true }
+  assert with { slice (-1) 2 "123"; false } { when 'arg cancel true }
+  assert with { slice 2 1 "123"; false } { when 'arg cancel true }
+  assert with { slice 0 5 "123"; false } { when 'mia cancel true }
+  assert with { slice 5 5 "123"; false } { when 'mia cancel true }
 }
 
 func take n (str and typeof 'string) =
@@ -60,7 +60,7 @@ test "string take" {
   assert take 2 "123" == "12"
   assert take 3 "123" == "123"
   assert take 12 "123" == "123"
-  assert with (take (-1) "123"; false) { when 'arg cancel true }
+  assert with { take (-1) "123"; false } { when 'arg cancel true }
 }
 
 func skip n (str and typeof 'string) =
@@ -74,7 +74,7 @@ test "string skip" {
   assert skip 2 "123" == "3"
   assert skip 3 "123" == ""
   assert skip 12 "123" == ""
-  assert with (skip (-1) "123"; false) { when 'arg cancel true }
+  assert with { skip (-1) "123"; false } { when 'arg cancel true }
 }
 
 func drop n (str and typeof 'string) =
@@ -88,7 +88,7 @@ test "string drop" {
   assert drop 2 "123" == "1"
   assert drop 3 "123" == ""
   assert drop 12 "123" == ""
-  assert with (drop (-1) "123"; false) { when 'arg cancel true }
+  assert with { drop (-1) "123"; false } { when 'arg cancel true }
 }
 
 func starts_with prefix string = take (length prefix) string == prefix
@@ -194,7 +194,7 @@ test "string split" {
 
 func collect iterator =
   let mut str = "",
-  with (iterator!(); str) {
+  with { iterator!(); str } {
     when 'next(val) then {
       str <>= core::to_string val
       become unit