tests: reactivate init_inherit and init_linext

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/tests/base_init_linext.nit b/tests/base_init_linext.nit
index ac93fb4..ac1d618 100644 (file)
--- a/tests/base_init_linext.nit
+++ b/tests/base_init_linext.nit
@@ -31,7 +31,7 @@ class B
                'B'.output
                '1'.output
                ' '.output
-               inita
+               super
                'B'.output
                '2'.output
                ' '.output
@@ -45,7 +45,7 @@ class C
                'C'.output
                '1'.output
                ' '.output
-               inita
+               super
                'C'.output
                '2'.output
                ' '.output
@@ -58,52 +58,12 @@ class D
        super C
        init do
                'D'.output
-               '0'.output
-               ' '.output
-#alt1#         inita
-#alt3#         inita
-#alt5#         inita
-#alt7#         inita
-#alt9#         inita
-#alt11#                inita
-#alt13#                inita
-#alt15#                inita
-               'D'.output
                '1'.output
                ' '.output
-#alt2#         initb
-#alt3#         initb
-#alt6#         initb
-#alt7#         initb
-#alt10#                initb
-#alt11#                initb
-#alt14#                initb
-#alt15#                initb
+               super
                'D'.output
                '2'.output
                ' '.output
-#alt4#         initc
-#alt5#         initc
-#alt6#         initc
-#alt7#         initc
-#alt12#                initc
-#alt13#                initc
-#alt14#                initc
-#alt15#                initc
-               'D'.output
-               '3'.output
-               ' '.output
-#alt8#         inite
-#alt9#         inite
-#alt10#                inite
-#alt11#                inite
-#alt12#                inite
-#alt13#                inite
-#alt14#                inite
-#alt15#                inite
-               'D'.output
-               '4'.output
-               ' '.output
        end
 
        init inite do

diff --git a/tests/base_init_linext2.nit b/tests/base_init_linext2.nit
index 7b5bfc4..aa032c0 100644 (file)
--- a/tests/base_init_linext2.nit
+++ b/tests/base_init_linext2.nit
@@ -68,7 +68,7 @@ class C
                'C'.output
                '1'.output
                ' '.output
-               inita
+               super
                'C'.output
                '2'.output
                ' '.output

diff --git a/tests/emscripten.skip b/tests/emscripten.skip
index c782ec0..e69de29 100644 (file)
--- a/tests/emscripten.skip
+++ b/tests/emscripten.skip
@@ -1,2 +0,0 @@
-init_inherit
-init_linext

diff --git a/tests/nitg-e.skip b/tests/nitg-e.skip
index c782ec0..e69de29 100644 (file)
--- a/tests/nitg-e.skip
+++ b/tests/nitg-e.skip
@@ -1,2 +0,0 @@
-init_inherit
-init_linext

diff --git a/tests/nitg-g.skip b/tests/nitg-g.skip
index fb091a0..1c64d1f 100644 (file)
--- a/tests/nitg-g.skip
+++ b/tests/nitg-g.skip
@@ -1,3 +1 @@
-init_inherit
-init_linext
 nitg

diff --git a/tests/nitg-s.skip b/tests/nitg-s.skip
index c782ec0..e69de29 100644 (file)
--- a/tests/nitg-s.skip
+++ b/tests/nitg-s.skip
@@ -1,2 +0,0 @@
-init_inherit
-init_linext

diff --git a/tests/nitg-sg.skip b/tests/nitg-sg.skip
index 5f17ed8..e69de29 100644 (file)
--- a/tests/nitg-sg.skip
+++ b/tests/nitg-sg.skip
@@ -1,3 +0,0 @@
-init_inherit
-init_linext
-android

diff --git a/tests/niti.skip b/tests/niti.skip
index baf5b76..dc52b3b 100644 (file)
--- a/tests/niti.skip
+++ b/tests/niti.skip
@@ -1,5 +1,3 @@
-init_inherit
-init_linext
 test_mem
 shoot_logic
 bench_

