Convert all fns to block arg syntax.

test/function/call_extra_arguments.wren

@@ -1,7 +1,7 @@
-var f0 = fn IO.print("zero")
-var f1 = fn(a) IO.print("one " + a)
-var f2 = fn(a, b) IO.print("two " + a + " " + b)
-var f3 = fn(a, b, c) IO.print("three " + a + " " + b + " " + c)
+var f0 = new Fn { IO.print("zero") }
+var f1 = new Fn {|a| IO.print("one " + a) }
+var f2 = new Fn {|a, b| IO.print("two " + a + " " + b) }
+var f3 = new Fn {|a, b, c| IO.print("three " + a + " " + b + " " + c) }
 
 f0.call("a") // expect: zero
 f0.call("a", "b") // expect: zero

test/function/call_missing_arguments.wren

@@ -1,2 +1,2 @@
-var f2 = fn(a, b) IO.print(a + b)
+var f2 = new Fn {|a, b| IO.print(a + b) }
 f2.call("a") // expect runtime error: Function expects more arguments.

test/function/empty_block.wren

@@ -1,2 +1,2 @@
-var f = fn {}
+var f = new Fn {}
 IO.print(f.call) // expect: null

test/function/equality.wren

@@ -1,16 +1,16 @@
 // Not structurally equal.
-IO.print((fn 123) == (fn 123))  // expect: false
-IO.print((fn 123) != (fn 123))  // expect: true
+IO.print(new Fn { 123 } == new Fn { 123 })  // expect: false
+IO.print(new Fn { 123 } != new Fn { 123 })  // expect: true
 
 // Not equal to other types.
-IO.print((fn 123) == 1)         // expect: false
-IO.print((fn 123) == false)     // expect: false
-IO.print((fn 123) == "fn 123")  // expect: false
-IO.print((fn 123) != 1)         // expect: true
-IO.print((fn 123) != false)     // expect: true
-IO.print((fn 123) != "fn 123")  // expect: true
+IO.print(new Fn { 123 } == 1)         // expect: false
+IO.print(new Fn { 123 } == false)     // expect: false
+IO.print(new Fn { 123 } == "fn 123")  // expect: false
+IO.print(new Fn { 123 } != 1)         // expect: true
+IO.print(new Fn { 123 } != false)     // expect: true
+IO.print(new Fn { 123 } != "fn 123")  // expect: true
 
 // Equal by identity.
-var f = fn 123
+var f = new Fn { 123 }
 IO.print(f == f) // expect: true
 IO.print(f != f) // expect: false

test/function/parameters.wren

@@ -1,50 +1,50 @@
-var f0 = fn 0
+var f0 = new Fn { 0 }
 IO.print(f0.call) // expect: 0
 
-var f1 = fn(a) a
+var f1 = new Fn {|a| a }
 IO.print(f1.call(1)) // expect: 1
 
-var f2 = fn(a, b) a + b
+var f2 = new Fn {|a, b| a + b }
 IO.print(f2.call(1, 2)) // expect: 3
 
-var f3 = fn(a, b, c) a + b + c
+var f3 = new Fn {|a, b, c| a + b + c }
 IO.print(f3.call(1, 2, 3)) // expect: 6
 
-var f4 = fn(a, b, c, d) a + b + c + d
+var f4 = new Fn {|a, b, c, d| a + b + c + d }
 IO.print(f4.call(1, 2, 3, 4)) // expect: 10
 
-var f5 = fn(a, b, c, d, e) a + b + c + d + e
+var f5 = new Fn {|a, b, c, d, e| a + b + c + d + e }
 IO.print(f5.call(1, 2, 3, 4, 5)) // expect: 15
 
-var f6 = fn(a, b, c, d, e, f) a + b + c + d + e + f
+var f6 = new Fn {|a, b, c, d, e, f| a + b + c + d + e + f }
 IO.print(f6.call(1, 2, 3, 4, 5, 6)) // expect: 21
 
-var f7 = fn(a, b, c, d, e, f, g) a + b + c + d + e + f + g
+var f7 = new Fn {|a, b, c, d, e, f, g| a + b + c + d + e + f + g }
 IO.print(f7.call(1, 2, 3, 4, 5, 6, 7)) // expect: 28
 
-var f8 = fn(a, b, c, d, e, f, g, h) a + b + c + d + e + f + g + h
+var f8 = new Fn {|a, b, c, d, e, f, g, h| a + b + c + d + e + f + g + h }
 IO.print(f8.call(1, 2, 3, 4, 5, 6, 7, 8)) // expect: 36
 
