Make constructors just methods.

* Eliminate "new" reserved word.
* Allow "this" before a method definition to define a constructor.
* Only create a default constructor for classes that don't define one.
This commit is contained in:
Bob Nystrom
2015-07-10 09:18:22 -07:00
parent 0ddaa2517c
commit 5fb6186d7d
221 changed files with 864 additions and 654 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
var f = new Fn {}
var f = Fn.new {}
IO.print(f.call()) // expect: null
+1 -1
View File
@@ -1,4 +1,4 @@
var f = new Fn {
var f = Fn.new {
// Hi.
}
IO.print(f.call()) // expect: null
@@ -1,2 +1,2 @@
new Fn {
Fn.new {
IO.print("ok") } // expect error
+1 -1
View File
@@ -1 +1 @@
new Fn {|| null } // expect error
Fn.new {|| null } // expect error
+17 -17
View File
@@ -1,50 +1,50 @@
var f0 = new Fn { 0 }
var f0 = Fn.new { 0 }
IO.print(f0.call()) // expect: 0
var f1 = new Fn {|a| a }
var f1 = Fn.new {|a| a }
IO.print(f1.call(1)) // expect: 1
var f2 = new Fn {|a, b| a + b }
var f2 = Fn.new {|a, b| a + b }
IO.print(f2.call(1, 2)) // expect: 3
var f3 = new Fn {|a, b, c| a + b + c }
var f3 = Fn.new {|a, b, c| a + b + c }
IO.print(f3.call(1, 2, 3)) // expect: 6
var f4 = new Fn {|a, b, c, d| a + b + c + d }
var f4 = Fn.new {|a, b, c, d| a + b + c + d }
IO.print(f4.call(1, 2, 3, 4)) // expect: 10
var f5 = new Fn {|a, b, c, d, e| a + b + c + d + e }
var f5 = Fn.new {|a, b, c, d, e| a + b + c + d + e }
IO.print(f5.call(1, 2, 3, 4, 5)) // expect: 15
var f6 = new Fn {|a, b, c, d, e, f| a + b + c + d + e + f }
var f6 = Fn.new {|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 = new Fn {|a, b, c, d, e, f, g| a + b + c + d + e + f + g }
var f7 = Fn.new {|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 = new Fn {|a, b, c, d, e, f, g, h| a + b + c + d + e + f + g + h }
var f8 = Fn.new {|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 = new Fn {|a, b, c, d, e, f, g, h, i| a + b + c + d + e + f + g + h + i }
var f9 = Fn.new {|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 = new Fn {|a, b, c, d, e, f, g, h, i, j| a + b + c + d + e + f + g + h + i + j }
var f10 = Fn.new {|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 = new 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 = Fn.new {|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 = 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 }
var f12 = Fn.new {|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 = 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 }
var f13 = Fn.new {|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 = 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 }
var f14 = Fn.new {|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 = 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 }
var f15 = Fn.new {|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 = 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 }
var f16 = Fn.new {|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
+4 -4
View File
@@ -1,19 +1,19 @@
// Single expression body.
new Fn { IO.print("ok") }.call() // expect: ok
Fn.new { IO.print("ok") }.call() // expect: ok
// Curly body.
new Fn {
Fn.new {
IO.print("ok") // expect: ok
}.call()
// Multiple statements.
new Fn {
Fn.new {
IO.print("1") // expect: 1
IO.print("2") // expect: 2
}.call()
// Extra newlines.
new Fn {
Fn.new {
IO.print("1") // expect: 1