diff --git a/tests/nitvm.skip b/tests/nitvm.skip
index afed2b6..da1d367 100644 (file)
--- a/tests/nitvm.skip
+++ b/tests/nitvm.skip
@@ -1,5 +1,3 @@
-init_inherit
-init_linext
 test_mem
 shoot_logic
 bench_

diff --git a/tests/sav/base_init_inherit.res b/tests/sav/base_init_inherit.res
index 04165c5..2240200 100644 (file)
--- a/tests/sav/base_init_inherit.res
+++ b/tests/sav/base_init_inherit.res
@@ -4,5 +4,5 @@ B{A}ba
 C{B{A}}cba
 Ama
 A2ma
-B{A}nbma
-O{C{B{A}}}onmcba
+B{A}nmba
+O{C{B{A}}}oncmba

diff --git a/tests/sav/base_init_inherit2_alt0.res b/tests/sav/base_init_inherit2_alt0.res
index 0212e99..6717ee4 100644 (file)
--- a/tests/sav/base_init_inherit2_alt0.res
+++ b/tests/sav/base_init_inherit2_alt0.res
@@ -2,4 +2,4 @@ Aa
 Aba
 Aca
 Amca
-Anbmca
+Anmcba

diff --git a/tests/sav/base_init_inherit2_alt1.res b/tests/sav/base_init_inherit2_alt1.res
index 3868b73..4e63661 100644 (file)
--- a/tests/sav/base_init_inherit2_alt1.res
+++ b/tests/sav/base_init_inherit2_alt1.res
@@ -2,4 +2,4 @@ Aa
 B{A}ba
 Aca
 Amca
-B{A}nbmca
+B{A}nmcba

diff --git a/tests/sav/base_init_inherit2_alt2.res b/tests/sav/base_init_inherit2_alt2.res
index 5bb2c66..5707297 100644 (file)
--- a/tests/sav/base_init_inherit2_alt2.res
+++ b/tests/sav/base_init_inherit2_alt2.res
@@ -2,4 +2,4 @@ Aa
 Aba
 C{A}ca
 C{A}mca
-C{A}nbmca
+C{A}nmcba

diff --git a/tests/sav/base_init_inherit2_alt3.res b/tests/sav/base_init_inherit2_alt3.res
index bf88578..863486b 100644 (file)
--- a/tests/sav/base_init_inherit2_alt3.res
+++ b/tests/sav/base_init_inherit2_alt3.res
@@ -1 +1 @@
-alt/base_init_inherit2_alt3.nit:75,7: Error: Explicit constructor required in N since multiple inheritance of constructor is forbiden. Conflicting classes are B, C. Costructors are base_init_inherit2_alt3::B::cb, base_init_inherit2_alt3::A::ca, base_init_inherit2_alt3::C::cc.
+Aa

diff --git a/tests/sav/base_init_inherit3_alt0.res b/tests/sav/base_init_inherit3_alt0.res
index 9a3590f..d25bc4f 100644 (file)
--- a/tests/sav/base_init_inherit3_alt0.res
+++ b/tests/sav/base_init_inherit3_alt0.res
@@ -2,6 +2,6 @@ Aa
 Ama
 B{A}ba
 Ana
-B{A}omba
-B{A}pbna
-B{A}qmbna
+B{A}obma
+B{A}pnba
+B{A}qnbma

diff --git a/tests/sav/base_init_inherit3_alt1.res b/tests/sav/base_init_inherit3_alt1.res
index 3a08969..3aef777 100644 (file)
--- a/tests/sav/base_init_inherit3_alt1.res
+++ b/tests/sav/base_init_inherit3_alt1.res
@@ -2,6 +2,6 @@ Aa
 Ama
 B{A}ba
 Ana
-B{A}omba
-B{A}pbna
-B{A}qombna
+B{A}obma
+B{A}pnba
+B{A}qonbma