-var f9 = fn(a, b, c, d, e, f, g, h, i) a + b + c + d + e + f + g + h + i
+var f9 = new Fn {|a, b, c, d, e, f, g, h, i| a + b + c + d + e + f + g + h + i }
 IO.print(f9.call(1, 2, 3, 4, 5, 6, 7, 8, 9)) // expect: 45
 
-var f10 = fn(a, b, c, d, e, f, g, h, i, j) a + b + c + d + e + f + g + h + i + j
+var f10 = new Fn {|a, b, c, d, e, f, g, h, i, j| a + b + c + d + e + f + g + h + i + j }
 IO.print(f10.call(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)) // expect: 55
 
-var f11 = fn(a, b, c, d, e, f, g, h, i, j, k) a + b + c + d + e + f + g + h + i + j + k
+var f11 = new Fn {|a, b, c, d, e, f, g, h, i, j, k| a + b + c + d + e + f + g + h + i + j + k }
 IO.print(f11.call(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)) // expect: 66
 
-var f12 = fn(a, b, c, d, e, f, g, h, i, j, k, l) a + b + c + d + e + f + g + h + i + j + k + l
+var f12 = new Fn {|a, b, c, d, e, f, g, h, i, j, k, l| a + b + c + d + e + f + g + h + i + j + k + l }
 IO.print(f12.call(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12)) // expect: 78
 
-var f13 = fn(a, b, c, d, e, f, g, h, i, j, k, l, m) a + b + c + d + e + f + g + h + i + j + k + l + m
+var f13 = new Fn {|a, b, c, d, e, f, g, h, i, j, k, l, m| a + b + c + d + e + f + g + h + i + j + k + l + m }
 IO.print(f13.call(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13)) // expect: 91
 
-var f14 = fn(a, b, c, d, e, f, g, h, i, j, k, l, m, n) a + b + c + d + e + f + g + h + i + j + k + l + m + n
+var f14 = new Fn {|a, b, c, d, e, f, g, h, i, j, k, l, m, n| a + b + c + d + e + f + g + h + i + j + k + l + m + n }
 IO.print(f14.call(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14)) // expect: 105
 
-var f15 = fn(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) a + b + c + d + e + f + g + h + i + j + k + l + m + n + o
+var f15 = new Fn {|a, b, c, d, e, f, g, h, i, j, k, l, m, n, o| a + b + c + d + e + f + g + h + i + j + k + l + m + n + o }
 IO.print(f15.call(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15)) // expect: 120
 
-var f16 = fn(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) a + b + c + d + e + f + g + h + i + j + k + l + m + n + o + p
+var f16 = new Fn {|a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p| a + b + c + d + e + f + g + h + i + j + k + l + m + n + o + p }
 IO.print(f16.call(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)) // expect: 136

test/function/syntax.wren

@@ -1,25 +1,23 @@
 // Single expression body.
-(fn IO.print("ok")).call // expect: ok
-
-// TODO: Precedence of fn body.
+new Fn { IO.print("ok") }.call // expect: ok
 
 // Curly body.
-fn {
+new Fn {
   IO.print("ok") // expect: ok
 }.call
 
 // No trailing newline.
-fn {
+new Fn {
   IO.print("ok") }.call // expect: ok
 
 // Multiple expressions.
-fn {
+new Fn {
   IO.print("1") // expect: 1
   IO.print("2") // expect: 2
 }.call
 
 // Extra newlines.
-fn {
+new Fn {
 
 
   IO.print("1") // expect: 1

test/function/to_string.wren

@@ -1 +1 @@
-IO.print(fn {}) // expect: <fn>
+IO.print(new Fn {}) // expect: <fn>

test/function/too_many_parameters.wren

@@ -1 +1 @@
-var f = fn(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) { "!" } // expect error
+var f = new Fn {|a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q| "!" } // expect error

test/function/type.wren

@@ -1,4 +1,4 @@
-IO.print((fn 0) is Fn)      // expect: true
-IO.print((fn 0) is Object)  // expect: true
-IO.print((fn 0) is String)  // expect: false
-IO.print((fn 0).type == Fn) // expect: true
+IO.print(new Fn { 0 } is Fn)      // expect: true
+IO.print(new Fn { 0 } is Object)  // expect: true
+IO.print(new Fn { 0 } is String)  // expect: false
+IO.print(new Fn { 0 }.type == Fn) // expect: true