X-Git-Url: http://nitlanguage.org diff --git a/tests/bench_complex_sort.nit b/tests/bench_complex_sort.nit index 7ebe0f1..ad72cc6 100644 --- a/tests/bench_complex_sort.nit +++ b/tests/bench_complex_sort.nit @@ -16,37 +16,37 @@ interface Elt - meth val1: Int is abstract - meth val2: Int do return val1 + fun val1: Int is abstract + fun val2: Int do return val1 end class A -special Elt - attr _a: Int - redef meth val1: Int do return _a + super Elt + var _a: Int + redef fun val1: Int do return _a init(i: Int) do _a = i end class Elt2 -special Elt - attr _b: Int - redef meth val1: Int do return _b/2 - redef meth val2: Int do return _b + super Elt + var _b: Int + redef fun val1: Int do return _b/2 + redef fun val2: Int do return _b init initelt2(i: Int) do _b = i end class B -special Elt2 + super Elt2 init(i: Int) do initelt2(i) end class C -special Elt - attr _c: Int - attr _d: Int - redef meth val1: Int do return _c end - redef meth val2: Int do return _d end + super Elt + var _c: Int + var _d: Int + redef fun val1: Int do return _c end + redef fun val2: Int do return _d end init init2(i: Int, j: Int) do _c = i @@ -55,10 +55,10 @@ special Elt end class D -special A -special Elt2 - redef meth val1: Int do return _a end - redef meth val2: Int do return _b end + super A + super Elt2 + redef fun val1: Int do return _a end + redef fun val2: Int do return _b end init init2(i: Int, j: Int) do init(i) @@ -67,15 +67,15 @@ special Elt2 end class E -special Elt2 - redef meth val1: Int do return 5 end + super Elt2 + redef fun val1: Int do return 5 end init(i: Int) do initelt2(i) end class EltSorter -special AbstractSorter[Elt] - redef meth compare(a: Elt, b: Elt): Int + super AbstractSorter[Elt] + redef fun compare(a: Elt, b: Elt): Int do if _is_val1 then return a.val1 <=> b.val1 @@ -84,17 +84,17 @@ special AbstractSorter[Elt] end end - meth toggle + fun toggle do _is_val1 = not _is_val1 end - attr _is_val1: Bool + var _is_val1: Bool = false init do end end -meth generator: Elt +fun generator: Elt do var r = 5.rand if r == 0 then