tests: replace #!alt by #alt

mass replace (done by sed).
no additional semantic.

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

diff --git a/tests/base_array_nullable.nit b/tests/base_array_nullable.nit
index d79fc57..2164bfe 100644 (file)
--- a/tests/base_array_nullable.nit
+++ b/tests/base_array_nullable.nit
@@ -16,7 +16,7 @@
 
 import array
 
-var a: Array[nullable Int] = [1, 2, 3, null, 5]#!alt1#
+var a: Array[nullable Int] = [1, 2, 3, null, 5]#alt1#
 #alt1#var a = [1, 2, 3, null, 5]
 
 for i in a do

diff --git a/tests/base_attr_gen.nit b/tests/base_attr_gen.nit
index 6da20f8..bc0e7d9 100644 (file)
--- a/tests/base_attr_gen.nit
+++ b/tests/base_attr_gen.nit
@@ -3,6 +3,6 @@ class A[E]
        init do end
 end
 
-var a = new A[nullable Int]#!alt1#
+var a = new A[nullable Int]#alt1#
 #alt1#var a = new A[Int]
 a.e.output

diff --git a/tests/base_attr_isset.nit b/tests/base_attr_isset.nit
index bc5ab98..5120c9b 100644 (file)
--- a/tests/base_attr_isset.nit
+++ b/tests/base_attr_isset.nit
@@ -55,7 +55,7 @@ class Foo
                show(1)
                _a1 = new Integer(1)
                show(2)
-               _a2 = new Integer(_a1.val + 1) #!alt3# #!alt4#
+               _a2 = new Integer(_a1.val + 1) #alt3# #alt4#
                show(3)
        end
                #alt3#
@@ -64,7 +64,7 @@ end
 
 class Bar
        super Foo
-       var _a3: Integer#!alt1# #!alt2#
+       var _a3: Integer#alt1# #alt2#
        #alt1#var _a3: Integer = new Integer(9000)
        #alt2#var _a3: nullable Integer
        redef fun run

diff --git a/tests/base_closure1.nit b/tests/base_closure1.nit
index fc33d3a..53a8fb7 100644 (file)
--- a/tests/base_closure1.nit
+++ b/tests/base_closure1.nit
@@ -21,7 +21,7 @@ class A
                !bar
        do
                1.output
-               bar #!alt1#
+               bar #alt1#
                #alt2#bar(2)
                #alt3#var x = bar
                4.output
@@ -33,7 +33,7 @@ fun maybe: Bool do return true
 fun work
 do
        var a = new A
-       a.foo !bar do #!alt11#
+       a.foo !bar do #alt11#
        #alt11#a.foo !bar x do
                2.output
                if maybe then

diff --git a/tests/base_closure2.nit b/tests/base_closure2.nit
index ac1e651..821d2ad 100644 (file)
--- a/tests/base_closure2.nit
+++ b/tests/base_closure2.nit
@@ -21,7 +21,7 @@ class A
                !bar(i: Int)
        do
                1.output
-               bar(2) #!alt1#
+               bar(2) #alt1#
                #alt2#bar
                #alt12#bar('x')
                #alt3#var x = bar(2)
@@ -34,7 +34,7 @@ fun maybe: Bool do return true
 fun work
 do
        var a = new A
-       a.foo !bar x do #!alt11#
+       a.foo !bar x do #alt11#
        #alt11#a.foo !bar do
                x.output
                if maybe then

diff --git a/tests/base_closure3.nit b/tests/base_closure3.nit
index 3910bae..05ecc2a 100644 (file)
--- a/tests/base_closure3.nit
+++ b/tests/base_closure3.nit
@@ -31,7 +31,7 @@ fun maybe: Bool do return true
 
 var a = new A
 0.output
-a.foo(1,8) !bar x, y, b do #!alt2#
+a.foo(1,8) !bar x, y, b do #alt2#
 #alt2#a.foo(1,8) !bar x, y do
        x.output
        b.foo(x+1, y-1) !bar z, t, c do