diff --git a/tests/sav/base_init_inherit3_alt2.res b/tests/sav/base_init_inherit3_alt2.res
index 77e587f..340bcfd 100644 (file)
--- a/tests/sav/base_init_inherit3_alt2.res
+++ b/tests/sav/base_init_inherit3_alt2.res
@@ -2,6 +2,6 @@ Aa
 Ama
 B{A}ba
 Ana
-B{A}omba
-B{A}pbna
-B{A}qmpbna
+B{A}obma
+B{A}pnba
+B{A}qpnbma

diff --git a/tests/sav/base_init_inherit3_alt3.res b/tests/sav/base_init_inherit3_alt3.res
index 7293394..486e174 100644 (file)
--- a/tests/sav/base_init_inherit3_alt3.res
+++ b/tests/sav/base_init_inherit3_alt3.res
@@ -2,6 +2,6 @@ Aa
 Ama
 B{A}ba
 Ana
-B{A}omba
-B{A}pbna
-B{A}qompbna
+B{A}obma
+B{A}pnba
+B{A}qponbma

diff --git a/tests/sav/base_init_inherit4_alt0.res b/tests/sav/base_init_inherit4_alt0.res
index 1df3160..b14d378 100644 (file)
--- a/tests/sav/base_init_inherit4_alt0.res
+++ b/tests/sav/base_init_inherit4_alt0.res
@@ -1,4 +1,4 @@
 Bba
-Bomba
-Bpbna
-Bqmbna
+Bobma
+Bpnba
+Bqnbma

diff --git a/tests/sav/base_init_inherit4_alt1.res b/tests/sav/base_init_inherit4_alt1.res
index 1b94fae..5fa8ab0 100644 (file)
--- a/tests/sav/base_init_inherit4_alt1.res
+++ b/tests/sav/base_init_inherit4_alt1.res
@@ -1,4 +1,4 @@
 Bba
-Bomba
-Bpbna
-Bqombna
+Bobma
+Bpnba
+Bqonbma

diff --git a/tests/sav/base_init_inherit4_alt2.res b/tests/sav/base_init_inherit4_alt2.res
index 5d31ef6..652e57b 100644 (file)
--- a/tests/sav/base_init_inherit4_alt2.res
+++ b/tests/sav/base_init_inherit4_alt2.res
@@ -1,4 +1,4 @@
 Bba
-Bomba
-Bpbna
-Bqmpbna
+Bobma
+Bpnba
+Bqpnbma

diff --git a/tests/sav/base_init_inherit4_alt3.res b/tests/sav/base_init_inherit4_alt3.res
index 65961af..d7b2cd6 100644 (file)
--- a/tests/sav/base_init_inherit4_alt3.res
+++ b/tests/sav/base_init_inherit4_alt3.res
@@ -1,4 +1,4 @@
 Bba
-Bomba
-Bpbna
-Bqompbna
+Bobma
+Bpnba
+Bqponbma

diff --git a/tests/sav/base_init_inherit5.res b/tests/sav/base_init_inherit5.res
index c67526f..246f558 100644 (file)
--- a/tests/sav/base_init_inherit5.res
+++ b/tests/sav/base_init_inherit5.res
@@ -2,5 +2,5 @@ A1a
 B2{A1}ba
 C3{B2{A1}}cba
 A1ma
-B2{A1}nbma
-O4{C3{B2{A1}}}onmcba
+B2{A1}nmba
+O4{C3{B2{A1}}}oncmba

diff --git a/tests/sav/base_init_inherit6_alt1.res b/tests/sav/base_init_inherit6_alt1.res
index 893493f..a912b09 100644 (file)
--- a/tests/sav/base_init_inherit6_alt1.res
+++ b/tests/sav/base_init_inherit6_alt1.res
@@ -1 +1,5 @@
-alt/base_init_inherit6_alt1.nit:32,10--14: Error: init is not a constructor in B.
+1
+2
+1
+3
+1

diff --git a/tests/sav/base_init_inherit6_alt2.res b/tests/sav/base_init_inherit6_alt2.res
index 900503c..ce7a77e 100644 (file)
--- a/tests/sav/base_init_inherit6_alt2.res
+++ b/tests/sav/base_init_inherit6_alt2.res
@@ -1 +1,5 @@
-alt/base_init_inherit6_alt2.nit:33,10--18: Error: foo is not a constructor in B.
+1
+2
+1
+3
+2

