syntax: 'meth' -> 'fun', 'attr' -> 'var'

[nit.git] / tests / test_gen_inh.nit

diff --git a/tests/test_gen_inh.nit b/tests/test_gen_inh.nit
index d658002..c8545bb 100644 (file)
--- a/tests/test_gen_inh.nit
+++ b/tests/test_gen_inh.nit
@@ -18,33 +18,32 @@ import kernel
 
 class Gen1[E, F]
 special Object
-   readable writable attr _e: E
-   attr _f_: F
-   meth f: F do return _f_ end 
-   meth f=(x: F) do _f_ = x end
+   readable writable var _e: E
+   var _f_: F
+   fun f: F do return _f_ end 
+   fun f=(x: F) do _f_ = x end
 
-   init do end
+   init(e:E) do _e = e
 end
 
 class Gen2[G: Int]
 special Gen1[G, Char]
-
-   init do end
+   init(e:G) do super(e)
 end
 
 class Gen3[H: Int]
 special Gen1[H, Char]
-   redef readable redef writable redef attr _e: H
-   redef attr _f_: Char
-   redef meth f: Char do return _f_ end 
-   redef meth f=(x: Char) do _f_ = x end
+   redef readable redef writable redef var _e: H
+   redef var _f_: Char = 'N'
+   redef fun f: Char do return _f_ end 
+   redef fun f=(x: Char) do _f_ = x end
 
-   init do end
+   init(e:H) do super(e)
 end
 
-var g1 = new Gen1[Int, Char]
-var g2 = new Gen2[Int]
-var g3 = new Gen3[Int]
+var g1 = new Gen1[Int, Char](1)
+var g2 = new Gen2[Int](2)
+var g3 = new Gen3[Int](3)
 g1.e = 1
 g1.f = '1'
 g2.e = 2