diff --git a/tests/base_closure4.nit b/tests/base_closure4.nit
index 489b1e8..37ed4a3 100644 (file)
--- a/tests/base_closure4.nit
+++ b/tests/base_closure4.nit
@@ -21,7 +21,7 @@ class A
                !bar: Int
        do
                1.output
-               bar.output #!alt1#
+               bar.output #alt1#
                #alt2#bar(2)
                #alt3#var x: Char = bar
                4.output
@@ -33,7 +33,7 @@ fun maybe: Bool do return true
 fun work
 do
        var a = new A
-       a.foo !bar do #!alt11#
+       a.foo !bar do #alt11#
        #alt11#a.foo !bar x do
                2.output
                if maybe then

diff --git a/tests/base_closure5.nit b/tests/base_closure5.nit
index 5b68ff2..71a204b 100644 (file)
--- a/tests/base_closure5.nit
+++ b/tests/base_closure5.nit
@@ -44,7 +44,7 @@ do
                #alt7#continue
                #alt8#continue 'x'
                end
-               continue 5 #!alt9#
+               continue 5 #alt9#
        end
        4.output
        return i

diff --git a/tests/base_closure6.nit b/tests/base_closure6.nit
index f9ecb67..5d26989 100644 (file)
--- a/tests/base_closure6.nit
+++ b/tests/base_closure6.nit
@@ -49,7 +49,7 @@ var u: U = new U
 var v: V = new V
 var w: W = new W
 
-var y: Object#!alt1#
+var y: Object#alt1#
 #alt1#var y: U
 y = a.foo !bar do 0.output
 y = a.foo !bar do break t

diff --git a/tests/base_closure_break.nit b/tests/base_closure_break.nit
index 8d8c3f6..e4934fb 100644 (file)
--- a/tests/base_closure_break.nit
+++ b/tests/base_closure_break.nit
@@ -18,11 +18,11 @@ import kernel
 
 class A
        fun foo
-               break !bar #!alt12#
+               break !bar #alt12#
                #alt12#break !bar: Int
        do
                1.output
-               if maybe then bar #!alt1#
+               if maybe then bar #alt1#
                #alt2#if maybe then bar(2)
                #alt3#if maybe then var x = bar
                4.output
@@ -34,7 +34,7 @@ fun maybe: Bool do return true
 fun work
 do
        var a = new A
-       a.foo !bar do #!alt11#
+       a.foo !bar do #alt11#
        #alt11#a.foo !bar x do
                2.output
                if maybe then
@@ -46,7 +46,7 @@ do
                #alt9#return 'x'
                end
                3.output
-               break #!alt13#
+               break #alt13#
        end
        #alt10# a.foo
        5.output

diff --git a/tests/base_closure_break2.nit b/tests/base_closure_break2.nit
index 28f0820..8902df3 100644 (file)
--- a/tests/base_closure_break2.nit
+++ b/tests/base_closure_break2.nit
@@ -18,11 +18,11 @@ import kernel
 
 class A
        fun foo: Int
-               break !bar #!alt12#
+               break !bar #alt12#
                #alt12#break !bar: Int
        do
                1.output
-               if maybe then bar #!alt1#
+               if maybe then bar #alt1#
                #alt2#if maybe then bar(2)
                #alt3#if maybe then var x = bar
                return 4
@@ -34,7 +34,7 @@ fun maybe: Bool do return true
 fun work
 do
        var a = new A
-       var r = a.foo !bar do #!alt11#
+       var r = a.foo !bar do #alt11#
                #alt11#var r = a.foo !bar x do
                2.output
                if maybe then
@@ -46,7 +46,7 @@ do
                #alt9#return 'x'
                end
                3.output
-               break 4 #!alt13#
+               break 4 #alt13#
        end
        r.output
        #alt10# a.foo