diff --git a/tests/sav/base_init_inherit_alt1.res b/tests/sav/base_init_inherit_alt1.res
index a63698b..1243025 100644 (file)
--- a/tests/sav/base_init_inherit_alt1.res
+++ b/tests/sav/base_init_inherit_alt1.res
@@ -1,11 +1,19 @@
-alt/base_init_inherit_alt1.nit:95,2--9: Error: ca is not a constructor in B.
-alt/base_init_inherit_alt1.nit:96,2--10: Error: ca2 is not a constructor in B.
-alt/base_init_inherit_alt1.nit:98,2--9: Error: ca is not a constructor in C.
-alt/base_init_inherit_alt1.nit:99,2--10: Error: ca2 is not a constructor in C.
-alt/base_init_inherit_alt1.nit:100,2--9: Error: cb is not a constructor in C.
-alt/base_init_inherit_alt1.nit:104,2--9: Error: ca is not a constructor in N.
-alt/base_init_inherit_alt1.nit:105,2--10: Error: ca2 is not a constructor in N.
-alt/base_init_inherit_alt1.nit:107,2--9: Error: ca is not a constructor in O.
-alt/base_init_inherit_alt1.nit:108,2--10: Error: ca2 is not a constructor in O.
-alt/base_init_inherit_alt1.nit:109,2--9: Error: cb is not a constructor in O.
-alt/base_init_inherit_alt1.nit:110,2--9: Error: cc is not a constructor in O.
+Aa
+A2a
+B{A}ba
+Aba
+A2ba
+C{B{A}}cba
+Acba
+A2cba
+B{A}cba
+Ama
+A2ma
+B{A}nmba
+Anmba
+A2nmba
+O{C{B{A}}}oncmba
+Aoncmba
+A2oncmba
+B{A}oncmba
+C{B{A}}oncmba

diff --git a/tests/sav/base_init_linext.res b/tests/sav/base_init_linext.res
index 6f74ed3..b0e29f8 100644 (file)
--- a/tests/sav/base_init_linext.res
+++ b/tests/sav/base_init_linext.res
@@ -1 +1 @@
-B1 A B2 C1 C2 D0 D1 D2 D3 D4 
+D1 C1 B1 A B2 C2 D2 

diff --git a/tests/sav/base_init_linext2.res b/tests/sav/base_init_linext2.res
index c12605c..daa73b2 100644 (file)
--- a/tests/sav/base_init_linext2.res
+++ b/tests/sav/base_init_linext2.res
@@ -3,6 +3,6 @@ A2x
 B1 A B2 
 A B3 
 A B4y 
-C1 A C2 
+C1 C2 
 A2z C3z 
-D1 B1 A B2 C1 C2 D2 D3 
+D1 B1 A B2 D2 D3 

diff --git a/tests/sav/base_init_linext2_alt1.res b/tests/sav/base_init_linext2_alt1.res
index 1b64c0f..fc63fc7 100644 (file)
--- a/tests/sav/base_init_linext2_alt1.res
+++ b/tests/sav/base_init_linext2_alt1.res
@@ -1 +1 @@
-alt/base_init_linext2_alt1.nit:100,1--5: Error: No contructor named initd in superclasses.
+alt/base_init_linext2_alt1.nit:100,1--5: Error: No super method to call for initd.

diff --git a/tests/sav/base_init_linext2_alt2.res b/tests/sav/base_init_linext2_alt2.res
index c7c14d4..fe7551d 100644 (file)
--- a/tests/sav/base_init_linext2_alt2.res
+++ b/tests/sav/base_init_linext2_alt2.res
@@ -1 +1,8 @@
-alt/base_init_linext2_alt2.nit:99,2--5: Error: there is no available compatible constructor in B. Discarded candidates are base_init_linext2_alt2::B::initb, base_init_linext2_alt2::B::init_par, base_init_linext2_alt2::B::init_par2(c: Char).
+A 
+A2x 
+B1 A B2 
+A B3 
+A B4y 
+C1 C2 
+A2z C3z 
+C1 C2 D1 D2 D3 