diff --git a/tests/base_closure_break_default2.nit b/tests/base_closure_break_default2.nit
index 36a3a5f..9fdb3ad 100644 (file)
--- a/tests/base_closure_break_default2.nit
+++ b/tests/base_closure_break_default2.nit
@@ -29,7 +29,7 @@ class A
                        #alt7# break 1
                        #alt8# break 'x'
                        end
-                       break 20#!alt9#
+                       break 20#alt9#
                end
        do
                1.output

diff --git a/tests/base_closure_default3.nit b/tests/base_closure_default3.nit
index 91a4149..4cab9a2 100644 (file)
--- a/tests/base_closure_default3.nit
+++ b/tests/base_closure_default3.nit
@@ -27,7 +27,7 @@ class A
                        #alt6# break 1
                        end
                        #alt5# break
-                       continue 20 #!alt5#
+                       continue 20 #alt5#
                end
        do
                1.output

diff --git a/tests/base_closure_default4.nit b/tests/base_closure_default4.nit
index bb7b9e9..561f298 100644 (file)
--- a/tests/base_closure_default4.nit
+++ b/tests/base_closure_default4.nit
@@ -27,7 +27,7 @@ class A
                        #alt6# break
                        #alt7# break 1
                        end
-                       continue  i * 10 #!alt5#
+                       continue  i * 10 #alt5#
                end
        do
                1.output

diff --git a/tests/base_closure_multi.nit b/tests/base_closure_multi.nit
index 65df401..01ce323 100644 (file)
--- a/tests/base_closure_multi.nit
+++ b/tests/base_closure_multi.nit
@@ -17,12 +17,12 @@
 import kernel
 fun a
        !a1
-       !a2 #!alt1#
+       !a2 #alt1#
 #alt2# !a3
 #alt6#  !a1
 do
        a1
-       a2 #!alt1#
+       a2 #alt1#
 #alt2# a3
 end
 
@@ -54,8 +54,8 @@ end
 a !a1 do
        b !b1 do
                1.output
-       !b2 do #!alt3#
-               2.output #!alt3#
+       !b2 do #alt3#
+               2.output #alt3#
 #alt4# !b3 do
 #alt4#         20.output
        end

diff --git a/tests/base_closure_raf.nit b/tests/base_closure_raf.nit
index 1bed473..15bd66b 100644 (file)
--- a/tests/base_closure_raf.nit
+++ b/tests/base_closure_raf.nit
@@ -19,13 +19,13 @@ import base_closure2
 class B
        super A
        redef fun foo
-               !bar(i: Int) #!alt13# #!alt14# #!alt15#
+               !bar(i: Int) #alt13# #alt14# #alt15#
                #alt13# !bar
                #alt14# !bar(b: Bool)
                #alt15# !bar(i: Int): Int
        do
                10.output
-               bar(20) #!alt1#
+               bar(20) #alt1#
                #alt2#bar
                #alt12#bar('x')
                #alt3#var x = bar(2)
@@ -36,7 +36,7 @@ end
 fun work2
 do
        var a: A = new B
-       a.foo !bar x do #!alt11#
+       a.foo !bar x do #alt11#
        #alt11#a.foo !bar do
                x.output
                if maybe then

diff --git a/tests/base_combined_assignment.nit b/tests/base_combined_assignment.nit
index 0548c19..12e1481 100644 (file)
--- a/tests/base_combined_assignment.nit
+++ b/tests/base_combined_assignment.nit
@@ -16,7 +16,7 @@
 
 import kernel
 
-var i = 1#!alt1#
+var i = 1#alt1#
 #alt1#var i: Object = 1
 i += 2
 i.output

diff --git a/tests/base_control_flow.nit b/tests/base_control_flow.nit
index f6fd678..57f94a3 100644 (file)
--- a/tests/base_control_flow.nit
+++ b/tests/base_control_flow.nit
@@ -28,7 +28,7 @@ do
        a
        if true then return 0
        a
-       return 1#!alt1#
+       return 1#alt1#
 end
 
 fun c: Int