diff --git a/tests/sav/base_init_linext2_alt3.res b/tests/sav/base_init_linext2_alt3.res
index 924b31d..7eadb94 100644 (file)
--- a/tests/sav/base_init_linext2_alt3.res
+++ b/tests/sav/base_init_linext2_alt3.res
@@ -3,6 +3,6 @@ A2x
 B1 A B2 
 A B3 
 A B4y 
-C1 A C2 
+C1 C2 
 A2z C3z 
 D1 B1 A B2 D2 C1 C2 D3 

diff --git a/tests/sav/base_init_linext2_alt4.res b/tests/sav/base_init_linext2_alt4.res
index 1bd61e3..9bc59e1 100644 (file)
--- a/tests/sav/base_init_linext2_alt4.res
+++ b/tests/sav/base_init_linext2_alt4.res
@@ -1 +1,8 @@
-alt/base_init_linext2_alt4.nit:99,2--5: Error: there is no available compatible constructor in B. Discarded candidates are base_init_linext2_alt4::B::initb, base_init_linext2_alt4::B::init_par, base_init_linext2_alt4::B::init_par2(c: Char).
+A 
+A2x 
+B1 A B2 
+A B3 
+A B4y 
+C1 C2 
+A2z C3z 
+D1 C1 C2 B1 A B2 D2 D3 

diff --git a/tests/sav/base_init_linext2_alt5.res b/tests/sav/base_init_linext2_alt5.res
index d04a73a..bc59762 100644 (file)
--- a/tests/sav/base_init_linext2_alt5.res
+++ b/tests/sav/base_init_linext2_alt5.res
@@ -1 +1,8 @@
-alt/base_init_linext2_alt5.nit:109,1--5: Error: Only one super constructor invocation of class B is allowed.
+A 
+A2x 
+B1 A B2 
+A B3 
+A B4y 
+C1 C2 
+A2z C3z 
+D1 B1 A B2 D2 B1 A B2 D3 

diff --git a/tests/sav/base_init_linext_alt0.res b/tests/sav/base_init_linext_alt0.res
index 90938b0..6d4b14b 100644 (file)
--- a/tests/sav/base_init_linext_alt0.res
+++ b/tests/sav/base_init_linext_alt0.res
@@ -1,5 +1,5 @@
 A 
 B1 A B2 
 C1 A C2 
-B1 A B2 C1 C2 D0 D1 D2 D3 D4 
-E1 A E2 B1 B2 E3 C1 C2 E4 
+D1 C1 B1 A B2 C2 D2 
+E1 D1 C1 B1 A B2 C2 D2 E2 D1 C1 B1 A B2 C2 D2 E3 D1 C1 B1 A B2 C2 D2 E4 

diff --git a/tests/sav/base_init_linext_alt1.res b/tests/sav/base_init_linext_alt1.res
deleted file mode 100644 (file)
index 04e3275..0000000
--- a/tests/sav/base_init_linext_alt1.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A B1 B2 C1 C2 D1 D2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt10.res b/tests/sav/base_init_linext_alt10.res
deleted file mode 100644 (file)
index 683e93c..0000000
--- a/tests/sav/base_init_linext_alt10.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 B1 A B2 D2 D3 E1 E2 E3 C1 C2 E4 D4 

diff --git a/tests/sav/base_init_linext_alt11.res b/tests/sav/base_init_linext_alt11.res
deleted file mode 100644 (file)
index edef552..0000000
--- a/tests/sav/base_init_linext_alt11.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 B1 B2 D2 D3 E1 E2 E3 C1 C2 E4 D4 