@@ -40,7 +40,7 @@ do
                return 0
        end
        a
-       return 2#!alt1#
+       return 2#alt1#
 end
 
 fun d: Int

diff --git a/tests/base_for_custom.nit b/tests/base_for_custom.nit
index c13e3b1..83c238a 100644 (file)
--- a/tests/base_for_custom.nit
+++ b/tests/base_for_custom.nit
@@ -16,9 +16,9 @@ import kernel
 
 class A
        var v: Int
-       fun iterate #!alt1#
+       fun iterate #alt1#
        #alt1# fun foo
-               !each(i: Int) #!alt2# #!alt5#
+               !each(i: Int) #alt2# #alt5#
                #alt5#!each(i: Int): Int
        do
                each(v)
@@ -35,14 +35,14 @@ class B
 end
 
 var a = new A(5)
-for i in a do #!alt3#
+for i in a do #alt3#
 #alt3#for i, j in a do
        i.output
 end
 
 var b = new B(5)
-for i, j in b do #!alt4#
+for i, j in b do #alt4#
 #alt4#for i in b do
        i.output
-       j.output #!alt4#
+       j.output #alt4#
 end

diff --git a/tests/base_init_auto.nit b/tests/base_init_auto.nit
index 655caf4..933a230 100644 (file)
--- a/tests/base_init_auto.nit
+++ b/tests/base_init_auto.nit
@@ -17,9 +17,9 @@
 import kernel
 
 class A
-       readable var _x: Int #!alt1#
+       readable var _x: Int #alt1#
        #alt1#readable var _x: Int = 2
-       readable var _y: Int = -2 #!alt2#
+       readable var _y: Int = -2 #alt2#
        #alt2#readable var _y: Int
        #alt3#init (xx: Int) do _x = xx
        #alt4#init foo(xx: Int) do _x = xx
@@ -31,7 +31,7 @@ class A
 end
 
 var a: A
-a = new A(1)#!alt1##!alt2##!alt3##!alt4#
+a = new A(1)#alt1##alt2##alt3##alt4#
 #alt1#a = new A
 #alt2#a = new A(3, -3)
 #alt3#a = new A(4)

diff --git a/tests/base_init_linext2.nit b/tests/base_init_linext2.nit
index 2ecfb60..7b5bfc4 100644 (file)
--- a/tests/base_init_linext2.nit
+++ b/tests/base_init_linext2.nit
@@ -102,7 +102,7 @@ class D
                '1'.output
                ' '.output
 #alt4#         init
-               initb #!alt2#
+               initb #alt2#
                'D'.output
                '2'.output
                ' '.output

diff --git a/tests/base_init_simple.nit b/tests/base_init_simple.nit
index 1ebe670..a5cdb89 100644 (file)
--- a/tests/base_init_simple.nit
+++ b/tests/base_init_simple.nit
@@ -9,11 +9,11 @@ end
 class B
        super A
        #alt1#redef init do '1'.output
-       init do '1'.output #!alt1#
+       init do '1'.output #alt1#
        #alt1#redef init init2 do '2'.output
-       init init2 do '2'.output #!alt1#
+       init init2 do '2'.output #alt1#
        #alt1#redef init init3 do '3'.output
-       init init3 do '3'.output #!alt1#
+       init init3 do '3'.output #alt1#
 end
 
 (new A).foo

diff --git a/tests/base_label_closure.nit b/tests/base_label_closure.nit
index f81c010..dc8e161 100644 (file)
--- a/tests/base_label_closure.nit
+++ b/tests/base_label_closure.nit
@@ -39,7 +39,7 @@ foo !bar do
                end
                if maybe then break label l1
                4.output
-       end label l2#!alt6#
+       end label l2#alt6#
        #alt6#end label l1
        5.output
 end label l1

diff --git a/tests/base_label_closure2.nit b/tests/base_label_closure2.nit
index 6969883..d7f608c 100644 (file)
--- a/tests/base_label_closure2.nit
+++ b/tests/base_label_closure2.nit
@@ -43,7 +43,7 @@ var i = foo !bar do
                if maybe then break label l1 10
                4.output
                break 4