diff --git a/tests/sav/base_init_linext_alt12.res b/tests/sav/base_init_linext_alt12.res
deleted file mode 100644 (file)
index a92a06b..0000000
--- a/tests/sav/base_init_linext_alt12.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 D2 C1 A C2 D3 E1 E2 B1 B2 E3 E4 D4 

diff --git a/tests/sav/base_init_linext_alt13.res b/tests/sav/base_init_linext_alt13.res
deleted file mode 100644 (file)
index cea7bbd..0000000
--- a/tests/sav/base_init_linext_alt13.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 D2 C1 C2 D3 E1 E2 B1 B2 E3 E4 D4 

diff --git a/tests/sav/base_init_linext_alt14.res b/tests/sav/base_init_linext_alt14.res
deleted file mode 100644 (file)
index ce9cfc0..0000000
--- a/tests/sav/base_init_linext_alt14.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 B1 A B2 D2 C1 C2 D3 E1 E2 E3 E4 D4 

diff --git a/tests/sav/base_init_linext_alt15.res b/tests/sav/base_init_linext_alt15.res
deleted file mode 100644 (file)
index d48d0e2..0000000
--- a/tests/sav/base_init_linext_alt15.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 B1 B2 D2 C1 C2 D3 E1 E2 E3 E4 D4 

diff --git a/tests/sav/base_init_linext_alt2.res b/tests/sav/base_init_linext_alt2.res
deleted file mode 100644 (file)
index 0d383df..0000000
--- a/tests/sav/base_init_linext_alt2.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 B1 A B2 C1 C2 D2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt3.res b/tests/sav/base_init_linext_alt3.res
deleted file mode 100644 (file)
index 539f8ad..0000000
--- a/tests/sav/base_init_linext_alt3.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 B1 B2 C1 C2 D2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt4.res b/tests/sav/base_init_linext_alt4.res
deleted file mode 100644 (file)
index 2aa8b4e..0000000
--- a/tests/sav/base_init_linext_alt4.res
+++ /dev/null
@@ -1 +0,0 @@
-B1 A B2 D0 D1 D2 C1 C2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt5.res b/tests/sav/base_init_linext_alt5.res
deleted file mode 100644 (file)
index 7883af4..0000000
--- a/tests/sav/base_init_linext_alt5.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A B1 B2 D1 D2 C1 C2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt6.res b/tests/sav/base_init_linext_alt6.res
deleted file mode 100644 (file)
index ce5e04a..0000000
--- a/tests/sav/base_init_linext_alt6.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 B1 A B2 D2 C1 C2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt7.res b/tests/sav/base_init_linext_alt7.res
deleted file mode 100644 (file)
index c075e86..0000000
--- a/tests/sav/base_init_linext_alt7.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 B1 B2 D2 C1 C2 D3 D4 

diff --git a/tests/sav/base_init_linext_alt8.res b/tests/sav/base_init_linext_alt8.res
deleted file mode 100644 (file)
index 305d19c..0000000
--- a/tests/sav/base_init_linext_alt8.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 D1 D2 D3 E1 A E2 B1 B2 E3 C1 C2 E4 D4 

diff --git a/tests/sav/base_init_linext_alt9.res b/tests/sav/base_init_linext_alt9.res
deleted file mode 100644 (file)
index 322c6ab..0000000
--- a/tests/sav/base_init_linext_alt9.res
+++ /dev/null
@@ -1 +0,0 @@
-D0 A D1 D2 D3 E1 E2 B1 B2 E3 C1 C2 E4 D4 

diff --git a/tests/sav/base_init_linext_raf.res b/tests/sav/base_init_linext_raf.res
index 2d4d642..27671d4 100644 (file)
--- a/tests/sav/base_init_linext_raf.res
+++ b/tests/sav/base_init_linext_raf.res
@@ -1,4 +1,4 @@
 A 
 b1 B1 A B2 b2 
 c1 C1 A C2 c2 
-d1 b1 B1 A B2 b2 c1 C1 C2 c2 D0 D1 D2 D3 D4 d2 
+d1 D1 c1 C1 b1 B1 A B2 b2 C2 c2 D2 d2