-       end label l2#!alt6#
+       end label l2#alt6#
        #alt6#end label l1
        j.output
        5.output

diff --git a/tests/base_label_closure3.nit b/tests/base_label_closure3.nit
index 46877d7..d0eb8ba 100644 (file)
--- a/tests/base_label_closure3.nit
+++ b/tests/base_label_closure3.nit
@@ -43,7 +43,7 @@ foo !bar do
                4.output
        !baz do
                40.output
-       end label l2#!alt6#
+       end label l2#alt6#
        #alt6#end label l1
        5.output
 !baz do

diff --git a/tests/base_label_do.nit b/tests/base_label_do.nit
index 138bb70..c337093 100644 (file)
--- a/tests/base_label_do.nit
+++ b/tests/base_label_do.nit
@@ -33,7 +33,7 @@ do
                end
                if maybe then break label l1
                4.output
-       end label l2#!alt6#
+       end label l2#alt6#
        #alt6#end label l1
        5.output
 end label l1

diff --git a/tests/base_label_for.nit b/tests/base_label_for.nit
index e7d59b5..0f81381 100644 (file)
--- a/tests/base_label_for.nit
+++ b/tests/base_label_for.nit
@@ -34,7 +34,7 @@ for i in a do
                end
                if maybe then break label l1
                4.output
-       end label l2#!alt6#
+       end label l2#alt6#
        #alt6#end label l1
        5.output
 end label l1

diff --git a/tests/base_label_loop.nit b/tests/base_label_loop.nit
index ec16d02..182677b 100644 (file)
--- a/tests/base_label_loop.nit
+++ b/tests/base_label_loop.nit
@@ -39,7 +39,7 @@ loop
                if maybe then break label l1
                4.output
                if maybe then break
-       end label l2#!alt6#
+       end label l2#alt6#
        #alt6#end label l1
        5.output
 end label l1

diff --git a/tests/base_label_while.nit b/tests/base_label_while.nit
index 69f3793..06b2bff 100644 (file)
--- a/tests/base_label_while.nit
+++ b/tests/base_label_while.nit
@@ -36,7 +36,7 @@ while a == 1 do
                end
                if maybe then break label l1
                4.output
-       end label l2#!alt6#
+       end label l2#alt6#
        #alt6#end label l1
        5.output
 end label l1

diff --git a/tests/base_var_assignment_flow.nit b/tests/base_var_assignment_flow.nit
index 91bab93..bab71d0 100644 (file)
--- a/tests/base_var_assignment_flow.nit
+++ b/tests/base_var_assignment_flow.nit
@@ -40,9 +40,9 @@ b.output
 
 var c: Object
 if maybe then
-       c = 2 #!alt2# #!alt4#
+       c = 2 #alt2# #alt4#
 else
-       c = 2 #!alt3# #!alt4#
+       c = 2 #alt3# #alt4#
 end
 c.output
 

diff --git a/tests/base_var_type_evolution.nit b/tests/base_var_type_evolution.nit
index 38e6caf..76450c3 100644 (file)
--- a/tests/base_var_type_evolution.nit
+++ b/tests/base_var_type_evolution.nit
@@ -67,7 +67,7 @@ if rand then
        a = new B
 else
        a = new C
-       abort#!alt6#
+       abort#alt6#
 end
 a.a
 a.b

diff --git a/tests/base_var_type_evolution_null.nit b/tests/base_var_type_evolution_null.nit
index 6a5273e..146445e 100644 (file)
--- a/tests/base_var_type_evolution_null.nit
+++ b/tests/base_var_type_evolution_null.nit
@@ -33,7 +33,7 @@ fun eat_b(b: B) do 'B'.output
 var a: nullable Object = null
 a = new B
 if rand then
-       a = null #!alt1#
+       a = null #alt1#
        #alt2#a = new A
        #alt3#a = new B
 end

diff --git a/tests/base_var_type_evolution_null2.nit b/tests/base_var_type_evolution_null2.nit
index b1088a9..6f135f9 100644 (file)
--- a/tests/base_var_type_evolution_null2.nit
+++ b/tests/base_var_type_evolution_null2.nit
@@ -34,7 +34,7 @@ if a == null then
        eat_na(a)
        #alt1#eat_a(a)
        '\n'.output
-       abort#!alt2#
+       abort#alt2#
 end
 eat_na(a)
 eat_a(a)

diff --git a/tests/base_var_type_evolution_null4.nit b/tests/base_var_type_evolution_null4.nit
index b49911c..aaca6e5 100644 (file)
--- a/tests/base_var_type_evolution_null4.nit
+++ b/tests/base_var_type_evolution_null4.nit
@@ -58,7 +58,7 @@ do
                eat_a(a)
                break label doblock
        end
-       abort #!alt4#
+       abort #alt4#
 end label doblock
 eat_na(a)
 eat_a(a)

diff --git a/tests/error_defs.nit b/tests/error_defs.nit
index 3a66003..4a5036c 100644 (file)
--- a/tests/error_defs.nit
+++ b/tests/error_defs.nit
@@ -17,14 +17,14 @@
 import kernel
 
 #alt1#class Object
-redef class Object #!alt1#
+redef class Object #alt1#
        fun bar: Int do return 10 + baz
 end
 
 class A
        fun foo: Int do return 100 + bar
 #alt2# fun foo(c: Char) do (200 + bar).output
-       redef fun bar: Int do return 20 + baz #!alt3#
+       redef fun bar: Int do return 20 + baz #alt3#
 #alt3# fun bar: Int do return 30 + baz
 #alt4# fun baz(c: Char) do 2.output
 #alt5# redef fun baz(c: Char) do 2.output

diff --git a/tests/error_init_auto.nit b/tests/error_init_auto.nit
index b7e6aa4..67eff9b 100644 (file)
--- a/tests/error_init_auto.nit
+++ b/tests/error_init_auto.nit
@@ -17,9 +17,9 @@
 import kernel
 
 class A
-       readable var _x: Int #!alt1#
+       readable var _x: Int #alt1#
        #alt1#readable var _x: Int = 2
-       readable var _y: Int = -2 #!alt2#
+       readable var _y: Int = -2 #alt2#
        #alt2#readable var _y: Int
        #alt3#init (xx: Int) do _x = xx
        #alt4#init foo(xx: Int) do _x = xx

diff --git a/tests/error_needed_types.nit b/tests/error_needed_types.nit
index 6d41036..d4fc31c 100644 (file)
--- a/tests/error_needed_types.nit
+++ b/tests/error_needed_types.nit
@@ -1,8 +1,8 @@
 
-import end#!alt7#
+import end#alt7#
 #alt7#import kernel
-class Object#!alt7#
-end#!alt7#
+class Object#alt7#
+end#alt7#
 
 #alt6#class A
 #alt6#end

diff --git a/tests/icode_dmr_inh.nit b/tests/icode_dmr_inh.nit
index b71ec67..f2f4e22 100644 (file)
--- a/tests/icode_dmr_inh.nit
+++ b/tests/icode_dmr_inh.nit
@@ -16,5 +16,5 @@ var o: B
 #alt2#o = new B
 #alt3#o = new B
 #alt3#o.foo
-o = new A#!alt2#
+o = new A#alt2#
 o.foo

diff --git a/tests/test_combined_assignment.nit b/tests/test_combined_assignment.nit
index 58f6da3..cb61de6 100644 (file)
--- a/tests/test_combined_assignment.nit
+++ b/tests/test_combined_assignment.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 class A
-       readable writable var _a: Int = 0#!alt1#
+       readable writable var _a: Int = 0#alt1#
        #alt1#readable writable var _a: Object = 0
        init do end
        fun foo