parser: include obra, cbra, opar and cpar in arguments

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

diff --git a/src/parser/nit.sablecc3xx b/src/parser/nit.sablecc3xx
index 651bd4f..fecd742 100644 (file)
--- a/src/parser/nit.sablecc3xx
+++ b/src/parser/nit.sablecc3xx
@@ -360,9 +360,9 @@ stmt~withelse {-> expr}
        | {loop} loop~withelse {-> loop~withelse.expr}
        | {for} for~withelse {-> for~withelse.expr}
        | {assert} assert~withelse {-> assert~withelse.expr}
-       | {call} recv id args_nopar closure_defs~withelse? {-> New expr.call(recv.expr, id, [args_nopar.expr], [closure_defs~withelse.closure_def])}
-       | {super} qualified? kwsuper args_nopar {-> New expr.super(qualified, kwsuper, [args_nopar.expr])}
-       | {init} recv kwinit args_nopar {-> New expr.init(recv.expr, kwinit, [args_nopar.expr])}
+       | {call} recv id args_nopar closure_defs~withelse? {-> New expr.call(recv.expr, id, args_nopar.exprs, [closure_defs~withelse.closure_def])}
+       | {super} qualified? kwsuper args_nopar {-> New expr.super(qualified, kwsuper, args_nopar.exprs)}
+       | {init} recv kwinit args_nopar {-> New expr.init(recv.expr, kwinit, args_nopar.exprs)}
        ;
 
 label= kwlabel id;
@@ -398,11 +398,11 @@ vardecl~withelse{-> expr}
 
 assignment~withelse {-> expr}
        = {attr} recv attrid assign expr_final~withelse {-> New expr.attr_assign(recv.expr, attrid, assign, expr_final~withelse.expr)}
-       | {call} recv id args assign expr_final~withelse {-> New expr.call_assign(recv.expr, id, [args.expr], assign,  expr_final~withelse.expr)}
-       | {bra} expr_atom braargs assign expr_final~withelse {-> New expr.bra_assign(expr_atom.expr, [braargs.expr], assign,  expr_final~withelse.expr)}
+       | {call} recv id args assign expr_final~withelse {-> New expr.call_assign(recv.expr, id, args.exprs, assign,  expr_final~withelse.expr)}
+       | {bra} expr_atom braargs assign expr_final~withelse {-> New expr.bra_assign(expr_atom.expr, braargs.exprs, assign,  expr_final~withelse.expr)}
        | {attr_re} recv attrid assign_op expr_final~withelse {-> New expr.attr_reassign(recv.expr, attrid, assign_op,  expr_final~withelse.expr)}
-       | {call_re} recv id args assign_op expr_final~withelse {-> New expr.call_reassign(recv.expr, id, [args.expr], assign_op,  expr_final~withelse.expr)}
-       | {bra_re} expr_atom braargs assign_op expr_final~withelse {-> New expr.bra_reassign(expr_atom.expr, [braargs.expr], assign_op,  expr_final~withelse.expr)}
+       | {call_re} recv id args assign_op expr_final~withelse {-> New expr.call_reassign(recv.expr, id, args.exprs, assign_op,  expr_final~withelse.expr)}
+       | {bra_re} expr_atom braargs assign_op expr_final~withelse {-> New expr.bra_reassign(expr_atom.expr, braargs.exprs, assign_op,  expr_final~withelse.expr)}
        ;
 assign_op
        = {plus} pluseq
@@ -450,8 +450,8 @@ assertid {-> id}
 /* EXPRESSIONS ***************************************************************/
 expr_final~nopar~withelse~nobra {-> expr}
        = expr~nopar~nobra {-> expr~nopar~nobra.expr}
-       | {closure_call} recv~nobra id args closure_defs~withelse {-> New expr.call(recv~nobra.expr, id, [args.expr], [closure_defs~withelse.closure_def])}
-!nobra!nopar   | {closure_bra} expr_atom braargs closure_defs~withelse {-> New expr.bra(expr_atom.expr, [braargs.expr], [closure_defs~withelse.closure_def])}
+       | {closure_call} recv~nobra id args closure_defs~withelse {-> New expr.call(recv~nobra.expr, id, args.exprs, [closure_defs~withelse.closure_def])}
+!nobra!nopar   | {closure_bra} expr_atom braargs closure_defs~withelse {-> New expr.bra(expr_atom.expr, braargs.exprs, [closure_defs~withelse.closure_def])}
        ;
 
 expr~nopar~nobra {-> expr}
@@ -507,21 +507,21 @@ expr_minus~nopar~nobra {-> expr}
 
 expr_new~nopar~nobra {-> expr}
        = expr_atom~nopar~nobra {-> expr_atom~nopar~nobra.expr}
-       | {new} kwnew no type~nobra args {-> New expr.new(kwnew, type~nobra.type, Null, [args.expr])}
+       | {new} kwnew no type~nobra args {-> New expr.new(kwnew, type~nobra.type, Null, args.exprs)}
        | {isset_attr} kwisset recv~nopar~nobra attrid {-> New expr.isset_attr(kwisset, recv~nopar~nobra.expr, attrid)}
        ;
 
 expr_atom~nopar~nobra {-> expr}
        = {attr} recv~nopar~nobra attrid {-> New expr.attr(recv~nopar~nobra.expr, attrid)}
-       | {call} recv~nopar~nobra id args {-> New expr.call(recv~nopar~nobra.expr, id, [args.expr], [])}
-       | {super} qualified? kwsuper args {-> New expr.super(qualified, kwsuper, [args.expr])}
-       | {init} recv~nopar~nobra kwinit args {-> New expr.init(recv~nopar~nobra.expr, kwinit, [args.expr])}
-!nobra | {bra} expr_atom~nopar braargs {-> New expr.bra(expr_atom~nopar.expr, [braargs.expr], [])}
-       | {new} kwnew no type~nobra dot [n2]:no id args {-> New expr.new(kwnew, type~nobra.type, id, [args.expr])}
+       | {call} recv~nopar~nobra id args {-> New expr.call(recv~nopar~nobra.expr, id, args.exprs, [])}
+       | {super} qualified? kwsuper args {-> New expr.super(qualified, kwsuper, args.exprs)}
+       | {init} recv~nopar~nobra kwinit args {-> New expr.init(recv~nopar~nobra.expr, kwinit, args.exprs)}
+!nobra | {bra} expr_atom~nopar braargs {-> New expr.bra(expr_atom~nopar.expr, braargs.exprs, [])}
+       | {new} kwnew no type~nobra dot [n2]:no id args {-> New expr.new(kwnew, type~nobra.type, id, args.exprs)}
 // !nopar to unambiguise 'foo[5].bar' between '(foo[5]).bar' and 'foo([5].bar),
 !nobra!nopar   | {range} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no cbra {-> New expr.crange(obra, expr, expr2.expr, cbra)}
 !nobra!nopar   | {orange} obra no expr [n2]:no dotdot [n3]:no [expr2]:expr_nobra [n4]:no [cbra]:obra  {-> New expr.orange(obra, expr, expr2.expr, cbra)}
-!nobra!nopar   | {array} braargs {-> New expr.array([braargs.expr])}
+!nobra!nopar   | {array} braargs {-> New expr.array(braargs.exprs)}
        | {self} kwself {-> New expr.self(kwself)}
        | {true} kwtrue {-> New expr.true(kwtrue)}
        | {false} kwfalse {-> New expr.false(kwfalse)}
@@ -556,20 +556,22 @@ recv~nopar~nobra {-> expr}
        | {implicit} {-> New expr.implicit_self()}
        ;
 
-args {-> expr*}
-       = opar no expr [n2]:no args_tail* cpar {-> [expr, args_tail.expr]}
-       | {emptypar} opar no cpar {-> []}
-       | {empty} {-> []}
+args {-> exprs}
+       = opar no expr_list cpar {-> New exprs.par(opar, [expr_list.expr], cpar) }
+       | {emptypar} opar no cpar {-> New exprs.par(opar, [], cpar) }
+       | {empty} {-> New exprs.list([])}
        ;
-args_nopar {-> expr*}
-       = opar no expr [n2]:no args_tail* cpar {-> [expr, args_tail.expr]}
-       | {onearg} expr_nopar {-> [expr_nopar.expr]}
-       | {emptypar} opar no cpar {-> []}
-       | {empty} {-> []}
+args_nopar {-> exprs}
+       = opar no expr_list cpar {-> New exprs.par(opar, [expr_list.expr], cpar) }
+       | {onearg} expr_nopar {-> New exprs.list([expr_nopar.expr])}
+       | {emptypar} opar no cpar {-> New exprs.par(opar, [], cpar) }
+       | {empty} {-> New exprs.list([])}
        ;
-braargs        {-> expr*}
-       = obra no expr [n2]:no args_tail* cbra {-> [expr, args_tail.expr]};
-args_tail {-> expr} 
+braargs        {-> exprs}
+       = obra no expr_list cbra {-> New exprs.bra(obra, [expr_list.expr], cbra)};
+expr_list {-> expr*}
+       = expr [n2]:no expr_tail* {-> [expr, expr_tail.expr]};
+expr_tail {-> expr} 
        = comma no expr [n2]:no {-> expr};
 idlist {-> id*}
        = opar idlist_nopar cpar {-> [idlist_nopar.id]}
@@ -711,26 +713,26 @@ expr      = {block} expr* kwend?
        | {slash} expr [expr2]:expr 
        | {percent} expr [expr2]:expr 
        | {uminus} minus expr 
-       | {new} kwnew type id? [args]:expr*
+       | {new} kwnew type id? [args]:exprs
        | {attr} expr [id]:attrid 
        | {attr_assign} expr [id]:attrid assign [value]:expr 
        | {attr_reassign} expr [id]:attrid assign_op [value]:expr 
-       | {call} expr id [args]:expr* [closure_defs]:closure_def*
-       | {call_assign} expr id [args]:expr* assign [value]:expr 
-       | {call_reassign} expr id [args]:expr* assign_op [value]:expr 
-       | {super} qualified? kwsuper [args]:expr*
-       | {init} expr kwinit [args]:expr* 
-       | {bra} expr [args]:expr* [closure_defs]:closure_def* 
-       | {bra_assign} expr [args]:expr* assign [value]:expr 
-       | {bra_reassign} expr [args]:expr* assign_op [value]:expr 
-       | {closure_call} id [args]:expr* [closure_defs]:closure_def*
+       | {call} expr id [args]:exprs [closure_defs]:closure_def*
+       | {call_assign} expr id [args]:exprs assign [value]:expr 
+       | {call_reassign} expr id [args]:exprs assign_op [value]:expr 
+       | {super} qualified? kwsuper [args]:exprs
+       | {init} expr kwinit [args]:exprs 
+       | {bra} expr [args]:exprs [closure_defs]:closure_def* 
+       | {bra_assign} expr [args]:exprs assign [value]:expr 
+       | {bra_reassign} expr [args]:exprs assign_op [value]:expr 
+       | {closure_call} id [args]:exprs [closure_defs]:closure_def*
        | {var} id
        | {var_assign} id assign [value]:expr 
        | {var_reassign} id assign_op [value]:expr 
        | {range} expr [expr2]:expr 
        | {crange} obra expr [expr2]:expr cbra
        | {orange} obra expr [expr2]:expr [cbra]:obra
-       | {array} [exprs]:expr*
+       | {array} [exprs]:exprs
        | {self} kwself 
        | {implicit_self} 
        | {true} kwtrue 
@@ -749,6 +751,11 @@ expr       = {block} expr* kwend?
         | {as_notnull} expr kwas opar kwnot kwnull cpar
        | {isset_attr} kwisset expr [id]:attrid
        ;
+exprs
+       = {list} [exprs]:expr*
+       | {par} opar [exprs]:expr* cpar
+       | {bra} obra [exprs]:expr* cbra
+       ;
 assign_op
        = {plus} pluseq
        | {minus} minuseq

diff --git a/src/parser/parser.nit b/src/parser/parser.nit
index c30d894..669c970 100644 (file)
--- a/src/parser/parser.nit
+++ b/src/parser/parser.nit
@@ -554,350 +554,349 @@ class Parser
                        new ReduceAction401(73),
                        new ReduceAction402(74),
                        new ReduceAction403(74),
-                       new ReduceAction202(74),
-                       new ReduceAction405(74),
+                       new ReduceAction404(74),
                        new ReduceAction402(75),
+                       new ReduceAction406(75),
                        new ReduceAction403(75),
-                       new ReduceAction408(75),
-                       new ReduceAction202(75),
-                       new ReduceAction405(75),
-                       new ReduceAction402(76),
-                       new ReduceAction403(76),
-                       new ReduceAction413(77),
-                       new ReduceAction414(78),
-                       new ReduceAction415(78),
-                       new ReduceAction416(79),
-                       new ReduceAction417(79),
-                       new ReduceAction418(79),
-                       new ReduceAction419(79),
-                       new ReduceAction420(80),
-                       new ReduceAction421(80),
-                       new ReduceAction422(80),
-                       new ReduceAction423(81),
-                       new ReduceAction424(82),
-                       new ReduceAction425(83),
-                       new ReduceAction425(83),
-                       new ReduceAction427(84),
-                       new ReduceAction428(84),
-                       new ReduceAction36(84),
-                       new ReduceAction430(85),
-                       new ReduceAction431(85),
-                       new ReduceAction432(86),
-                       new ReduceAction433(86),
-                       new ReduceAction425(86),
-                       new ReduceAction67(87),
-                       new ReduceAction68(88),
-                       new ReduceAction69(88),
-                       new ReduceAction70(88),
-                       new ReduceAction71(88),
-                       new ReduceAction72(88),
-                       new ReduceAction73(88),
-                       new ReduceAction78(88),
-                       new ReduceAction79(88),
-                       new ReduceAction80(88),
-                       new ReduceAction81(88),
-                       new ReduceAction82(88),
-                       new ReduceAction83(88),
-                       new ReduceAction84(88),
-                       new ReduceAction85(88),
-                       new ReduceAction188(89),
-                       new ReduceAction189(89),
-                       new ReduceAction190(89),
-                       new ReduceAction191(89),
-                       new ReduceAction227(90),
-                       new ReduceAction228(90),
-                       new ReduceAction238(91),
-                       new ReduceAction267(91),
-                       new ReduceAction268(91),
+                       new ReduceAction404(75),
+                       new ReduceAction409(76),
+                       new ReduceAction410(77),
+                       new ReduceAction411(77),
+                       new ReduceAction412(78),
+                       new ReduceAction413(79),
+                       new ReduceAction414(79),
+                       new ReduceAction415(80),
+                       new ReduceAction416(80),
+                       new ReduceAction417(80),
+                       new ReduceAction418(80),
+                       new ReduceAction419(81),
+                       new ReduceAction420(81),
+                       new ReduceAction421(81),
+                       new ReduceAction422(82),
+                       new ReduceAction423(83),
+                       new ReduceAction424(84),
+                       new ReduceAction424(84),
+                       new ReduceAction426(85),
+                       new ReduceAction427(85),
+                       new ReduceAction36(85),
+                       new ReduceAction429(86),
+                       new ReduceAction430(86),
+                       new ReduceAction431(87),
+                       new ReduceAction432(87),
+                       new ReduceAction424(87),
+                       new ReduceAction67(88),
+                       new ReduceAction68(89),
+                       new ReduceAction69(89),
+                       new ReduceAction70(89),
+                       new ReduceAction71(89),
+                       new ReduceAction72(89),
+                       new ReduceAction73(89),
+                       new ReduceAction78(89),
+                       new ReduceAction79(89),
+                       new ReduceAction80(89),
+                       new ReduceAction81(89),
+                       new ReduceAction82(89),
+                       new ReduceAction83(89),
+                       new ReduceAction84(89),
+                       new ReduceAction85(89),
+                       new ReduceAction188(90),
+                       new ReduceAction189(90),
+                       new ReduceAction190(90),
+                       new ReduceAction191(90),
+                       new ReduceAction227(91),
+                       new ReduceAction228(91),
                        new ReduceAction238(92),
-                       new ReduceAction337(92),
+                       new ReduceAction267(92),
+                       new ReduceAction268(92),
                        new ReduceAction238(93),
-                       new ReduceAction339(93),
-                       new ReduceAction340(93),
-                       new ReduceAction341(93),
+                       new ReduceAction337(93),
                        new ReduceAction238(94),
-                       new ReduceAction343(94),
+                       new ReduceAction339(94),
+                       new ReduceAction340(94),
+                       new ReduceAction341(94),
                        new ReduceAction238(95),
-                       new ReduceAction345(95),
-                       new ReduceAction346(95),
-                       new ReduceAction347(95),
-                       new ReduceAction348(95),
-                       new ReduceAction349(95),
-                       new ReduceAction350(95),
-                       new ReduceAction351(95),
-                       new ReduceAction352(95),
-                       new ReduceAction353(95),
-                       new ReduceAction354(95),
-                       new ReduceAction355(95),
+                       new ReduceAction343(95),
                        new ReduceAction238(96),
-                       new ReduceAction357(96),
-                       new ReduceAction358(96),
+                       new ReduceAction345(96),
+                       new ReduceAction346(96),
+                       new ReduceAction347(96),
+                       new ReduceAction348(96),
+                       new ReduceAction349(96),
+                       new ReduceAction350(96),
+                       new ReduceAction351(96),
+                       new ReduceAction352(96),
+                       new ReduceAction353(96),
+                       new ReduceAction354(96),
+                       new ReduceAction355(96),
                        new ReduceAction238(97),
-                       new ReduceAction360(97),
-                       new ReduceAction361(97),
-                       new ReduceAction362(97),
+                       new ReduceAction357(97),
+                       new ReduceAction358(97),
                        new ReduceAction238(98),
-                       new ReduceAction364(98),
-                       new ReduceAction365(98),
+                       new ReduceAction360(98),
+                       new ReduceAction361(98),
+                       new ReduceAction362(98),
                        new ReduceAction238(99),
-                       new ReduceAction367(99),
-                       new ReduceAction368(99),
-                       new ReduceAction369(99),
-                       new ReduceAction370(100),
-                       new ReduceAction371(100),
-                       new ReduceAction265(100),
-                       new ReduceAction266(100),
-                       new ReduceAction269(100),
-                       new ReduceAction270(100),
-                       new ReduceAction271(100),
-                       new ReduceAction272(100),
-                       new ReduceAction379(100),
-                       new ReduceAction383(100),
-                       new ReduceAction384(100),
-                       new ReduceAction385(100),
-                       new ReduceAction386(100),
-                       new ReduceAction387(100),
-                       new ReduceAction388(100),
-                       new ReduceAction389(100),
-                       new ReduceAction390(100),
+                       new ReduceAction364(99),
+                       new ReduceAction365(99),
                        new ReduceAction238(100),
-                       new ReduceAction392(100),
-                       new ReduceAction393(100),
-                       new ReduceAction394(100),
-                       new ReduceAction235(101),
-                       new ReduceAction236(101),
-                       new ReduceAction237(101),
+                       new ReduceAction367(100),
+                       new ReduceAction368(100),
+                       new ReduceAction369(100),
+                       new ReduceAction370(101),
+                       new ReduceAction371(101),
+                       new ReduceAction265(101),
+                       new ReduceAction266(101),
+                       new ReduceAction269(101),
+                       new ReduceAction270(101),
+                       new ReduceAction271(101),
+                       new ReduceAction272(101),
+                       new ReduceAction379(101),
+                       new ReduceAction383(101),
+                       new ReduceAction384(101),
+                       new ReduceAction385(101),
+                       new ReduceAction386(101),
+                       new ReduceAction387(101),
+                       new ReduceAction388(101),
+                       new ReduceAction389(101),
+                       new ReduceAction390(101),
                        new ReduceAction238(101),
+                       new ReduceAction392(101),
+                       new ReduceAction393(101),
+                       new ReduceAction394(101),
+                       new ReduceAction235(102),
+                       new ReduceAction236(102),
+                       new ReduceAction237(102),
                        new ReduceAction238(102),
-                       new ReduceAction238(102),
-                       new ReduceAction248(102),
-                       new ReduceAction249(102),
-                       new ReduceAction250(102),
-                       new ReduceAction251(102),
-                       new ReduceAction252(102),
-                       new ReduceAction253(102),
-                       new ReduceAction254(102),
-                       new ReduceAction255(102),
-                       new ReduceAction256(102),
-                       new ReduceAction257(102),
-                       new ReduceAction258(102),
-                       new ReduceAction238(102),
-                       new ReduceAction238(102),
-                       new ReduceAction238(102),
-                       new ReduceAction238(102),
-                       new ReduceAction238(102),
-                       new ReduceAction238(102),
-                       new ReduceAction265(102),
-                       new ReduceAction266(102),
-                       new ReduceAction267(102),
-                       new ReduceAction268(102),
-                       new ReduceAction269(102),
-                       new ReduceAction270(102),
-                       new ReduceAction271(102),
-                       new ReduceAction272(102),
-                       new ReduceAction274(103),
-                       new ReduceAction275(103),
-                       new ReduceAction276(104),
-                       new ReduceAction277(104),
-                       new ReduceAction278(104),
-                       new ReduceAction279(104),
-                       new ReduceAction280(104),
-                       new ReduceAction281(104),
-                       new ReduceAction282(104),
-                       new ReduceAction283(104),
-                       new ReduceAction284(104),
-                       new ReduceAction293(105),
-                       new ReduceAction294(106),
-                       new ReduceAction295(106),
-                       new ReduceAction296(106),
-                       new ReduceAction297(106),
-                       new ReduceAction298(107),
-                       new ReduceAction299(107),
-                       new ReduceAction300(107),
-                       new ReduceAction301(107),
-                       new ReduceAction302(107),
-                       new ReduceAction303(107),
-                       new ReduceAction304(107),
-                       new ReduceAction305(107),
-                       new ReduceAction306(107),
-                       new ReduceAction307(107),
-                       new ReduceAction310(108),
-                       new ReduceAction311(108),
-                       new ReduceAction312(109),
-                       new ReduceAction319(110),
-                       new ReduceAction320(110),
-                       new ReduceAction321(111),
-                       new ReduceAction322(111),
-                       new ReduceAction323(112),
-                       new ReduceAction324(112),
-                       new ReduceAction325(112),
-                       new ReduceAction326(112),
-                       new ReduceAction327(113),
-                       new ReduceAction328(113),
-                       new ReduceAction238(114),
-                       new ReduceAction267(114),
-                       new ReduceAction268(114),
-                       new ReduceAction335(114),
+                       new ReduceAction238(103),
+                       new ReduceAction238(103),
+                       new ReduceAction248(103),
+                       new ReduceAction249(103),
+                       new ReduceAction250(103),
+                       new ReduceAction251(103),
+                       new ReduceAction252(103),
+                       new ReduceAction253(103),
+                       new ReduceAction254(103),
+                       new ReduceAction255(103),
+                       new ReduceAction256(103),
+                       new ReduceAction257(103),
+                       new ReduceAction258(103),
+                       new ReduceAction238(103),
+                       new ReduceAction238(103),
+                       new ReduceAction238(103),
+                       new ReduceAction238(103),
+                       new ReduceAction238(103),
+                       new ReduceAction238(103),
+                       new ReduceAction265(103),
+                       new ReduceAction266(103),
+                       new ReduceAction267(103),
+                       new ReduceAction268(103),
+                       new ReduceAction269(103),
+                       new ReduceAction270(103),
+                       new ReduceAction271(103),
+                       new ReduceAction272(103),
+                       new ReduceAction274(104),
+                       new ReduceAction275(104),
+                       new ReduceAction276(105),
+                       new ReduceAction277(105),
+                       new ReduceAction278(105),
+                       new ReduceAction279(105),
+                       new ReduceAction280(105),
+                       new ReduceAction281(105),
+                       new ReduceAction282(105),
+                       new ReduceAction283(105),
+                       new ReduceAction284(105),
+                       new ReduceAction293(106),
+                       new ReduceAction294(107),
+                       new ReduceAction295(107),
+                       new ReduceAction296(107),
+                       new ReduceAction297(107),
+                       new ReduceAction298(108),
+                       new ReduceAction299(108),
+                       new ReduceAction300(108),
+                       new ReduceAction301(108),
+                       new ReduceAction302(108),
+                       new ReduceAction303(108),
+                       new ReduceAction304(108),
+                       new ReduceAction305(108),
+                       new ReduceAction306(108),
+                       new ReduceAction307(108),
+                       new ReduceAction310(109),
+                       new ReduceAction311(109),
+                       new ReduceAction312(110),
+                       new ReduceAction319(111),
+                       new ReduceAction320(111),
+                       new ReduceAction321(112),
+                       new ReduceAction322(112),
+                       new ReduceAction323(113),
+                       new ReduceAction324(113),
+                       new ReduceAction325(113),
+                       new ReduceAction326(113),
+                       new ReduceAction327(114),
+                       new ReduceAction328(114),
                        new ReduceAction238(115),
                        new ReduceAction267(115),
                        new ReduceAction268(115),
-                       new ReduceAction235(116),
-                       new ReduceAction236(116),
-                       new ReduceAction237(116),
+                       new ReduceAction335(115),
+                       new ReduceAction238(116),
+                       new ReduceAction267(116),
+                       new ReduceAction268(116),
                        new ReduceAction235(117),
                        new ReduceAction236(117),
                        new ReduceAction237(117),
-                       new ReduceAction238(118),
-                       new ReduceAction267(118),
-                       new ReduceAction268(118),
+                       new ReduceAction235(118),
+                       new ReduceAction236(118),
+                       new ReduceAction237(118),
                        new ReduceAction238(119),
-                       new ReduceAction337(119),
+                       new ReduceAction267(119),
+                       new ReduceAction268(119),
                        new ReduceAction238(120),
-                       new ReduceAction339(120),
-                       new ReduceAction340(120),
-                       new ReduceAction341(120),
+                       new ReduceAction337(120),
                        new ReduceAction238(121),
-                       new ReduceAction343(121),
+                       new ReduceAction339(121),
+                       new ReduceAction340(121),
+                       new ReduceAction341(121),
                        new ReduceAction238(122),
-                       new ReduceAction345(122),
-                       new ReduceAction346(122),
-                       new ReduceAction347(122),
-                       new ReduceAction348(122),
-                       new ReduceAction349(122),
-                       new ReduceAction350(122),
-                       new ReduceAction351(122),
-                       new ReduceAction352(122),
-                       new ReduceAction353(122),
-                       new ReduceAction354(122),
-                       new ReduceAction355(122),
+                       new ReduceAction343(122),
                        new ReduceAction238(123),
-                       new ReduceAction357(123),
-                       new ReduceAction358(123),
+                       new ReduceAction345(123),
+                       new ReduceAction346(123),
+                       new ReduceAction347(123),
+                       new ReduceAction348(123),
+                       new ReduceAction349(123),
+                       new ReduceAction350(123),
+                       new ReduceAction351(123),
+                       new ReduceAction352(123),
+                       new ReduceAction353(123),
+                       new ReduceAction354(123),
+                       new ReduceAction355(123),
                        new ReduceAction238(124),
-                       new ReduceAction360(124),
-                       new ReduceAction361(124),
-                       new ReduceAction362(124),
+                       new ReduceAction357(124),
+                       new ReduceAction358(124),
                        new ReduceAction238(125),
-                       new ReduceAction364(125),
-                       new ReduceAction365(125),
+                       new ReduceAction360(125),
+                       new ReduceAction361(125),
+                       new ReduceAction362(125),
                        new ReduceAction238(126),
-                       new ReduceAction367(126),
-                       new ReduceAction368(126),
-                       new ReduceAction369(126),
-                       new ReduceAction370(127),
-                       new ReduceAction371(127),
-                       new ReduceAction265(127),
-                       new ReduceAction266(127),
-                       new ReduceAction269(127),
-                       new ReduceAction270(127),
-                       new ReduceAction271(127),
-                       new ReduceAction272(127),
-                       new ReduceAction378(127),
-                       new ReduceAction379(127),
-                       new ReduceAction383(127),
-                       new ReduceAction384(127),
-                       new ReduceAction385(127),
-                       new ReduceAction386(127),
-                       new ReduceAction387(127),
-                       new ReduceAction388(127),
-                       new ReduceAction389(127),
-                       new ReduceAction390(127),
+                       new ReduceAction364(126),
+                       new ReduceAction365(126),
                        new ReduceAction238(127),
-                       new ReduceAction393(127),
-                       new ReduceAction394(127),
+                       new ReduceAction367(127),
+                       new ReduceAction368(127),
+                       new ReduceAction369(127),
+                       new ReduceAction370(128),
+                       new ReduceAction371(128),
+                       new ReduceAction265(128),
+                       new ReduceAction266(128),
+                       new ReduceAction269(128),
+                       new ReduceAction270(128),
+                       new ReduceAction271(128),
+                       new ReduceAction272(128),
+                       new ReduceAction378(128),
+                       new ReduceAction379(128),
+                       new ReduceAction383(128),
+                       new ReduceAction384(128),
+                       new ReduceAction385(128),
+                       new ReduceAction386(128),
+                       new ReduceAction387(128),
+                       new ReduceAction388(128),
+                       new ReduceAction389(128),
+                       new ReduceAction390(128),
                        new ReduceAction238(128),
-                       new ReduceAction267(128),
-                       new ReduceAction268(128),
+                       new ReduceAction393(128),
+                       new ReduceAction394(128),
                        new ReduceAction238(129),
-                       new ReduceAction337(129),
+                       new ReduceAction267(129),
+                       new ReduceAction268(129),
                        new ReduceAction238(130),
-                       new ReduceAction339(130),
-                       new ReduceAction340(130),
-                       new ReduceAction341(130),
+                       new ReduceAction337(130),
                        new ReduceAction238(131),
-                       new ReduceAction343(131),
+                       new ReduceAction339(131),
+                       new ReduceAction340(131),
+                       new ReduceAction341(131),
                        new ReduceAction238(132),
-                       new ReduceAction345(132),
-                       new ReduceAction346(132),
-                       new ReduceAction347(132),
-                       new ReduceAction348(132),
-                       new ReduceAction349(132),
-                       new ReduceAction350(132),
-                       new ReduceAction351(132),
-                       new ReduceAction352(132),
-                       new ReduceAction353(132),
-                       new ReduceAction354(132),
-                       new ReduceAction355(132),
+                       new ReduceAction343(132),
                        new ReduceAction238(133),
-                       new ReduceAction357(133),
-                       new ReduceAction358(133),
+                       new ReduceAction345(133),
+                       new ReduceAction346(133),
+                       new ReduceAction347(133),
+                       new ReduceAction348(133),
+                       new ReduceAction349(133),
+                       new ReduceAction350(133),
+                       new ReduceAction351(133),
+                       new ReduceAction352(133),
+                       new ReduceAction353(133),
+                       new ReduceAction354(133),
+                       new ReduceAction355(133),
                        new ReduceAction238(134),
-                       new ReduceAction360(134),
-                       new ReduceAction361(134),
-                       new ReduceAction362(134),
+                       new ReduceAction357(134),
+                       new ReduceAction358(134),
                        new ReduceAction238(135),
-                       new ReduceAction364(135),
-                       new ReduceAction365(135),
+                       new ReduceAction360(135),
+                       new ReduceAction361(135),
+                       new ReduceAction362(135),
                        new ReduceAction238(136),
-                       new ReduceAction367(136),
-                       new ReduceAction690(136),
-                       new ReduceAction691(137),
-                       new ReduceAction692(137),
-                       new ReduceAction269(137),
-                       new ReduceAction270(137),
-                       new ReduceAction695(137),
-                       new ReduceAction379(137),
-                       new ReduceAction383(137),
-                       new ReduceAction384(137),
-                       new ReduceAction385(137),
-                       new ReduceAction386(137),
-                       new ReduceAction387(137),
-                       new ReduceAction388(137),
-                       new ReduceAction389(137),
-                       new ReduceAction390(137),
+                       new ReduceAction364(136),
+                       new ReduceAction365(136),
                        new ReduceAction238(137),
-                       new ReduceAction393(137),
-                       new ReduceAction394(137),
-                       new ReduceAction708(138),
-                       new ReduceAction709(138),
-                       new ReduceAction238(139),
-                       new ReduceAction267(139),
-                       new ReduceAction268(139),
+                       new ReduceAction367(137),
+                       new ReduceAction689(137),
+                       new ReduceAction690(138),
+                       new ReduceAction691(138),
+                       new ReduceAction269(138),
+                       new ReduceAction270(138),
+                       new ReduceAction694(138),
+                       new ReduceAction379(138),
+                       new ReduceAction383(138),
+                       new ReduceAction384(138),
+                       new ReduceAction385(138),
+                       new ReduceAction386(138),
+                       new ReduceAction387(138),
+                       new ReduceAction388(138),
+                       new ReduceAction389(138),
+                       new ReduceAction390(138),
+                       new ReduceAction238(138),
+                       new ReduceAction393(138),
+                       new ReduceAction394(138),
+                       new ReduceAction707(139),
+                       new ReduceAction708(139),
                        new ReduceAction238(140),
                        new ReduceAction267(140),
                        new ReduceAction268(140),
-                       new ReduceAction716(141),
-                       new ReduceAction717(141),
-                       new ReduceAction718(142),
-                       new ReduceAction719(142),
-                       new ReduceAction720(143),
-                       new ReduceAction721(143),
-                       new ReduceAction722(144),
-                       new ReduceAction723(144),
-                       new ReduceAction720(145),
+                       new ReduceAction238(141),
+                       new ReduceAction267(141),
+                       new ReduceAction268(141),
+                       new ReduceAction715(142),
+                       new ReduceAction716(142),
+                       new ReduceAction717(143),
+                       new ReduceAction718(143),
+                       new ReduceAction719(144),
+                       new ReduceAction720(144),
                        new ReduceAction721(145),
-                       new ReduceAction726(146),
-                       new ReduceAction727(146),
-                       new ReduceAction728(147),
-                       new ReduceAction729(147),
-                       new ReduceAction730(148),
-                       new ReduceAction731(148),
-                       new ReduceAction732(149),
-                       new ReduceAction733(149),
-                       new ReduceAction231(150),
-                       new ReduceAction735(150),
-                       new ReduceAction408(151),
-                       new ReduceAction737(151),
-                       new ReduceAction738(152),
-                       new ReduceAction739(152),
-                       new ReduceAction408(153),
+                       new ReduceAction722(145),
+                       new ReduceAction719(146),
+                       new ReduceAction720(146),
+                       new ReduceAction725(147),
+                       new ReduceAction726(147),
+                       new ReduceAction727(148),
+                       new ReduceAction728(148),
+                       new ReduceAction729(149),
+                       new ReduceAction730(149),
+                       new ReduceAction731(150),
+                       new ReduceAction732(150),
+                       new ReduceAction231(151),
+                       new ReduceAction734(151),
+                       new ReduceAction735(152),
+                       new ReduceAction736(152),
                        new ReduceAction737(153),
-                       new ReduceAction414(154),
-                       new ReduceAction743(154),
-                       new ReduceAction744(155),
-                       new ReduceAction745(155),
-                       new ReduceAction746(156),
-                       new ReduceAction747(156)
+                       new ReduceAction738(153),
+                       new ReduceAction735(154),
+                       new ReduceAction736(154),
+                       new ReduceAction413(155),
+                       new ReduceAction742(155),
+                       new ReduceAction743(156),
+                       new ReduceAction744(156),
+                       new ReduceAction745(157),
+                       new ReduceAction746(157)
                )
        end
 end
@@ -8583,19 +8582,17 @@ private class ReduceAction265
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
-                                       var listnode6 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
                                        assert tidnode3 isa nullable TId
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
+                                       var pexprsnode4 = nodearraylist5
+                                       assert pexprsnode4 isa nullable AExprs
                                        var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
-                                               listnode5,
-                                               listnode6
+                                               pexprsnode4,
+                                               listnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -8609,19 +8606,17 @@ private class ReduceAction266
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
-                                       var listnode6 = new Array[Object]
                                        var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
                                        assert tidnode3 isa nullable TId
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
+                                       var pexprsnode4 = nodearraylist2
+                                       assert pexprsnode4 isa nullable AExprs
                                        var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
-                                               listnode5,
-                                               listnode6
+                                               pexprsnode4,
+                                               listnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -8638,23 +8633,21 @@ private class ReduceAction267
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
+                                       var listnode6 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
                                        assert tidnode3 isa nullable TId
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode6 = nodearraylist6
-                                       assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
+                                       var pexprsnode4 = nodearraylist5
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var listnode5 = nodearraylist6
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
                                        var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
-                                               listnode5,
-                                               listnode7
+                                               pexprsnode4,
+                                               listnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -8668,23 +8661,21 @@ private class ReduceAction268
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var listnode7 = new Array[Object]
+                                       var listnode6 = new Array[Object]
                                        var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
                                        assert tidnode3 isa nullable TId
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var listnode6 = nodearraylist3
-                                       assert listnode6 isa Array[Object]
-                                       listnode7 = concat(listnode7, listnode6)
+                                       var pexprsnode4 = nodearraylist2
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var listnode5 = nodearraylist3
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
                                        var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
-                                               listnode5,
-                                               listnode7
+                                               pexprsnode4,
+                                               listnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -8697,16 +8688,14 @@ private class ReduceAction269
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
                                        var tkwsupernode3 = nodearraylist1
                                        assert tkwsupernode3 isa nullable TKwsuper
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
+                                       var pexprsnode4 = nodearraylist2
+                                       assert pexprsnode4 isa nullable AExprs
                                        var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
                                                null,
                                                tkwsupernode3,
-                                               listnode5
+                                               pexprsnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -8720,18 +8709,16 @@ private class ReduceAction270
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
                                        var pqualifiednode2 = nodearraylist1
                                        assert pqualifiednode2 isa nullable AQualified
                                        var tkwsupernode3 = nodearraylist2
                                        assert tkwsupernode3 isa nullable TKwsuper
-                                       var listnode4 = nodearraylist3
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
+                                       var pexprsnode4 = nodearraylist3
+                                       assert pexprsnode4 isa nullable AExprs
                                        var pexprnode1: nullable ASuperExpr = new ASuperExpr.init_asuperexpr(
                                                pqualifiednode2,
                                                tkwsupernode3,
-                                               listnode5
+                                               pexprsnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -8747,18 +8734,16 @@ private class ReduceAction271
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
                                        var tkwinitnode3 = nodearraylist4
                                        assert tkwinitnode3 isa nullable TKwinit
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
+                                       var pexprsnode4 = nodearraylist5
+                                       assert pexprsnode4 isa nullable AExprs
                                        var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
                                                pexprnode2,
                                                tkwinitnode3,
-                                               listnode5
+                                               pexprsnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -8771,18 +8756,16 @@ private class ReduceAction272
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
                                        var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tkwinitnode3 = nodearraylist1
                                        assert tkwinitnode3 isa nullable TKwinit
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
+                                       var pexprsnode4 = nodearraylist2
+                                       assert pexprsnode4 isa nullable AExprs
                                        var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
                                                pexprnode2,
                                                tkwinitnode3,
-                                               listnode5
+                                               pexprsnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -9566,24 +9549,22 @@ private class ReduceAction300
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
                                        assert tidnode3 isa nullable TId
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tassignnode6 = nodearraylist6
-                                       assert tassignnode6 isa nullable TAssign
-                                       var pexprnode7 = nodearraylist7
-                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprsnode4 = nodearraylist5
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var tassignnode5 = nodearraylist6
+                                       assert tassignnode5 isa nullable TAssign
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
                                        var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
                                                pexprnode2,
                                                tidnode3,
-                                               listnode5,
-                                               tassignnode6,
-                                               pexprnode7
+                                               pexprsnode4,
+                                               tassignnode5,
+                                               pexprnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -9598,24 +9579,22 @@ private class ReduceAction301
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
                                        var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
                                        assert tidnode3 isa nullable TId
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tassignnode6 = nodearraylist3
-                                       assert tassignnode6 isa nullable TAssign
-                                       var pexprnode7 = nodearraylist4
-                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprsnode4 = nodearraylist2
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var tassignnode5 = nodearraylist3
+                                       assert tassignnode5 isa nullable TAssign
+                                       var pexprnode6 = nodearraylist4
+                                       assert pexprnode6 isa nullable AExpr
                                        var pexprnode1: nullable ACallAssignExpr = new ACallAssignExpr.init_acallassignexpr(
                                                pexprnode2,
                                                tidnode3,
-                                               listnode5,
-                                               tassignnode6,
-                                               pexprnode7
+                                               pexprsnode4,
+                                               tassignnode5,
+                                               pexprnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -9630,21 +9609,19 @@ private class ReduceAction302
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var tassignnode5 = nodearraylist3
-                                       assert tassignnode5 isa nullable TAssign
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprsnode3 = nodearraylist2
+                                       assert pexprsnode3 isa nullable AExprs
+                                       var tassignnode4 = nodearraylist3
+                                       assert tassignnode4 isa nullable TAssign
+                                       var pexprnode5 = nodearraylist4
+                                       assert pexprnode5 isa nullable AExpr
                                        var pexprnode1: nullable ABraAssignExpr = new ABraAssignExpr.init_abraassignexpr(
                                                pexprnode2,
-                                               listnode4,
-                                               tassignnode5,
-                                               pexprnode6
+                                               pexprsnode3,
+                                               tassignnode4,
+                                               pexprnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -9717,24 +9694,22 @@ private class ReduceAction305
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist4
                                        assert tidnode3 isa nullable TId
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var passignopnode6 = nodearraylist6
-                                       assert passignopnode6 isa nullable AAssignOp
-                                       var pexprnode7 = nodearraylist7
-                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprsnode4 = nodearraylist5
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var passignopnode5 = nodearraylist6
+                                       assert passignopnode5 isa nullable AAssignOp
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
                                        var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
                                                pexprnode2,
                                                tidnode3,
-                                               listnode5,
-                                               passignopnode6,
-                                               pexprnode7
+                                               pexprsnode4,
+                                               passignopnode5,
+                                               pexprnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -9749,24 +9724,22 @@ private class ReduceAction306
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
                                        var pexprnode2: nullable AImplicitSelfExpr = new AImplicitSelfExpr.init_aimplicitselfexpr(
                                        )
                                        var tidnode3 = nodearraylist1
                                        assert tidnode3 isa nullable TId
-                                       var listnode4 = nodearraylist2
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var passignopnode6 = nodearraylist3
-                                       assert passignopnode6 isa nullable AAssignOp
-                                       var pexprnode7 = nodearraylist4
-                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprsnode4 = nodearraylist2
+                                       assert pexprsnode4 isa nullable AExprs
+                                       var passignopnode5 = nodearraylist3
+                                       assert passignopnode5 isa nullable AAssignOp
+                                       var pexprnode6 = nodearraylist4
+                                       assert pexprnode6 isa nullable AExpr
                                        var pexprnode1: nullable ACallReassignExpr = new ACallReassignExpr.init_acallreassignexpr(
                                                pexprnode2,
                                                tidnode3,
-                                               listnode5,
-                                               passignopnode6,
-                                               pexprnode7
+                                               pexprsnode4,
+                                               passignopnode5,
+                                               pexprnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -9781,21 +9754,19 @@ private class ReduceAction307
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var passignopnode5 = nodearraylist3
-                                       assert passignopnode5 isa nullable AAssignOp
-                                       var pexprnode6 = nodearraylist4
-                                       assert pexprnode6 isa nullable AExpr
+                                       var pexprsnode3 = nodearraylist2
+                                       assert pexprsnode3 isa nullable AExprs
+                                       var passignopnode4 = nodearraylist3
+                                       assert passignopnode4 isa nullable AAssignOp
+                                       var pexprnode5 = nodearraylist4
+                                       assert pexprnode5 isa nullable AExpr
                                        var pexprnode1: nullable ABraReassignExpr = new ABraReassignExpr.init_abrareassignexpr(
                                                pexprnode2,
-                                               listnode4,
-                                               passignopnode5,
-                                               pexprnode6
+                                               pexprsnode3,
+                                               passignopnode4,
+                                               pexprnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -10408,20 +10379,18 @@ private class ReduceAction335
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
-                                       var listnode6 = new Array[Object]
+                                       var listnode5 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
-                                       var listnode5 = nodearraylist3
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
+                                       var pexprsnode3 = nodearraylist2
+                                       assert pexprsnode3 isa nullable AExprs
+                                       var listnode4 = nodearraylist3
+                                       assert listnode4 isa Array[Object]
+                                       listnode5 = concat(listnode5, listnode4)
                                        var pexprnode1: nullable ABraExpr = new ABraExpr.init_abraexpr(
                                                pexprnode2,
-                                               listnode4,
-                                               listnode6
+                                               pexprsnode3,
+                                               listnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -10936,19 +10905,17 @@ private class ReduceAction367
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
                                        var tkwnewnode2 = nodearraylist1
                                        assert tkwnewnode2 isa nullable TKwnew
                                        var ptypenode3 = nodearraylist3
                                        assert ptypenode3 isa nullable AType
-                                       var listnode5 = nodearraylist4
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
+                                       var pexprsnode5 = nodearraylist4
+                                       assert pexprsnode5 isa nullable AExprs
                                        var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
                                                tkwnewnode2,
                                                ptypenode3,
                                                null,
-                                               listnode6
+                                               pexprsnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -11048,16 +11015,14 @@ private class ReduceAction378
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
-                                       var listnode5 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
-                                       var listnode3 = nodearraylist2
-                                       assert listnode3 isa Array[Object]
-                                       listnode4 = concat(listnode4, listnode3)
+                                       var pexprsnode3 = nodearraylist2
+                                       assert pexprsnode3 isa nullable AExprs
                                        var pexprnode1: nullable ABraExpr = new ABraExpr.init_abraexpr(
                                                pexprnode2,
-                                               listnode4,
-                                               listnode5
+                                               pexprsnode3,
+                                               listnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -11075,21 +11040,19 @@ private class ReduceAction379
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode6 = new Array[Object]
                                        var tkwnewnode2 = nodearraylist1
                                        assert tkwnewnode2 isa nullable TKwnew
                                        var ptypenode3 = nodearraylist3
                                        assert ptypenode3 isa nullable AType
                                        var tidnode4 = nodearraylist6
                                        assert tidnode4 isa nullable TId
-                                       var listnode5 = nodearraylist7
-                                       assert listnode5 isa Array[Object]
-                                       listnode6 = concat(listnode6, listnode5)
+                                       var pexprsnode5 = nodearraylist7
+                                       assert pexprsnode5 isa nullable AExprs
                                        var pexprnode1: nullable ANewExpr = new ANewExpr.init_anewexpr(
                                                tkwnewnode2,
                                                ptypenode3,
                                                tidnode4,
-                                               listnode6
+                                               pexprsnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -11165,12 +11128,10 @@ private class ReduceAction382
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode2 = nodearraylist1
-                                       assert listnode2 isa Array[Object]
-                                       listnode3 = concat(listnode3, listnode2)
+                                       var pexprsnode2 = nodearraylist1
+                                       assert pexprsnode2 isa nullable AExprs
                                        var pexprnode1: nullable AArrayExpr = new AArrayExpr.init_aarrayexpr(
-                                               listnode3
+                                               pexprsnode2
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -11518,17 +11479,24 @@ private class ReduceAction402
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var pexprnode1 = nodearraylist3
-                                       if pexprnode1 != null then
-                                               listnode2.add(pexprnode1)
-                                       end
-                                       node_list = listnode2
+                                       var listnode4 = new Array[Object]
+                                       var toparnode2 = nodearraylist1
+                                       assert toparnode2 isa nullable TOpar
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tcparnode5 = nodearraylist4
+                                       assert tcparnode5 isa nullable TCpar
+                                       var pexprsnode1: nullable AParExprs = new AParExprs.init_aparexprs(
+                                               toparnode2,
+                                               listnode4,
+                                               tcparnode5
+                                       )
+                                       node_list = pexprsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -11537,39 +11505,87 @@ private class ReduceAction403
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist6 = p.pop
-                                       var nodearraylist5 = p.pop
-                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
-                                       var pexprnode1 = nodearraylist3
-                                       var listnode2 = nodearraylist5
-                                       assert listnode2 isa Array[Object]
-                                       if pexprnode1 != null then
-                                               listnode3.add(pexprnode1)
+                                       var toparnode2 = nodearraylist1
+                                       assert toparnode2 isa nullable TOpar
+                                       var tcparnode4 = nodearraylist3
+                                       assert tcparnode4 isa nullable TCpar
+                                       var pexprsnode1: nullable AParExprs = new AParExprs.init_aparexprs(
+                                               toparnode2,
+                                               listnode3,
+                                               tcparnode4
+                                       )
+                                       node_list = pexprsnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction404
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var listnode2 = new Array[Object]
+                                       var pexprsnode1: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode2
+                                       )
+                                       node_list = pexprsnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction406
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       if pexprnode2 != null then
+                                               listnode3.add(pexprnode2)
                                        end
-                                       listnode3 = concat(listnode3, listnode2)
-                                       node_list = listnode3
+                                       var pexprsnode1: nullable AListExprs = new AListExprs.init_alistexprs(
+                                               listnode3
+                                       )
+                                       node_list = pexprsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction405
+private class ReduceAction409
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var listnode1 = new Array[Object]
-                                       node_list = listnode1
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode4 = new Array[Object]
+                                       var tobranode2 = nodearraylist1
+                                       assert tobranode2 isa nullable TObra
+                                       var listnode3 = nodearraylist3
+                                       assert listnode3 isa Array[Object]
+                                       listnode4 = concat(listnode4, listnode3)
+                                       var tcbranode5 = nodearraylist4
+                                       assert tcbranode5 isa nullable TCbra
+                                       var pexprsnode1: nullable ABraExprs = new ABraExprs.init_abraexprs(
+                                               tobranode2,
+                                               listnode4,
+                                               tcbranode5
+                                       )
+                                       node_list = pexprsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction408
+private class ReduceAction410
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode2 = new Array[Object]
                                        var pexprnode1 = nodearraylist1
@@ -11580,7 +11596,27 @@ private class ReduceAction408
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction413
+private class ReduceAction411
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode3 = new Array[Object]
+                                       var pexprnode1 = nodearraylist1
+                                       var listnode2 = nodearraylist3
+                                       assert listnode2 isa Array[Object]
+                                       if pexprnode1 != null then
+                                               listnode3.add(pexprnode1)
+                                       end
+                                       listnode3 = concat(listnode3, listnode2)
+                                       node_list = listnode3
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction412
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11594,7 +11630,7 @@ private class ReduceAction413
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction414
+private class ReduceAction413
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11609,7 +11645,7 @@ private class ReduceAction414
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction415
+private class ReduceAction414
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11631,7 +11667,7 @@ private class ReduceAction415
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction416
+private class ReduceAction415
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11649,7 +11685,7 @@ private class ReduceAction416
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction417
+private class ReduceAction416
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11671,7 +11707,7 @@ private class ReduceAction417
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction418
+private class ReduceAction417
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11693,7 +11729,7 @@ private class ReduceAction418
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction419
+private class ReduceAction418
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11719,7 +11755,7 @@ private class ReduceAction419
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction420
+private class ReduceAction419
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11736,7 +11772,7 @@ private class ReduceAction420
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction421
+private class ReduceAction420
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11757,7 +11793,7 @@ private class ReduceAction421
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction422
+private class ReduceAction421
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11775,7 +11811,7 @@ private class ReduceAction422
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction423
+private class ReduceAction422
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11788,7 +11824,7 @@ private class ReduceAction423
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction424
+private class ReduceAction423
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11801,7 +11837,7 @@ private class ReduceAction424
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction425
+private class ReduceAction424
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11810,7 +11846,7 @@ private class ReduceAction425
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction427
+private class ReduceAction426
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11827,7 +11863,7 @@ private class ReduceAction427
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction428
+private class ReduceAction427
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11845,7 +11881,7 @@ private class ReduceAction428
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction430
+private class ReduceAction429
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11854,7 +11890,7 @@ private class ReduceAction430
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction431
+private class ReduceAction430
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11865,7 +11901,7 @@ private class ReduceAction431
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction432
+private class ReduceAction431
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11875,7 +11911,7 @@ private class ReduceAction432
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction433
+private class ReduceAction432
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11886,7 +11922,7 @@ private class ReduceAction433
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction690
+private class ReduceAction689
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11909,7 +11945,7 @@ private class ReduceAction690
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction691
+private class ReduceAction690
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11928,7 +11964,7 @@ private class ReduceAction691
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction692
+private class ReduceAction691
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11937,25 +11973,23 @@ private class ReduceAction692
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode5 = new Array[Object]
-                                       var listnode6 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
                                        var tidnode3 = nodearraylist2
                                        assert tidnode3 isa nullable TId
-                                       var listnode4 = nodearraylist3
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
+                                       var pexprsnode4 = nodearraylist3
+                                       assert pexprsnode4 isa nullable AExprs
                                        var pexprnode1: nullable ACallExpr = new ACallExpr.init_acallexpr(
                                                pexprnode2,
                                                tidnode3,
-                                               listnode5,
-                                               listnode6
+                                               pexprsnode4,
+                                               listnode5
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction695
+private class ReduceAction694
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11963,24 +11997,22 @@ private class ReduceAction695
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
                                        var pexprnode2 = nodearraylist1
                                        assert pexprnode2 isa nullable AExpr
                                        var tkwinitnode3 = nodearraylist2
                                        assert tkwinitnode3 isa nullable TKwinit
-                                       var listnode4 = nodearraylist3
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
+                                       var pexprsnode4 = nodearraylist3
+                                       assert pexprsnode4 isa nullable AExprs
                                        var pexprnode1: nullable AInitExpr = new AInitExpr.init_ainitexpr(
                                                pexprnode2,
                                                tkwinitnode3,
-                                               listnode5
+                                               pexprsnode4
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction708
+private class ReduceAction707
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -11993,7 +12025,7 @@ private class ReduceAction708
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction709
+private class ReduceAction708
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12004,7 +12036,7 @@ private class ReduceAction709
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction716
+private class ReduceAction715
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12019,7 +12051,7 @@ private class ReduceAction716
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction717
+private class ReduceAction716
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12038,7 +12070,7 @@ private class ReduceAction717
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction718
+private class ReduceAction717
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12053,7 +12085,7 @@ private class ReduceAction718
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction719
+private class ReduceAction718
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12072,7 +12104,7 @@ private class ReduceAction719
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction720
+private class ReduceAction719
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12087,7 +12119,7 @@ private class ReduceAction720
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction721
+private class ReduceAction720
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12106,7 +12138,7 @@ private class ReduceAction721
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction722
+private class ReduceAction721
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12121,7 +12153,7 @@ private class ReduceAction722
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction723
+private class ReduceAction722
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12140,7 +12172,7 @@ private class ReduceAction723
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction726
+private class ReduceAction725
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12155,7 +12187,7 @@ private class ReduceAction726
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction727
+private class ReduceAction726
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12174,7 +12206,7 @@ private class ReduceAction727
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction728
+private class ReduceAction727
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12189,7 +12221,7 @@ private class ReduceAction728
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction729
+private class ReduceAction728
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12208,7 +12240,7 @@ private class ReduceAction729
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction730
+private class ReduceAction729
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12223,7 +12255,7 @@ private class ReduceAction730
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction731
+private class ReduceAction730
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12242,7 +12274,7 @@ private class ReduceAction731
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction732
+private class ReduceAction731
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12257,7 +12289,7 @@ private class ReduceAction732
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction733
+private class ReduceAction732
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12276,7 +12308,7 @@ private class ReduceAction733
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction735
+private class ReduceAction734
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12295,7 +12327,22 @@ private class ReduceAction735
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction737
+private class ReduceAction735
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var listnode2 = new Array[Object]
+                                       var pexprnode1 = nodearraylist1
+                                       if pexprnode1 != null then
+                                               listnode2.add(pexprnode1)
+                                       end
+                                       node_list = listnode2
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction736
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12314,7 +12361,7 @@ private class ReduceAction737
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction738
+private class ReduceAction737
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12328,7 +12375,7 @@ private class ReduceAction738
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction739
+private class ReduceAction738
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12346,7 +12393,7 @@ private class ReduceAction739
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction743
+private class ReduceAction742
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12365,7 +12412,7 @@ private class ReduceAction743
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction744
+private class ReduceAction743
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12380,7 +12427,7 @@ private class ReduceAction744
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction745
+private class ReduceAction744
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12399,7 +12446,7 @@ private class ReduceAction745
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction746
+private class ReduceAction745
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -12414,7 +12461,7 @@ private class ReduceAction746
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction747
+private class ReduceAction746
        super ReduceAction
        redef fun action(p: Parser)
        do

diff --git a/src/parser/parser_abs.nit b/src/parser/parser_abs.nit
index e097386..16fe07d 100644 (file)
--- a/src/parser/parser_abs.nit
+++ b/src/parser/parser_abs.nit
@@ -322,6 +322,7 @@ class AClosureDecl super Prod end
 class AType super Prod end
 class ALabel super Prod end
 class AExpr super Prod end
+class AExprs super Prod end
 class AAssignOp super Prod end
 class AClosureDef super Prod end
 class AClosureId super Prod end
@@ -845,7 +846,7 @@ class ANewExpr
     readable var _n_kwnew: TKwnew
     readable var _n_type: AType
     readable var _n_id: nullable TId = null
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
 end
 class AAttrExpr
        super AExpr
@@ -870,14 +871,14 @@ class ACallExpr
        super AExpr
     readable var _n_expr: AExpr
     readable var _n_id: TId
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
     readable var _n_closure_defs: List[AClosureDef] = new List[AClosureDef]
 end
 class ACallAssignExpr
        super AExpr
     readable var _n_expr: AExpr
     readable var _n_id: TId
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
     readable var _n_assign: TAssign
     readable var _n_value: AExpr
 end
@@ -885,7 +886,7 @@ class ACallReassignExpr
        super AExpr
     readable var _n_expr: AExpr
     readable var _n_id: TId
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
     readable var _n_assign_op: AAssignOp
     readable var _n_value: AExpr
 end
@@ -893,38 +894,38 @@ class ASuperExpr
        super AExpr
     readable var _n_qualified: nullable AQualified = null
     readable var _n_kwsuper: TKwsuper
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
 end
 class AInitExpr
        super AExpr
     readable var _n_expr: AExpr
     readable var _n_kwinit: TKwinit
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
 end
 class ABraExpr
        super AExpr
     readable var _n_expr: AExpr
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
     readable var _n_closure_defs: List[AClosureDef] = new List[AClosureDef]
 end
 class ABraAssignExpr
        super AExpr
     readable var _n_expr: AExpr
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
     readable var _n_assign: TAssign
     readable var _n_value: AExpr
 end
 class ABraReassignExpr
        super AExpr
     readable var _n_expr: AExpr
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
     readable var _n_assign_op: AAssignOp
     readable var _n_value: AExpr
 end
 class AClosureCallExpr
        super AExpr
     readable var _n_id: TId
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
     readable var _n_closure_defs: List[AClosureDef] = new List[AClosureDef]
 end
 class AVarExpr
@@ -964,7 +965,7 @@ class AOrangeExpr
 end
 class AArrayExpr
        super AExpr
-    readable var _n_exprs: List[AExpr] = new List[AExpr]
+    readable var _n_exprs: AExprs
 end
 class ASelfExpr
        super AExpr
@@ -1046,6 +1047,22 @@ class AIssetAttrExpr
     readable var _n_expr: AExpr
     readable var _n_id: TAttrid
 end
+class AListExprs
+       super AExprs
+    readable var _n_exprs: List[AExpr] = new List[AExpr]
+end
+class AParExprs
+       super AExprs
+    readable var _n_opar: TOpar
+    readable var _n_exprs: List[AExpr] = new List[AExpr]
+    readable var _n_cpar: TCpar
+end
+class ABraExprs
+       super AExprs
+    readable var _n_obra: TObra
+    readable var _n_exprs: List[AExpr] = new List[AExpr]
+    readable var _n_cbra: TCbra
+end
 class APlusAssignOp
        super AAssignOp
     readable var _n_pluseq: TPluseq

diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit
index 17a8aad..661844c 100644 (file)
--- a/src/parser/parser_nodes.nit
+++ b/src/parser/parser_nodes.nit
@@ -925,7 +925,7 @@ class ANewExpr
     readable var _n_kwnew: TKwnew
     readable var _n_type: AType
     readable var _n_id: nullable TId = null
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
 end
 class AAttrFormExpr
        super AExpr
@@ -942,7 +942,7 @@ end
 class ACallFormExpr
        super ASendExpr
     readable var _n_id: TId
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
 end
 class AAttrReassignExpr
        super AExpr
@@ -965,16 +965,16 @@ class ASuperExpr
        super AExpr
     readable var _n_qualified: nullable AQualified = null
     readable var _n_kwsuper: TKwsuper
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
 end
 class AInitExpr
        super ASendExpr
     readable var _n_kwinit: TKwinit
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
 end
 class ABraFormExpr
        super ASendExpr
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
 end
 class ABraExpr
        super ABraFormExpr
@@ -994,7 +994,7 @@ end
 class AClosureCallExpr
        super AExpr
     readable var _n_id: TId
-    readable var _n_args: List[AExpr] = new List[AExpr]
+    readable var _n_args: AExprs
     readable var _n_closure_defs: List[AClosureDef] = new List[AClosureDef]
 end
 class AVarExpr
@@ -1025,7 +1025,7 @@ class AOrangeExpr
 end
 class AArrayExpr
        super AExpr
-    readable var _n_exprs: List[AExpr] = new List[AExpr]
+    readable var _n_exprs: AExprs
 end
 class ASelfExpr
        super AExpr
@@ -1111,6 +1111,23 @@ class AIssetAttrExpr
        super AAttrFormExpr
     readable var _n_kwisset: TKwisset
 end
+class AExprs
+       super Prod 
+    readable var _n_exprs: List[AExpr] = new List[AExpr]
+end
+class AListExprs
+       super AExprs
+end
+class AParExprs
+       super AExprs
+    readable var _n_opar: TOpar
+    readable var _n_cpar: TCpar
+end
+class ABraExprs
+       super AExprs
+    readable var _n_obra: TObra
+    readable var _n_cbra: TCbra
+end
 class AAssignOp super Prod end
 class APlusAssignOp
        super AAssignOp

diff --git a/src/parser/parser_prod.nit b/src/parser/parser_prod.nit
index 163d14a..1122a98 100644 (file)
--- a/src/parser/parser_prod.nit
+++ b/src/parser/parser_prod.nit
@@ -5329,7 +5329,7 @@ redef class ANewExpr
             n_kwnew: nullable TKwnew,
             n_type: nullable AType,
             n_id: nullable TId,
-            n_args: Collection[Object] # Should be Collection[AExpr]
+            n_args: nullable AExprs
     )
     do
         empty_init
@@ -5341,11 +5341,8 @@ redef class ANewExpr
        if n_id != null then
                n_id.parent = self
        end
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -5380,18 +5377,16 @@ redef class ANewExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
     end
 
     redef fun visit_all(v: Visitor)
@@ -5401,9 +5396,7 @@ redef class ANewExpr
         if _n_id != null then
             v.enter_visit(_n_id.as(not null))
         end
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
     end
 end
 redef class AAttrExpr
@@ -5603,7 +5596,7 @@ redef class ACallExpr
     init init_acallexpr (
             n_expr: nullable AExpr,
             n_id: nullable TId,
-            n_args: Collection[Object], # Should be Collection[AExpr]
+            n_args: nullable AExprs,
             n_closure_defs: Collection[Object] # Should be Collection[AClosureDef]
     )
     do
@@ -5612,11 +5605,8 @@ redef class ACallExpr
        n_expr.parent = self
         _n_id = n_id.as(not null)
        n_id.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
        for n in n_closure_defs do
                assert n isa AClosureDef
                _n_closure_defs.add(n)
@@ -5646,18 +5636,16 @@ redef class ACallExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
         for i in [0.._n_closure_defs.length[ do
             if _n_closure_defs[i] == old_child then
                 if new_child != null then
@@ -5676,9 +5664,7 @@ redef class ACallExpr
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_id)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
             for n in _n_closure_defs do
                 v.enter_visit(n)
            end
@@ -5690,7 +5676,7 @@ redef class ACallAssignExpr
     init init_acallassignexpr (
             n_expr: nullable AExpr,
             n_id: nullable TId,
-            n_args: Collection[Object], # Should be Collection[AExpr]
+            n_args: nullable AExprs,
             n_assign: nullable TAssign,
             n_value: nullable AExpr
     )
@@ -5700,11 +5686,8 @@ redef class ACallAssignExpr
        n_expr.parent = self
         _n_id = n_id.as(not null)
        n_id.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
         _n_assign = n_assign.as(not null)
        n_assign.parent = self
         _n_value = n_value.as(not null)
@@ -5733,18 +5716,16 @@ redef class ACallAssignExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
         if _n_assign == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -5771,9 +5752,7 @@ redef class ACallAssignExpr
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_id)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
         v.enter_visit(_n_assign)
         v.enter_visit(_n_value)
     end
@@ -5784,7 +5763,7 @@ redef class ACallReassignExpr
     init init_acallreassignexpr (
             n_expr: nullable AExpr,
             n_id: nullable TId,
-            n_args: Collection[Object], # Should be Collection[AExpr]
+            n_args: nullable AExprs,
             n_assign_op: nullable AAssignOp,
             n_value: nullable AExpr
     )
@@ -5794,11 +5773,8 @@ redef class ACallReassignExpr
        n_expr.parent = self
         _n_id = n_id.as(not null)
        n_id.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
         _n_assign_op = n_assign_op.as(not null)
        n_assign_op.parent = self
         _n_value = n_value.as(not null)
@@ -5827,18 +5803,16 @@ redef class ACallReassignExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
         if _n_assign_op == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -5865,9 +5839,7 @@ redef class ACallReassignExpr
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_id)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
         v.enter_visit(_n_assign_op)
         v.enter_visit(_n_value)
     end
@@ -5878,7 +5850,7 @@ redef class ASuperExpr
     init init_asuperexpr (
             n_qualified: nullable AQualified,
             n_kwsuper: nullable TKwsuper,
-            n_args: Collection[Object] # Should be Collection[AExpr]
+            n_args: nullable AExprs
     )
     do
         empty_init
@@ -5888,11 +5860,8 @@ redef class ASuperExpr
        end
         _n_kwsuper = n_kwsuper.as(not null)
        n_kwsuper.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -5917,18 +5886,16 @@ redef class ASuperExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
     end
 
     redef fun visit_all(v: Visitor)
@@ -5937,9 +5904,7 @@ redef class ASuperExpr
             v.enter_visit(_n_qualified.as(not null))
         end
         v.enter_visit(_n_kwsuper)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
     end
 end
 redef class AInitExpr
@@ -5948,7 +5913,7 @@ redef class AInitExpr
     init init_ainitexpr (
             n_expr: nullable AExpr,
             n_kwinit: nullable TKwinit,
-            n_args: Collection[Object] # Should be Collection[AExpr]
+            n_args: nullable AExprs
     )
     do
         empty_init
@@ -5956,11 +5921,8 @@ redef class AInitExpr
        n_expr.parent = self
         _n_kwinit = n_kwinit.as(not null)
        n_kwinit.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
@@ -5985,27 +5947,23 @@ redef class AInitExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
     end
 
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
         v.enter_visit(_n_kwinit)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
     end
 end
 redef class ABraExpr
@@ -6013,18 +5971,15 @@ redef class ABraExpr
 
     init init_abraexpr (
             n_expr: nullable AExpr,
-            n_args: Collection[Object], # Should be Collection[AExpr]
+            n_args: nullable AExprs,
             n_closure_defs: Collection[Object] # Should be Collection[AClosureDef]
     )
     do
         empty_init
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
        for n in n_closure_defs do
                assert n isa AClosureDef
                _n_closure_defs.add(n)
@@ -6044,18 +5999,16 @@ redef class ABraExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
         for i in [0.._n_closure_defs.length[ do
             if _n_closure_defs[i] == old_child then
                 if new_child != null then
@@ -6073,9 +6026,7 @@ redef class ABraExpr
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
             for n in _n_closure_defs do
                 v.enter_visit(n)
            end
@@ -6086,7 +6037,7 @@ redef class ABraAssignExpr
 
     init init_abraassignexpr (
             n_expr: nullable AExpr,
-            n_args: Collection[Object], # Should be Collection[AExpr]
+            n_args: nullable AExprs,
             n_assign: nullable TAssign,
             n_value: nullable AExpr
     )
@@ -6094,11 +6045,8 @@ redef class ABraAssignExpr
         empty_init
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
         _n_assign = n_assign.as(not null)
        n_assign.parent = self
         _n_value = n_value.as(not null)
@@ -6117,18 +6065,16 @@ redef class ABraAssignExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
         if _n_assign == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -6154,9 +6100,7 @@ redef class ABraAssignExpr
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
         v.enter_visit(_n_assign)
         v.enter_visit(_n_value)
     end
@@ -6166,7 +6110,7 @@ redef class ABraReassignExpr
 
     init init_abrareassignexpr (
             n_expr: nullable AExpr,
-            n_args: Collection[Object], # Should be Collection[AExpr]
+            n_args: nullable AExprs,
             n_assign_op: nullable AAssignOp,
             n_value: nullable AExpr
     )
@@ -6174,11 +6118,8 @@ redef class ABraReassignExpr
         empty_init
         _n_expr = n_expr.as(not null)
        n_expr.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
         _n_assign_op = n_assign_op.as(not null)
        n_assign_op.parent = self
         _n_value = n_value.as(not null)
@@ -6197,18 +6138,16 @@ redef class ABraReassignExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
         if _n_assign_op == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -6234,9 +6173,7 @@ redef class ABraReassignExpr
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_expr)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
         v.enter_visit(_n_assign_op)
         v.enter_visit(_n_value)
     end
@@ -6246,18 +6183,15 @@ redef class AClosureCallExpr
 
     init init_aclosurecallexpr (
             n_id: nullable TId,
-            n_args: Collection[Object], # Should be Collection[AExpr]
+            n_args: nullable AExprs,
             n_closure_defs: Collection[Object] # Should be Collection[AClosureDef]
     )
     do
         empty_init
         _n_id = n_id.as(not null)
        n_id.parent = self
-       for n in n_args do
-               assert n isa AExpr
-               _n_args.add(n)
-               n.parent = self
-       end
+        _n_args = n_args.as(not null)
+       n_args.parent = self
        for n in n_closure_defs do
                assert n isa AClosureDef
                _n_closure_defs.add(n)
@@ -6277,18 +6211,16 @@ redef class AClosureCallExpr
             end
             return
        end
-        for i in [0.._n_args.length[ do
-            if _n_args[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_args[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_args.remove_at(i)
-                end
-                return
+        if _n_args == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_args = new_child
+           else
+               abort
             end
-        end
+            return
+       end
         for i in [0.._n_closure_defs.length[ do
             if _n_closure_defs[i] == old_child then
                 if new_child != null then
@@ -6306,9 +6238,7 @@ redef class AClosureCallExpr
     redef fun visit_all(v: Visitor)
     do
         v.enter_visit(_n_id)
-            for n in _n_args do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_args)
             for n in _n_closure_defs do
                 v.enter_visit(n)
            end
@@ -6658,38 +6588,31 @@ redef class AArrayExpr
     private init empty_init do end
 
     init init_aarrayexpr (
-            n_exprs: Collection[Object] # Should be Collection[AExpr]
+            n_exprs: nullable AExprs
     )
     do
         empty_init
-       for n in n_exprs do
-               assert n isa AExpr
-               _n_exprs.add(n)
-               n.parent = self
-       end
+        _n_exprs = n_exprs.as(not null)
+       n_exprs.parent = self
     end
 
     redef fun replace_child(old_child: ANode, new_child: nullable ANode)
     do
-        for i in [0.._n_exprs.length[ do
-            if _n_exprs[i] == old_child then
-                if new_child != null then
-                   assert new_child isa AExpr
-                    _n_exprs[i] = new_child
-                    new_child.parent = self
-                else
-                    _n_exprs.remove_at(i)
-                end
-                return
+        if _n_exprs == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AExprs
+                _n_exprs = new_child
+           else
+               abort
             end
-        end
+            return
+       end
     end
 
     redef fun visit_all(v: Visitor)
     do
-            for n in _n_exprs do
-                v.enter_visit(n)
-           end
+        v.enter_visit(_n_exprs)
     end
 end
 redef class ASelfExpr
@@ -7393,6 +7316,176 @@ redef class AIssetAttrExpr
         v.enter_visit(_n_id)
     end
 end
+redef class AListExprs
+    private init empty_init do end
+
+    init init_alistexprs (
+            n_exprs: Collection[Object] # Should be Collection[AExpr]
+    )
+    do
+        empty_init
+       for n in n_exprs do
+               assert n isa AExpr
+               _n_exprs.add(n)
+               n.parent = self
+       end
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        for i in [0.._n_exprs.length[ do
+            if _n_exprs[i] == old_child then
+                if new_child != null then
+                   assert new_child isa AExpr
+                    _n_exprs[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_exprs.remove_at(i)
+                end
+                return
+            end
+        end
+    end
+
+    redef fun visit_all(v: Visitor)
+    do
+            for n in _n_exprs do
+                v.enter_visit(n)
+           end
+    end
+end
+redef class AParExprs
+    private init empty_init do end
+
+    init init_aparexprs (
+            n_opar: nullable TOpar,
+            n_exprs: Collection[Object], # Should be Collection[AExpr]
+            n_cpar: nullable TCpar
+    )
+    do
+        empty_init
+        _n_opar = n_opar.as(not null)
+       n_opar.parent = self
+       for n in n_exprs do
+               assert n isa AExpr
+               _n_exprs.add(n)
+               n.parent = self
+       end
+        _n_cpar = n_cpar.as(not null)
+       n_cpar.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_opar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TOpar
+                _n_opar = new_child
+           else
+               abort
+            end
+            return
+       end
+        for i in [0.._n_exprs.length[ do
+            if _n_exprs[i] == old_child then
+                if new_child != null then
+                   assert new_child isa AExpr
+                    _n_exprs[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_exprs.remove_at(i)
+                end
+                return
+            end
+        end
+        if _n_cpar == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TCpar
+                _n_cpar = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_opar)
+            for n in _n_exprs do
+                v.enter_visit(n)
+           end
+        v.enter_visit(_n_cpar)
+    end
+end
+redef class ABraExprs
+    private init empty_init do end
+
+    init init_abraexprs (
+            n_obra: nullable TObra,
+            n_exprs: Collection[Object], # Should be Collection[AExpr]
+            n_cbra: nullable TCbra
+    )
+    do
+        empty_init
+        _n_obra = n_obra.as(not null)
+       n_obra.parent = self
+       for n in n_exprs do
+               assert n isa AExpr
+               _n_exprs.add(n)
+               n.parent = self
+       end
+        _n_cbra = n_cbra.as(not null)
+       n_cbra.parent = self
+    end
+
+    redef fun replace_child(old_child: ANode, new_child: nullable ANode)
+    do
+        if _n_obra == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TObra
+                _n_obra = new_child
+           else
+               abort
+            end
+            return
+       end
+        for i in [0.._n_exprs.length[ do
+            if _n_exprs[i] == old_child then
+                if new_child != null then
+                   assert new_child isa AExpr
+                    _n_exprs[i] = new_child
+                    new_child.parent = self
+                else
+                    _n_exprs.remove_at(i)
+                end
+                return
+            end
+        end
+        if _n_cbra == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TCbra
+                _n_cbra = new_child
+           else
+               abort
+            end
+            return
+       end
+    end
+
+    redef fun visit_all(v: Visitor)
+    do
+        v.enter_visit(_n_obra)
+            for n in _n_exprs do
+                v.enter_visit(n)
+           end
+        v.enter_visit(_n_cbra)
+    end
+end
 redef class APlusAssignOp
     private init empty_init do end
 

diff --git a/src/parser/tables_nit.c b/src/parser/tables_nit.c
index a329856..09e7929 100644 (file)
--- a/src/parser/tables_nit.c
+++ b/src/parser/tables_nit.c
@@ -1758,18 +1758,18 @@ const int lexer_accept_table[] = {
 
 static int parser_action_row1[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 0
 };
 static int parser_action_row2[] = {
        1,
-       -1, 1, 746
+       -1, 1, 745
 };
 static int parser_action_row3[] = {
        1,
-       -1, 1, 744
+       -1, 1, 743
 };
 static int parser_action_row4[] = {
        2,
@@ -1778,14 +1778,14 @@ static int parser_action_row4[] = {
 };
 static int parser_action_row5[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 1
 };
 static int parser_action_row6[] = {
        1,
-       -1, 1, 716
+       -1, 1, 715
 };
 static int parser_action_row7[] = {
        1,
@@ -1797,11 +1797,11 @@ static int parser_action_row8[] = {
 };
 static int parser_action_row9[] = {
        1,
-       -1, 1, 718
+       -1, 1, 717
 };
 static int parser_action_row10[] = {
        2,
-       -1, 1, 431,
+       -1, 1, 430,
        91, 1, 36
 };
 static int parser_action_row11[] = {
@@ -1843,12 +1843,12 @@ static int parser_action_row11[] = {
 };
 static int parser_action_row12[] = {
        2,
-       -1, 1, 429,
+       -1, 1, 428,
        1, 0, 2
 };
 static int parser_action_row13[] = {
        1,
-       -1, 1, 720
+       -1, 1, 719
 };
 static int parser_action_row14[] = {
        3,
@@ -1858,34 +1858,34 @@ static int parser_action_row14[] = {
 };
 static int parser_action_row15[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 2
 };
 static int parser_action_row16[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 4
 };
 static int parser_action_row17[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 8
 };
 static int parser_action_row18[] = {
        3,
-       -1, 1, 427,
+       -1, 1, 426,
        0, 0, 1,
        1, 0, 93
 };
 static int parser_action_row19[] = {
        2,
-       -1, 1, 434,
+       -1, 1, 433,
        0, 0, 95
 };
 static int parser_action_row20[] = {
@@ -1930,34 +1930,34 @@ static int parser_action_row21[] = {
 };
 static int parser_action_row22[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 3
 };
 static int parser_action_row23[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 5
 };
 static int parser_action_row24[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 9
 };
 static int parser_action_row25[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row26[] = {
        24,
-       -1, 1, 410,
+       -1, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -1970,8 +1970,8 @@ static int parser_action_row26[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 405,
-       63, 1, 405,
+       53, 1, 404,
+       63, 1, 404,
        65, 0, 116,
        79, 0, 49,
        80, 0, 117,
@@ -2031,31 +2031,31 @@ static int parser_action_row29[] = {
 };
 static int parser_action_row30[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row31[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row32[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row33[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row34[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
@@ -2096,7 +2096,7 @@ static int parser_action_row35[] = {
 };
 static int parser_action_row36[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
@@ -2212,13 +2212,13 @@ static int parser_action_row41[] = {
 };
 static int parser_action_row42[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row43[] = {
        24,
-       -1, 1, 410,
+       -1, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -2231,8 +2231,8 @@ static int parser_action_row43[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 405,
-       63, 1, 405,
+       53, 1, 404,
+       63, 1, 404,
        65, 0, 116,
        79, 0, 49,
        80, 0, 117,
@@ -2287,7 +2287,7 @@ static int parser_action_row48[] = {
 };
 static int parser_action_row49[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
@@ -2298,10 +2298,10 @@ static int parser_action_row50[] = {
 };
 static int parser_action_row51[] = {
        28,
-       -1, 1, 405,
-       0, 1, 410,
-       1, 1, 410,
-       9, 1, 410,
+       -1, 1, 404,
+       0, 1, 408,
+       1, 1, 408,
+       9, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -2316,7 +2316,7 @@ static int parser_action_row51[] = {
        51, 0, 115,
        57, 0, 191,
        65, 0, 116,
-       78, 1, 410,
+       78, 1, 408,
        79, 0, 49,
        80, 0, 117,
        81, 0, 118,
@@ -2325,7 +2325,7 @@ static int parser_action_row51[] = {
        84, 0, 121,
        85, 0, 122,
        86, 0, 56,
-       91, 1, 410
+       91, 1, 408
 };
 static int parser_action_row52[] = {
        4,
@@ -2429,7 +2429,7 @@ static int parser_action_row72[] = {
 };
 static int parser_action_row73[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
@@ -2444,39 +2444,39 @@ static int parser_action_row75[] = {
 };
 static int parser_action_row76[] = {
        1,
-       -1, 1, 742
+       -1, 1, 741
 };
 static int parser_action_row77[] = {
        1,
-       -1, 1, 420
+       -1, 1, 419
 };
 static int parser_action_row78[] = {
        3,
-       -1, 1, 422,
+       -1, 1, 421,
        79, 0, 49,
        80, 0, 220
 };
 static int parser_action_row79[] = {
        3,
-       -1, 1, 428,
+       -1, 1, 427,
        0, 0, 1,
        1, 0, 93
 };
 static int parser_action_row80[] = {
        1,
-       -1, 1, 426
+       -1, 1, 425
 };
 static int parser_action_row81[] = {
        1,
-       -1, 1, 425
+       -1, 1, 424
 };
 static int parser_action_row82[] = {
        1,
-       -1, 1, 435
+       -1, 1, 434
 };
 static int parser_action_row83[] = {
        1,
-       -1, 1, 717
+       -1, 1, 716
 };
 static int parser_action_row84[] = {
        1,
@@ -2484,14 +2484,14 @@ static int parser_action_row84[] = {
 };
 static int parser_action_row85[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 6
 };
 static int parser_action_row86[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 10
@@ -2502,7 +2502,7 @@ static int parser_action_row87[] = {
 };
 static int parser_action_row88[] = {
        1,
-       -1, 1, 719
+       -1, 1, 718
 };
 static int parser_action_row89[] = {
        33,
@@ -2542,7 +2542,7 @@ static int parser_action_row89[] = {
 };
 static int parser_action_row90[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 12
@@ -2589,20 +2589,20 @@ static int parser_action_row92[] = {
 };
 static int parser_action_row93[] = {
        1,
-       -1, 1, 721
+       -1, 1, 720
 };
 static int parser_action_row94[] = {
        1,
-       -1, 1, 745
+       -1, 1, 744
 };
 static int parser_action_row95[] = {
        2,
-       -1, 1, 432,
+       -1, 1, 431,
        0, 0, 95
 };
 static int parser_action_row96[] = {
        1,
-       -1, 1, 747
+       -1, 1, 746
 };
 static int parser_action_row97[] = {
        1,
@@ -2610,14 +2610,14 @@ static int parser_action_row97[] = {
 };
 static int parser_action_row98[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 7
 };
 static int parser_action_row99[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 11
@@ -2628,7 +2628,7 @@ static int parser_action_row100[] = {
 };
 static int parser_action_row101[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 13
@@ -2639,7 +2639,7 @@ static int parser_action_row102[] = {
 };
 static int parser_action_row103[] = {
        1,
-       -1, 1, 431
+       -1, 1, 430
 };
 static int parser_action_row104[] = {
        3,
@@ -2649,53 +2649,53 @@ static int parser_action_row104[] = {
 };
 static int parser_action_row105[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
 static int parser_action_row106[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row107[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row108[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row109[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row110[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
 static int parser_action_row111[] = {
        1,
-       -1, 1, 644
+       -1, 1, 643
 };
 static int parser_action_row112[] = {
        1,
-       -1, 1, 645
+       -1, 1, 644
 };
 static int parser_action_row113[] = {
        1,
-       -1, 1, 646
+       -1, 1, 645
 };
 static int parser_action_row114[] = {
        1,
-       -1, 1, 647
+       -1, 1, 646
 };
 static int parser_action_row115[] = {
        16,
@@ -2718,45 +2718,45 @@ static int parser_action_row115[] = {
 };
 static int parser_action_row116[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row117[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row118[] = {
        3,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239,
        57, 0, 191
 };
 static int parser_action_row119[] = {
        1,
-       -1, 1, 635
+       -1, 1, 634
 };
 static int parser_action_row120[] = {
        1,
-       -1, 1, 648
+       -1, 1, 647
 };
 static int parser_action_row121[] = {
        1,
-       -1, 1, 649
+       -1, 1, 648
 };
 static int parser_action_row122[] = {
        1,
-       -1, 1, 650
+       -1, 1, 649
 };
 static int parser_action_row123[] = {
        1,
-       -1, 1, 651
+       -1, 1, 650
 };
 static int parser_action_row124[] = {
        1,
-       -1, 1, 652
+       -1, 1, 651
 };
 static int parser_action_row125[] = {
        1,
@@ -2773,27 +2773,27 @@ static int parser_action_row127[] = {
 };
 static int parser_action_row128[] = {
        1,
-       -1, 1, 408
+       -1, 1, 406
 };
 static int parser_action_row129[] = {
        3,
-       -1, 1, 600,
+       -1, 1, 599,
        31, 0, 253,
        32, 0, 254
 };
 static int parser_action_row130[] = {
        1,
-       -1, 1, 602
+       -1, 1, 601
 };
 static int parser_action_row131[] = {
        3,
-       -1, 1, 606,
+       -1, 1, 605,
        73, 0, 255,
        76, 0, 256
 };
 static int parser_action_row132[] = {
        12,
-       -1, 1, 608,
+       -1, 1, 607,
        14, 0, 257,
        40, 0, 258,
        64, 0, 259,
@@ -2808,22 +2808,22 @@ static int parser_action_row132[] = {
 };
 static int parser_action_row133[] = {
        4,
-       -1, 1, 620,
+       -1, 1, 619,
        66, 0, 268,
        67, 0, 269,
        68, 0, 270
 };
 static int parser_action_row134[] = {
        1,
-       -1, 1, 623
+       -1, 1, 622
 };
 static int parser_action_row135[] = {
        1,
-       -1, 1, 627
+       -1, 1, 626
 };
 static int parser_action_row136[] = {
        3,
-       -1, 1, 630,
+       -1, 1, 629,
        53, 0, 209,
        63, 0, 271
 };
@@ -2840,7 +2840,7 @@ static int parser_action_row137[] = {
 static int parser_action_row138[] = {
        2,
        -1, 1, 237,
-       50, 1, 593
+       50, 1, 592
 };
 static int parser_action_row139[] = {
        1,
@@ -2975,36 +2975,36 @@ static int parser_action_row151[] = {
 };
 static int parser_action_row152[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
 static int parser_action_row153[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row154[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row155[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row156[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row157[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
 static int parser_action_row158[] = {
@@ -3030,13 +3030,13 @@ static int parser_action_row158[] = {
 };
 static int parser_action_row159[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row160[] = {
        3,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239,
        57, 0, 191
 };
@@ -3176,7 +3176,7 @@ static int parser_action_row177[] = {
 };
 static int parser_action_row178[] = {
        4,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239,
        56, 0, 320,
        57, 0, 191
@@ -3214,7 +3214,7 @@ static int parser_action_row180[] = {
 static int parser_action_row181[] = {
        2,
        -1, 1, 332,
-       26, 1, 584
+       26, 1, 583
 };
 static int parser_action_row182[] = {
        3,
@@ -3243,7 +3243,7 @@ static int parser_action_row186[] = {
 };
 static int parser_action_row187[] = {
        3,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239,
        57, 0, 191
 };
@@ -3286,27 +3286,27 @@ static int parser_action_row190[] = {
 };
 static int parser_action_row191[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row192[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row193[] = {
        4,
        -1, 1, 373,
-       58, 0, 338,
+       58, 0, 339,
        59, 0, 195,
        60, 0, 196
 };
 static int parser_action_row194[] = {
        2,
        -1, 1, 266,
-       78, 0, 340
+       78, 0, 341
 };
 static int parser_action_row195[] = {
        23,
@@ -3370,7 +3370,7 @@ static int parser_action_row198[] = {
 };
 static int parser_action_row199[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
@@ -3381,7 +3381,7 @@ static int parser_action_row200[] = {
 static int parser_action_row201[] = {
        2,
        -1, 3, 200,
-       4, 0, 347
+       4, 0, 348
 };
 static int parser_action_row202[] = {
        1,
@@ -3394,22 +3394,22 @@ static int parser_action_row203[] = {
 static int parser_action_row204[] = {
        17,
        -1, 3, 203,
-       53, 0, 348,
-       64, 0, 349,
-       65, 0, 350,
-       66, 0, 351,
-       67, 0, 352,
-       68, 0, 353,
-       69, 0, 354,
-       70, 0, 355,
-       71, 0, 356,
-       72, 0, 357,
-       73, 0, 358,
-       74, 0, 359,
-       75, 0, 360,
-       76, 0, 361,
-       77, 0, 362,
-       80, 0, 363
+       53, 0, 349,
+       64, 0, 350,
+       65, 0, 351,
+       66, 0, 352,
+       67, 0, 353,
+       68, 0, 354,
+       69, 0, 355,
+       70, 0, 356,
+       71, 0, 357,
+       72, 0, 358,
+       73, 0, 359,
+       74, 0, 360,
+       75, 0, 361,
+       76, 0, 362,
+       77, 0, 363,
+       80, 0, 364
 };
 static int parser_action_row205[] = {
        1,
@@ -3417,13 +3417,13 @@ static int parser_action_row205[] = {
 };
 static int parser_action_row206[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row207[] = {
        1,
-       -1, 1, 736
+       -1, 1, 735
 };
 static int parser_action_row208[] = {
        29,
@@ -3465,20 +3465,20 @@ static int parser_action_row209[] = {
 };
 static int parser_action_row210[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row211[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row212[] = {
        4,
        -1, 1, 378,
-       58, 0, 371,
+       58, 0, 372,
        59, 0, 195,
        60, 0, 196
 };
@@ -3492,11 +3492,11 @@ static int parser_action_row214[] = {
 };
 static int parser_action_row215[] = {
        1,
-       -1, 1, 738
+       -1, 1, 737
 };
 static int parser_action_row216[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
@@ -3538,7 +3538,7 @@ static int parser_action_row219[] = {
 };
 static int parser_action_row220[] = {
        24,
-       -1, 1, 410,
+       -1, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -3551,8 +3551,8 @@ static int parser_action_row220[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 405,
-       63, 1, 405,
+       53, 1, 404,
+       63, 1, 404,
        65, 0, 116,
        79, 0, 49,
        80, 0, 117,
@@ -3570,15 +3570,15 @@ static int parser_action_row221[] = {
 };
 static int parser_action_row222[] = {
        1,
-       -1, 1, 743
+       -1, 1, 742
 };
 static int parser_action_row223[] = {
        1,
-       -1, 1, 421
+       -1, 1, 420
 };
 static int parser_action_row224[] = {
        2,
-       -1, 1, 433,
+       -1, 1, 432,
        0, 0, 95
 };
 static int parser_action_row225[] = {
@@ -3587,7 +3587,7 @@ static int parser_action_row225[] = {
 };
 static int parser_action_row226[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 14
@@ -3628,7 +3628,7 @@ static int parser_action_row232[] = {
 };
 static int parser_action_row233[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        91, 1, 15
@@ -3643,13 +3643,13 @@ static int parser_action_row235[] = {
 };
 static int parser_action_row236[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row237[] = {
        2,
-       -1, 1, 416,
+       -1, 1, 415,
        57, 0, 191
 };
 static int parser_action_row238[] = {
@@ -3661,17 +3661,17 @@ static int parser_action_row238[] = {
 static int parser_action_row239[] = {
        2,
        -1, 3, 238,
-       80, 0, 384
+       80, 0, 385
 };
 static int parser_action_row240[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row241[] = {
        1,
-       -1, 1, 641
+       -1, 1, 640
 };
 static int parser_action_row242[] = {
        23,
@@ -3752,25 +3752,25 @@ static int parser_action_row245[] = {
 };
 static int parser_action_row246[] = {
        1,
-       -1, 1, 638
+       -1, 1, 637
 };
 static int parser_action_row247[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row248[] = {
        3,
-       -1, 1, 633,
-       53, 1, 635,
-       63, 1, 635
+       -1, 1, 632,
+       53, 1, 634,
+       63, 1, 634
 };
 static int parser_action_row249[] = {
        3,
        -1, 3, 248,
        53, 0, 209,
-       63, 0, 391
+       63, 0, 392
 };
 static int parser_action_row250[] = {
        24,
@@ -3787,7 +3787,7 @@ static int parser_action_row250[] = {
        46, 0, 46,
        49, 0, 157,
        51, 0, 47,
-       52, 0, 392,
+       52, 0, 393,
        53, 0, 48,
        65, 0, 158,
        79, 0, 49,
@@ -3823,167 +3823,167 @@ static int parser_action_row251[] = {
 };
 static int parser_action_row252[] = {
        1,
-       -1, 1, 637
+       -1, 1, 636
 };
 static int parser_action_row253[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
 static int parser_action_row254[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row255[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       26, 0, 397
+       26, 0, 399
 };
 static int parser_action_row256[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row257[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row258[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row259[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row260[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row261[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row262[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row263[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row264[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row265[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row266[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row267[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row268[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row269[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row270[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row271[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row272[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row273[] = {
        1,
-       -1, 1, 642
+       -1, 1, 641
 };
 static int parser_action_row274[] = {
        17,
        -1, 3, 273,
-       53, 0, 348,
-       64, 0, 349,
-       65, 0, 350,
-       66, 0, 351,
-       67, 0, 352,
-       68, 0, 353,
-       69, 0, 354,
-       70, 0, 355,
-       71, 0, 356,
-       72, 0, 357,
-       73, 0, 358,
-       74, 0, 359,
-       75, 0, 360,
-       76, 0, 361,
-       77, 0, 362,
-       80, 0, 363
+       53, 0, 349,
+       64, 0, 350,
+       65, 0, 351,
+       66, 0, 352,
+       67, 0, 353,
+       68, 0, 354,
+       69, 0, 355,
+       70, 0, 356,
+       71, 0, 357,
+       72, 0, 358,
+       73, 0, 359,
+       74, 0, 360,
+       75, 0, 361,
+       76, 0, 362,
+       77, 0, 363,
+       80, 0, 364
 };
 static int parser_action_row275[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row276[] = {
        2,
        -1, 1, 236,
-       50, 1, 592
+       50, 1, 591
 };
 static int parser_action_row277[] = {
        2,
        -1, 1, 235,
-       50, 1, 591
+       50, 1, 590
 };
 static int parser_action_row278[] = {
        3,
@@ -3997,30 +3997,30 @@ static int parser_action_row279[] = {
 };
 static int parser_action_row280[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row281[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row282[] = {
        2,
        -1, 1, 295,
-       58, 0, 422
+       58, 0, 424
 };
 static int parser_action_row283[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row284[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
@@ -4035,11 +4035,11 @@ static int parser_action_row286[] = {
 };
 static int parser_action_row287[] = {
        1,
-       -1, 1, 414
+       -1, 1, 413
 };
 static int parser_action_row288[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
@@ -4134,7 +4134,7 @@ static int parser_action_row294[] = {
        3,
        -1, 3, 293,
        53, 0, 209,
-       63, 0, 431
+       63, 0, 433
 };
 static int parser_action_row295[] = {
        21,
@@ -4163,131 +4163,131 @@ static int parser_action_row295[] = {
 static int parser_action_row296[] = {
        2,
        -1, 1, 373,
-       78, 0, 340
+       78, 0, 341
 };
 static int parser_action_row297[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row298[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       26, 0, 435
+       26, 0, 437
 };
 static int parser_action_row299[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row300[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row301[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row302[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row303[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row304[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row305[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row306[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row307[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row308[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row309[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row310[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row311[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row312[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row313[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row314[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row315[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row316[] = {
        2,
        -1, 1, 378,
-       78, 0, 340
+       78, 0, 341
 };
 static int parser_action_row317[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
 static int parser_action_row318[] = {
@@ -4309,11 +4309,11 @@ static int parser_action_row321[] = {
 static int parser_action_row322[] = {
        2,
        -1, 1, 373,
-       78, 0, 455
+       78, 0, 457
 };
 static int parser_action_row323[] = {
        3,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239,
        57, 0, 191
 };
@@ -4324,25 +4324,25 @@ static int parser_action_row324[] = {
 static int parser_action_row325[] = {
        2,
        -1, 3, 324,
-       26, 0, 459
+       26, 0, 461
 };
 static int parser_action_row326[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row327[] = {
        2,
        -1, 1, 378,
-       78, 0, 455
+       78, 0, 457
 };
 static int parser_action_row328[] = {
        32,
        -1, 3, 327,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -4375,17 +4375,17 @@ static int parser_action_row328[] = {
 static int parser_action_row329[] = {
        2,
        -1, 3, 328,
-       79, 0, 465
+       79, 0, 467
 };
 static int parser_action_row330[] = {
        2,
        -1, 1, 227,
-       53, 0, 466
+       53, 0, 468
 };
 static int parser_action_row331[] = {
        2,
        -1, 3, 330,
-       63, 0, 467
+       63, 0, 469
 };
 static int parser_action_row332[] = {
        1,
@@ -4397,7 +4397,7 @@ static int parser_action_row333[] = {
 };
 static int parser_action_row334[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
@@ -4407,21 +4407,26 @@ static int parser_action_row335[] = {
 };
 static int parser_action_row336[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row337[] = {
-       1,
-       -1, 1, 424
+       2,
+       -1, 3, 336,
+       54, 0, 472
 };
 static int parser_action_row338[] = {
        1,
        -1, 1, 423
 };
 static int parser_action_row339[] = {
+       1,
+       -1, 1, 422
+};
+static int parser_action_row340[] = {
        23,
-       -1, 3, 338,
+       -1, 3, 339,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -4445,9 +4450,9 @@ static int parser_action_row339[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row340[] = {
+static int parser_action_row341[] = {
        23,
-       -1, 3, 339,
+       -1, 3, 340,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -4471,132 +4476,132 @@ static int parser_action_row340[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row341[] = {
+static int parser_action_row342[] = {
        3,
-       -1, 3, 340,
-       36, 0, 472,
-       80, 0, 473
+       -1, 3, 341,
+       36, 0, 475,
+       80, 0, 476
 };
-static int parser_action_row342[] = {
+static int parser_action_row343[] = {
        1,
        -1, 1, 268
 };
-static int parser_action_row343[] = {
+static int parser_action_row344[] = {
        1,
        -1, 1, 274
 };
-static int parser_action_row344[] = {
+static int parser_action_row345[] = {
        2,
-       -1, 3, 343,
-       78, 0, 340
+       -1, 3, 344,
+       78, 0, 341
 };
-static int parser_action_row345[] = {
+static int parser_action_row346[] = {
        1,
        -1, 1, 299
 };
-static int parser_action_row346[] = {
+static int parser_action_row347[] = {
        1,
        -1, 1, 304
 };
-static int parser_action_row347[] = {
+static int parser_action_row348[] = {
        4,
-       -1, 3, 346,
-       9, 0, 476,
+       -1, 3, 347,
+       9, 0, 479,
        57, 0, 235,
        80, 0, 236
 };
-static int parser_action_row348[] = {
+static int parser_action_row349[] = {
        1,
        -1, 1, 56
 };
-static int parser_action_row349[] = {
+static int parser_action_row350[] = {
        2,
-       -1, 3, 348,
-       54, 0, 478
+       -1, 3, 349,
+       54, 0, 481
 };
-static int parser_action_row350[] = {
+static int parser_action_row351[] = {
        1,
        -1, 1, 171
 };
-static int parser_action_row351[] = {
+static int parser_action_row352[] = {
        1,
        -1, 1, 172
 };
-static int parser_action_row352[] = {
+static int parser_action_row353[] = {
        1,
        -1, 1, 173
 };
-static int parser_action_row353[] = {
+static int parser_action_row354[] = {
        1,
        -1, 1, 174
 };
-static int parser_action_row354[] = {
+static int parser_action_row355[] = {
        1,
        -1, 1, 175
 };
-static int parser_action_row355[] = {
+static int parser_action_row356[] = {
        1,
        -1, 1, 176
 };
-static int parser_action_row356[] = {
+static int parser_action_row357[] = {
        1,
        -1, 1, 177
 };
-static int parser_action_row357[] = {
+static int parser_action_row358[] = {
        1,
        -1, 1, 180
 };
-static int parser_action_row358[] = {
+static int parser_action_row359[] = {
        1,
        -1, 1, 178
 };
-static int parser_action_row359[] = {
+static int parser_action_row360[] = {
        1,
        -1, 1, 182
 };
-static int parser_action_row360[] = {
+static int parser_action_row361[] = {
        1,
        -1, 1, 181
 };
-static int parser_action_row361[] = {
+static int parser_action_row362[] = {
        1,
        -1, 1, 179
 };
-static int parser_action_row362[] = {
+static int parser_action_row363[] = {
        1,
        -1, 1, 183
 };
-static int parser_action_row363[] = {
+static int parser_action_row364[] = {
        1,
        -1, 1, 185
 };
-static int parser_action_row364[] = {
+static int parser_action_row365[] = {
        2,
        -1, 1, 170,
-       58, 0, 479
+       58, 0, 482
 };
-static int parser_action_row365[] = {
+static int parser_action_row366[] = {
        5,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
+       51, 0, 483,
        56, 0, 279
 };
-static int parser_action_row366[] = {
+static int parser_action_row367[] = {
        2,
-       -1, 3, 365,
-       79, 0, 487
+       -1, 3, 366,
+       79, 0, 490
 };
-static int parser_action_row367[] = {
+static int parser_action_row368[] = {
        1,
        -1, 1, 245
 };
-static int parser_action_row368[] = {
+static int parser_action_row369[] = {
        1,
-       -1, 1, 737
+       -1, 1, 736
 };
-static int parser_action_row369[] = {
+static int parser_action_row370[] = {
        29,
        -1, 1, 242,
        12, 0, 25,
@@ -4628,9 +4633,9 @@ static int parser_action_row369[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row370[] = {
+static int parser_action_row371[] = {
        23,
-       -1, 3, 369,
+       -1, 3, 370,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -4654,17 +4659,17 @@ static int parser_action_row370[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row371[] = {
+static int parser_action_row372[] = {
        5,
-       -1, 3, 370,
-       12, 0, 489,
-       47, 0, 490,
-       80, 0, 491,
-       81, 0, 492
+       -1, 3, 371,
+       12, 0, 491,
+       47, 0, 492,
+       80, 0, 493,
+       81, 0, 494
 };
-static int parser_action_row372[] = {
+static int parser_action_row373[] = {
        23,
-       -1, 3, 371,
+       -1, 3, 372,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -4688,9 +4693,9 @@ static int parser_action_row372[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row373[] = {
+static int parser_action_row374[] = {
        23,
-       -1, 3, 372,
+       -1, 3, 373,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -4714,9 +4719,9 @@ static int parser_action_row373[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row374[] = {
+static int parser_action_row375[] = {
        23,
-       -1, 3, 373,
+       -1, 3, 374,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -4740,58 +4745,58 @@ static int parser_action_row374[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row375[] = {
+static int parser_action_row376[] = {
        1,
-       -1, 1, 739
+       -1, 1, 738
 };
-static int parser_action_row376[] = {
+static int parser_action_row377[] = {
        1,
        -1, 1, 396
 };
-static int parser_action_row377[] = {
+static int parser_action_row378[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row378[] = {
+static int parser_action_row379[] = {
        1,
        -1, 1, 375
 };
-static int parser_action_row379[] = {
+static int parser_action_row380[] = {
        1,
        -1, 1, 270
 };
-static int parser_action_row380[] = {
+static int parser_action_row381[] = {
        1,
        -1, 1, 30
 };
-static int parser_action_row381[] = {
+static int parser_action_row382[] = {
        2,
-       -1, 3, 380,
+       -1, 3, 381,
        10, 0, 273
 };
-static int parser_action_row382[] = {
+static int parser_action_row383[] = {
        1,
        -1, 1, 31
 };
-static int parser_action_row383[] = {
+static int parser_action_row384[] = {
        2,
-       -1, 3, 382,
-       80, 0, 497
+       -1, 3, 383,
+       80, 0, 499
 };
-static int parser_action_row384[] = {
+static int parser_action_row385[] = {
        1,
        -1, 1, 32
 };
-static int parser_action_row385[] = {
+static int parser_action_row386[] = {
        2,
-       -1, 1, 417,
+       -1, 1, 416,
        57, 0, 191
 };
-static int parser_action_row386[] = {
+static int parser_action_row387[] = {
        24,
-       -1, 3, 385,
+       -1, 3, 386,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -4804,7 +4809,7 @@ static int parser_action_row386[] = {
        46, 0, 46,
        49, 0, 157,
        51, 0, 47,
-       52, 0, 499,
+       52, 0, 501,
        53, 0, 48,
        65, 0, 158,
        79, 0, 49,
@@ -4816,64 +4821,69 @@ static int parser_action_row386[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row387[] = {
+static int parser_action_row388[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row388[] = {
+static int parser_action_row389[] = {
        1,
-       -1, 1, 607
+       -1, 1, 606
 };
-static int parser_action_row389[] = {
+static int parser_action_row390[] = {
        3,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239,
-       63, 0, 502
+       63, 0, 504
 };
-static int parser_action_row390[] = {
+static int parser_action_row391[] = {
        1,
-       -1, 1, 629
+       -1, 1, 628
 };
-static int parser_action_row391[] = {
+static int parser_action_row392[] = {
        3,
-       -1, 3, 390,
+       -1, 3, 391,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row392[] = {
+static int parser_action_row393[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row393[] = {
+static int parser_action_row394[] = {
        6,
-       -1, 1, 409,
-       53, 1, 404,
-       58, 1, 404,
-       59, 1, 404,
-       60, 1, 404,
-       63, 1, 404
+       -1, 1, 407,
+       53, 1, 403,
+       58, 1, 403,
+       59, 1, 403,
+       60, 1, 403,
+       63, 1, 403
 };
-static int parser_action_row394[] = {
+static int parser_action_row395[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row395[] = {
+static int parser_action_row396[] = {
+       2,
+       -1, 3, 395,
+       52, 0, 509
+};
+static int parser_action_row397[] = {
        1,
-       -1, 1, 628
+       -1, 1, 627
 };
-static int parser_action_row396[] = {
+static int parser_action_row398[] = {
        1,
-       -1, 1, 639
+       -1, 1, 638
 };
-static int parser_action_row397[] = {
+static int parser_action_row399[] = {
        20,
-       -1, 3, 396,
+       -1, 3, 398,
        12, 0, 104,
        33, 0, 106,
        39, 0, 107,
@@ -4894,15 +4904,15 @@ static int parser_action_row397[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row398[] = {
+static int parser_action_row400[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row399[] = {
+static int parser_action_row401[] = {
        20,
-       -1, 3, 398,
+       -1, 3, 400,
        12, 0, 104,
        33, 0, 106,
        39, 0, 107,
@@ -4923,9 +4933,9 @@ static int parser_action_row399[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row400[] = {
+static int parser_action_row402[] = {
        19,
-       -1, 3, 399,
+       -1, 3, 401,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -4945,9 +4955,9 @@ static int parser_action_row400[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row401[] = {
+static int parser_action_row403[] = {
        19,
-       -1, 3, 400,
+       -1, 3, 402,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -4967,9 +4977,9 @@ static int parser_action_row401[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row402[] = {
+static int parser_action_row404[] = {
        19,
-       -1, 3, 401,
+       -1, 3, 403,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -4989,15 +4999,15 @@ static int parser_action_row402[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row403[] = {
+static int parser_action_row405[] = {
        3,
-       -1, 3, 402,
+       -1, 3, 404,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row404[] = {
+static int parser_action_row406[] = {
        19,
-       -1, 3, 403,
+       -1, 3, 405,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5017,9 +5027,9 @@ static int parser_action_row404[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row405[] = {
+static int parser_action_row407[] = {
        19,
-       -1, 3, 404,
+       -1, 3, 406,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5039,9 +5049,9 @@ static int parser_action_row405[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row406[] = {
+static int parser_action_row408[] = {
        19,
-       -1, 3, 405,
+       -1, 3, 407,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5061,9 +5071,9 @@ static int parser_action_row406[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row407[] = {
+static int parser_action_row409[] = {
        19,
-       -1, 3, 406,
+       -1, 3, 408,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5083,9 +5093,9 @@ static int parser_action_row407[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row408[] = {
+static int parser_action_row410[] = {
        19,
-       -1, 3, 407,
+       -1, 3, 409,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5105,9 +5115,9 @@ static int parser_action_row408[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row409[] = {
+static int parser_action_row411[] = {
        19,
-       -1, 3, 408,
+       -1, 3, 410,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5127,9 +5137,9 @@ static int parser_action_row409[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row410[] = {
+static int parser_action_row412[] = {
        19,
-       -1, 3, 409,
+       -1, 3, 411,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5149,9 +5159,9 @@ static int parser_action_row410[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row411[] = {
+static int parser_action_row413[] = {
        19,
-       -1, 3, 410,
+       -1, 3, 412,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5171,9 +5181,9 @@ static int parser_action_row411[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row412[] = {
+static int parser_action_row414[] = {
        19,
-       -1, 3, 411,
+       -1, 3, 413,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5193,9 +5203,9 @@ static int parser_action_row412[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row413[] = {
+static int parser_action_row415[] = {
        19,
-       -1, 3, 412,
+       -1, 3, 414,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5215,9 +5225,9 @@ static int parser_action_row413[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row414[] = {
+static int parser_action_row416[] = {
        19,
-       -1, 3, 413,
+       -1, 3, 415,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5237,9 +5247,9 @@ static int parser_action_row414[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row415[] = {
+static int parser_action_row417[] = {
        19,
-       -1, 3, 414,
+       -1, 3, 416,
        12, 0, 104,
        39, 0, 107,
        41, 0, 108,
@@ -5259,31 +5269,31 @@ static int parser_action_row415[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row416[] = {
+static int parser_action_row418[] = {
        5,
-       -1, 3, 415,
-       12, 0, 526,
-       47, 0, 527,
-       80, 0, 528,
-       81, 0, 529
+       -1, 3, 417,
+       12, 0, 529,
+       47, 0, 530,
+       80, 0, 531,
+       81, 0, 532
 };
-static int parser_action_row417[] = {
+static int parser_action_row419[] = {
        5,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
+       51, 0, 483,
        56, 0, 279
 };
-static int parser_action_row418[] = {
+static int parser_action_row420[] = {
        2,
-       -1, 3, 417,
-       79, 0, 532
+       -1, 3, 419,
+       79, 0, 535
 };
-static int parser_action_row419[] = {
+static int parser_action_row421[] = {
        30,
-       -1, 3, 418,
-       9, 0, 533,
+       -1, 3, 420,
+       9, 0, 536,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -5313,21 +5323,21 @@ static int parser_action_row419[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row420[] = {
+static int parser_action_row422[] = {
        3,
-       -1, 3, 419,
+       -1, 3, 421,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row421[] = {
+static int parser_action_row423[] = {
        3,
-       -1, 3, 420,
+       -1, 3, 422,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row422[] = {
+static int parser_action_row424[] = {
        23,
-       -1, 3, 421,
+       -1, 3, 423,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -5351,72 +5361,72 @@ static int parser_action_row422[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row423[] = {
+static int parser_action_row425[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row424[] = {
+static int parser_action_row426[] = {
        2,
-       -1, 3, 423,
-       25, 0, 538
+       -1, 3, 425,
+       25, 0, 541
 };
-static int parser_action_row425[] = {
+static int parser_action_row427[] = {
        2,
-       -1, 3, 424,
-       15, 0, 539
+       -1, 3, 426,
+       15, 0, 542
 };
-static int parser_action_row426[] = {
+static int parser_action_row428[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       52, 0, 540
+       52, 0, 543
 };
-static int parser_action_row427[] = {
+static int parser_action_row429[] = {
        3,
-       -1, 3, 426,
-       30, 0, 542,
-       55, 0, 543
+       -1, 3, 428,
+       30, 0, 545,
+       55, 0, 546
 };
-static int parser_action_row428[] = {
+static int parser_action_row430[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row429[] = {
+static int parser_action_row431[] = {
        1,
        -1, 1, 343
 };
-static int parser_action_row430[] = {
+static int parser_action_row432[] = {
        3,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239,
-       63, 0, 467
+       63, 0, 469
 };
-static int parser_action_row431[] = {
+static int parser_action_row433[] = {
        1,
        -1, 1, 365
 };
-static int parser_action_row432[] = {
+static int parser_action_row434[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row433[] = {
+static int parser_action_row435[] = {
        1,
        -1, 1, 364
 };
-static int parser_action_row434[] = {
+static int parser_action_row436[] = {
        1,
        -1, 1, 334
 };
-static int parser_action_row435[] = {
+static int parser_action_row437[] = {
        22,
-       -1, 3, 434,
+       -1, 3, 436,
        12, 0, 151,
        33, 0, 153,
        39, 0, 154,
@@ -5439,15 +5449,15 @@ static int parser_action_row435[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row436[] = {
+static int parser_action_row438[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row437[] = {
+static int parser_action_row439[] = {
        22,
-       -1, 3, 436,
+       -1, 3, 438,
        12, 0, 151,
        33, 0, 153,
        39, 0, 154,
@@ -5470,9 +5480,9 @@ static int parser_action_row437[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row438[] = {
+static int parser_action_row440[] = {
        21,
-       -1, 3, 437,
+       -1, 3, 439,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5494,9 +5504,9 @@ static int parser_action_row438[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row439[] = {
+static int parser_action_row441[] = {
        21,
-       -1, 3, 438,
+       -1, 3, 440,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5518,9 +5528,9 @@ static int parser_action_row439[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row440[] = {
+static int parser_action_row442[] = {
        21,
-       -1, 3, 439,
+       -1, 3, 441,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5542,15 +5552,15 @@ static int parser_action_row440[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row441[] = {
+static int parser_action_row443[] = {
        3,
-       -1, 3, 440,
+       -1, 3, 442,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row442[] = {
+static int parser_action_row444[] = {
        21,
-       -1, 3, 441,
+       -1, 3, 443,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5572,9 +5582,9 @@ static int parser_action_row442[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row443[] = {
+static int parser_action_row445[] = {
        21,
-       -1, 3, 442,
+       -1, 3, 444,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5596,9 +5606,9 @@ static int parser_action_row443[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row444[] = {
+static int parser_action_row446[] = {
        21,
-       -1, 3, 443,
+       -1, 3, 445,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5620,9 +5630,9 @@ static int parser_action_row444[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row445[] = {
+static int parser_action_row447[] = {
        21,
-       -1, 3, 444,
+       -1, 3, 446,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5644,9 +5654,9 @@ static int parser_action_row445[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row446[] = {
+static int parser_action_row448[] = {
        21,
-       -1, 3, 445,
+       -1, 3, 447,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5668,9 +5678,9 @@ static int parser_action_row446[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row447[] = {
+static int parser_action_row449[] = {
        21,
-       -1, 3, 446,
+       -1, 3, 448,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5692,9 +5702,9 @@ static int parser_action_row447[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row448[] = {
+static int parser_action_row450[] = {
        21,
-       -1, 3, 447,
+       -1, 3, 449,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5716,9 +5726,9 @@ static int parser_action_row448[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row449[] = {
+static int parser_action_row451[] = {
        21,
-       -1, 3, 448,
+       -1, 3, 450,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5740,9 +5750,9 @@ static int parser_action_row449[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row450[] = {
+static int parser_action_row452[] = {
        21,
-       -1, 3, 449,
+       -1, 3, 451,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5764,9 +5774,9 @@ static int parser_action_row450[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row451[] = {
+static int parser_action_row453[] = {
        21,
-       -1, 3, 450,
+       -1, 3, 452,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5788,9 +5798,9 @@ static int parser_action_row451[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row452[] = {
+static int parser_action_row454[] = {
        21,
-       -1, 3, 451,
+       -1, 3, 453,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5812,9 +5822,9 @@ static int parser_action_row452[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row453[] = {
+static int parser_action_row455[] = {
        21,
-       -1, 3, 452,
+       -1, 3, 454,
        12, 0, 151,
        39, 0, 154,
        41, 0, 155,
@@ -5836,43 +5846,43 @@ static int parser_action_row453[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row454[] = {
+static int parser_action_row456[] = {
        5,
-       -1, 3, 453,
-       12, 0, 566,
-       47, 0, 490,
-       80, 0, 567,
-       81, 0, 568
+       -1, 3, 455,
+       12, 0, 569,
+       47, 0, 492,
+       80, 0, 570,
+       81, 0, 571
 };
-static int parser_action_row455[] = {
+static int parser_action_row457[] = {
        1,
        -1, 1, 335
 };
-static int parser_action_row456[] = {
+static int parser_action_row458[] = {
        3,
-       -1, 3, 455,
-       36, 0, 472,
-       80, 0, 473
+       -1, 3, 457,
+       36, 0, 475,
+       80, 0, 476
 };
-static int parser_action_row457[] = {
+static int parser_action_row459[] = {
        2,
-       -1, 3, 456,
-       78, 0, 455
+       -1, 3, 458,
+       78, 0, 457
 };
-static int parser_action_row458[] = {
+static int parser_action_row460[] = {
        1,
-       -1, 1, 586
+       -1, 1, 585
 };
-static int parser_action_row459[] = {
+static int parser_action_row461[] = {
        1,
-       -1, 1, 545
+       -1, 1, 544
 };
-static int parser_action_row460[] = {
+static int parser_action_row462[] = {
        32,
-       -1, 3, 459,
+       -1, 3, 461,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -5902,30 +5912,30 @@ static int parser_action_row460[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row461[] = {
+static int parser_action_row463[] = {
        5,
-       -1, 3, 460,
-       12, 0, 566,
-       47, 0, 490,
-       80, 0, 572,
-       81, 0, 568
+       -1, 3, 462,
+       12, 0, 569,
+       47, 0, 492,
+       80, 0, 575,
+       81, 0, 571
 };
-static int parser_action_row462[] = {
+static int parser_action_row464[] = {
        1,
-       -1, 1, 587
+       -1, 1, 586
 };
-static int parser_action_row463[] = {
+static int parser_action_row465[] = {
        1,
        -1, 1, 237
 };
-static int parser_action_row464[] = {
+static int parser_action_row466[] = {
        1,
        -1, 1, 327
 };
-static int parser_action_row465[] = {
+static int parser_action_row467[] = {
        30,
-       -1, 3, 464,
-       9, 0, 573,
+       -1, 3, 466,
+       9, 0, 576,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -5955,143 +5965,140 @@ static int parser_action_row465[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row466[] = {
+static int parser_action_row468[] = {
        2,
        -1, 1, 228,
-       53, 0, 575
+       53, 0, 578
 };
-static int parser_action_row467[] = {
+static int parser_action_row469[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row468[] = {
+static int parser_action_row470[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row469[] = {
+static int parser_action_row471[] = {
        5,
-       -1, 3, 468,
-       12, 0, 566,
-       47, 0, 490,
-       80, 0, 578,
-       81, 0, 568
+       -1, 3, 470,
+       12, 0, 569,
+       47, 0, 492,
+       80, 0, 581,
+       81, 0, 571
 };
-static int parser_action_row470[] = {
-       4,
-       -1, 3, 469,
-       54, 0, 579,
-       55, 0, 580,
-       62, 0, 581
+static int parser_action_row472[] = {
+       3,
+       -1, 1, 410,
+       55, 0, 582,
+       62, 0, 583
 };
-static int parser_action_row471[] = {
+static int parser_action_row473[] = {
+       1,
+       -1, 1, 409
+};
+static int parser_action_row474[] = {
        1,
        -1, 1, 301
 };
-static int parser_action_row472[] = {
+static int parser_action_row475[] = {
        1,
        -1, 1, 306
 };
-static int parser_action_row473[] = {
+static int parser_action_row476[] = {
        1,
        -1, 1, 292
 };
-static int parser_action_row474[] = {
+static int parser_action_row477[] = {
        1,
        -1, 1, 291
 };
-static int parser_action_row475[] = {
+static int parser_action_row478[] = {
        5,
-       -1, 3, 474,
-       15, 0, 584,
-       51, 0, 585,
-       58, 0, 586,
+       -1, 3, 477,
+       15, 0, 586,
+       51, 0, 587,
+       58, 0, 588,
        80, 0, 286
 };
-static int parser_action_row476[] = {
+static int parser_action_row479[] = {
        1,
        -1, 1, 275
 };
-static int parser_action_row477[] = {
+static int parser_action_row480[] = {
        3,
-       -1, 3, 476,
+       -1, 3, 479,
        0, 0, 79,
        1, 0, 80
 };
-static int parser_action_row478[] = {
+static int parser_action_row481[] = {
        3,
-       -1, 3, 477,
+       -1, 3, 480,
        0, 0, 79,
        1, 0, 80
 };
-static int parser_action_row479[] = {
+static int parser_action_row482[] = {
        2,
        -1, 1, 184,
-       58, 0, 590
+       58, 0, 592
 };
-static int parser_action_row480[] = {
+static int parser_action_row483[] = {
        1,
        -1, 1, 186
 };
-static int parser_action_row481[] = {
+static int parser_action_row484[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row482[] = {
+static int parser_action_row485[] = {
        3,
-       -1, 3, 481,
-       14, 0, 592,
-       15, 0, 593
+       -1, 3, 484,
+       14, 0, 594,
+       15, 0, 595
 };
-static int parser_action_row483[] = {
+static int parser_action_row486[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        56, 0, 279
 };
-static int parser_action_row484[] = {
+static int parser_action_row487[] = {
        1,
        -1, 1, 192
 };
-static int parser_action_row485[] = {
+static int parser_action_row488[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row486[] = {
+static int parser_action_row489[] = {
        3,
        -1, 1, 194,
-       36, 0, 599,
-       78, 0, 600
+       36, 0, 601,
+       78, 0, 602
 };
-static int parser_action_row487[] = {
+static int parser_action_row490[] = {
        2,
-       -1, 3, 486,
-       58, 0, 603
+       -1, 3, 489,
+       58, 0, 605
 };
-static int parser_action_row488[] = {
+static int parser_action_row491[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       53, 0, 604
+       53, 0, 606
 };
-static int parser_action_row489[] = {
-       3,
-       -1, 1, 430,
-       0, 0, 1,
-       1, 0, 2
-};
-static int parser_action_row490[] = {
+static int parser_action_row492[] = {
        24,
-       -1, 1, 410,
+       -1, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -6104,8 +6111,8 @@ static int parser_action_row490[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 405,
-       63, 1, 405,
+       53, 1, 404,
+       63, 1, 404,
        65, 0, 116,
        79, 0, 49,
        80, 0, 117,
@@ -6116,18 +6123,18 @@ static int parser_action_row490[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row491[] = {
+static int parser_action_row493[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row492[] = {
+static int parser_action_row494[] = {
        27,
-       -1, 1, 405,
-       0, 1, 410,
-       1, 1, 410,
-       9, 1, 410,
+       -1, 1, 404,
+       0, 1, 408,
+       1, 1, 408,
+       9, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -6141,7 +6148,7 @@ static int parser_action_row492[] = {
        49, 0, 114,
        51, 0, 115,
        65, 0, 116,
-       78, 1, 410,
+       78, 1, 408,
        79, 0, 49,
        80, 0, 117,
        81, 0, 118,
@@ -6150,94 +6157,101 @@ static int parser_action_row492[] = {
        84, 0, 121,
        85, 0, 122,
        86, 0, 56,
-       91, 1, 410
+       91, 1, 408
 };
-static int parser_action_row493[] = {
+static int parser_action_row495[] = {
        4,
        -1, 1, 370,
-       58, 0, 618,
+       58, 0, 619,
        59, 0, 195,
        60, 0, 196
 };
-static int parser_action_row494[] = {
+static int parser_action_row496[] = {
        1,
        -1, 1, 302
 };
-static int parser_action_row495[] = {
+static int parser_action_row497[] = {
        1,
        -1, 1, 307
 };
-static int parser_action_row496[] = {
+static int parser_action_row498[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row497[] = {
+static int parser_action_row499[] = {
        1,
        -1, 1, 397
 };
-static int parser_action_row498[] = {
+static int parser_action_row500[] = {
        2,
-       -1, 1, 418,
+       -1, 1, 417,
        57, 0, 191
 };
-static int parser_action_row499[] = {
+static int parser_action_row501[] = {
        2,
-       -1, 3, 498,
-       80, 0, 621
+       -1, 3, 500,
+       80, 0, 622
 };
-static int parser_action_row500[] = {
+static int parser_action_row502[] = {
        1,
-       -1, 1, 404
+       -1, 1, 403
 };
-static int parser_action_row501[] = {
-       3,
-       -1, 1, 430,
-       0, 0, 1,
-       1, 0, 2
+static int parser_action_row503[] = {
+       2,
+       -1, 3, 502,
+       52, 0, 623
 };
-static int parser_action_row502[] = {
+static int parser_action_row504[] = {
        2,
-       -1, 3, 501,
-       25, 0, 623
+       -1, 3, 503,
+       25, 0, 624
 };
-static int parser_action_row503[] = {
+static int parser_action_row505[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row504[] = {
+static int parser_action_row506[] = {
        1,
-       -1, 1, 631
+       -1, 1, 630
 };
-static int parser_action_row505[] = {
+static int parser_action_row507[] = {
        2,
-       -1, 3, 504,
-       63, 0, 502
+       -1, 3, 506,
+       63, 0, 504
 };
-static int parser_action_row506[] = {
+static int parser_action_row508[] = {
        5,
-       -1, 3, 505,
-       12, 0, 526,
-       47, 0, 527,
-       80, 0, 528,
-       81, 0, 625
+       -1, 3, 507,
+       12, 0, 529,
+       47, 0, 530,
+       80, 0, 531,
+       81, 0, 626
 };
-static int parser_action_row507[] = {
-       3,
-       -1, 3, 506,
-       52, 0, 626,
-       55, 0, 580
+static int parser_action_row509[] = {
+       2,
+       -1, 1, 410,
+       55, 0, 582
 };
-static int parser_action_row508[] = {
+static int parser_action_row510[] = {
+       6,
+       -1, 1, 405,
+       53, 1, 402,
+       58, 1, 402,
+       59, 1, 402,
+       60, 1, 402,
+       63, 1, 402
+};
+static int parser_action_row511[] = {
        1,
-       -1, 1, 604
+       -1, 1, 603
 };
-static int parser_action_row509[] = {
+static int parser_action_row512[] = {
        20,
-       -1, 3, 508,
+       -1, 3, 511,
        12, 0, 104,
        33, 0, 106,
        39, 0, 107,
@@ -6258,146 +6272,146 @@ static int parser_action_row509[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row510[] = {
+static int parser_action_row513[] = {
        1,
-       -1, 1, 603
+       -1, 1, 602
 };
-static int parser_action_row511[] = {
+static int parser_action_row514[] = {
        3,
-       -1, 1, 614,
+       -1, 1, 613,
        64, 0, 259,
        65, 0, 260
 };
-static int parser_action_row512[] = {
+static int parser_action_row515[] = {
        3,
-       -1, 1, 617,
+       -1, 1, 616,
        64, 0, 259,
        65, 0, 260
 };
-static int parser_action_row513[] = {
+static int parser_action_row516[] = {
        3,
-       -1, 1, 610,
+       -1, 1, 609,
        64, 0, 259,
        65, 0, 260
 };
-static int parser_action_row514[] = {
+static int parser_action_row517[] = {
        1,
-       -1, 1, 619
+       -1, 1, 618
 };
-static int parser_action_row515[] = {
+static int parser_action_row518[] = {
        4,
-       -1, 1, 621,
+       -1, 1, 620,
        66, 0, 268,
        67, 0, 269,
        68, 0, 270
 };
-static int parser_action_row516[] = {
+static int parser_action_row519[] = {
        4,
-       -1, 1, 622,
+       -1, 1, 621,
        66, 0, 268,
        67, 0, 269,
        68, 0, 270
 };
-static int parser_action_row517[] = {
+static int parser_action_row520[] = {
        3,
-       -1, 1, 609,
+       -1, 1, 608,
        64, 0, 259,
        65, 0, 260
 };
-static int parser_action_row518[] = {
+static int parser_action_row521[] = {
        3,
-       -1, 1, 611,
+       -1, 1, 610,
        64, 0, 259,
        65, 0, 260
 };
-static int parser_action_row519[] = {
+static int parser_action_row522[] = {
        3,
-       -1, 1, 612,
+       -1, 1, 611,
        64, 0, 259,
        65, 0, 260
 };
-static int parser_action_row520[] = {
+static int parser_action_row523[] = {
        3,
-       -1, 1, 613,
+       -1, 1, 612,
        64, 0, 259,
        65, 0, 260
 };
-static int parser_action_row521[] = {
+static int parser_action_row524[] = {
        3,
-       -1, 1, 615,
+       -1, 1, 614,
        64, 0, 259,
        65, 0, 260
 };
-static int parser_action_row522[] = {
+static int parser_action_row525[] = {
        3,
-       -1, 1, 616,
+       -1, 1, 615,
        64, 0, 259,
        65, 0, 260
 };
-static int parser_action_row523[] = {
+static int parser_action_row526[] = {
        3,
-       -1, 1, 618,
+       -1, 1, 617,
        64, 0, 259,
        65, 0, 260
 };
-static int parser_action_row524[] = {
+static int parser_action_row527[] = {
        1,
-       -1, 1, 624
+       -1, 1, 623
 };
-static int parser_action_row525[] = {
+static int parser_action_row528[] = {
        1,
-       -1, 1, 625
+       -1, 1, 624
 };
-static int parser_action_row526[] = {
+static int parser_action_row529[] = {
        1,
-       -1, 1, 626
+       -1, 1, 625
 };
-static int parser_action_row527[] = {
+static int parser_action_row530[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row528[] = {
+static int parser_action_row531[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row529[] = {
+static int parser_action_row532[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row530[] = {
+static int parser_action_row533[] = {
        1,
-       -1, 1, 634
+       -1, 1, 633
 };
-static int parser_action_row531[] = {
+static int parser_action_row534[] = {
        3,
-       -1, 3, 530,
-       14, 0, 632,
-       15, 0, 633
+       -1, 3, 533,
+       14, 0, 631,
+       15, 0, 632
 };
-static int parser_action_row532[] = {
+static int parser_action_row535[] = {
        2,
-       -1, 3, 531,
-       58, 0, 634
+       -1, 3, 534,
+       58, 0, 633
 };
-static int parser_action_row533[] = {
+static int parser_action_row536[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       53, 0, 604
+       53, 0, 606
 };
-static int parser_action_row534[] = {
+static int parser_action_row537[] = {
        1,
        -1, 1, 243
 };
-static int parser_action_row535[] = {
+static int parser_action_row538[] = {
        30,
-       -1, 3, 534,
-       9, 0, 639,
+       -1, 3, 537,
+       9, 0, 638,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -6427,17 +6441,17 @@ static int parser_action_row535[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row536[] = {
+static int parser_action_row539[] = {
        1,
        -1, 1, 234
 };
-static int parser_action_row537[] = {
+static int parser_action_row540[] = {
        1,
        -1, 1, 296
 };
-static int parser_action_row538[] = {
+static int parser_action_row541[] = {
        23,
-       -1, 3, 537,
+       -1, 3, 540,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -6461,27 +6475,27 @@ static int parser_action_row538[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row539[] = {
+static int parser_action_row542[] = {
        33,
-       -1, 3, 538,
+       -1, 3, 541,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 641,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       26, 0, 646,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 640,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       26, 0, 645,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -6489,17 +6503,17 @@ static int parser_action_row539[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row540[] = {
+static int parser_action_row543[] = {
        32,
-       -1, 3, 539,
+       -1, 3, 542,
        0, 0, 1,
        1, 0, 2,
        9, 0, 137,
@@ -6532,53 +6546,53 @@ static int parser_action_row540[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row541[] = {
+static int parser_action_row544[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row542[] = {
+static int parser_action_row545[] = {
        2,
-       -1, 3, 541,
-       55, 0, 543
+       -1, 3, 544,
+       55, 0, 546
 };
-static int parser_action_row543[] = {
+static int parser_action_row546[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row544[] = {
+static int parser_action_row547[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row545[] = {
+static int parser_action_row548[] = {
        2,
-       -1, 3, 544,
-       25, 0, 677
+       -1, 3, 547,
+       25, 0, 676
 };
-static int parser_action_row546[] = {
+static int parser_action_row549[] = {
        1,
        -1, 1, 367
 };
-static int parser_action_row547[] = {
+static int parser_action_row550[] = {
        5,
-       -1, 3, 546,
-       12, 0, 566,
-       47, 0, 490,
-       80, 0, 578,
-       81, 0, 678
+       -1, 3, 549,
+       12, 0, 569,
+       47, 0, 492,
+       80, 0, 581,
+       81, 0, 677
 };
-static int parser_action_row548[] = {
+static int parser_action_row551[] = {
        1,
        -1, 1, 340
 };
-static int parser_action_row549[] = {
+static int parser_action_row552[] = {
        22,
-       -1, 3, 548,
+       -1, 3, 551,
        12, 0, 151,
        33, 0, 153,
        39, 0, 154,
@@ -6601,194 +6615,189 @@ static int parser_action_row549[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row550[] = {
+static int parser_action_row553[] = {
        1,
        -1, 1, 339
 };
-static int parser_action_row551[] = {
+static int parser_action_row554[] = {
        3,
        -1, 1, 350,
        64, 0, 302,
        65, 0, 303
 };
-static int parser_action_row552[] = {
+static int parser_action_row555[] = {
        3,
        -1, 1, 353,
        64, 0, 302,
        65, 0, 303
 };
-static int parser_action_row553[] = {
+static int parser_action_row556[] = {
        3,
        -1, 1, 346,
        64, 0, 302,
        65, 0, 303
 };
-static int parser_action_row554[] = {
+static int parser_action_row557[] = {
        1,
        -1, 1, 355
 };
-static int parser_action_row555[] = {
+static int parser_action_row558[] = {
        4,
        -1, 1, 357,
        66, 0, 311,
        67, 0, 312,
        68, 0, 313
 };
-static int parser_action_row556[] = {
+static int parser_action_row559[] = {
        4,
        -1, 1, 358,
        66, 0, 311,
        67, 0, 312,
        68, 0, 313
 };
-static int parser_action_row557[] = {
+static int parser_action_row560[] = {
        3,
        -1, 1, 345,
        64, 0, 302,
        65, 0, 303
 };
-static int parser_action_row558[] = {
+static int parser_action_row561[] = {
        3,
        -1, 1, 347,
        64, 0, 302,
        65, 0, 303
 };
-static int parser_action_row559[] = {
+static int parser_action_row562[] = {
        3,
        -1, 1, 348,
        64, 0, 302,
        65, 0, 303
 };
-static int parser_action_row560[] = {
+static int parser_action_row563[] = {
        3,
        -1, 1, 349,
        64, 0, 302,
        65, 0, 303
 };
-static int parser_action_row561[] = {
+static int parser_action_row564[] = {
        3,
        -1, 1, 351,
        64, 0, 302,
        65, 0, 303
 };
-static int parser_action_row562[] = {
+static int parser_action_row565[] = {
        3,
        -1, 1, 352,
        64, 0, 302,
        65, 0, 303
 };
-static int parser_action_row563[] = {
+static int parser_action_row566[] = {
        3,
        -1, 1, 354,
        64, 0, 302,
        65, 0, 303
 };
-static int parser_action_row564[] = {
+static int parser_action_row567[] = {
        1,
        -1, 1, 360
 };
-static int parser_action_row565[] = {
+static int parser_action_row568[] = {
        1,
        -1, 1, 361
 };
-static int parser_action_row566[] = {
+static int parser_action_row569[] = {
        1,
        -1, 1, 362
 };
-static int parser_action_row567[] = {
+static int parser_action_row570[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row568[] = {
+static int parser_action_row571[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row569[] = {
+static int parser_action_row572[] = {
        1,
        -1, 1, 370
 };
-static int parser_action_row570[] = {
+static int parser_action_row573[] = {
        5,
-       -1, 3, 569,
-       15, 0, 681,
-       51, 0, 682,
-       58, 0, 683,
+       -1, 3, 572,
+       15, 0, 680,
+       51, 0, 681,
+       58, 0, 682,
        80, 0, 286
 };
-static int parser_action_row571[] = {
+static int parser_action_row574[] = {
        1,
-       -1, 1, 546
+       -1, 1, 545
 };
-static int parser_action_row572[] = {
+static int parser_action_row575[] = {
        1,
        -1, 1, 328
 };
-static int parser_action_row573[] = {
+static int parser_action_row576[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row574[] = {
+static int parser_action_row577[] = {
        1,
        -1, 1, 236
 };
-static int parser_action_row575[] = {
+static int parser_action_row578[] = {
        1,
        -1, 1, 235
 };
-static int parser_action_row576[] = {
+static int parser_action_row579[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row577[] = {
+static int parser_action_row580[] = {
        3,
-       -1, 3, 576,
+       -1, 3, 579,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row578[] = {
+static int parser_action_row581[] = {
        2,
-       -1, 3, 577,
-       80, 0, 689
+       -1, 3, 580,
+       80, 0, 688
 };
-static int parser_action_row579[] = {
+static int parser_action_row582[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row580[] = {
-       1,
-       -1, 1, 411
-};
-static int parser_action_row581[] = {
+static int parser_action_row583[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row582[] = {
+static int parser_action_row584[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row583[] = {
+static int parser_action_row585[] = {
        1,
-       -1, 1, 740
+       -1, 1, 739
 };
-static int parser_action_row584[] = {
-       3,
-       -1, 3, 583,
-       54, 0, 693,
-       55, 0, 580
+static int parser_action_row586[] = {
+       2,
+       -1, 1, 411,
+       55, 0, 582
 };
-static int parser_action_row585[] = {
+static int parser_action_row587[] = {
        32,
-       -1, 3, 584,
+       -1, 3, 586,
        0, 0, 1,
        1, 0, 2,
        9, 0, 137,
@@ -6821,54 +6830,54 @@ static int parser_action_row585[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row586[] = {
+static int parser_action_row588[] = {
        2,
-       -1, 3, 585,
+       -1, 3, 587,
        80, 0, 286
 };
-static int parser_action_row587[] = {
+static int parser_action_row589[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row588[] = {
+static int parser_action_row590[] = {
        5,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       15, 0, 700,
-       58, 0, 701
+       15, 0, 698,
+       58, 0, 699
 };
-static int parser_action_row589[] = {
+static int parser_action_row591[] = {
        1,
        -1, 1, 34
 };
-static int parser_action_row590[] = {
+static int parser_action_row592[] = {
        1,
        -1, 1, 33
 };
-static int parser_action_row591[] = {
+static int parser_action_row593[] = {
        1,
        -1, 1, 187
 };
-static int parser_action_row592[] = {
+static int parser_action_row594[] = {
        3,
-       -1, 3, 591,
-       52, 0, 702,
-       80, 0, 703
+       -1, 3, 593,
+       52, 0, 700,
+       80, 0, 701
 };
-static int parser_action_row593[] = {
+static int parser_action_row595[] = {
        2,
-       -1, 3, 592,
-       20, 0, 705
+       -1, 3, 594,
+       20, 0, 703
 };
-static int parser_action_row594[] = {
+static int parser_action_row596[] = {
        32,
-       -1, 3, 593,
+       -1, 3, 595,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -6898,145 +6907,139 @@ static int parser_action_row594[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row595[] = {
+static int parser_action_row597[] = {
        1,
        -1, 1, 193
 };
-static int parser_action_row596[] = {
+static int parser_action_row598[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row597[] = {
+static int parser_action_row599[] = {
        3,
        -1, 1, 195,
-       36, 0, 599,
-       78, 0, 600
+       36, 0, 601,
+       78, 0, 602
 };
-static int parser_action_row598[] = {
+static int parser_action_row600[] = {
        2,
        -1, 1, 188,
-       58, 1, 450
+       58, 1, 449
 };
-static int parser_action_row599[] = {
+static int parser_action_row601[] = {
        4,
        -1, 1, 190,
-       36, 0, 599,
-       58, 1, 452,
-       78, 0, 600
+       36, 0, 601,
+       58, 1, 451,
+       78, 0, 602
 };
-static int parser_action_row600[] = {
+static int parser_action_row602[] = {
        2,
-       -1, 3, 599,
-       78, 0, 709
+       -1, 3, 601,
+       78, 0, 707
 };
-static int parser_action_row601[] = {
+static int parser_action_row603[] = {
        2,
-       -1, 3, 600,
-       80, 0, 710
+       -1, 3, 602,
+       80, 0, 708
 };
-static int parser_action_row602[] = {
+static int parser_action_row604[] = {
        1,
-       -1, 1, 730
+       -1, 1, 729
 };
-static int parser_action_row603[] = {
+static int parser_action_row605[] = {
        3,
        -1, 1, 207,
-       36, 0, 599,
-       78, 0, 600
+       36, 0, 601,
+       78, 0, 602
 };
-static int parser_action_row604[] = {
+static int parser_action_row606[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row605[] = {
+static int parser_action_row607[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row606[] = {
+static int parser_action_row608[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row607[] = {
+static int parser_action_row609[] = {
        1,
-       -1, 1, 722
+       -1, 1, 721
 };
-static int parser_action_row608[] = {
+static int parser_action_row610[] = {
        1,
-       -1, 1, 724
+       -1, 1, 723
 };
-static int parser_action_row609[] = {
+static int parser_action_row611[] = {
        3,
-       -1, 3, 608,
+       -1, 3, 610,
        0, 0, 79,
        1, 0, 80
 };
-static int parser_action_row610[] = {
+static int parser_action_row612[] = {
        10,
        -1, 1, 166,
-       8, 0, 718,
-       9, 0, 719,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       8, 0, 716,
+       9, 0, 717,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
-       42, 0, 723
+       42, 0, 721
 };
-static int parser_action_row611[] = {
+static int parser_action_row613[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row612[] = {
+static int parser_action_row614[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row613[] = {
-       3,
-       -1, 3, 612,
-       54, 0, 579,
-       55, 0, 580
-};
-static int parser_action_row614[] = {
+static int parser_action_row615[] = {
        1,
        -1, 1, 376
 };
-static int parser_action_row615[] = {
+static int parser_action_row616[] = {
        1,
        -1, 1, 271
 };
-static int parser_action_row616[] = {
+static int parser_action_row617[] = {
        2,
-       -1, 3, 615,
-       51, 0, 732
+       -1, 3, 616,
+       51, 0, 730
 };
-static int parser_action_row617[] = {
+static int parser_action_row618[] = {
        4,
        -1, 1, 372,
-       58, 0, 733,
+       58, 0, 731,
        59, 0, 195,
        60, 0, 196
 };
-static int parser_action_row618[] = {
+static int parser_action_row619[] = {
        2,
        -1, 1, 265,
-       78, 0, 340
+       78, 0, 341
 };
-static int parser_action_row619[] = {
+static int parser_action_row620[] = {
        23,
-       -1, 3, 618,
+       -1, 3, 619,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -7060,9 +7063,9 @@ static int parser_action_row619[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row620[] = {
+static int parser_action_row621[] = {
        23,
-       -1, 3, 619,
+       -1, 3, 620,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -7086,81 +7089,64 @@ static int parser_action_row620[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row621[] = {
+static int parser_action_row622[] = {
        1,
        -1, 1, 399
 };
-static int parser_action_row622[] = {
+static int parser_action_row623[] = {
        2,
-       -1, 1, 419,
+       -1, 1, 418,
        57, 0, 191
 };
-static int parser_action_row623[] = {
-       3,
-       -1, 3, 622,
-       52, 0, 738,
-       55, 0, 580
-};
 static int parser_action_row624[] = {
+       1,
+       -1, 1, 402
+};
+static int parser_action_row625[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row625[] = {
-       2,
-       -1, 3, 624,
-       80, 0, 741
-};
 static int parser_action_row626[] = {
-       3,
-       -1, 1, 632,
-       53, 1, 634,
-       63, 1, 634
+       2,
+       -1, 3, 625,
+       80, 0, 737
 };
 static int parser_action_row627[] = {
-       6,
-       -1, 1, 406,
-       53, 1, 402,
-       58, 1, 402,
-       59, 1, 402,
-       60, 1, 402,
-       63, 1, 402
+       3,
+       -1, 1, 631,
+       53, 1, 633,
+       63, 1, 633
 };
 static int parser_action_row628[] = {
-       3,
-       -1, 3, 627,
-       52, 0, 742,
-       55, 0, 580
+       1,
+       -1, 1, 604
 };
 static int parser_action_row629[] = {
        1,
-       -1, 1, 605
+       -1, 1, 639
 };
 static int parser_action_row630[] = {
-       1,
-       -1, 1, 640
-};
-static int parser_action_row631[] = {
        2,
-       -1, 3, 630,
-       51, 0, 743
+       -1, 3, 629,
+       51, 0, 738
 };
-static int parser_action_row632[] = {
+static int parser_action_row631[] = {
        1,
-       -1, 1, 636
+       -1, 1, 635
 };
-static int parser_action_row633[] = {
+static int parser_action_row632[] = {
        2,
-       -1, 3, 632,
-       20, 0, 744
+       -1, 3, 631,
+       20, 0, 739
 };
-static int parser_action_row634[] = {
+static int parser_action_row633[] = {
        32,
-       -1, 3, 633,
+       -1, 3, 632,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -7190,58 +7176,58 @@ static int parser_action_row634[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row635[] = {
+static int parser_action_row634[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row636[] = {
+static int parser_action_row635[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row637[] = {
+static int parser_action_row636[] = {
        10,
        -1, 1, 166,
-       8, 0, 718,
-       9, 0, 750,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       8, 0, 716,
+       9, 0, 745,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
-       42, 0, 723
+       42, 0, 721
 };
-static int parser_action_row638[] = {
+static int parser_action_row637[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row639[] = {
+static int parser_action_row638[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row640[] = {
+static int parser_action_row639[] = {
        1,
        -1, 1, 244
 };
-static int parser_action_row641[] = {
+static int parser_action_row640[] = {
        1,
        -1, 1, 297
 };
-static int parser_action_row642[] = {
+static int parser_action_row641[] = {
        1,
        -1, 1, 318
 };
-static int parser_action_row643[] = {
+static int parser_action_row642[] = {
        24,
-       -1, 1, 410,
+       -1, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -7254,8 +7240,8 @@ static int parser_action_row643[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 405,
-       63, 1, 405,
+       53, 1, 404,
+       63, 1, 404,
        65, 0, 116,
        79, 0, 49,
        80, 0, 117,
@@ -7266,26 +7252,26 @@ static int parser_action_row643[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row644[] = {
+static int parser_action_row643[] = {
        32,
-       -1, 3, 643,
+       -1, 3, 642,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 755,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 750,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -7293,31 +7279,31 @@ static int parser_action_row644[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row645[] = {
+static int parser_action_row644[] = {
        2,
-       -1, 3, 644,
-       80, 0, 760
+       -1, 3, 643,
+       80, 0, 755
 };
-static int parser_action_row646[] = {
+static int parser_action_row645[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row647[] = {
+static int parser_action_row646[] = {
        32,
-       -1, 3, 646,
+       -1, 3, 645,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -7347,32 +7333,32 @@ static int parser_action_row647[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row648[] = {
+static int parser_action_row647[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row649[] = {
+static int parser_action_row648[] = {
        32,
-       -1, 3, 648,
+       -1, 3, 647,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 755,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 750,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -7380,26 +7366,26 @@ static int parser_action_row649[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row650[] = {
+static int parser_action_row649[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row651[] = {
+static int parser_action_row650[] = {
        24,
        -1, 1, 248,
        12, 0, 151,
        24, 0, 152,
-       26, 1, 520,
+       26, 1, 519,
        33, 0, 153,
        39, 0, 154,
        41, 0, 155,
@@ -7421,12 +7407,12 @@ static int parser_action_row651[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row652[] = {
+static int parser_action_row651[] = {
        25,
        -1, 1, 255,
        12, 0, 151,
        24, 0, 152,
-       26, 1, 527,
+       26, 1, 526,
        33, 0, 153,
        39, 0, 154,
        41, 0, 155,
@@ -7449,12 +7435,12 @@ static int parser_action_row652[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row653[] = {
+static int parser_action_row652[] = {
        25,
        -1, 1, 250,
        12, 0, 151,
        24, 0, 152,
-       26, 1, 522,
+       26, 1, 521,
        33, 0, 153,
        39, 0, 154,
        41, 0, 155,
@@ -7477,14 +7463,14 @@ static int parser_action_row653[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row654[] = {
+static int parser_action_row653[] = {
        2,
        -1, 1, 254,
-       26, 1, 526
+       26, 1, 525
 };
-static int parser_action_row655[] = {
+static int parser_action_row654[] = {
        23,
-       -1, 3, 654,
+       -1, 3, 653,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -7508,9 +7494,9 @@ static int parser_action_row655[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row656[] = {
+static int parser_action_row655[] = {
        24,
-       -1, 1, 410,
+       -1, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -7523,8 +7509,8 @@ static int parser_action_row656[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 405,
-       63, 1, 405,
+       53, 1, 404,
+       63, 1, 404,
        65, 0, 116,
        79, 0, 49,
        80, 0, 117,
@@ -7535,9 +7521,9 @@ static int parser_action_row656[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row657[] = {
+static int parser_action_row656[] = {
        28,
-       -1, 1, 410,
+       -1, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -7550,12 +7536,12 @@ static int parser_action_row657[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 405,
+       53, 1, 404,
        57, 0, 191,
-       58, 1, 405,
-       59, 1, 405,
-       60, 1, 405,
-       63, 1, 405,
+       58, 1, 404,
+       59, 1, 404,
+       60, 1, 404,
+       63, 1, 404,
        65, 0, 116,
        79, 0, 49,
        80, 0, 117,
@@ -7566,41 +7552,41 @@ static int parser_action_row657[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row658[] = {
+static int parser_action_row657[] = {
        4,
        -1, 1, 371,
-       58, 0, 777,
+       58, 0, 772,
        59, 0, 195,
        60, 0, 196
 };
-static int parser_action_row659[] = {
+static int parser_action_row658[] = {
        1,
        -1, 1, 313
 };
-static int parser_action_row660[] = {
+static int parser_action_row659[] = {
        1,
        -1, 1, 315
 };
-static int parser_action_row661[] = {
+static int parser_action_row660[] = {
        3,
-       -1, 3, 660,
+       -1, 3, 659,
        53, 0, 209,
-       63, 0, 779
+       63, 0, 774
 };
-static int parser_action_row662[] = {
+static int parser_action_row661[] = {
        2,
-       -1, 3, 661,
-       42, 0, 781
+       -1, 3, 660,
+       42, 0, 776
 };
-static int parser_action_row663[] = {
+static int parser_action_row662[] = {
        31,
-       -1, 3, 662,
-       9, 0, 641,
+       -1, 3, 661,
+       9, 0, 640,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
        24, 0, 32,
-       26, 0, 646,
+       26, 0, 645,
        27, 0, 33,
        28, 0, 34,
        29, 0, 35,
@@ -7626,10 +7612,14 @@ static int parser_action_row663[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row664[] = {
+static int parser_action_row663[] = {
        2,
-       -1, 3, 663,
-       26, 0, 785
+       -1, 3, 662,
+       26, 0, 780
+};
+static int parser_action_row664[] = {
+       1,
+       -1, 1, 517
 };
 static int parser_action_row665[] = {
        1,
@@ -7637,7 +7627,7 @@ static int parser_action_row665[] = {
 };
 static int parser_action_row666[] = {
        1,
-       -1, 1, 519
+       -1, 1, 530
 };
 static int parser_action_row667[] = {
        1,
@@ -7645,15 +7635,15 @@ static int parser_action_row667[] = {
 };
 static int parser_action_row668[] = {
        1,
-       -1, 1, 532
+       -1, 1, 533
 };
 static int parser_action_row669[] = {
        1,
-       -1, 1, 534
+       -1, 1, 532
 };
 static int parser_action_row670[] = {
        1,
-       -1, 1, 533
+       -1, 1, 534
 };
 static int parser_action_row671[] = {
        1,
@@ -7661,25 +7651,21 @@ static int parser_action_row671[] = {
 };
 static int parser_action_row672[] = {
        1,
-       -1, 1, 536
+       -1, 1, 322
 };
 static int parser_action_row673[] = {
-       1,
-       -1, 1, 322
+       2,
+       -1, 3, 672,
+       50, 0, 172
 };
 static int parser_action_row674[] = {
        2,
        -1, 3, 673,
-       50, 0, 172
+       30, 0, 782
 };
 static int parser_action_row675[] = {
-       2,
-       -1, 3, 674,
-       30, 0, 787
-};
-static int parser_action_row676[] = {
        23,
-       -1, 3, 675,
+       -1, 3, 674,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -7703,52 +7689,52 @@ static int parser_action_row676[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row677[] = {
+static int parser_action_row676[] = {
        2,
-       -1, 3, 676,
-       80, 0, 789
+       -1, 3, 675,
+       80, 0, 784
 };
-static int parser_action_row678[] = {
+static int parser_action_row677[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row679[] = {
+static int parser_action_row678[] = {
        3,
        -1, 1, 368,
        53, 1, 370,
        63, 1, 370
 };
-static int parser_action_row680[] = {
+static int parser_action_row679[] = {
        1,
        -1, 1, 341
 };
-static int parser_action_row681[] = {
+static int parser_action_row680[] = {
        2,
        -1, 1, 372,
-       78, 0, 340
+       78, 0, 341
 };
-static int parser_action_row682[] = {
+static int parser_action_row681[] = {
        32,
-       -1, 3, 681,
+       -1, 3, 680,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 755,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 750,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -7756,67 +7742,67 @@ static int parser_action_row682[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row683[] = {
+static int parser_action_row682[] = {
        2,
-       -1, 3, 682,
+       -1, 3, 681,
        80, 0, 286
 };
-static int parser_action_row684[] = {
+static int parser_action_row683[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row685[] = {
+static int parser_action_row684[] = {
        5,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       15, 0, 797,
-       58, 0, 798
+       15, 0, 792,
+       58, 0, 793
 };
-static int parser_action_row686[] = {
+static int parser_action_row685[] = {
        2,
        -1, 1, 372,
-       78, 0, 455
+       78, 0, 457
 };
-static int parser_action_row687[] = {
+static int parser_action_row686[] = {
        3,
-       -1, 3, 686,
+       -1, 3, 685,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row688[] = {
+static int parser_action_row687[] = {
        2,
        -1, 1, 231,
-       55, 0, 801
+       55, 0, 796
 };
-static int parser_action_row689[] = {
+static int parser_action_row688[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row690[] = {
+static int parser_action_row689[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row691[] = {
+static int parser_action_row690[] = {
        1,
        -1, 1, 372
 };
-static int parser_action_row692[] = {
+static int parser_action_row691[] = {
        23,
-       -1, 3, 691,
+       -1, 3, 690,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -7840,44 +7826,40 @@ static int parser_action_row692[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row693[] = {
+static int parser_action_row692[] = {
        22,
-       -1, 3, 692,
-       12, 0, 807,
-       24, 0, 808,
-       33, 0, 809,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       -1, 3, 691,
+       12, 0, 802,
+       24, 0, 803,
+       33, 0, 804,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
-static int parser_action_row694[] = {
-       1,
-       -1, 1, 412
-};
-static int parser_action_row695[] = {
+static int parser_action_row693[] = {
        1,
-       -1, 1, 741
+       -1, 1, 740
 };
-static int parser_action_row696[] = {
+static int parser_action_row694[] = {
        1,
        -1, 1, 279
 };
-static int parser_action_row697[] = {
+static int parser_action_row695[] = {
        30,
        -1, 1, 288,
        9, 0, 275,
@@ -7910,21 +7892,21 @@ static int parser_action_row697[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row698[] = {
+static int parser_action_row696[] = {
        2,
-       -1, 3, 697,
+       -1, 3, 695,
        50, 0, 172
 };
-static int parser_action_row699[] = {
+static int parser_action_row697[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       52, 0, 840
+       52, 0, 835
 };
-static int parser_action_row700[] = {
+static int parser_action_row698[] = {
        23,
-       -1, 3, 699,
+       -1, 3, 697,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -7948,9 +7930,9 @@ static int parser_action_row700[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row701[] = {
+static int parser_action_row699[] = {
        32,
-       -1, 3, 700,
+       -1, 3, 698,
        0, 0, 1,
        1, 0, 2,
        9, 0, 137,
@@ -7983,69 +7965,69 @@ static int parser_action_row701[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row702[] = {
+static int parser_action_row700[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row703[] = {
+static int parser_action_row701[] = {
        1,
        -1, 1, 202
 };
-static int parser_action_row704[] = {
+static int parser_action_row702[] = {
        2,
        -1, 1, 204,
        56, 0, 279
 };
-static int parser_action_row705[] = {
+static int parser_action_row703[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       55, 0, 848
+       55, 0, 843
 };
-static int parser_action_row706[] = {
+static int parser_action_row704[] = {
        3,
-       -1, 1, 442,
-       3, 0, 852,
-       85, 0, 853
+       -1, 1, 441,
+       3, 0, 847,
+       85, 0, 848
 };
-static int parser_action_row707[] = {
+static int parser_action_row705[] = {
        2,
-       -1, 1, 436,
-       9, 0, 855
+       -1, 1, 435,
+       9, 0, 850
 };
-static int parser_action_row708[] = {
+static int parser_action_row706[] = {
        2,
        -1, 1, 189,
-       58, 1, 451
+       58, 1, 450
 };
-static int parser_action_row709[] = {
+static int parser_action_row707[] = {
        4,
        -1, 1, 191,
-       36, 0, 599,
-       58, 1, 453,
-       78, 0, 600
+       36, 0, 601,
+       58, 1, 452,
+       78, 0, 602
 };
-static int parser_action_row710[] = {
+static int parser_action_row708[] = {
        2,
-       -1, 3, 709,
-       80, 0, 856
+       -1, 3, 707,
+       80, 0, 851
 };
-static int parser_action_row711[] = {
+static int parser_action_row709[] = {
        3,
        -1, 1, 196,
-       51, 0, 480,
+       51, 0, 483,
        56, 0, 279
 };
-static int parser_action_row712[] = {
+static int parser_action_row710[] = {
        1,
-       -1, 1, 731
+       -1, 1, 730
 };
-static int parser_action_row713[] = {
+static int parser_action_row711[] = {
        23,
-       -1, 3, 712,
+       -1, 3, 710,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8069,146 +8051,146 @@ static int parser_action_row713[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row714[] = {
+static int parser_action_row712[] = {
        2,
-       -1, 3, 713,
-       79, 0, 862
+       -1, 3, 711,
+       79, 0, 857
 };
-static int parser_action_row715[] = {
+static int parser_action_row713[] = {
        10,
        -1, 1, 166,
-       8, 0, 718,
-       9, 0, 864,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       8, 0, 716,
+       9, 0, 859,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
-       42, 0, 723
+       42, 0, 721
 };
-static int parser_action_row716[] = {
+static int parser_action_row714[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row717[] = {
+static int parser_action_row715[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row718[] = {
+static int parser_action_row716[] = {
        1,
        -1, 1, 67
 };
-static int parser_action_row719[] = {
+static int parser_action_row717[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row720[] = {
+static int parser_action_row718[] = {
        1,
        -1, 1, 39
 };
-static int parser_action_row721[] = {
+static int parser_action_row719[] = {
        6,
        -1, 1, 166,
-       16, 0, 869,
-       17, 0, 870,
+       16, 0, 864,
+       17, 0, 865,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row722[] = {
+static int parser_action_row720[] = {
        1,
        -1, 1, 160
 };
-static int parser_action_row723[] = {
+static int parser_action_row721[] = {
        1,
        -1, 1, 162
 };
-static int parser_action_row724[] = {
+static int parser_action_row722[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row725[] = {
+static int parser_action_row723[] = {
        6,
        -1, 1, 166,
-       13, 0, 873,
-       17, 0, 722,
+       13, 0, 868,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row726[] = {
+static int parser_action_row724[] = {
        5,
        -1, 1, 166,
-       13, 0, 876,
+       13, 0, 871,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row727[] = {
+static int parser_action_row725[] = {
        6,
-       -1, 3, 726,
-       10, 0, 878,
-       11, 0, 879,
-       12, 0, 880,
-       18, 0, 881,
-       39, 0, 882
+       -1, 3, 724,
+       10, 0, 873,
+       11, 0, 874,
+       12, 0, 875,
+       18, 0, 876,
+       39, 0, 877
 };
-static int parser_action_row728[] = {
+static int parser_action_row726[] = {
        1,
-       -1, 1, 723
+       -1, 1, 722
 };
-static int parser_action_row729[] = {
+static int parser_action_row727[] = {
        10,
        -1, 1, 166,
-       8, 0, 718,
-       9, 0, 883,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       8, 0, 716,
+       9, 0, 878,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
-       42, 0, 723
+       42, 0, 721
 };
-static int parser_action_row730[] = {
+static int parser_action_row728[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row731[] = {
+static int parser_action_row729[] = {
        1,
-       -1, 1, 725
+       -1, 1, 724
 };
-static int parser_action_row732[] = {
+static int parser_action_row730[] = {
        8,
        -1, 1, 166,
-       9, 0, 885,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       9, 0, 880,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row733[] = {
+static int parser_action_row731[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row734[] = {
+static int parser_action_row732[] = {
        23,
-       -1, 3, 733,
+       -1, 3, 731,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8232,9 +8214,9 @@ static int parser_action_row734[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row735[] = {
+static int parser_action_row733[] = {
        23,
-       -1, 3, 734,
+       -1, 3, 732,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8258,31 +8240,21 @@ static int parser_action_row735[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row736[] = {
+static int parser_action_row734[] = {
        1,
        -1, 1, 267
 };
-static int parser_action_row737[] = {
+static int parser_action_row735[] = {
        1,
        -1, 1, 298
 };
-static int parser_action_row738[] = {
+static int parser_action_row736[] = {
        1,
        -1, 1, 303
 };
-static int parser_action_row739[] = {
-       1,
-       -1, 1, 402
-};
-static int parser_action_row740[] = {
-       3,
-       -1, 3, 739,
-       52, 0, 889,
-       55, 0, 580
-};
-static int parser_action_row741[] = {
+static int parser_action_row737[] = {
        23,
-       -1, 3, 740,
+       -1, 3, 736,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8306,40 +8278,31 @@ static int parser_action_row741[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row742[] = {
+static int parser_action_row738[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row743[] = {
-       6,
-       -1, 1, 407,
-       53, 1, 403,
-       58, 1, 403,
-       59, 1, 403,
-       60, 1, 403,
-       63, 1, 403
-};
-static int parser_action_row744[] = {
+static int parser_action_row739[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row745[] = {
+static int parser_action_row740[] = {
        3,
-       -1, 1, 443,
-       3, 0, 852,
-       85, 0, 893
+       -1, 1, 442,
+       3, 0, 847,
+       85, 0, 887
 };
-static int parser_action_row746[] = {
+static int parser_action_row741[] = {
        2,
-       -1, 1, 437,
-       9, 0, 895
+       -1, 1, 436,
+       9, 0, 889
 };
-static int parser_action_row747[] = {
+static int parser_action_row742[] = {
        23,
-       -1, 3, 746,
+       -1, 3, 741,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8363,80 +8326,80 @@ static int parser_action_row747[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row748[] = {
+static int parser_action_row743[] = {
        10,
        -1, 1, 166,
-       8, 0, 718,
-       9, 0, 897,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       8, 0, 716,
+       9, 0, 891,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
-       42, 0, 723
+       42, 0, 721
 };
-static int parser_action_row749[] = {
+static int parser_action_row744[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row750[] = {
+static int parser_action_row745[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row751[] = {
+static int parser_action_row746[] = {
        1,
        -1, 1, 40
 };
-static int parser_action_row752[] = {
+static int parser_action_row747[] = {
        10,
        -1, 1, 166,
-       8, 0, 718,
-       9, 0, 901,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       8, 0, 716,
+       9, 0, 895,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
-       42, 0, 723
+       42, 0, 721
 };
-static int parser_action_row753[] = {
+static int parser_action_row748[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row754[] = {
+static int parser_action_row749[] = {
        8,
        -1, 1, 166,
-       9, 0, 903,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       9, 0, 897,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row755[] = {
+static int parser_action_row750[] = {
        2,
        -1, 1, 272,
-       26, 1, 544
+       26, 1, 543
 };
-static int parser_action_row756[] = {
+static int parser_action_row751[] = {
        3,
        -1, 1, 237,
-       26, 1, 516,
-       50, 1, 593
+       26, 1, 515,
+       50, 1, 592
 };
-static int parser_action_row757[] = {
+static int parser_action_row752[] = {
        30,
-       -1, 3, 756,
-       9, 0, 904,
+       -1, 3, 751,
+       9, 0, 898,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -8466,29 +8429,29 @@ static int parser_action_row757[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row758[] = {
+static int parser_action_row753[] = {
        1,
-       -1, 1, 572
+       -1, 1, 571
 };
-static int parser_action_row759[] = {
+static int parser_action_row754[] = {
        1,
-       -1, 1, 517
+       -1, 1, 516
 };
-static int parser_action_row760[] = {
+static int parser_action_row755[] = {
        2,
-       -1, 3, 759,
+       -1, 3, 754,
        50, 0, 172
 };
-static int parser_action_row761[] = {
+static int parser_action_row756[] = {
        4,
        -1, 1, 294,
-       26, 1, 557,
+       26, 1, 556,
        56, 0, 279,
-       58, 0, 907
+       58, 0, 901
 };
-static int parser_action_row762[] = {
+static int parser_action_row757[] = {
        23,
-       -1, 3, 761,
+       -1, 3, 756,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8512,13 +8475,13 @@ static int parser_action_row762[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row763[] = {
+static int parser_action_row758[] = {
        1,
        -1, 1, 317
 };
-static int parser_action_row764[] = {
+static int parser_action_row759[] = {
        23,
-       -1, 3, 763,
+       -1, 3, 758,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8542,31 +8505,31 @@ static int parser_action_row764[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row765[] = {
+static int parser_action_row760[] = {
        1,
-       -1, 1, 575
+       -1, 1, 574
 };
-static int parser_action_row766[] = {
+static int parser_action_row761[] = {
        2,
-       -1, 3, 765,
+       -1, 3, 760,
        50, 0, 172
 };
-static int parser_action_row767[] = {
+static int parser_action_row762[] = {
        3,
-       -1, 3, 766,
-       51, 0, 912,
+       -1, 3, 761,
+       51, 0, 906,
        80, 0, 286
 };
-static int parser_action_row768[] = {
+static int parser_action_row763[] = {
        1,
-       -1, 1, 521
+       -1, 1, 520
 };
-static int parser_action_row769[] = {
+static int parser_action_row764[] = {
        24,
        -1, 1, 256,
        12, 0, 151,
        24, 0, 152,
-       26, 1, 528,
+       26, 1, 527,
        33, 0, 153,
        39, 0, 154,
        41, 0, 155,
@@ -8588,16 +8551,16 @@ static int parser_action_row769[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row770[] = {
+static int parser_action_row765[] = {
        1,
-       -1, 1, 529
+       -1, 1, 528
 };
-static int parser_action_row771[] = {
+static int parser_action_row766[] = {
        24,
        -1, 1, 251,
        12, 0, 151,
        24, 0, 152,
-       26, 1, 523,
+       26, 1, 522,
        33, 0, 153,
        39, 0, 154,
        41, 0, 155,
@@ -8619,13 +8582,13 @@ static int parser_action_row771[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row772[] = {
+static int parser_action_row767[] = {
        1,
-       -1, 1, 524
+       -1, 1, 523
 };
-static int parser_action_row773[] = {
+static int parser_action_row768[] = {
        23,
-       -1, 3, 772,
+       -1, 3, 767,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8649,32 +8612,32 @@ static int parser_action_row773[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row774[] = {
+static int parser_action_row769[] = {
        2,
-       -1, 3, 773,
-       26, 0, 917
+       -1, 3, 768,
+       26, 0, 911
 };
-static int parser_action_row775[] = {
+static int parser_action_row770[] = {
        2,
        -1, 1, 269,
-       26, 1, 541
+       26, 1, 540
 };
-static int parser_action_row776[] = {
+static int parser_action_row771[] = {
        4,
        -1, 1, 373,
-       58, 0, 918,
+       58, 0, 912,
        59, 0, 195,
        60, 0, 196
 };
-static int parser_action_row777[] = {
+static int parser_action_row772[] = {
        3,
        -1, 1, 266,
-       26, 1, 538,
-       78, 0, 455
+       26, 1, 537,
+       78, 0, 457
 };
-static int parser_action_row778[] = {
+static int parser_action_row773[] = {
        23,
-       -1, 3, 777,
+       -1, 3, 772,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8698,9 +8661,9 @@ static int parser_action_row778[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row779[] = {
+static int parser_action_row774[] = {
        23,
-       -1, 3, 778,
+       -1, 3, 773,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8724,22 +8687,22 @@ static int parser_action_row779[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row780[] = {
+static int parser_action_row775[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row781[] = {
+static int parser_action_row776[] = {
        4,
        -1, 1, 378,
-       58, 0, 924,
+       58, 0, 918,
        59, 0, 195,
        60, 0, 196
 };
-static int parser_action_row782[] = {
+static int parser_action_row777[] = {
        24,
-       -1, 1, 410,
+       -1, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -8752,8 +8715,8 @@ static int parser_action_row782[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 405,
-       63, 1, 405,
+       53, 1, 404,
+       63, 1, 404,
        65, 0, 116,
        79, 0, 49,
        80, 0, 117,
@@ -8764,28 +8727,28 @@ static int parser_action_row782[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row783[] = {
+static int parser_action_row778[] = {
        3,
-       -1, 3, 782,
-       9, 0, 641,
-       26, 0, 646
+       -1, 3, 777,
+       9, 0, 640,
+       26, 0, 645
 };
-static int parser_action_row784[] = {
+static int parser_action_row779[] = {
        3,
-       -1, 3, 783,
+       -1, 3, 778,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row785[] = {
+static int parser_action_row780[] = {
        1,
        -1, 1, 316
 };
-static int parser_action_row786[] = {
+static int parser_action_row781[] = {
        32,
-       -1, 3, 785,
+       -1, 3, 780,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -8815,29 +8778,29 @@ static int parser_action_row786[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row787[] = {
+static int parser_action_row782[] = {
        1,
        -1, 1, 321
 };
-static int parser_action_row788[] = {
+static int parser_action_row783[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row789[] = {
+static int parser_action_row784[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row790[] = {
+static int parser_action_row785[] = {
        1,
-       -1, 1, 415
+       -1, 1, 414
 };
-static int parser_action_row791[] = {
+static int parser_action_row786[] = {
        23,
-       -1, 3, 790,
+       -1, 3, 785,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8861,14 +8824,14 @@ static int parser_action_row791[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row792[] = {
+static int parser_action_row787[] = {
        1,
        -1, 1, 333
 };
-static int parser_action_row793[] = {
+static int parser_action_row788[] = {
        30,
        -1, 1, 288,
-       9, 0, 904,
+       9, 0, 898,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -8898,25 +8861,25 @@ static int parser_action_row793[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row794[] = {
+static int parser_action_row789[] = {
        1,
-       -1, 1, 550
+       -1, 1, 549
 };
-static int parser_action_row795[] = {
+static int parser_action_row790[] = {
        2,
-       -1, 3, 794,
+       -1, 3, 789,
        50, 0, 172
 };
-static int parser_action_row796[] = {
+static int parser_action_row791[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       52, 0, 934
+       52, 0, 928
 };
-static int parser_action_row797[] = {
+static int parser_action_row792[] = {
        23,
-       -1, 3, 796,
+       -1, 3, 791,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -8940,26 +8903,26 @@ static int parser_action_row797[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row798[] = {
+static int parser_action_row793[] = {
        32,
-       -1, 3, 797,
+       -1, 3, 792,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 755,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 750,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -8967,133 +8930,133 @@ static int parser_action_row798[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row799[] = {
+static int parser_action_row794[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row800[] = {
+static int parser_action_row795[] = {
        1,
-       -1, 1, 585
+       -1, 1, 584
 };
-static int parser_action_row801[] = {
+static int parser_action_row796[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row802[] = {
+static int parser_action_row797[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row803[] = {
+static int parser_action_row798[] = {
        1,
-       -1, 1, 734
+       -1, 1, 733
 };
-static int parser_action_row804[] = {
+static int parser_action_row799[] = {
        2,
        -1, 1, 232,
-       55, 0, 801
+       55, 0, 796
 };
-static int parser_action_row805[] = {
+static int parser_action_row800[] = {
        2,
-       -1, 3, 804,
-       54, 0, 944
+       -1, 3, 799,
+       54, 0, 938
 };
-static int parser_action_row806[] = {
+static int parser_action_row801[] = {
        1,
        -1, 1, 379
 };
-static int parser_action_row807[] = {
+static int parser_action_row802[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row808[] = {
+static int parser_action_row803[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row809[] = {
+static int parser_action_row804[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row810[] = {
+static int parser_action_row805[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row811[] = {
+static int parser_action_row806[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row812[] = {
+static int parser_action_row807[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row813[] = {
+static int parser_action_row808[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row814[] = {
+static int parser_action_row809[] = {
+       1,
+       -1, 1, 501
+};
+static int parser_action_row810[] = {
        1,
        -1, 1, 502
 };
-static int parser_action_row815[] = {
+static int parser_action_row811[] = {
        1,
        -1, 1, 503
 };
-static int parser_action_row816[] = {
+static int parser_action_row812[] = {
        1,
        -1, 1, 504
 };
-static int parser_action_row817[] = {
-       1,
-       -1, 1, 505
-};
-static int parser_action_row818[] = {
+static int parser_action_row813[] = {
        17,
-       -1, 3, 817,
-       12, 0, 807,
-       39, 0, 952,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       51, 0, 818,
+       -1, 3, 812,
+       12, 0, 802,
+       39, 0, 946,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       51, 0, 813,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 953,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 947,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
-static int parser_action_row819[] = {
+static int parser_action_row814[] = {
        23,
-       -1, 3, 818,
+       -1, 3, 813,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -9117,137 +9080,137 @@ static int parser_action_row819[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row820[] = {
+static int parser_action_row815[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row821[] = {
+static int parser_action_row816[] = {
        3,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239,
        57, 0, 191
 };
-static int parser_action_row822[] = {
+static int parser_action_row817[] = {
        1,
-       -1, 1, 494
+       -1, 1, 493
 };
-static int parser_action_row823[] = {
+static int parser_action_row818[] = {
+       1,
+       -1, 1, 505
+};
+static int parser_action_row819[] = {
        1,
        -1, 1, 506
 };
-static int parser_action_row824[] = {
+static int parser_action_row820[] = {
        1,
        -1, 1, 507
 };
-static int parser_action_row825[] = {
+static int parser_action_row821[] = {
        1,
        -1, 1, 508
 };
-static int parser_action_row826[] = {
+static int parser_action_row822[] = {
        1,
        -1, 1, 509
 };
-static int parser_action_row827[] = {
-       1,
-       -1, 1, 510
-};
-static int parser_action_row828[] = {
+static int parser_action_row823[] = {
        2,
-       -1, 3, 827,
-       42, 0, 958
+       -1, 3, 822,
+       42, 0, 952
 };
-static int parser_action_row829[] = {
+static int parser_action_row824[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row830[] = {
+static int parser_action_row825[] = {
        3,
-       -1, 1, 459,
-       31, 0, 960,
-       32, 0, 961
+       -1, 1, 458,
+       31, 0, 954,
+       32, 0, 955
 };
-static int parser_action_row831[] = {
+static int parser_action_row826[] = {
        1,
-       -1, 1, 461
+       -1, 1, 460
 };
-static int parser_action_row832[] = {
+static int parser_action_row827[] = {
        3,
-       -1, 1, 465,
-       73, 0, 962,
-       76, 0, 963
+       -1, 1, 464,
+       73, 0, 956,
+       76, 0, 957
 };
-static int parser_action_row833[] = {
+static int parser_action_row828[] = {
        12,
-       -1, 1, 467,
-       14, 0, 964,
-       40, 0, 965,
-       64, 0, 966,
-       65, 0, 967,
-       69, 0, 968,
-       70, 0, 969,
-       71, 0, 970,
-       72, 0, 971,
-       74, 0, 972,
-       75, 0, 973,
-       77, 0, 974
+       -1, 1, 466,
+       14, 0, 958,
+       40, 0, 959,
+       64, 0, 960,
+       65, 0, 961,
+       69, 0, 962,
+       70, 0, 963,
+       71, 0, 964,
+       72, 0, 965,
+       74, 0, 966,
+       75, 0, 967,
+       77, 0, 968
 };
-static int parser_action_row834[] = {
+static int parser_action_row829[] = {
        4,
-       -1, 1, 479,
-       66, 0, 975,
-       67, 0, 976,
-       68, 0, 977
+       -1, 1, 478,
+       66, 0, 969,
+       67, 0, 970,
+       68, 0, 971
 };
-static int parser_action_row835[] = {
+static int parser_action_row830[] = {
        1,
-       -1, 1, 482
+       -1, 1, 481
 };
-static int parser_action_row836[] = {
+static int parser_action_row831[] = {
        1,
-       -1, 1, 486
+       -1, 1, 485
 };
-static int parser_action_row837[] = {
+static int parser_action_row832[] = {
        2,
-       -1, 1, 489,
-       63, 0, 978
+       -1, 1, 488,
+       63, 0, 972
 };
-static int parser_action_row838[] = {
+static int parser_action_row833[] = {
        1,
        -1, 1, 285
 };
-static int parser_action_row839[] = {
+static int parser_action_row834[] = {
        3,
-       -1, 3, 838,
+       -1, 3, 833,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row840[] = {
+static int parser_action_row835[] = {
        1,
        -1, 1, 276
 };
-static int parser_action_row841[] = {
+static int parser_action_row836[] = {
        3,
-       -1, 3, 840,
-       15, 0, 981,
-       58, 0, 982
+       -1, 3, 835,
+       15, 0, 975,
+       58, 0, 976
 };
-static int parser_action_row842[] = {
+static int parser_action_row837[] = {
        1,
        -1, 1, 282
 };
-static int parser_action_row843[] = {
+static int parser_action_row838[] = {
        1,
        -1, 1, 293
 };
-static int parser_action_row844[] = {
+static int parser_action_row839[] = {
        1,
        -1, 1, 281
 };
-static int parser_action_row845[] = {
+static int parser_action_row840[] = {
        30,
        -1, 1, 290,
        9, 0, 275,
@@ -9280,14 +9243,14 @@ static int parser_action_row845[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row846[] = {
+static int parser_action_row841[] = {
        2,
-       -1, 3, 845,
+       -1, 3, 840,
        50, 0, 172
 };
-static int parser_action_row847[] = {
+static int parser_action_row842[] = {
        23,
-       -1, 3, 846,
+       -1, 3, 841,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -9311,485 +9274,481 @@ static int parser_action_row847[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row848[] = {
+static int parser_action_row843[] = {
        2,
        -1, 1, 205,
-       61, 0, 986
+       61, 0, 980
 };
-static int parser_action_row849[] = {
+static int parser_action_row844[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row850[] = {
+static int parser_action_row845[] = {
        1,
-       -1, 1, 728
+       -1, 1, 727
 };
-static int parser_action_row851[] = {
+static int parser_action_row846[] = {
        2,
-       -1, 3, 850,
-       52, 0, 988
+       -1, 3, 845,
+       52, 0, 982
 };
-static int parser_action_row852[] = {
+static int parser_action_row847[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       55, 0, 848
+       55, 0, 843
 };
-static int parser_action_row853[] = {
+static int parser_action_row848[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row854[] = {
+static int parser_action_row849[] = {
        2,
-       -1, 1, 444,
-       3, 0, 852
+       -1, 1, 443,
+       3, 0, 847
 };
-static int parser_action_row855[] = {
+static int parser_action_row850[] = {
        1,
-       -1, 1, 446
+       -1, 1, 445
 };
-static int parser_action_row856[] = {
+static int parser_action_row851[] = {
        1,
-       -1, 1, 438
+       -1, 1, 437
 };
-static int parser_action_row857[] = {
+static int parser_action_row852[] = {
        3,
        -1, 1, 196,
-       51, 0, 480,
+       51, 0, 483,
        56, 0, 279
 };
-static int parser_action_row858[] = {
+static int parser_action_row853[] = {
        5,
-       -1, 3, 857,
+       -1, 3, 852,
        0, 0, 1,
        1, 0, 2,
-       15, 0, 994,
-       58, 0, 995
+       15, 0, 988,
+       58, 0, 989
 };
-static int parser_action_row859[] = {
+static int parser_action_row854[] = {
        2,
        -1, 1, 197,
        56, 0, 279
 };
-static int parser_action_row860[] = {
+static int parser_action_row855[] = {
        1,
        -1, 1, 198
 };
-static int parser_action_row861[] = {
+static int parser_action_row856[] = {
        1,
-       -1, 1, 440
+       -1, 1, 439
 };
-static int parser_action_row862[] = {
+static int parser_action_row857[] = {
        1,
        -1, 1, 214
 };
-static int parser_action_row863[] = {
+static int parser_action_row858[] = {
        2,
        -1, 1, 63,
        56, 0, 279
 };
-static int parser_action_row864[] = {
+static int parser_action_row859[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       55, 0, 999
+       55, 0, 993
 };
-static int parser_action_row865[] = {
+static int parser_action_row860[] = {
        1,
        -1, 1, 41
 };
-static int parser_action_row866[] = {
+static int parser_action_row861[] = {
        10,
        -1, 1, 166,
-       8, 0, 718,
-       9, 0, 1003,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       8, 0, 716,
+       9, 0, 997,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
-       42, 0, 723
+       42, 0, 721
 };
-static int parser_action_row867[] = {
+static int parser_action_row862[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row868[] = {
+static int parser_action_row863[] = {
        8,
        -1, 1, 166,
-       9, 0, 1005,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       9, 0, 999,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row869[] = {
+static int parser_action_row864[] = {
        3,
-       -1, 3, 868,
+       -1, 3, 863,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row870[] = {
+static int parser_action_row865[] = {
        1,
        -1, 1, 161
 };
-static int parser_action_row871[] = {
+static int parser_action_row866[] = {
        1,
        -1, 1, 163
 };
-static int parser_action_row872[] = {
+static int parser_action_row867[] = {
        6,
-       -1, 3, 871,
-       10, 0, 1007,
-       11, 0, 1008,
-       12, 0, 1009,
-       18, 0, 1010,
-       39, 0, 1011
+       -1, 3, 866,
+       10, 0, 1001,
+       11, 0, 1002,
+       12, 0, 1003,
+       18, 0, 1004,
+       39, 0, 1005
 };
-static int parser_action_row873[] = {
+static int parser_action_row868[] = {
        3,
-       -1, 3, 872,
+       -1, 3, 867,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row874[] = {
+static int parser_action_row869[] = {
        5,
        -1, 1, 166,
-       17, 0, 870,
+       17, 0, 865,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row875[] = {
+static int parser_action_row870[] = {
        5,
        -1, 1, 166,
-       13, 0, 1014,
+       13, 0, 1008,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row876[] = {
+static int parser_action_row871[] = {
        2,
-       -1, 3, 875,
-       18, 0, 1016
+       -1, 3, 870,
+       18, 0, 1010
 };
-static int parser_action_row877[] = {
+static int parser_action_row872[] = {
        4,
        -1, 1, 166,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row878[] = {
+static int parser_action_row873[] = {
        2,
-       -1, 3, 877,
-       18, 0, 1018
+       -1, 3, 872,
+       18, 0, 1012
 };
-static int parser_action_row879[] = {
+static int parser_action_row874[] = {
        17,
-       -1, 3, 878,
-       53, 0, 348,
-       64, 0, 349,
-       65, 0, 350,
-       66, 0, 351,
-       67, 0, 352,
-       68, 0, 353,
-       69, 0, 354,
-       70, 0, 355,
-       71, 0, 356,
-       72, 0, 357,
-       73, 0, 358,
-       74, 0, 359,
-       75, 0, 360,
-       76, 0, 361,
-       77, 0, 362,
-       80, 0, 363
+       -1, 3, 873,
+       53, 0, 349,
+       64, 0, 350,
+       65, 0, 351,
+       66, 0, 352,
+       67, 0, 353,
+       68, 0, 354,
+       69, 0, 355,
+       70, 0, 356,
+       71, 0, 357,
+       72, 0, 358,
+       73, 0, 359,
+       74, 0, 360,
+       75, 0, 361,
+       76, 0, 362,
+       77, 0, 363,
+       80, 0, 364
 };
-static int parser_action_row880[] = {
+static int parser_action_row875[] = {
        2,
-       -1, 3, 879,
-       79, 0, 1020
+       -1, 3, 874,
+       79, 0, 1014
 };
-static int parser_action_row881[] = {
+static int parser_action_row876[] = {
        21,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
-       53, 0, 348,
+       51, 0, 483,
+       53, 0, 349,
        56, 0, 279,
-       64, 0, 349,
-       65, 0, 350,
-       66, 0, 351,
-       67, 0, 352,
-       68, 0, 353,
-       69, 0, 354,
-       70, 0, 355,
-       71, 0, 356,
-       72, 0, 357,
-       73, 0, 358,
-       74, 0, 359,
-       75, 0, 360,
-       76, 0, 361,
-       77, 0, 362,
-       80, 0, 363
+       64, 0, 350,
+       65, 0, 351,
+       66, 0, 352,
+       67, 0, 353,
+       68, 0, 354,
+       69, 0, 355,
+       70, 0, 356,
+       71, 0, 357,
+       72, 0, 358,
+       73, 0, 359,
+       74, 0, 360,
+       75, 0, 361,
+       76, 0, 362,
+       77, 0, 363,
+       80, 0, 364
 };
-static int parser_action_row882[] = {
+static int parser_action_row877[] = {
        3,
-       -1, 3, 881,
-       80, 0, 1025,
-       81, 0, 1026
+       -1, 3, 876,
+       80, 0, 1019,
+       81, 0, 1020
 };
-static int parser_action_row883[] = {
+static int parser_action_row878[] = {
        21,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
-       53, 0, 348,
+       51, 0, 483,
+       53, 0, 349,
        56, 0, 279,
-       64, 0, 349,
-       65, 0, 350,
-       66, 0, 351,
-       67, 0, 352,
-       68, 0, 353,
-       69, 0, 354,
-       70, 0, 355,
-       71, 0, 356,
-       72, 0, 357,
-       73, 0, 358,
-       74, 0, 359,
-       75, 0, 360,
-       76, 0, 361,
-       77, 0, 362,
-       80, 0, 363
+       64, 0, 350,
+       65, 0, 351,
+       66, 0, 352,
+       67, 0, 353,
+       68, 0, 354,
+       69, 0, 355,
+       70, 0, 356,
+       71, 0, 357,
+       72, 0, 358,
+       73, 0, 359,
+       74, 0, 360,
+       75, 0, 361,
+       76, 0, 362,
+       77, 0, 363,
+       80, 0, 364
 };
-static int parser_action_row884[] = {
+static int parser_action_row879[] = {
        1,
        -1, 1, 43
 };
-static int parser_action_row885[] = {
+static int parser_action_row880[] = {
        8,
        -1, 1, 166,
-       9, 0, 1029,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       9, 0, 1023,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row886[] = {
+static int parser_action_row881[] = {
        1,
        -1, 1, 47
 };
-static int parser_action_row887[] = {
+static int parser_action_row882[] = {
        4,
-       -1, 3, 886,
-       33, 0, 1030,
+       -1, 3, 881,
+       33, 0, 1024,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row888[] = {
+static int parser_action_row883[] = {
        1,
        -1, 1, 300
 };
-static int parser_action_row889[] = {
+static int parser_action_row884[] = {
        1,
        -1, 1, 305
 };
-static int parser_action_row890[] = {
-       1,
-       -1, 1, 403
-};
-static int parser_action_row891[] = {
+static int parser_action_row885[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row892[] = {
+static int parser_action_row886[] = {
        1,
-       -1, 1, 643
+       -1, 1, 642
 };
-static int parser_action_row893[] = {
+static int parser_action_row887[] = {
        4,
-       -1, 3, 892,
-       33, 0, 1033,
+       -1, 3, 886,
+       33, 0, 1027,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row894[] = {
+static int parser_action_row888[] = {
        2,
-       -1, 1, 445,
-       3, 0, 852
+       -1, 1, 444,
+       3, 0, 847
 };
-static int parser_action_row895[] = {
+static int parser_action_row889[] = {
        1,
-       -1, 1, 447
+       -1, 1, 446
 };
-static int parser_action_row896[] = {
+static int parser_action_row890[] = {
        1,
-       -1, 1, 439
+       -1, 1, 438
 };
-static int parser_action_row897[] = {
+static int parser_action_row891[] = {
        1,
-       -1, 1, 441
+       -1, 1, 440
 };
-static int parser_action_row898[] = {
+static int parser_action_row892[] = {
        1,
        -1, 1, 42
 };
-static int parser_action_row899[] = {
+static int parser_action_row893[] = {
        10,
        -1, 1, 166,
-       8, 0, 718,
-       9, 0, 1036,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       8, 0, 716,
+       9, 0, 1030,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
-       42, 0, 723
+       42, 0, 721
 };
-static int parser_action_row900[] = {
+static int parser_action_row894[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row901[] = {
+static int parser_action_row895[] = {
        8,
        -1, 1, 166,
-       9, 0, 1038,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       9, 0, 1032,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row902[] = {
+static int parser_action_row896[] = {
        1,
        -1, 1, 44
 };
-static int parser_action_row903[] = {
+static int parser_action_row897[] = {
        8,
        -1, 1, 166,
-       9, 0, 1039,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       9, 0, 1033,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row904[] = {
+static int parser_action_row898[] = {
        1,
        -1, 1, 48
 };
-static int parser_action_row905[] = {
+static int parser_action_row899[] = {
        3,
        -1, 1, 236,
-       26, 1, 515,
-       50, 1, 592
+       26, 1, 514,
+       50, 1, 591
 };
-static int parser_action_row906[] = {
+static int parser_action_row900[] = {
        3,
        -1, 1, 235,
-       26, 1, 514,
-       50, 1, 591
+       26, 1, 513,
+       50, 1, 590
 };
-static int parser_action_row907[] = {
+static int parser_action_row901[] = {
        2,
        -1, 1, 310,
-       26, 1, 571
+       26, 1, 570
 };
-static int parser_action_row908[] = {
+static int parser_action_row902[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row909[] = {
+static int parser_action_row903[] = {
        3,
        -1, 1, 295,
-       26, 1, 558,
-       58, 0, 1041
+       26, 1, 557,
+       58, 0, 1035
 };
-static int parser_action_row910[] = {
+static int parser_action_row904[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row911[] = {
+static int parser_action_row905[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row912[] = {
+static int parser_action_row906[] = {
        2,
        -1, 1, 319,
-       26, 1, 574
+       26, 1, 573
 };
-static int parser_action_row913[] = {
+static int parser_action_row907[] = {
        2,
-       -1, 3, 912,
+       -1, 3, 906,
        80, 0, 286
 };
-static int parser_action_row914[] = {
+static int parser_action_row908[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row915[] = {
+static int parser_action_row909[] = {
        1,
-       -1, 1, 530
+       -1, 1, 529
 };
-static int parser_action_row916[] = {
+static int parser_action_row910[] = {
        1,
-       -1, 1, 525
+       -1, 1, 524
 };
-static int parser_action_row917[] = {
+static int parser_action_row911[] = {
        2,
-       -1, 3, 916,
-       26, 0, 1046
+       -1, 3, 910,
+       26, 0, 1040
 };
-static int parser_action_row918[] = {
+static int parser_action_row912[] = {
        32,
-       -1, 3, 917,
+       -1, 3, 911,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 1047,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 1041,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -9797,17 +9756,17 @@ static int parser_action_row918[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row919[] = {
+static int parser_action_row913[] = {
        23,
-       -1, 3, 918,
+       -1, 3, 912,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -9831,9 +9790,9 @@ static int parser_action_row919[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row920[] = {
+static int parser_action_row914[] = {
        23,
-       -1, 3, 919,
+       -1, 3, 913,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -9857,29 +9816,29 @@ static int parser_action_row920[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row921[] = {
+static int parser_action_row915[] = {
        1,
-       -1, 1, 540
+       -1, 1, 539
 };
-static int parser_action_row922[] = {
+static int parser_action_row916[] = {
        1,
-       -1, 1, 562
+       -1, 1, 561
 };
-static int parser_action_row923[] = {
+static int parser_action_row917[] = {
        1,
-       -1, 1, 567
+       -1, 1, 566
 };
-static int parser_action_row924[] = {
+static int parser_action_row918[] = {
        5,
-       -1, 3, 923,
-       12, 0, 1052,
-       47, 0, 490,
-       80, 0, 1053,
-       81, 0, 1054
+       -1, 3, 917,
+       12, 0, 1046,
+       47, 0, 492,
+       80, 0, 1047,
+       81, 0, 1048
 };
-static int parser_action_row925[] = {
+static int parser_action_row919[] = {
        23,
-       -1, 3, 924,
+       -1, 3, 918,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -9903,9 +9862,9 @@ static int parser_action_row925[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row926[] = {
+static int parser_action_row920[] = {
        23,
-       -1, 3, 925,
+       -1, 3, 919,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -9929,28 +9888,28 @@ static int parser_action_row926[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row927[] = {
+static int parser_action_row921[] = {
        2,
        -1, 1, 270,
-       26, 1, 542
+       26, 1, 541
 };
-static int parser_action_row928[] = {
+static int parser_action_row922[] = {
        1,
        -1, 1, 314
 };
-static int parser_action_row929[] = {
+static int parser_action_row923[] = {
        3,
-       -1, 3, 928,
+       -1, 3, 922,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row930[] = {
+static int parser_action_row924[] = {
        1,
        -1, 1, 312
 };
-static int parser_action_row931[] = {
+static int parser_action_row925[] = {
        23,
-       -1, 3, 930,
+       -1, 3, 924,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -9974,40 +9933,40 @@ static int parser_action_row931[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row932[] = {
+static int parser_action_row926[] = {
        2,
-       -1, 3, 931,
-       15, 0, 1058
+       -1, 3, 925,
+       15, 0, 1052
 };
-static int parser_action_row933[] = {
+static int parser_action_row927[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row934[] = {
+static int parser_action_row928[] = {
        2,
        -1, 1, 276,
-       26, 1, 547
+       26, 1, 546
 };
-static int parser_action_row935[] = {
+static int parser_action_row929[] = {
        3,
-       -1, 3, 934,
-       15, 0, 1060,
-       58, 0, 1061
+       -1, 3, 928,
+       15, 0, 1054,
+       58, 0, 1055
 };
-static int parser_action_row936[] = {
+static int parser_action_row930[] = {
        1,
-       -1, 1, 553
+       -1, 1, 552
 };
-static int parser_action_row937[] = {
+static int parser_action_row931[] = {
        1,
-       -1, 1, 556
+       -1, 1, 555
 };
-static int parser_action_row938[] = {
+static int parser_action_row932[] = {
        30,
        -1, 1, 290,
-       9, 0, 904,
+       9, 0, 898,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -10037,18 +9996,18 @@ static int parser_action_row938[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row939[] = {
+static int parser_action_row933[] = {
        1,
-       -1, 1, 552
+       -1, 1, 551
 };
-static int parser_action_row940[] = {
+static int parser_action_row934[] = {
        2,
-       -1, 3, 939,
+       -1, 3, 933,
        50, 0, 172
 };
-static int parser_action_row941[] = {
+static int parser_action_row935[] = {
        23,
-       -1, 3, 940,
+       -1, 3, 934,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -10072,36 +10031,36 @@ static int parser_action_row941[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row942[] = {
+static int parser_action_row936[] = {
        2,
-       -1, 3, 941,
-       54, 0, 1064
+       -1, 3, 935,
+       54, 0, 1058
 };
-static int parser_action_row943[] = {
+static int parser_action_row937[] = {
        3,
-       -1, 3, 942,
+       -1, 3, 936,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row944[] = {
+static int parser_action_row938[] = {
        1,
-       -1, 1, 735
+       -1, 1, 734
 };
-static int parser_action_row945[] = {
+static int parser_action_row939[] = {
        1,
        -1, 1, 229
 };
-static int parser_action_row946[] = {
+static int parser_action_row940[] = {
        1,
-       -1, 1, 413
+       -1, 1, 412
 };
-static int parser_action_row947[] = {
+static int parser_action_row941[] = {
        1,
-       -1, 1, 500
+       -1, 1, 499
 };
-static int parser_action_row948[] = {
+static int parser_action_row942[] = {
        23,
-       -1, 3, 947,
+       -1, 3, 941,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -10125,241 +10084,241 @@ static int parser_action_row948[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row949[] = {
+static int parser_action_row943[] = {
        21,
-       -1, 3, 948,
-       12, 0, 807,
-       33, 0, 809,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       -1, 3, 942,
+       12, 0, 802,
+       33, 0, 804,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
-static int parser_action_row950[] = {
+static int parser_action_row944[] = {
        3,
-       -1, 3, 949,
-       48, 0, 1068,
-       79, 0, 1069
+       -1, 3, 943,
+       48, 0, 1062,
+       79, 0, 1063
 };
-static int parser_action_row951[] = {
+static int parser_action_row945[] = {
        20,
-       -1, 3, 950,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       -1, 3, 944,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
-static int parser_action_row952[] = {
+static int parser_action_row946[] = {
        1,
-       -1, 1, 497
+       -1, 1, 496
 };
-static int parser_action_row953[] = {
+static int parser_action_row947[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row954[] = {
+static int parser_action_row948[] = {
        2,
-       -1, 1, 492,
-       63, 1, 494
+       -1, 1, 491,
+       63, 1, 493
 };
-static int parser_action_row955[] = {
+static int parser_action_row949[] = {
        2,
-       -1, 3, 954,
-       63, 0, 1073
+       -1, 3, 948,
+       63, 0, 1067
 };
-static int parser_action_row956[] = {
+static int parser_action_row950[] = {
        2,
-       -1, 3, 955,
-       52, 0, 1074
+       -1, 3, 949,
+       52, 0, 1068
 };
-static int parser_action_row957[] = {
+static int parser_action_row951[] = {
        20,
-       -1, 3, 956,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       -1, 3, 950,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
-static int parser_action_row958[] = {
+static int parser_action_row952[] = {
        1,
-       -1, 1, 496
+       -1, 1, 495
 };
-static int parser_action_row959[] = {
+static int parser_action_row953[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row960[] = {
+static int parser_action_row954[] = {
        3,
-       -1, 3, 959,
-       53, 0, 1077,
-       54, 0, 1078
+       -1, 3, 953,
+       53, 0, 1071,
+       54, 0, 1072
 };
-static int parser_action_row961[] = {
+static int parser_action_row955[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row962[] = {
+static int parser_action_row956[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       26, 0, 1080
+       26, 0, 1074
 };
-static int parser_action_row963[] = {
+static int parser_action_row957[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row964[] = {
+static int parser_action_row958[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row965[] = {
+static int parser_action_row959[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row966[] = {
+static int parser_action_row960[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row967[] = {
+static int parser_action_row961[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row968[] = {
+static int parser_action_row962[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row969[] = {
+static int parser_action_row963[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row970[] = {
+static int parser_action_row964[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row971[] = {
+static int parser_action_row965[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row972[] = {
+static int parser_action_row966[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row973[] = {
+static int parser_action_row967[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row974[] = {
+static int parser_action_row968[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row975[] = {
+static int parser_action_row969[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row976[] = {
+static int parser_action_row970[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row977[] = {
+static int parser_action_row971[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row978[] = {
+static int parser_action_row972[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row979[] = {
+static int parser_action_row973[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row980[] = {
+static int parser_action_row974[] = {
        30,
        -1, 1, 241,
-       9, 0, 533,
+       9, 0, 536,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -10389,15 +10348,15 @@ static int parser_action_row980[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row981[] = {
+static int parser_action_row975[] = {
        3,
-       -1, 3, 980,
+       -1, 3, 974,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row982[] = {
+static int parser_action_row976[] = {
        32,
-       -1, 3, 981,
+       -1, 3, 975,
        0, 0, 1,
        1, 0, 2,
        9, 0, 137,
@@ -10430,87 +10389,87 @@ static int parser_action_row982[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row983[] = {
+static int parser_action_row977[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row984[] = {
+static int parser_action_row978[] = {
        1,
        -1, 1, 287
 };
-static int parser_action_row985[] = {
+static int parser_action_row979[] = {
        1,
        -1, 1, 278
 };
-static int parser_action_row986[] = {
+static int parser_action_row980[] = {
        1,
        -1, 1, 284
 };
-static int parser_action_row987[] = {
+static int parser_action_row981[] = {
        1,
        -1, 1, 206
 };
-static int parser_action_row988[] = {
+static int parser_action_row982[] = {
        2,
-       -1, 3, 987,
-       80, 0, 703
+       -1, 3, 981,
+       80, 0, 701
 };
-static int parser_action_row989[] = {
+static int parser_action_row983[] = {
        1,
        -1, 1, 200
 };
-static int parser_action_row990[] = {
+static int parser_action_row984[] = {
        1,
-       -1, 1, 729
+       -1, 1, 728
 };
-static int parser_action_row991[] = {
+static int parser_action_row985[] = {
        2,
-       -1, 3, 990,
-       52, 0, 1105
+       -1, 3, 984,
+       52, 0, 1099
 };
-static int parser_action_row992[] = {
+static int parser_action_row986[] = {
        20,
-       -1, 3, 991,
-       42, 0, 1106,
+       -1, 3, 985,
+       42, 0, 1100,
        48, 0, 328,
-       53, 0, 348,
-       64, 0, 349,
-       65, 0, 350,
-       66, 0, 351,
-       67, 0, 352,
-       68, 0, 353,
-       69, 0, 354,
-       70, 0, 355,
-       71, 0, 356,
-       72, 0, 357,
-       73, 0, 358,
-       74, 0, 359,
-       75, 0, 360,
-       76, 0, 361,
-       77, 0, 362,
-       79, 0, 1107,
-       80, 0, 363
+       53, 0, 349,
+       64, 0, 350,
+       65, 0, 351,
+       66, 0, 352,
+       67, 0, 353,
+       68, 0, 354,
+       69, 0, 355,
+       70, 0, 356,
+       71, 0, 357,
+       72, 0, 358,
+       73, 0, 359,
+       74, 0, 360,
+       75, 0, 361,
+       76, 0, 362,
+       77, 0, 363,
+       79, 0, 1101,
+       80, 0, 364
 };
-static int parser_action_row993[] = {
+static int parser_action_row987[] = {
        1,
-       -1, 1, 448
+       -1, 1, 447
 };
-static int parser_action_row994[] = {
+static int parser_action_row988[] = {
        5,
-       -1, 3, 993,
+       -1, 3, 987,
        0, 0, 1,
        1, 0, 2,
-       15, 0, 1113,
-       58, 0, 1114
+       15, 0, 1107,
+       58, 0, 1108
 };
-static int parser_action_row995[] = {
+static int parser_action_row989[] = {
        32,
-       -1, 3, 994,
+       -1, 3, 988,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -10540,316 +10499,316 @@ static int parser_action_row995[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row996[] = {
+static int parser_action_row990[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row997[] = {
+static int parser_action_row991[] = {
        1,
        -1, 1, 208
 };
-static int parser_action_row998[] = {
+static int parser_action_row992[] = {
        1,
        -1, 1, 199
 };
-static int parser_action_row999[] = {
+static int parser_action_row993[] = {
        1,
        -1, 1, 64
 };
-static int parser_action_row1000[] = {
+static int parser_action_row994[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1001[] = {
+static int parser_action_row995[] = {
        1,
-       -1, 1, 726
+       -1, 1, 725
 };
-static int parser_action_row1002[] = {
+static int parser_action_row996[] = {
        2,
-       -1, 3, 1001,
-       54, 0, 1119
+       -1, 3, 995,
+       54, 0, 1113
 };
-static int parser_action_row1003[] = {
+static int parser_action_row997[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       55, 0, 999
+       55, 0, 993
 };
-static int parser_action_row1004[] = {
+static int parser_action_row998[] = {
        1,
        -1, 1, 45
 };
-static int parser_action_row1005[] = {
+static int parser_action_row999[] = {
        8,
        -1, 1, 166,
-       9, 0, 1122,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       9, 0, 1116,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row1006[] = {
+static int parser_action_row1000[] = {
        1,
        -1, 1, 49
 };
-static int parser_action_row1007[] = {
+static int parser_action_row1001[] = {
        1,
        -1, 1, 65
 };
-static int parser_action_row1008[] = {
+static int parser_action_row1002[] = {
        17,
-       -1, 3, 1007,
-       53, 0, 348,
-       64, 0, 349,
-       65, 0, 350,
-       66, 0, 351,
-       67, 0, 352,
-       68, 0, 353,
-       69, 0, 354,
-       70, 0, 355,
-       71, 0, 356,
-       72, 0, 357,
-       73, 0, 358,
-       74, 0, 359,
-       75, 0, 360,
-       76, 0, 361,
-       77, 0, 362,
-       80, 0, 363
+       -1, 3, 1001,
+       53, 0, 349,
+       64, 0, 350,
+       65, 0, 351,
+       66, 0, 352,
+       67, 0, 353,
+       68, 0, 354,
+       69, 0, 355,
+       70, 0, 356,
+       71, 0, 357,
+       72, 0, 358,
+       73, 0, 359,
+       74, 0, 360,
+       75, 0, 361,
+       76, 0, 362,
+       77, 0, 363,
+       80, 0, 364
 };
-static int parser_action_row1009[] = {
+static int parser_action_row1003[] = {
        2,
-       -1, 3, 1008,
-       79, 0, 1124
+       -1, 3, 1002,
+       79, 0, 1118
 };
-static int parser_action_row1010[] = {
+static int parser_action_row1004[] = {
        21,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
-       53, 0, 348,
+       51, 0, 483,
+       53, 0, 349,
        56, 0, 279,
-       64, 0, 349,
-       65, 0, 350,
-       66, 0, 351,
-       67, 0, 352,
-       68, 0, 353,
-       69, 0, 354,
-       70, 0, 355,
-       71, 0, 356,
-       72, 0, 357,
-       73, 0, 358,
-       74, 0, 359,
-       75, 0, 360,
-       76, 0, 361,
-       77, 0, 362,
-       80, 0, 363
+       64, 0, 350,
+       65, 0, 351,
+       66, 0, 352,
+       67, 0, 353,
+       68, 0, 354,
+       69, 0, 355,
+       70, 0, 356,
+       71, 0, 357,
+       72, 0, 358,
+       73, 0, 359,
+       74, 0, 360,
+       75, 0, 361,
+       76, 0, 362,
+       77, 0, 363,
+       80, 0, 364
 };
-static int parser_action_row1011[] = {
+static int parser_action_row1005[] = {
        3,
-       -1, 3, 1010,
-       80, 0, 1127,
-       81, 0, 1128
+       -1, 3, 1004,
+       80, 0, 1121,
+       81, 0, 1122
 };
-static int parser_action_row1012[] = {
+static int parser_action_row1006[] = {
        21,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
-       53, 0, 348,
+       51, 0, 483,
+       53, 0, 349,
        56, 0, 279,
-       64, 0, 349,
-       65, 0, 350,
-       66, 0, 351,
-       67, 0, 352,
-       68, 0, 353,
-       69, 0, 354,
-       70, 0, 355,
-       71, 0, 356,
-       72, 0, 357,
-       73, 0, 358,
-       74, 0, 359,
-       75, 0, 360,
-       76, 0, 361,
-       77, 0, 362,
-       80, 0, 363
+       64, 0, 350,
+       65, 0, 351,
+       66, 0, 352,
+       67, 0, 353,
+       68, 0, 354,
+       69, 0, 355,
+       70, 0, 356,
+       71, 0, 357,
+       72, 0, 358,
+       73, 0, 359,
+       74, 0, 360,
+       75, 0, 361,
+       76, 0, 362,
+       77, 0, 363,
+       80, 0, 364
 };
-static int parser_action_row1013[] = {
+static int parser_action_row1007[] = {
        1,
        -1, 1, 66
 };
-static int parser_action_row1014[] = {
+static int parser_action_row1008[] = {
        2,
-       -1, 3, 1013,
-       18, 0, 1131
+       -1, 3, 1007,
+       18, 0, 1125
 };
-static int parser_action_row1015[] = {
+static int parser_action_row1009[] = {
        4,
        -1, 1, 166,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row1016[] = {
+static int parser_action_row1010[] = {
        2,
-       -1, 3, 1015,
-       18, 0, 1133
+       -1, 3, 1009,
+       18, 0, 1127
 };
-static int parser_action_row1017[] = {
+static int parser_action_row1011[] = {
        2,
-       -1, 3, 1016,
-       81, 0, 1134
+       -1, 3, 1010,
+       81, 0, 1128
 };
-static int parser_action_row1018[] = {
+static int parser_action_row1012[] = {
        2,
-       -1, 3, 1017,
-       18, 0, 1135
+       -1, 3, 1011,
+       18, 0, 1129
 };
-static int parser_action_row1019[] = {
+static int parser_action_row1013[] = {
        2,
-       -1, 3, 1018,
-       81, 0, 1136
+       -1, 3, 1012,
+       81, 0, 1130
 };
-static int parser_action_row1020[] = {
+static int parser_action_row1014[] = {
        5,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
+       51, 0, 483,
        56, 0, 279
 };
-static int parser_action_row1021[] = {
+static int parser_action_row1015[] = {
        2,
-       -1, 3, 1020,
+       -1, 3, 1014,
        56, 0, 279
 };
-static int parser_action_row1022[] = {
+static int parser_action_row1016[] = {
        5,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
+       51, 0, 483,
        56, 0, 279
 };
-static int parser_action_row1023[] = {
+static int parser_action_row1017[] = {
        2,
-       -1, 3, 1022,
-       15, 0, 1141
+       -1, 3, 1016,
+       15, 0, 1135
 };
-static int parser_action_row1024[] = {
+static int parser_action_row1018[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
        56, 0, 279
 };
-static int parser_action_row1025[] = {
+static int parser_action_row1019[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1026[] = {
+static int parser_action_row1020[] = {
        8,
        -1, 1, 118,
-       13, 0, 1145,
+       13, 0, 1139,
        17, 1, 166,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
        56, 0, 279,
-       58, 0, 1146
+       58, 0, 1140
 };
-static int parser_action_row1027[] = {
+static int parser_action_row1021[] = {
        3,
        -1, 1, 86,
        56, 0, 279,
-       58, 0, 1150
+       58, 0, 1144
 };
-static int parser_action_row1028[] = {
+static int parser_action_row1022[] = {
        5,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
+       51, 0, 483,
        56, 0, 279
 };
-static int parser_action_row1029[] = {
+static int parser_action_row1023[] = {
        2,
-       -1, 3, 1028,
-       14, 0, 1153
+       -1, 3, 1022,
+       14, 0, 1147
 };
-static int parser_action_row1030[] = {
+static int parser_action_row1024[] = {
        1,
        -1, 1, 51
 };
-static int parser_action_row1031[] = {
+static int parser_action_row1025[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1032[] = {
+static int parser_action_row1026[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1033[] = {
+static int parser_action_row1027[] = {
        2,
-       -1, 3, 1032,
-       26, 0, 1156
+       -1, 3, 1026,
+       26, 0, 1150
 };
-static int parser_action_row1034[] = {
+static int parser_action_row1028[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1035[] = {
+static int parser_action_row1029[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1036[] = {
+static int parser_action_row1030[] = {
        1,
-       -1, 1, 449
+       -1, 1, 448
 };
-static int parser_action_row1037[] = {
+static int parser_action_row1031[] = {
        1,
        -1, 1, 46
 };
-static int parser_action_row1038[] = {
+static int parser_action_row1032[] = {
        8,
        -1, 1, 166,
-       9, 0, 1159,
-       13, 0, 720,
-       16, 0, 721,
-       17, 0, 722,
+       9, 0, 1153,
+       13, 0, 718,
+       16, 0, 719,
+       17, 0, 720,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row1039[] = {
+static int parser_action_row1033[] = {
        1,
        -1, 1, 50
 };
-static int parser_action_row1040[] = {
+static int parser_action_row1034[] = {
        1,
        -1, 1, 52
 };
-static int parser_action_row1041[] = {
+static int parser_action_row1035[] = {
        23,
-       -1, 3, 1040,
+       -1, 3, 1034,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -10873,55 +10832,55 @@ static int parser_action_row1041[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1042[] = {
+static int parser_action_row1036[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1043[] = {
+static int parser_action_row1037[] = {
        2,
-       -1, 3, 1042,
-       25, 0, 1162
+       -1, 3, 1036,
+       25, 0, 1156
 };
-static int parser_action_row1044[] = {
+static int parser_action_row1038[] = {
        2,
-       -1, 3, 1043,
-       15, 0, 1163
+       -1, 3, 1037,
+       15, 0, 1157
 };
-static int parser_action_row1045[] = {
+static int parser_action_row1039[] = {
        4,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       52, 0, 1164
+       52, 0, 1158
 };
-static int parser_action_row1046[] = {
+static int parser_action_row1040[] = {
        3,
-       -1, 3, 1045,
-       30, 0, 1165,
-       55, 0, 543
+       -1, 3, 1039,
+       30, 0, 1159,
+       55, 0, 546
 };
-static int parser_action_row1047[] = {
+static int parser_action_row1041[] = {
        32,
-       -1, 3, 1046,
+       -1, 3, 1040,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 1047,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 1041,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -10929,23 +10888,23 @@ static int parser_action_row1047[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1048[] = {
+static int parser_action_row1042[] = {
        2,
        -1, 1, 237,
-       26, 1, 516
+       26, 1, 515
 };
-static int parser_action_row1049[] = {
+static int parser_action_row1043[] = {
        30,
-       -1, 3, 1048,
-       9, 0, 1167,
+       -1, 3, 1042,
+       9, 0, 1161,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -10975,21 +10934,21 @@ static int parser_action_row1049[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1050[] = {
+static int parser_action_row1044[] = {
        1,
-       -1, 1, 582
+       -1, 1, 581
 };
-static int parser_action_row1051[] = {
+static int parser_action_row1045[] = {
        1,
-       -1, 1, 564
+       -1, 1, 563
 };
-static int parser_action_row1052[] = {
+static int parser_action_row1046[] = {
        1,
-       -1, 1, 569
+       -1, 1, 568
 };
-static int parser_action_row1053[] = {
+static int parser_action_row1047[] = {
        24,
-       -1, 1, 410,
+       -1, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -11002,8 +10961,8 @@ static int parser_action_row1053[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 405,
-       63, 1, 405,
+       53, 1, 404,
+       63, 1, 404,
        65, 0, 116,
        79, 0, 49,
        80, 0, 117,
@@ -11014,9 +10973,9 @@ static int parser_action_row1053[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row1054[] = {
+static int parser_action_row1048[] = {
        27,
-       -1, 1, 410,
+       -1, 1, 408,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -11029,11 +10988,11 @@ static int parser_action_row1054[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 405,
-       58, 1, 405,
-       59, 1, 405,
-       60, 1, 405,
-       63, 1, 405,
+       53, 1, 404,
+       58, 1, 404,
+       59, 1, 404,
+       60, 1, 404,
+       63, 1, 404,
        65, 0, 116,
        79, 0, 49,
        80, 0, 117,
@@ -11044,30 +11003,30 @@ static int parser_action_row1054[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row1055[] = {
+static int parser_action_row1049[] = {
        4,
        -1, 1, 370,
-       58, 0, 1172,
+       58, 0, 1166,
        59, 0, 195,
        60, 0, 196
 };
-static int parser_action_row1056[] = {
+static int parser_action_row1050[] = {
        1,
-       -1, 1, 565
+       -1, 1, 564
 };
-static int parser_action_row1057[] = {
+static int parser_action_row1051[] = {
        1,
-       -1, 1, 570
+       -1, 1, 569
 };
-static int parser_action_row1058[] = {
+static int parser_action_row1052[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1059[] = {
+static int parser_action_row1053[] = {
        32,
-       -1, 3, 1058,
+       -1, 3, 1052,
        0, 0, 1,
        1, 0, 2,
        9, 0, 137,
@@ -11100,31 +11059,31 @@ static int parser_action_row1059[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1060[] = {
+static int parser_action_row1054[] = {
        2,
-       -1, 3, 1059,
-       26, 0, 1177
+       -1, 3, 1053,
+       26, 0, 1171
 };
-static int parser_action_row1061[] = {
+static int parser_action_row1055[] = {
        32,
-       -1, 3, 1060,
+       -1, 3, 1054,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 755,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 750,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -11132,515 +11091,515 @@ static int parser_action_row1061[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1062[] = {
+static int parser_action_row1056[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1063[] = {
+static int parser_action_row1057[] = {
        2,
        -1, 1, 278,
-       26, 1, 549
+       26, 1, 548
 };
-static int parser_action_row1064[] = {
+static int parser_action_row1058[] = {
        1,
-       -1, 1, 555
+       -1, 1, 554
 };
-static int parser_action_row1065[] = {
+static int parser_action_row1059[] = {
        1,
        -1, 1, 230
 };
-static int parser_action_row1066[] = {
+static int parser_action_row1060[] = {
        1,
        -1, 1, 233
 };
-static int parser_action_row1067[] = {
+static int parser_action_row1061[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1068[] = {
+static int parser_action_row1062[] = {
        1,
-       -1, 1, 466
+       -1, 1, 465
 };
-static int parser_action_row1069[] = {
+static int parser_action_row1063[] = {
        2,
-       -1, 3, 1068,
-       79, 0, 1183
+       -1, 3, 1062,
+       79, 0, 1177
 };
-static int parser_action_row1070[] = {
+static int parser_action_row1064[] = {
        1,
-       -1, 1, 454
+       -1, 1, 453
 };
-static int parser_action_row1071[] = {
+static int parser_action_row1065[] = {
        3,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239,
-       63, 0, 1184
+       63, 0, 1178
 };
-static int parser_action_row1072[] = {
+static int parser_action_row1066[] = {
        1,
-       -1, 1, 488
+       -1, 1, 487
 };
-static int parser_action_row1073[] = {
+static int parser_action_row1067[] = {
        3,
-       -1, 3, 1072,
-       48, 0, 1068,
-       79, 0, 1069
+       -1, 3, 1066,
+       48, 0, 1062,
+       79, 0, 1063
 };
-static int parser_action_row1074[] = {
+static int parser_action_row1068[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1075[] = {
+static int parser_action_row1069[] = {
        1,
-       -1, 1, 511
+       -1, 1, 510
 };
-static int parser_action_row1076[] = {
+static int parser_action_row1070[] = {
        1,
-       -1, 1, 487
+       -1, 1, 486
 };
-static int parser_action_row1077[] = {
+static int parser_action_row1071[] = {
        1,
-       -1, 1, 498
+       -1, 1, 497
 };
-static int parser_action_row1078[] = {
+static int parser_action_row1072[] = {
        1,
        -1, 1, 381
 };
-static int parser_action_row1079[] = {
+static int parser_action_row1073[] = {
        1,
        -1, 1, 380
 };
-static int parser_action_row1080[] = {
+static int parser_action_row1074[] = {
+       21,
+       -1, 3, 1073,
+       12, 0, 802,
+       33, 0, 804,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
+       79, 0, 49,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
+       86, 0, 56
+};
+static int parser_action_row1075[] = {
+       3,
+       -1, 1, 429,
+       0, 0, 1,
+       1, 0, 2
+};
+static int parser_action_row1076[] = {
        21,
+       -1, 3, 1075,
+       12, 0, 802,
+       33, 0, 804,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
+       79, 0, 49,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
+       86, 0, 56
+};
+static int parser_action_row1077[] = {
+       20,
+       -1, 3, 1076,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
+       79, 0, 49,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
+       86, 0, 56
+};
+static int parser_action_row1078[] = {
+       20,
+       -1, 3, 1077,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
+       79, 0, 49,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
+       86, 0, 56
+};
+static int parser_action_row1079[] = {
+       20,
+       -1, 3, 1078,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
+       79, 0, 49,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
+       86, 0, 56
+};
+static int parser_action_row1080[] = {
+       3,
        -1, 3, 1079,
-       12, 0, 807,
-       33, 0, 809,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
-       79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
-       86, 0, 56
+       48, 0, 1062,
+       79, 0, 1063
 };
 static int parser_action_row1081[] = {
-       3,
-       -1, 1, 430,
-       0, 0, 1,
-       1, 0, 2
+       20,
+       -1, 3, 1080,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
+       79, 0, 49,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
+       86, 0, 56
 };
 static int parser_action_row1082[] = {
-       21,
+       20,
        -1, 3, 1081,
-       12, 0, 807,
-       33, 0, 809,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
 static int parser_action_row1083[] = {
        20,
        -1, 3, 1082,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
 static int parser_action_row1084[] = {
        20,
        -1, 3, 1083,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
 static int parser_action_row1085[] = {
        20,
        -1, 3, 1084,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
 static int parser_action_row1086[] = {
-       3,
+       20,
        -1, 3, 1085,
-       48, 0, 1068,
-       79, 0, 1069
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
+       79, 0, 49,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
+       86, 0, 56
 };
 static int parser_action_row1087[] = {
        20,
        -1, 3, 1086,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
 static int parser_action_row1088[] = {
        20,
        -1, 3, 1087,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
 static int parser_action_row1089[] = {
        20,
        -1, 3, 1088,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
 static int parser_action_row1090[] = {
        20,
        -1, 3, 1089,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
 static int parser_action_row1091[] = {
        20,
        -1, 3, 1090,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
 static int parser_action_row1092[] = {
        20,
        -1, 3, 1091,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       12, 0, 802,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
 static int parser_action_row1093[] = {
-       20,
+       5,
        -1, 3, 1092,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
-       79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
-       86, 0, 56
+       12, 0, 1201,
+       47, 0, 1202,
+       80, 0, 1203,
+       81, 0, 1204
 };
 static int parser_action_row1094[] = {
-       20,
-       -1, 3, 1093,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
-       79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
-       86, 0, 56
-};
-static int parser_action_row1095[] = {
-       20,
-       -1, 3, 1094,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
-       79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
-       86, 0, 56
-};
-static int parser_action_row1096[] = {
-       20,
-       -1, 3, 1095,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
-       79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
-       86, 0, 56
-};
-static int parser_action_row1097[] = {
-       20,
-       -1, 3, 1096,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
-       79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
-       86, 0, 56
-};
-static int parser_action_row1098[] = {
-       20,
-       -1, 3, 1097,
-       12, 0, 807,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
-       79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
-       86, 0, 56
-};
-static int parser_action_row1099[] = {
-       5,
-       -1, 3, 1098,
-       12, 0, 1207,
-       47, 0, 1208,
-       80, 0, 1209,
-       81, 0, 1210
-};
-static int parser_action_row1100[] = {
        30,
        -1, 1, 242,
-       9, 0, 639,
+       9, 0, 638,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -11670,11 +11629,11 @@ static int parser_action_row1100[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1101[] = {
+static int parser_action_row1095[] = {
        1,
        -1, 1, 280
 };
-static int parser_action_row1102[] = {
+static int parser_action_row1096[] = {
        30,
        -1, 1, 289,
        9, 0, 275,
@@ -11707,14 +11666,14 @@ static int parser_action_row1102[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1103[] = {
+static int parser_action_row1097[] = {
        2,
-       -1, 3, 1102,
+       -1, 3, 1096,
        50, 0, 172
 };
-static int parser_action_row1104[] = {
+static int parser_action_row1098[] = {
        23,
-       -1, 3, 1103,
+       -1, 3, 1097,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -11738,53 +11697,53 @@ static int parser_action_row1104[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1105[] = {
+static int parser_action_row1099[] = {
        1,
        -1, 1, 203
 };
-static int parser_action_row1106[] = {
+static int parser_action_row1100[] = {
        1,
        -1, 1, 201
 };
-static int parser_action_row1107[] = {
+static int parser_action_row1101[] = {
        1,
        -1, 1, 220
 };
-static int parser_action_row1108[] = {
+static int parser_action_row1102[] = {
        4,
        -1, 1, 223,
        47, 1, 227,
-       53, 0, 466,
-       57, 0, 1214
+       53, 0, 468,
+       57, 0, 1208
 };
-static int parser_action_row1109[] = {
+static int parser_action_row1103[] = {
        1,
        -1, 1, 221
 };
-static int parser_action_row1110[] = {
+static int parser_action_row1104[] = {
        2,
        -1, 1, 215,
-       55, 0, 1215
+       55, 0, 1209
 };
-static int parser_action_row1111[] = {
+static int parser_action_row1105[] = {
        1,
        -1, 1, 218
 };
-static int parser_action_row1112[] = {
+static int parser_action_row1106[] = {
        1,
        -1, 1, 219
 };
-static int parser_action_row1113[] = {
+static int parser_action_row1107[] = {
        2,
-       -1, 3, 1112,
-       47, 0, 1218
+       -1, 3, 1106,
+       47, 0, 1212
 };
-static int parser_action_row1114[] = {
+static int parser_action_row1108[] = {
        32,
-       -1, 3, 1113,
+       -1, 3, 1107,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -11814,25 +11773,25 @@ static int parser_action_row1114[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1115[] = {
+static int parser_action_row1109[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1116[] = {
+static int parser_action_row1110[] = {
        1,
        -1, 1, 209
 };
-static int parser_action_row1117[] = {
+static int parser_action_row1111[] = {
        3,
-       -1, 3, 1116,
+       -1, 3, 1110,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1118[] = {
+static int parser_action_row1112[] = {
        23,
-       -1, 3, 1117,
+       -1, 3, 1111,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -11856,142 +11815,142 @@ static int parser_action_row1118[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1119[] = {
+static int parser_action_row1113[] = {
        2,
-       -1, 3, 1118,
-       79, 0, 862
+       -1, 3, 1112,
+       79, 0, 857
 };
-static int parser_action_row1120[] = {
+static int parser_action_row1114[] = {
        1,
        -1, 1, 60
 };
-static int parser_action_row1121[] = {
+static int parser_action_row1115[] = {
        1,
-       -1, 1, 727
+       -1, 1, 726
 };
-static int parser_action_row1122[] = {
+static int parser_action_row1116[] = {
        2,
-       -1, 3, 1121,
-       54, 0, 1224
+       -1, 3, 1115,
+       54, 0, 1218
 };
-static int parser_action_row1123[] = {
+static int parser_action_row1117[] = {
        1,
        -1, 1, 53
 };
-static int parser_action_row1124[] = {
+static int parser_action_row1118[] = {
        5,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
+       51, 0, 483,
        56, 0, 279
 };
-static int parser_action_row1125[] = {
+static int parser_action_row1119[] = {
        2,
-       -1, 3, 1124,
+       -1, 3, 1118,
        56, 0, 279
 };
-static int parser_action_row1126[] = {
+static int parser_action_row1120[] = {
        5,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
+       51, 0, 483,
        56, 0, 279
 };
-static int parser_action_row1127[] = {
+static int parser_action_row1121[] = {
        2,
-       -1, 3, 1126,
-       15, 0, 1229
+       -1, 3, 1120,
+       15, 0, 1223
 };
-static int parser_action_row1128[] = {
+static int parser_action_row1122[] = {
        8,
        -1, 1, 119,
-       13, 0, 1145,
+       13, 0, 1139,
        17, 1, 166,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
        56, 0, 279,
-       58, 0, 1230
+       58, 0, 1224
 };
-static int parser_action_row1129[] = {
+static int parser_action_row1123[] = {
        3,
        -1, 1, 87,
        56, 0, 279,
-       58, 0, 1233
+       58, 0, 1227
 };
-static int parser_action_row1130[] = {
+static int parser_action_row1124[] = {
        5,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2,
-       51, 0, 480,
+       51, 0, 483,
        56, 0, 279
 };
-static int parser_action_row1131[] = {
+static int parser_action_row1125[] = {
        2,
-       -1, 3, 1130,
-       14, 0, 1236
+       -1, 3, 1124,
+       14, 0, 1230
 };
-static int parser_action_row1132[] = {
+static int parser_action_row1126[] = {
        2,
-       -1, 3, 1131,
-       81, 0, 1237
+       -1, 3, 1125,
+       81, 0, 1231
 };
-static int parser_action_row1133[] = {
+static int parser_action_row1127[] = {
        2,
-       -1, 3, 1132,
-       18, 0, 1238
+       -1, 3, 1126,
+       18, 0, 1232
 };
-static int parser_action_row1134[] = {
+static int parser_action_row1128[] = {
        2,
-       -1, 3, 1133,
-       81, 0, 1239
+       -1, 3, 1127,
+       81, 0, 1233
 };
-static int parser_action_row1135[] = {
+static int parser_action_row1129[] = {
        3,
        -1, 1, 88,
        56, 0, 279,
-       58, 0, 1240
+       58, 0, 1234
 };
-static int parser_action_row1136[] = {
+static int parser_action_row1130[] = {
        2,
-       -1, 3, 1135,
-       81, 0, 1242
+       -1, 3, 1129,
+       81, 0, 1236
 };
-static int parser_action_row1137[] = {
+static int parser_action_row1131[] = {
        3,
        -1, 1, 90,
        56, 0, 279,
-       58, 0, 1243
+       58, 0, 1237
 };
-static int parser_action_row1138[] = {
+static int parser_action_row1132[] = {
        3,
-       -1, 3, 1137,
-       14, 0, 1245,
-       15, 0, 1246
+       -1, 3, 1131,
+       14, 0, 1239,
+       15, 0, 1240
 };
-static int parser_action_row1139[] = {
+static int parser_action_row1133[] = {
        2,
-       -1, 3, 1138,
-       58, 0, 1247
+       -1, 3, 1132,
+       58, 0, 1241
 };
-static int parser_action_row1140[] = {
+static int parser_action_row1134[] = {
        1,
        -1, 1, 142
 };
-static int parser_action_row1141[] = {
+static int parser_action_row1135[] = {
        2,
-       -1, 3, 1140,
-       15, 0, 1248
+       -1, 3, 1134,
+       15, 0, 1242
 };
-static int parser_action_row1142[] = {
+static int parser_action_row1136[] = {
        32,
-       -1, 3, 1141,
+       -1, 3, 1135,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -12021,113 +11980,113 @@ static int parser_action_row1142[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1143[] = {
+static int parser_action_row1137[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1144[] = {
+static int parser_action_row1138[] = {
        1,
        -1, 1, 188
 };
-static int parser_action_row1145[] = {
+static int parser_action_row1139[] = {
        3,
        -1, 1, 190,
-       36, 0, 599,
-       78, 0, 600
+       36, 0, 601,
+       78, 0, 602
 };
-static int parser_action_row1146[] = {
+static int parser_action_row1140[] = {
        4,
        -1, 1, 166,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row1147[] = {
+static int parser_action_row1141[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1148[] = {
+static int parser_action_row1142[] = {
        2,
        -1, 1, 122,
-       58, 0, 1254
+       58, 0, 1248
 };
-static int parser_action_row1149[] = {
+static int parser_action_row1143[] = {
        2,
-       -1, 3, 1148,
-       17, 0, 1255
+       -1, 3, 1142,
+       17, 0, 1249
 };
-static int parser_action_row1150[] = {
+static int parser_action_row1144[] = {
        7,
        -1, 1, 120,
-       13, 0, 1145,
+       13, 0, 1139,
        17, 1, 166,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
-       58, 0, 1256
+       58, 0, 1250
 };
-static int parser_action_row1151[] = {
+static int parser_action_row1145[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1152[] = {
+static int parser_action_row1146[] = {
        2,
        -1, 1, 94,
-       58, 0, 1259
+       58, 0, 1253
 };
-static int parser_action_row1153[] = {
+static int parser_action_row1147[] = {
        2,
-       -1, 3, 1152,
-       14, 0, 1260
+       -1, 3, 1146,
+       14, 0, 1254
 };
-static int parser_action_row1154[] = {
+static int parser_action_row1148[] = {
        2,
-       -1, 3, 1153,
-       20, 0, 1261
+       -1, 3, 1147,
+       20, 0, 1255
 };
-static int parser_action_row1155[] = {
+static int parser_action_row1149[] = {
        2,
-       -1, 3, 1154,
-       46, 0, 1262
+       -1, 3, 1148,
+       46, 0, 1256
 };
-static int parser_action_row1156[] = {
+static int parser_action_row1150[] = {
        2,
-       -1, 3, 1155,
-       52, 0, 1263
+       -1, 3, 1149,
+       52, 0, 1257
 };
-static int parser_action_row1157[] = {
+static int parser_action_row1151[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1158[] = {
+static int parser_action_row1152[] = {
        2,
-       -1, 3, 1157,
-       46, 0, 1265
+       -1, 3, 1151,
+       46, 0, 1259
 };
-static int parser_action_row1159[] = {
+static int parser_action_row1153[] = {
        2,
-       -1, 3, 1158,
-       52, 0, 1266
+       -1, 3, 1152,
+       52, 0, 1260
 };
-static int parser_action_row1160[] = {
+static int parser_action_row1154[] = {
        1,
        -1, 1, 54
 };
-static int parser_action_row1161[] = {
+static int parser_action_row1155[] = {
        1,
-       -1, 1, 559
+       -1, 1, 558
 };
-static int parser_action_row1162[] = {
+static int parser_action_row1156[] = {
        23,
-       -1, 3, 1161,
+       -1, 3, 1155,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12151,27 +12110,27 @@ static int parser_action_row1162[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1163[] = {
+static int parser_action_row1157[] = {
        33,
-       -1, 3, 1162,
+       -1, 3, 1156,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 641,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       26, 0, 646,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 640,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       26, 0, 645,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -12179,34 +12138,34 @@ static int parser_action_row1163[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1164[] = {
+static int parser_action_row1158[] = {
        32,
-       -1, 3, 1163,
+       -1, 3, 1157,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 755,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 750,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -12214,61 +12173,61 @@ static int parser_action_row1164[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1165[] = {
+static int parser_action_row1159[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1166[] = {
+static int parser_action_row1160[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1167[] = {
+static int parser_action_row1161[] = {
        1,
-       -1, 1, 583
+       -1, 1, 582
 };
-static int parser_action_row1168[] = {
+static int parser_action_row1162[] = {
        2,
        -1, 1, 236,
-       26, 1, 515
+       26, 1, 514
 };
-static int parser_action_row1169[] = {
+static int parser_action_row1163[] = {
        2,
        -1, 1, 235,
-       26, 1, 514
+       26, 1, 513
 };
-static int parser_action_row1170[] = {
+static int parser_action_row1164[] = {
        2,
        -1, 1, 271,
-       26, 1, 543
+       26, 1, 542
 };
-static int parser_action_row1171[] = {
+static int parser_action_row1165[] = {
        4,
        -1, 1, 372,
-       58, 0, 1273,
+       58, 0, 1267,
        59, 0, 195,
        60, 0, 196
 };
-static int parser_action_row1172[] = {
+static int parser_action_row1166[] = {
        3,
        -1, 1, 265,
-       26, 1, 537,
-       78, 0, 455
+       26, 1, 536,
+       78, 0, 457
 };
-static int parser_action_row1173[] = {
+static int parser_action_row1167[] = {
        23,
-       -1, 3, 1172,
+       -1, 3, 1166,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12292,9 +12251,9 @@ static int parser_action_row1173[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1174[] = {
+static int parser_action_row1168[] = {
        23,
-       -1, 3, 1173,
+       -1, 3, 1167,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12318,30 +12277,30 @@ static int parser_action_row1174[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1175[] = {
+static int parser_action_row1169[] = {
        2,
-       -1, 3, 1174,
-       15, 0, 1278
+       -1, 3, 1168,
+       15, 0, 1272
 };
-static int parser_action_row1176[] = {
+static int parser_action_row1170[] = {
        1,
        -1, 1, 326
 };
-static int parser_action_row1177[] = {
+static int parser_action_row1171[] = {
        2,
-       -1, 3, 1176,
+       -1, 3, 1170,
        50, 0, 172
 };
-static int parser_action_row1178[] = {
+static int parser_action_row1172[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1179[] = {
+static int parser_action_row1173[] = {
        30,
        -1, 1, 289,
-       9, 0, 904,
+       9, 0, 898,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -12371,18 +12330,18 @@ static int parser_action_row1179[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1180[] = {
+static int parser_action_row1174[] = {
        1,
-       -1, 1, 551
+       -1, 1, 550
 };
-static int parser_action_row1181[] = {
+static int parser_action_row1175[] = {
        2,
-       -1, 3, 1180,
+       -1, 3, 1174,
        50, 0, 172
 };
-static int parser_action_row1182[] = {
+static int parser_action_row1176[] = {
        23,
-       -1, 3, 1181,
+       -1, 3, 1175,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12406,242 +12365,242 @@ static int parser_action_row1182[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1183[] = {
+static int parser_action_row1177[] = {
        2,
-       -1, 3, 1182,
-       25, 0, 1283
+       -1, 3, 1176,
+       25, 0, 1277
 };
-static int parser_action_row1184[] = {
+static int parser_action_row1178[] = {
        1,
-       -1, 1, 455
+       -1, 1, 454
 };
-static int parser_action_row1185[] = {
+static int parser_action_row1179[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1186[] = {
+static int parser_action_row1180[] = {
        1,
-       -1, 1, 490
+       -1, 1, 489
 };
-static int parser_action_row1187[] = {
+static int parser_action_row1181[] = {
        2,
-       -1, 3, 1186,
-       63, 0, 1184
+       -1, 3, 1180,
+       63, 0, 1178
 };
-static int parser_action_row1188[] = {
+static int parser_action_row1182[] = {
        5,
-       -1, 3, 1187,
-       12, 0, 1207,
-       47, 0, 1208,
-       80, 0, 1209,
-       81, 0, 1285
+       -1, 3, 1181,
+       12, 0, 1201,
+       47, 0, 1202,
+       80, 0, 1203,
+       81, 0, 1279
 };
-static int parser_action_row1189[] = {
+static int parser_action_row1183[] = {
        1,
-       -1, 1, 463
+       -1, 1, 462
 };
-static int parser_action_row1190[] = {
+static int parser_action_row1184[] = {
        21,
-       -1, 3, 1189,
-       12, 0, 807,
-       33, 0, 809,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       -1, 3, 1183,
+       12, 0, 802,
+       33, 0, 804,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
-static int parser_action_row1191[] = {
+static int parser_action_row1185[] = {
        1,
-       -1, 1, 462
+       -1, 1, 461
 };
-static int parser_action_row1192[] = {
+static int parser_action_row1186[] = {
        3,
-       -1, 1, 473,
-       64, 0, 966,
-       65, 0, 967
+       -1, 1, 472,
+       64, 0, 960,
+       65, 0, 961
 };
-static int parser_action_row1193[] = {
+static int parser_action_row1187[] = {
        3,
-       -1, 1, 476,
-       64, 0, 966,
-       65, 0, 967
+       -1, 1, 475,
+       64, 0, 960,
+       65, 0, 961
 };
-static int parser_action_row1194[] = {
+static int parser_action_row1188[] = {
        3,
-       -1, 1, 469,
-       64, 0, 966,
-       65, 0, 967
+       -1, 1, 468,
+       64, 0, 960,
+       65, 0, 961
 };
-static int parser_action_row1195[] = {
+static int parser_action_row1189[] = {
        1,
-       -1, 1, 478
+       -1, 1, 477
 };
-static int parser_action_row1196[] = {
+static int parser_action_row1190[] = {
        4,
-       -1, 1, 480,
-       66, 0, 975,
-       67, 0, 976,
-       68, 0, 977
+       -1, 1, 479,
+       66, 0, 969,
+       67, 0, 970,
+       68, 0, 971
 };
-static int parser_action_row1197[] = {
+static int parser_action_row1191[] = {
        4,
-       -1, 1, 481,
-       66, 0, 975,
-       67, 0, 976,
-       68, 0, 977
+       -1, 1, 480,
+       66, 0, 969,
+       67, 0, 970,
+       68, 0, 971
 };
-static int parser_action_row1198[] = {
+static int parser_action_row1192[] = {
        3,
-       -1, 1, 468,
-       64, 0, 966,
-       65, 0, 967
+       -1, 1, 467,
+       64, 0, 960,
+       65, 0, 961
 };
-static int parser_action_row1199[] = {
+static int parser_action_row1193[] = {
+       3,
+       -1, 1, 469,
+       64, 0, 960,
+       65, 0, 961
+};
+static int parser_action_row1194[] = {
        3,
        -1, 1, 470,
-       64, 0, 966,
-       65, 0, 967
+       64, 0, 960,
+       65, 0, 961
 };
-static int parser_action_row1200[] = {
+static int parser_action_row1195[] = {
        3,
        -1, 1, 471,
-       64, 0, 966,
-       65, 0, 967
+       64, 0, 960,
+       65, 0, 961
 };
-static int parser_action_row1201[] = {
+static int parser_action_row1196[] = {
        3,
-       -1, 1, 472,
-       64, 0, 966,
-       65, 0, 967
+       -1, 1, 473,
+       64, 0, 960,
+       65, 0, 961
 };
-static int parser_action_row1202[] = {
+static int parser_action_row1197[] = {
        3,
        -1, 1, 474,
-       64, 0, 966,
-       65, 0, 967
+       64, 0, 960,
+       65, 0, 961
 };
-static int parser_action_row1203[] = {
+static int parser_action_row1198[] = {
        3,
-       -1, 1, 475,
-       64, 0, 966,
-       65, 0, 967
+       -1, 1, 476,
+       64, 0, 960,
+       65, 0, 961
 };
-static int parser_action_row1204[] = {
-       3,
-       -1, 1, 477,
-       64, 0, 966,
-       65, 0, 967
+static int parser_action_row1199[] = {
+       1,
+       -1, 1, 482
 };
-static int parser_action_row1205[] = {
+static int parser_action_row1200[] = {
        1,
        -1, 1, 483
 };
-static int parser_action_row1206[] = {
+static int parser_action_row1201[] = {
        1,
        -1, 1, 484
 };
-static int parser_action_row1207[] = {
-       1,
-       -1, 1, 485
-};
-static int parser_action_row1208[] = {
+static int parser_action_row1202[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row1209[] = {
+static int parser_action_row1203[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1210[] = {
+static int parser_action_row1204[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row1211[] = {
+static int parser_action_row1205[] = {
        1,
-       -1, 1, 493
+       -1, 1, 492
 };
-static int parser_action_row1212[] = {
+static int parser_action_row1206[] = {
        1,
        -1, 1, 286
 };
-static int parser_action_row1213[] = {
+static int parser_action_row1207[] = {
        1,
        -1, 1, 277
 };
-static int parser_action_row1214[] = {
+static int parser_action_row1208[] = {
        1,
        -1, 1, 283
 };
-static int parser_action_row1215[] = {
+static int parser_action_row1209[] = {
        17,
-       -1, 3, 1214,
-       53, 0, 348,
-       64, 0, 349,
-       65, 0, 350,
-       66, 0, 351,
-       67, 0, 352,
-       68, 0, 353,
-       69, 0, 354,
-       70, 0, 355,
-       71, 0, 356,
-       72, 0, 357,
-       73, 0, 358,
-       74, 0, 359,
-       75, 0, 360,
-       76, 0, 361,
-       77, 0, 362,
-       80, 0, 363
+       -1, 3, 1208,
+       53, 0, 349,
+       64, 0, 350,
+       65, 0, 351,
+       66, 0, 352,
+       67, 0, 353,
+       68, 0, 354,
+       69, 0, 355,
+       70, 0, 356,
+       71, 0, 357,
+       72, 0, 358,
+       73, 0, 359,
+       74, 0, 360,
+       75, 0, 361,
+       76, 0, 362,
+       77, 0, 363,
+       80, 0, 364
 };
-static int parser_action_row1216[] = {
+static int parser_action_row1210[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1217[] = {
+static int parser_action_row1211[] = {
        1,
-       -1, 1, 732
+       -1, 1, 731
 };
-static int parser_action_row1218[] = {
+static int parser_action_row1212[] = {
        2,
        -1, 1, 216,
-       55, 0, 1215
+       55, 0, 1209
 };
-static int parser_action_row1219[] = {
+static int parser_action_row1213[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1220[] = {
+static int parser_action_row1214[] = {
        3,
-       -1, 3, 1219,
+       -1, 3, 1213,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1221[] = {
+static int parser_action_row1215[] = {
        23,
-       -1, 3, 1220,
+       -1, 3, 1214,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12665,50 +12624,50 @@ static int parser_action_row1221[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1222[] = {
+static int parser_action_row1216[] = {
        1,
        -1, 1, 210
 };
-static int parser_action_row1223[] = {
+static int parser_action_row1217[] = {
        3,
-       -1, 3, 1222,
+       -1, 3, 1216,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1224[] = {
+static int parser_action_row1218[] = {
        1,
        -1, 1, 62
 };
-static int parser_action_row1225[] = {
+static int parser_action_row1219[] = {
        1,
        -1, 1, 61
 };
-static int parser_action_row1226[] = {
+static int parser_action_row1220[] = {
        3,
-       -1, 3, 1225,
-       14, 0, 1297,
-       15, 0, 1298
+       -1, 3, 1219,
+       14, 0, 1291,
+       15, 0, 1292
 };
-static int parser_action_row1227[] = {
+static int parser_action_row1221[] = {
        2,
-       -1, 3, 1226,
-       58, 0, 1299
+       -1, 3, 1220,
+       58, 0, 1293
 };
-static int parser_action_row1228[] = {
+static int parser_action_row1222[] = {
        1,
        -1, 1, 143
 };
-static int parser_action_row1229[] = {
+static int parser_action_row1223[] = {
        2,
-       -1, 3, 1228,
-       15, 0, 1300
+       -1, 3, 1222,
+       15, 0, 1294
 };
-static int parser_action_row1230[] = {
+static int parser_action_row1224[] = {
        32,
-       -1, 3, 1229,
+       -1, 3, 1223,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -12738,106 +12697,106 @@ static int parser_action_row1230[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1231[] = {
+static int parser_action_row1225[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1232[] = {
+static int parser_action_row1226[] = {
        2,
        -1, 1, 123,
-       58, 0, 1303
+       58, 0, 1297
 };
-static int parser_action_row1233[] = {
+static int parser_action_row1227[] = {
        7,
        -1, 1, 121,
-       13, 0, 1145,
+       13, 0, 1139,
        17, 1, 166,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31,
-       58, 0, 1304
+       58, 0, 1298
 };
-static int parser_action_row1234[] = {
+static int parser_action_row1228[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1235[] = {
+static int parser_action_row1229[] = {
        2,
        -1, 1, 95,
-       58, 0, 1307
+       58, 0, 1301
 };
-static int parser_action_row1236[] = {
+static int parser_action_row1230[] = {
        2,
-       -1, 3, 1235,
-       14, 0, 1308
+       -1, 3, 1229,
+       14, 0, 1302
 };
-static int parser_action_row1237[] = {
+static int parser_action_row1231[] = {
        2,
-       -1, 3, 1236,
-       20, 0, 1309
+       -1, 3, 1230,
+       20, 0, 1303
 };
-static int parser_action_row1238[] = {
+static int parser_action_row1232[] = {
        3,
        -1, 1, 89,
        56, 0, 279,
-       58, 0, 1310
+       58, 0, 1304
 };
-static int parser_action_row1239[] = {
+static int parser_action_row1233[] = {
        2,
-       -1, 3, 1238,
-       81, 0, 1312
+       -1, 3, 1232,
+       81, 0, 1306
 };
-static int parser_action_row1240[] = {
+static int parser_action_row1234[] = {
        3,
        -1, 1, 92,
        56, 0, 279,
-       58, 0, 1313
+       58, 0, 1307
 };
-static int parser_action_row1241[] = {
+static int parser_action_row1235[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1242[] = {
+static int parser_action_row1236[] = {
        2,
        -1, 1, 96,
-       58, 0, 1316
+       58, 0, 1310
 };
-static int parser_action_row1243[] = {
+static int parser_action_row1237[] = {
        3,
        -1, 1, 91,
        56, 0, 279,
-       58, 0, 1317
+       58, 0, 1311
 };
-static int parser_action_row1244[] = {
+static int parser_action_row1238[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1245[] = {
+static int parser_action_row1239[] = {
        2,
        -1, 1, 98,
-       58, 0, 1320
+       58, 0, 1314
 };
-static int parser_action_row1246[] = {
+static int parser_action_row1240[] = {
        4,
-       -1, 3, 1245,
-       5, 0, 1321,
-       19, 0, 1322,
-       20, 0, 1323
+       -1, 3, 1239,
+       5, 0, 1315,
+       19, 0, 1316,
+       20, 0, 1317
 };
-static int parser_action_row1247[] = {
+static int parser_action_row1241[] = {
        32,
-       -1, 3, 1246,
+       -1, 3, 1240,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -12867,18 +12826,18 @@ static int parser_action_row1247[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1248[] = {
+static int parser_action_row1242[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1249[] = {
+static int parser_action_row1243[] = {
        32,
-       -1, 3, 1248,
+       -1, 3, 1242,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -12908,29 +12867,29 @@ static int parser_action_row1249[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1250[] = {
+static int parser_action_row1244[] = {
        2,
        -1, 1, 134,
-       9, 0, 1327
+       9, 0, 1321
 };
-static int parser_action_row1251[] = {
+static int parser_action_row1245[] = {
        1,
        -1, 1, 189
 };
-static int parser_action_row1252[] = {
+static int parser_action_row1246[] = {
        3,
        -1, 1, 191,
-       36, 0, 599,
-       78, 0, 600
+       36, 0, 601,
+       78, 0, 602
 };
-static int parser_action_row1253[] = {
+static int parser_action_row1247[] = {
        2,
-       -1, 3, 1252,
-       17, 0, 1328
+       -1, 3, 1246,
+       17, 0, 1322
 };
-static int parser_action_row1254[] = {
+static int parser_action_row1248[] = {
        23,
-       -1, 3, 1253,
+       -1, 3, 1247,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12954,30 +12913,30 @@ static int parser_action_row1254[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1255[] = {
+static int parser_action_row1249[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1256[] = {
+static int parser_action_row1250[] = {
        1,
        -1, 1, 164
 };
-static int parser_action_row1257[] = {
+static int parser_action_row1251[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1258[] = {
+static int parser_action_row1252[] = {
        2,
        -1, 1, 124,
-       58, 0, 1332
+       58, 0, 1326
 };
-static int parser_action_row1259[] = {
+static int parser_action_row1253[] = {
        23,
-       -1, 3, 1258,
+       -1, 3, 1252,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13001,36 +12960,36 @@ static int parser_action_row1259[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1260[] = {
+static int parser_action_row1254[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1261[] = {
+static int parser_action_row1255[] = {
        2,
-       -1, 3, 1260,
-       20, 0, 1335
+       -1, 3, 1254,
+       20, 0, 1329
 };
-static int parser_action_row1262[] = {
+static int parser_action_row1256[] = {
        3,
        -1, 1, 144,
-       3, 0, 852,
-       85, 0, 1336
+       3, 0, 847,
+       85, 0, 1330
 };
-static int parser_action_row1263[] = {
+static int parser_action_row1257[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1264[] = {
+static int parser_action_row1258[] = {
        1,
        -1, 1, 393
 };
-static int parser_action_row1265[] = {
+static int parser_action_row1259[] = {
        21,
-       -1, 3, 1264,
+       -1, 3, 1258,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -13052,42 +13011,42 @@ static int parser_action_row1265[] = {
        85, 0, 122,
        86, 0, 56
 };
-static int parser_action_row1266[] = {
+static int parser_action_row1260[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1267[] = {
+static int parser_action_row1261[] = {
        1,
-       -1, 1, 653
+       -1, 1, 652
 };
-static int parser_action_row1268[] = {
+static int parser_action_row1262[] = {
        1,
-       -1, 1, 560
+       -1, 1, 559
 };
-static int parser_action_row1269[] = {
+static int parser_action_row1263[] = {
        2,
-       -1, 3, 1268,
-       26, 0, 1341
+       -1, 3, 1262,
+       26, 0, 1335
 };
-static int parser_action_row1270[] = {
+static int parser_action_row1264[] = {
        1,
-       -1, 1, 577
+       -1, 1, 576
 };
-static int parser_action_row1271[] = {
+static int parser_action_row1265[] = {
        2,
-       -1, 3, 1270,
+       -1, 3, 1264,
        50, 0, 172
 };
-static int parser_action_row1272[] = {
+static int parser_action_row1266[] = {
        2,
-       -1, 3, 1271,
-       30, 0, 1343
+       -1, 3, 1265,
+       30, 0, 1337
 };
-static int parser_action_row1273[] = {
+static int parser_action_row1267[] = {
        23,
-       -1, 3, 1272,
+       -1, 3, 1266,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13111,9 +13070,9 @@ static int parser_action_row1273[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1274[] = {
+static int parser_action_row1268[] = {
        23,
-       -1, 3, 1273,
+       -1, 3, 1267,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13137,9 +13096,9 @@ static int parser_action_row1274[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1275[] = {
+static int parser_action_row1269[] = {
        23,
-       -1, 3, 1274,
+       -1, 3, 1268,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13163,21 +13122,21 @@ static int parser_action_row1275[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1276[] = {
+static int parser_action_row1270[] = {
        1,
-       -1, 1, 539
+       -1, 1, 538
 };
-static int parser_action_row1277[] = {
+static int parser_action_row1271[] = {
        1,
-       -1, 1, 561
+       -1, 1, 560
 };
-static int parser_action_row1278[] = {
+static int parser_action_row1272[] = {
        1,
-       -1, 1, 566
+       -1, 1, 565
 };
-static int parser_action_row1279[] = {
+static int parser_action_row1273[] = {
        32,
-       -1, 3, 1278,
+       -1, 3, 1272,
        0, 0, 1,
        1, 0, 2,
        9, 0, 137,
@@ -13210,13 +13169,13 @@ static int parser_action_row1279[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1280[] = {
+static int parser_action_row1274[] = {
        1,
        -1, 1, 324
 };
-static int parser_action_row1281[] = {
+static int parser_action_row1275[] = {
        23,
-       -1, 3, 1280,
+       -1, 3, 1274,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13240,113 +13199,113 @@ static int parser_action_row1281[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1282[] = {
+static int parser_action_row1276[] = {
        2,
        -1, 1, 277,
-       26, 1, 548
+       26, 1, 547
 };
-static int parser_action_row1283[] = {
+static int parser_action_row1277[] = {
        1,
-       -1, 1, 554
+       -1, 1, 553
 };
-static int parser_action_row1284[] = {
+static int parser_action_row1278[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1285[] = {
+static int parser_action_row1279[] = {
        2,
-       -1, 3, 1284,
-       80, 0, 1351
+       -1, 3, 1278,
+       80, 0, 1345
 };
-static int parser_action_row1286[] = {
+static int parser_action_row1280[] = {
        2,
-       -1, 1, 491,
-       63, 1, 493
+       -1, 1, 490,
+       63, 1, 492
 };
-static int parser_action_row1287[] = {
+static int parser_action_row1281[] = {
        1,
-       -1, 1, 464
+       -1, 1, 463
 };
-static int parser_action_row1288[] = {
+static int parser_action_row1282[] = {
        1,
-       -1, 1, 499
+       -1, 1, 498
 };
-static int parser_action_row1289[] = {
+static int parser_action_row1283[] = {
        2,
-       -1, 3, 1288,
-       51, 0, 1352
+       -1, 3, 1282,
+       51, 0, 1346
 };
-static int parser_action_row1290[] = {
+static int parser_action_row1284[] = {
        1,
-       -1, 1, 495
+       -1, 1, 494
 };
-static int parser_action_row1291[] = {
+static int parser_action_row1285[] = {
        1,
        -1, 1, 222
 };
-static int parser_action_row1292[] = {
+static int parser_action_row1286[] = {
        20,
-       -1, 3, 1291,
-       42, 0, 1106,
+       -1, 3, 1285,
+       42, 0, 1100,
        48, 0, 328,
-       53, 0, 348,
-       64, 0, 349,
-       65, 0, 350,
-       66, 0, 351,
-       67, 0, 352,
-       68, 0, 353,
-       69, 0, 354,
-       70, 0, 355,
-       71, 0, 356,
-       72, 0, 357,
-       73, 0, 358,
-       74, 0, 359,
-       75, 0, 360,
-       76, 0, 361,
-       77, 0, 362,
-       79, 0, 1107,
-       80, 0, 363
+       53, 0, 349,
+       64, 0, 350,
+       65, 0, 351,
+       66, 0, 352,
+       67, 0, 353,
+       68, 0, 354,
+       69, 0, 355,
+       70, 0, 356,
+       71, 0, 357,
+       72, 0, 358,
+       73, 0, 359,
+       74, 0, 360,
+       75, 0, 361,
+       76, 0, 362,
+       77, 0, 363,
+       79, 0, 1101,
+       80, 0, 364
 };
-static int parser_action_row1293[] = {
+static int parser_action_row1287[] = {
        1,
-       -1, 1, 733
+       -1, 1, 732
 };
-static int parser_action_row1294[] = {
+static int parser_action_row1288[] = {
        4,
-       -1, 3, 1293,
-       33, 0, 1354,
-       48, 0, 1355,
-       51, 0, 1356
+       -1, 3, 1287,
+       33, 0, 1348,
+       48, 0, 1349,
+       51, 0, 1350
 };
-static int parser_action_row1295[] = {
+static int parser_action_row1289[] = {
        1,
        -1, 1, 211
 };
-static int parser_action_row1296[] = {
+static int parser_action_row1290[] = {
        3,
-       -1, 3, 1295,
+       -1, 3, 1289,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1297[] = {
+static int parser_action_row1291[] = {
        1,
        -1, 1, 212
 };
-static int parser_action_row1298[] = {
+static int parser_action_row1292[] = {
        4,
-       -1, 3, 1297,
-       5, 0, 1358,
-       19, 0, 1359,
-       20, 0, 1360
+       -1, 3, 1291,
+       5, 0, 1352,
+       19, 0, 1353,
+       20, 0, 1354
 };
-static int parser_action_row1299[] = {
+static int parser_action_row1293[] = {
        32,
-       -1, 3, 1298,
+       -1, 3, 1292,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -13376,18 +13335,18 @@ static int parser_action_row1299[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1300[] = {
+static int parser_action_row1294[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1301[] = {
+static int parser_action_row1295[] = {
        32,
-       -1, 3, 1300,
+       -1, 3, 1294,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 462,
+       9, 0, 464,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -13417,14 +13376,14 @@ static int parser_action_row1301[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1302[] = {
+static int parser_action_row1296[] = {
        2,
        -1, 1, 135,
-       9, 0, 1364
+       9, 0, 1358
 };
-static int parser_action_row1303[] = {
+static int parser_action_row1297[] = {
        23,
-       -1, 3, 1302,
+       -1, 3, 1296,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13448,26 +13407,26 @@ static int parser_action_row1303[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1304[] = {
+static int parser_action_row1298[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1305[] = {
+static int parser_action_row1299[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1306[] = {
+static int parser_action_row1300[] = {
        2,
        -1, 1, 125,
-       58, 0, 1368
+       58, 0, 1362
 };
-static int parser_action_row1307[] = {
+static int parser_action_row1301[] = {
        23,
-       -1, 3, 1306,
+       -1, 3, 1300,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13491,54 +13450,54 @@ static int parser_action_row1307[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1308[] = {
+static int parser_action_row1302[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1309[] = {
+static int parser_action_row1303[] = {
        2,
-       -1, 3, 1308,
-       20, 0, 1371
+       -1, 3, 1302,
+       20, 0, 1365
 };
-static int parser_action_row1310[] = {
+static int parser_action_row1304[] = {
        3,
        -1, 1, 145,
-       3, 0, 852,
-       85, 0, 1372
+       3, 0, 847,
+       85, 0, 1366
 };
-static int parser_action_row1311[] = {
+static int parser_action_row1305[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1312[] = {
+static int parser_action_row1306[] = {
        2,
        -1, 1, 97,
-       58, 0, 1375
+       58, 0, 1369
 };
-static int parser_action_row1313[] = {
+static int parser_action_row1307[] = {
        3,
        -1, 1, 93,
        56, 0, 279,
-       58, 0, 1376
+       58, 0, 1370
 };
-static int parser_action_row1314[] = {
+static int parser_action_row1308[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1315[] = {
+static int parser_action_row1309[] = {
        2,
        -1, 1, 100,
-       58, 0, 1379
+       58, 0, 1373
 };
-static int parser_action_row1316[] = {
+static int parser_action_row1310[] = {
        23,
-       -1, 3, 1315,
+       -1, 3, 1309,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13562,26 +13521,26 @@ static int parser_action_row1316[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1317[] = {
+static int parser_action_row1311[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1318[] = {
+static int parser_action_row1312[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1319[] = {
+static int parser_action_row1313[] = {
        2,
        -1, 1, 99,
-       58, 0, 1383
+       58, 0, 1377
 };
-static int parser_action_row1320[] = {
+static int parser_action_row1314[] = {
        23,
-       -1, 3, 1319,
+       -1, 3, 1313,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13605,34 +13564,34 @@ static int parser_action_row1320[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1321[] = {
+static int parser_action_row1315[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1322[] = {
+static int parser_action_row1316[] = {
        1,
        -1, 1, 74
 };
-static int parser_action_row1323[] = {
+static int parser_action_row1317[] = {
        1,
        -1, 1, 76
 };
-static int parser_action_row1324[] = {
+static int parser_action_row1318[] = {
        3,
        -1, 1, 78,
-       3, 0, 852,
-       85, 0, 1386
+       3, 0, 847,
+       85, 0, 1380
 };
-static int parser_action_row1325[] = {
+static int parser_action_row1319[] = {
        2,
        -1, 1, 68,
-       9, 0, 1388
+       9, 0, 1382
 };
-static int parser_action_row1326[] = {
+static int parser_action_row1320[] = {
        23,
-       -1, 3, 1325,
+       -1, 3, 1319,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13656,26 +13615,26 @@ static int parser_action_row1326[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1327[] = {
+static int parser_action_row1321[] = {
        2,
        -1, 1, 136,
-       9, 0, 1390
+       9, 0, 1384
 };
-static int parser_action_row1328[] = {
+static int parser_action_row1322[] = {
        1,
        -1, 1, 138
 };
-static int parser_action_row1329[] = {
+static int parser_action_row1323[] = {
        1,
        -1, 1, 165
 };
-static int parser_action_row1330[] = {
+static int parser_action_row1324[] = {
        1,
        -1, 1, 126
 };
-static int parser_action_row1331[] = {
+static int parser_action_row1325[] = {
        23,
-       -1, 3, 1330,
+       -1, 3, 1324,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13699,9 +13658,9 @@ static int parser_action_row1331[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1332[] = {
+static int parser_action_row1326[] = {
        23,
-       -1, 3, 1331,
+       -1, 3, 1325,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13725,19 +13684,19 @@ static int parser_action_row1332[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1333[] = {
+static int parser_action_row1327[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1334[] = {
+static int parser_action_row1328[] = {
        1,
        -1, 1, 102
 };
-static int parser_action_row1335[] = {
+static int parser_action_row1329[] = {
        23,
-       -1, 3, 1334,
+       -1, 3, 1328,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13761,55 +13720,55 @@ static int parser_action_row1335[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1336[] = {
+static int parser_action_row1330[] = {
        3,
        -1, 1, 146,
-       3, 0, 852,
-       85, 0, 1395
+       3, 0, 847,
+       85, 0, 1389
 };
-static int parser_action_row1337[] = {
+static int parser_action_row1331[] = {
        2,
        -1, 1, 148,
-       3, 0, 852
+       3, 0, 847
 };
-static int parser_action_row1338[] = {
+static int parser_action_row1332[] = {
        1,
        -1, 1, 152
 };
-static int parser_action_row1339[] = {
+static int parser_action_row1333[] = {
        2,
-       -1, 3, 1338,
-       52, 0, 1398
+       -1, 3, 1332,
+       52, 0, 1392
 };
-static int parser_action_row1340[] = {
+static int parser_action_row1334[] = {
        1,
-       -1, 1, 601
+       -1, 1, 600
 };
-static int parser_action_row1341[] = {
+static int parser_action_row1335[] = {
        2,
-       -1, 3, 1340,
-       52, 0, 1399
+       -1, 3, 1334,
+       52, 0, 1393
 };
-static int parser_action_row1342[] = {
+static int parser_action_row1336[] = {
        32,
-       -1, 3, 1341,
+       -1, 3, 1335,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 1047,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 1041,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -13817,55 +13776,55 @@ static int parser_action_row1342[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1343[] = {
+static int parser_action_row1337[] = {
        2,
        -1, 1, 321,
-       26, 1, 576
+       26, 1, 575
 };
-static int parser_action_row1344[] = {
+static int parser_action_row1338[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1345[] = {
+static int parser_action_row1339[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1346[] = {
+static int parser_action_row1340[] = {
        1,
-       -1, 1, 563
+       -1, 1, 562
 };
-static int parser_action_row1347[] = {
+static int parser_action_row1341[] = {
        1,
-       -1, 1, 568
+       -1, 1, 567
 };
-static int parser_action_row1348[] = {
+static int parser_action_row1342[] = {
        1,
        -1, 1, 325
 };
-static int parser_action_row1349[] = {
+static int parser_action_row1343[] = {
        2,
-       -1, 3, 1348,
+       -1, 3, 1342,
        50, 0, 172
 };
-static int parser_action_row1350[] = {
+static int parser_action_row1344[] = {
        1,
        -1, 1, 337
 };
-static int parser_action_row1351[] = {
+static int parser_action_row1345[] = {
        23,
-       -1, 3, 1350,
+       -1, 3, 1344,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13889,63 +13848,63 @@ static int parser_action_row1351[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1352[] = {
+static int parser_action_row1346[] = {
        2,
-       -1, 1, 405,
+       -1, 1, 404,
        51, 0, 239
 };
-static int parser_action_row1353[] = {
+static int parser_action_row1347[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1354[] = {
+static int parser_action_row1348[] = {
        1,
        -1, 1, 217
 };
-static int parser_action_row1355[] = {
+static int parser_action_row1349[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1356[] = {
+static int parser_action_row1350[] = {
        1,
        -1, 1, 225
 };
-static int parser_action_row1357[] = {
+static int parser_action_row1351[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1358[] = {
+static int parser_action_row1352[] = {
        1,
        -1, 1, 213
 };
-static int parser_action_row1359[] = {
+static int parser_action_row1353[] = {
        1,
        -1, 1, 75
 };
-static int parser_action_row1360[] = {
+static int parser_action_row1354[] = {
        1,
        -1, 1, 77
 };
-static int parser_action_row1361[] = {
+static int parser_action_row1355[] = {
        3,
        -1, 1, 79,
-       3, 0, 852,
-       85, 0, 1409
+       3, 0, 847,
+       85, 0, 1403
 };
-static int parser_action_row1362[] = {
+static int parser_action_row1356[] = {
        2,
        -1, 1, 69,
-       9, 0, 1411
+       9, 0, 1405
 };
-static int parser_action_row1363[] = {
+static int parser_action_row1357[] = {
        23,
-       -1, 3, 1362,
+       -1, 3, 1356,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13969,22 +13928,22 @@ static int parser_action_row1363[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1364[] = {
+static int parser_action_row1358[] = {
        2,
        -1, 1, 137,
-       9, 0, 1413
+       9, 0, 1407
 };
-static int parser_action_row1365[] = {
+static int parser_action_row1359[] = {
        1,
        -1, 1, 139
 };
-static int parser_action_row1366[] = {
+static int parser_action_row1360[] = {
        1,
        -1, 1, 127
 };
-static int parser_action_row1367[] = {
+static int parser_action_row1361[] = {
        23,
-       -1, 3, 1366,
+       -1, 3, 1360,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14008,9 +13967,9 @@ static int parser_action_row1367[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1368[] = {
+static int parser_action_row1362[] = {
        23,
-       -1, 3, 1367,
+       -1, 3, 1361,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14034,19 +13993,19 @@ static int parser_action_row1368[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1369[] = {
+static int parser_action_row1363[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1370[] = {
+static int parser_action_row1364[] = {
        1,
        -1, 1, 103
 };
-static int parser_action_row1371[] = {
+static int parser_action_row1365[] = {
        23,
-       -1, 3, 1370,
+       -1, 3, 1364,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14070,24 +14029,24 @@ static int parser_action_row1371[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1372[] = {
+static int parser_action_row1366[] = {
        3,
        -1, 1, 147,
-       3, 0, 852,
-       85, 0, 1418
+       3, 0, 847,
+       85, 0, 1412
 };
-static int parser_action_row1373[] = {
+static int parser_action_row1367[] = {
        2,
        -1, 1, 149,
-       3, 0, 852
+       3, 0, 847
 };
-static int parser_action_row1374[] = {
+static int parser_action_row1368[] = {
        1,
        -1, 1, 153
 };
-static int parser_action_row1375[] = {
+static int parser_action_row1369[] = {
        23,
-       -1, 3, 1374,
+       -1, 3, 1368,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14111,26 +14070,26 @@ static int parser_action_row1375[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1376[] = {
+static int parser_action_row1370[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1377[] = {
+static int parser_action_row1371[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1378[] = {
+static int parser_action_row1372[] = {
        2,
        -1, 1, 101,
-       58, 0, 1424
+       58, 0, 1418
 };
-static int parser_action_row1379[] = {
+static int parser_action_row1373[] = {
        23,
-       -1, 3, 1378,
+       -1, 3, 1372,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14154,19 +14113,19 @@ static int parser_action_row1379[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1380[] = {
+static int parser_action_row1374[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1381[] = {
+static int parser_action_row1375[] = {
        1,
        -1, 1, 104
 };
-static int parser_action_row1382[] = {
+static int parser_action_row1376[] = {
        23,
-       -1, 3, 1381,
+       -1, 3, 1375,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14190,9 +14149,9 @@ static int parser_action_row1382[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1383[] = {
+static int parser_action_row1377[] = {
        23,
-       -1, 3, 1382,
+       -1, 3, 1376,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14216,19 +14175,19 @@ static int parser_action_row1383[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1384[] = {
+static int parser_action_row1378[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1385[] = {
+static int parser_action_row1379[] = {
        1,
        -1, 1, 106
 };
-static int parser_action_row1386[] = {
+static int parser_action_row1380[] = {
        23,
-       -1, 3, 1385,
+       -1, 3, 1379,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14252,38 +14211,38 @@ static int parser_action_row1386[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1387[] = {
+static int parser_action_row1381[] = {
        2,
        -1, 1, 80,
-       3, 0, 852
+       3, 0, 847
 };
-static int parser_action_row1388[] = {
+static int parser_action_row1382[] = {
        1,
        -1, 1, 82
 };
-static int parser_action_row1389[] = {
+static int parser_action_row1383[] = {
        1,
        -1, 1, 70
 };
-static int parser_action_row1390[] = {
+static int parser_action_row1384[] = {
        1,
        -1, 1, 72
 };
-static int parser_action_row1391[] = {
+static int parser_action_row1385[] = {
        1,
        -1, 1, 140
 };
-static int parser_action_row1392[] = {
+static int parser_action_row1386[] = {
        1,
        -1, 1, 130
 };
-static int parser_action_row1393[] = {
+static int parser_action_row1387[] = {
        1,
        -1, 1, 128
 };
-static int parser_action_row1394[] = {
+static int parser_action_row1388[] = {
        23,
-       -1, 3, 1393,
+       -1, 3, 1387,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14307,38 +14266,38 @@ static int parser_action_row1394[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1395[] = {
+static int parser_action_row1389[] = {
        1,
        -1, 1, 110
 };
-static int parser_action_row1396[] = {
+static int parser_action_row1390[] = {
        2,
        -1, 1, 150,
-       3, 0, 852
+       3, 0, 847
 };
-static int parser_action_row1397[] = {
+static int parser_action_row1391[] = {
        1,
        -1, 1, 154
 };
-static int parser_action_row1398[] = {
+static int parser_action_row1392[] = {
        1,
        -1, 1, 156
 };
-static int parser_action_row1399[] = {
+static int parser_action_row1393[] = {
        1,
        -1, 1, 394
 };
-static int parser_action_row1400[] = {
+static int parser_action_row1394[] = {
        1,
-       -1, 1, 654
+       -1, 1, 653
 };
-static int parser_action_row1401[] = {
+static int parser_action_row1395[] = {
        1,
-       -1, 1, 573
+       -1, 1, 572
 };
-static int parser_action_row1402[] = {
+static int parser_action_row1396[] = {
        23,
-       -1, 3, 1401,
+       -1, 3, 1395,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14362,75 +14321,75 @@ static int parser_action_row1402[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1403[] = {
+static int parser_action_row1397[] = {
        2,
-       -1, 3, 1402,
-       15, 0, 1435
+       -1, 3, 1396,
+       15, 0, 1429
 };
-static int parser_action_row1404[] = {
+static int parser_action_row1398[] = {
        1,
        -1, 1, 323
 };
-static int parser_action_row1405[] = {
+static int parser_action_row1399[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1406[] = {
+static int parser_action_row1400[] = {
        1,
-       -1, 1, 501
+       -1, 1, 500
 };
-static int parser_action_row1407[] = {
+static int parser_action_row1401[] = {
        4,
-       -1, 3, 1406,
-       33, 0, 1437,
+       -1, 3, 1400,
+       33, 0, 1431,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row1408[] = {
+static int parser_action_row1402[] = {
        2,
-       -1, 3, 1407,
-       48, 0, 1439
+       -1, 3, 1401,
+       48, 0, 1433
 };
-static int parser_action_row1409[] = {
+static int parser_action_row1403[] = {
        3,
-       -1, 3, 1408,
+       -1, 3, 1402,
        48, 0, 328,
        79, 0, 329
 };
-static int parser_action_row1410[] = {
+static int parser_action_row1404[] = {
        2,
        -1, 1, 81,
-       3, 0, 852
+       3, 0, 847
 };
-static int parser_action_row1411[] = {
+static int parser_action_row1405[] = {
        1,
        -1, 1, 83
 };
-static int parser_action_row1412[] = {
+static int parser_action_row1406[] = {
        1,
        -1, 1, 71
 };
-static int parser_action_row1413[] = {
+static int parser_action_row1407[] = {
        1,
        -1, 1, 73
 };
-static int parser_action_row1414[] = {
+static int parser_action_row1408[] = {
        1,
        -1, 1, 141
 };
-static int parser_action_row1415[] = {
+static int parser_action_row1409[] = {
        1,
        -1, 1, 131
 };
-static int parser_action_row1416[] = {
+static int parser_action_row1410[] = {
        1,
        -1, 1, 129
 };
-static int parser_action_row1417[] = {
+static int parser_action_row1411[] = {
        23,
-       -1, 3, 1416,
+       -1, 3, 1410,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14454,30 +14413,30 @@ static int parser_action_row1417[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1418[] = {
+static int parser_action_row1412[] = {
        1,
        -1, 1, 111
 };
-static int parser_action_row1419[] = {
+static int parser_action_row1413[] = {
        2,
        -1, 1, 151,
-       3, 0, 852
+       3, 0, 847
 };
-static int parser_action_row1420[] = {
+static int parser_action_row1414[] = {
        1,
        -1, 1, 155
 };
-static int parser_action_row1421[] = {
+static int parser_action_row1415[] = {
        1,
        -1, 1, 157
 };
-static int parser_action_row1422[] = {
+static int parser_action_row1416[] = {
        1,
        -1, 1, 105
 };
-static int parser_action_row1423[] = {
+static int parser_action_row1417[] = {
        23,
-       -1, 3, 1422,
+       -1, 3, 1416,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14501,9 +14460,9 @@ static int parser_action_row1423[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1424[] = {
+static int parser_action_row1418[] = {
        23,
-       -1, 3, 1423,
+       -1, 3, 1417,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14527,19 +14486,19 @@ static int parser_action_row1424[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1425[] = {
+static int parser_action_row1419[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1426[] = {
+static int parser_action_row1420[] = {
        1,
        -1, 1, 108
 };
-static int parser_action_row1427[] = {
+static int parser_action_row1421[] = {
        23,
-       -1, 3, 1426,
+       -1, 3, 1420,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14563,17 +14522,17 @@ static int parser_action_row1427[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1428[] = {
+static int parser_action_row1422[] = {
        1,
        -1, 1, 112
 };
-static int parser_action_row1429[] = {
+static int parser_action_row1423[] = {
        1,
        -1, 1, 107
 };
-static int parser_action_row1430[] = {
+static int parser_action_row1424[] = {
        23,
-       -1, 3, 1429,
+       -1, 3, 1423,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14597,48 +14556,48 @@ static int parser_action_row1430[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1431[] = {
+static int parser_action_row1425[] = {
        1,
        -1, 1, 114
 };
-static int parser_action_row1432[] = {
+static int parser_action_row1426[] = {
        1,
        -1, 1, 84
 };
-static int parser_action_row1433[] = {
+static int parser_action_row1427[] = {
        1,
        -1, 1, 132
 };
-static int parser_action_row1434[] = {
+static int parser_action_row1428[] = {
        1,
        -1, 1, 158
 };
-static int parser_action_row1435[] = {
+static int parser_action_row1429[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1436[] = {
+static int parser_action_row1430[] = {
        32,
-       -1, 3, 1435,
+       -1, 3, 1429,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 755,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 750,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -14646,64 +14605,64 @@ static int parser_action_row1436[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1437[] = {
+static int parser_action_row1431[] = {
        2,
-       -1, 3, 1436,
-       26, 0, 1452
+       -1, 3, 1430,
+       26, 0, 1446
 };
-static int parser_action_row1438[] = {
+static int parser_action_row1432[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1439[] = {
+static int parser_action_row1433[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1440[] = {
+static int parser_action_row1434[] = {
        1,
        -1, 1, 226
 };
-static int parser_action_row1441[] = {
+static int parser_action_row1435[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1442[] = {
+static int parser_action_row1436[] = {
        1,
        -1, 1, 85
 };
-static int parser_action_row1443[] = {
+static int parser_action_row1437[] = {
        1,
        -1, 1, 133
 };
-static int parser_action_row1444[] = {
+static int parser_action_row1438[] = {
        1,
        -1, 1, 159
 };
-static int parser_action_row1445[] = {
+static int parser_action_row1439[] = {
        1,
        -1, 1, 113
 };
-static int parser_action_row1446[] = {
+static int parser_action_row1440[] = {
        1,
        -1, 1, 109
 };
-static int parser_action_row1447[] = {
+static int parser_action_row1441[] = {
        23,
-       -1, 3, 1446,
+       -1, 3, 1440,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -14727,73 +14686,73 @@ static int parser_action_row1447[] = {
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1448[] = {
+static int parser_action_row1442[] = {
        1,
        -1, 1, 116
 };
-static int parser_action_row1449[] = {
+static int parser_action_row1443[] = {
        1,
        -1, 1, 115
 };
-static int parser_action_row1450[] = {
+static int parser_action_row1444[] = {
        2,
-       -1, 3, 1449,
-       15, 0, 1457
+       -1, 3, 1443,
+       15, 0, 1451
 };
-static int parser_action_row1451[] = {
+static int parser_action_row1445[] = {
        1,
-       -1, 1, 581
+       -1, 1, 580
 };
-static int parser_action_row1452[] = {
+static int parser_action_row1446[] = {
        2,
-       -1, 3, 1451,
+       -1, 3, 1445,
        50, 0, 172
 };
-static int parser_action_row1453[] = {
+static int parser_action_row1447[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1454[] = {
+static int parser_action_row1448[] = {
        2,
-       -1, 3, 1453,
-       46, 0, 1460
+       -1, 3, 1447,
+       46, 0, 1454
 };
-static int parser_action_row1455[] = {
+static int parser_action_row1449[] = {
        2,
-       -1, 3, 1454,
-       52, 0, 1461
+       -1, 3, 1448,
+       52, 0, 1455
 };
-static int parser_action_row1456[] = {
+static int parser_action_row1450[] = {
        2,
-       -1, 3, 1455,
-       52, 0, 1462
+       -1, 3, 1449,
+       52, 0, 1456
 };
-static int parser_action_row1457[] = {
+static int parser_action_row1451[] = {
        1,
        -1, 1, 117
 };
-static int parser_action_row1458[] = {
+static int parser_action_row1452[] = {
        32,
-       -1, 3, 1457,
+       -1, 3, 1451,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 755,
-       12, 0, 642,
-       15, 0, 643,
-       18, 0, 644,
-       24, 0, 645,
-       27, 0, 647,
-       28, 0, 648,
-       29, 0, 649,
-       34, 0, 650,
-       35, 0, 651,
-       36, 0, 652,
-       37, 0, 653,
-       38, 0, 654,
+       9, 0, 750,
+       12, 0, 641,
+       15, 0, 642,
+       18, 0, 643,
+       24, 0, 644,
+       27, 0, 646,
+       28, 0, 647,
+       29, 0, 648,
+       34, 0, 649,
+       35, 0, 650,
+       36, 0, 651,
+       37, 0, 652,
+       38, 0, 653,
        39, 0, 41,
-       42, 0, 655,
+       42, 0, 654,
        43, 0, 43,
        44, 0, 44,
        45, 0, 45,
@@ -14801,84 +14760,84 @@ static int parser_action_row1458[] = {
        51, 0, 47,
        53, 0, 48,
        79, 0, 49,
-       80, 0, 656,
-       81, 0, 657,
+       80, 0, 655,
+       81, 0, 656,
        82, 0, 52,
        83, 0, 53,
        84, 0, 54,
        85, 0, 55,
        86, 0, 56
 };
-static int parser_action_row1459[] = {
+static int parser_action_row1453[] = {
        2,
        -1, 1, 324,
-       26, 1, 579
+       26, 1, 578
 };
-static int parser_action_row1460[] = {
+static int parser_action_row1454[] = {
        22,
-       -1, 3, 1459,
-       12, 0, 807,
-       24, 0, 808,
-       33, 0, 809,
-       39, 0, 810,
-       41, 0, 811,
-       42, 0, 812,
-       43, 0, 813,
-       44, 0, 814,
-       45, 0, 815,
-       46, 0, 816,
-       49, 0, 817,
-       51, 0, 818,
-       65, 0, 819,
+       -1, 3, 1453,
+       12, 0, 802,
+       24, 0, 803,
+       33, 0, 804,
+       39, 0, 805,
+       41, 0, 806,
+       42, 0, 807,
+       43, 0, 808,
+       44, 0, 809,
+       45, 0, 810,
+       46, 0, 811,
+       49, 0, 812,
+       51, 0, 813,
+       65, 0, 814,
        79, 0, 49,
-       80, 0, 820,
-       81, 0, 821,
-       82, 0, 822,
-       83, 0, 823,
-       84, 0, 824,
-       85, 0, 825,
+       80, 0, 815,
+       81, 0, 816,
+       82, 0, 817,
+       83, 0, 818,
+       84, 0, 819,
+       85, 0, 820,
        86, 0, 56
 };
-static int parser_action_row1461[] = {
+static int parser_action_row1455[] = {
        3,
-       -1, 1, 430,
+       -1, 1, 429,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1462[] = {
+static int parser_action_row1456[] = {
        1,
-       -1, 1, 512
+       -1, 1, 511
 };
-static int parser_action_row1463[] = {
+static int parser_action_row1457[] = {
        1,
        -1, 1, 224
 };
-static int parser_action_row1464[] = {
+static int parser_action_row1458[] = {
        1,
-       -1, 1, 580
+       -1, 1, 579
 };
-static int parser_action_row1465[] = {
+static int parser_action_row1459[] = {
        2,
-       -1, 3, 1464,
+       -1, 3, 1458,
        50, 0, 172
 };
-static int parser_action_row1466[] = {
+static int parser_action_row1460[] = {
        1,
-       -1, 1, 460
+       -1, 1, 459
 };
-static int parser_action_row1467[] = {
+static int parser_action_row1461[] = {
        2,
-       -1, 3, 1466,
-       52, 0, 1468
+       -1, 3, 1460,
+       52, 0, 1462
 };
-static int parser_action_row1468[] = {
+static int parser_action_row1462[] = {
        2,
        -1, 1, 323,
-       26, 1, 578
+       26, 1, 577
 };
-static int parser_action_row1469[] = {
+static int parser_action_row1463[] = {
        1,
-       -1, 1, 513
+       -1, 1, 512
 };
 
 const int* const parser_action_table[] = {
@@ -16344,13 +16303,7 @@ const int* const parser_action_table[] = {
        parser_action_row1460,
        parser_action_row1461,
        parser_action_row1462,
-       parser_action_row1463,
-       parser_action_row1464,
-       parser_action_row1465,
-       parser_action_row1466,
-       parser_action_row1467,
-       parser_action_row1468,
-       parser_action_row1469
+       parser_action_row1463
 };
 
 static int parser_goto_row1[] = {
@@ -16383,8 +16336,8 @@ static int parser_goto_row4[] = {
        97, 231,
        98, 233,
        100, 234,
-       225, 379,
-       232, 381
+       225, 380,
+       232, 382
 };
 static int parser_goto_row5[] = {
        1,
@@ -16405,286 +16358,286 @@ static int parser_goto_row7[] = {
 };
 static int parser_goto_row8[] = {
        2,
-       -1, 605,
-       532, 635
+       -1, 607,
+       535, 634
 };
 static int parser_goto_row9[] = {
        2,
-       -1, 1000,
-       1002, 1120
+       -1, 994,
+       996, 1114
 };
 static int parser_goto_row10[] = {
        2,
-       -1, 863,
-       1118, 1223
+       -1, 858,
+       1112, 1217
 };
 static int parser_goto_row11[] = {
        5,
-       -1, 606,
-       610, 727,
-       637, 727,
-       715, 727,
-       748, 727
+       -1, 608,
+       612, 725,
+       636, 725,
+       713, 725,
+       743, 725
 };
 static int parser_goto_row12[] = {
        9,
-       -1, 607,
-       611, 730,
-       638, 730,
-       716, 730,
-       729, 730,
-       749, 730,
-       752, 730,
-       866, 730,
-       899, 730
+       -1, 609,
+       613, 728,
+       637, 728,
+       714, 728,
+       727, 728,
+       744, 728,
+       747, 728,
+       861, 728,
+       893, 728
 };
 static int parser_goto_row13[] = {
        1,
-       -1, 608
+       -1, 610
 };
 static int parser_goto_row14[] = {
        1,
-       -1, 724
+       -1, 722
 };
 static int parser_goto_row15[] = {
        2,
-       -1, 725,
-       724, 874
+       -1, 723,
+       722, 869
 };
 static int parser_goto_row16[] = {
        4,
-       -1, 1147,
-       1127, 1231,
-       1149, 1257,
-       1232, 1305
+       -1, 1141,
+       1121, 1225,
+       1143, 1251,
+       1226, 1299
 };
 static int parser_goto_row17[] = {
        19,
-       -1, 726,
+       -1, 724,
        10, 57,
        20, 57,
        26, 136,
        88, 227,
        91, 230,
-       229, 380,
-       720, 871,
-       724, 875,
-       725, 877,
-       873, 1013,
-       874, 1015,
-       876, 1017,
-       1014, 1132,
-       1025, 1148,
-       1127, 1148,
-       1145, 1252,
-       1149, 1148,
-       1232, 1148
+       229, 381,
+       718, 866,
+       722, 870,
+       723, 872,
+       868, 1007,
+       869, 1009,
+       871, 1011,
+       1008, 1126,
+       1019, 1142,
+       1121, 1142,
+       1139, 1246,
+       1143, 1142,
+       1226, 1142
 };
 static int parser_goto_row18[] = {
        10,
-       -1, 1108,
-       203, 364,
-       273, 416,
-       878, 1019,
-       880, 1021,
-       882, 1027,
-       1007, 1123,
-       1009, 1125,
-       1011, 1129,
-       1214, 1290
+       -1, 1102,
+       203, 365,
+       273, 418,
+       873, 1013,
+       875, 1015,
+       877, 1021,
+       1001, 1117,
+       1003, 1119,
+       1005, 1123,
+       1208, 1284
 };
 static int parser_goto_row19[] = {
        12,
-       -1, 481,
-       416, 530,
-       880, 1022,
-       882, 1028,
-       1009, 1126,
-       1011, 1130,
-       1019, 1137,
-       1021, 1140,
-       1027, 1152,
-       1123, 1225,
-       1125, 1228,
-       1129, 1235
+       -1, 484,
+       418, 533,
+       875, 1016,
+       877, 1022,
+       1003, 1120,
+       1005, 1124,
+       1013, 1131,
+       1015, 1134,
+       1021, 1146,
+       1117, 1219,
+       1119, 1222,
+       1123, 1229
 };
 static int parser_goto_row20[] = {
        2,
-       -1, 857,
-       856, 993
+       -1, 852,
+       851, 987
 };
 static int parser_goto_row21[] = {
        7,
-       -1, 1023,
-       364, 482,
-       416, 482,
-       710, 858,
-       856, 858,
-       1019, 482,
-       1123, 482
+       -1, 1017,
+       365, 485,
+       418, 485,
+       708, 853,
+       851, 853,
+       1013, 485,
+       1117, 485
 };
 static int parser_goto_row22[] = {
        2,
-       -1, 849,
-       851, 989
+       -1, 844,
+       846, 983
 };
 static int parser_goto_row23[] = {
        2,
-       -1, 704,
-       987, 1104
+       -1, 702,
+       981, 1098
 };
 static int parser_goto_row24[] = {
        7,
-       -1, 483,
-       482, 594,
-       484, 597,
-       595, 707,
-       1023, 594,
-       1024, 1143,
-       1142, 1250
+       -1, 486,
+       485, 596,
+       487, 599,
+       597, 705,
+       1017, 596,
+       1018, 1137,
+       1136, 1244
 };
 static int parser_goto_row25[] = {
        2,
-       -1, 601,
-       602, 711
+       -1, 603,
+       604, 709
 };
 static int parser_goto_row26[] = {
        4,
-       -1, 860,
-       746, 896,
-       1325, 1389,
-       1362, 1412
+       -1, 855,
+       741, 890,
+       1319, 1383,
+       1356, 1406
 };
 static int parser_goto_row27[] = {
        16,
-       -1, 854,
-       744, 894,
-       853, 992,
-       893, 1035,
-       1261, 1337,
-       1309, 1373,
-       1323, 1387,
-       1335, 1396,
-       1336, 1397,
-       1360, 1410,
-       1371, 1419,
-       1372, 1420,
-       1386, 1431,
-       1395, 1433,
-       1409, 1441,
-       1418, 1443
+       -1, 849,
+       739, 888,
+       848, 986,
+       887, 1029,
+       1255, 1331,
+       1303, 1367,
+       1317, 1381,
+       1329, 1390,
+       1330, 1391,
+       1354, 1404,
+       1365, 1413,
+       1366, 1414,
+       1380, 1425,
+       1389, 1427,
+       1403, 1435,
+       1412, 1437
 };
 static int parser_goto_row28[] = {
        2,
-       -1, 1216,
-       1217, 1292
+       -1, 1210,
+       1211, 1286
 };
 static int parser_goto_row29[] = {
        2,
-       -1, 1109,
-       1291, 1353
+       -1, 1103,
+       1285, 1347
 };
 static int parser_goto_row30[] = {
        1,
-       -1, 1110
+       -1, 1104
 };
 static int parser_goto_row31[] = {
        1,
-       -1, 1111
+       -1, 1105
 };
 static int parser_goto_row32[] = {
        17,
-       -1, 687,
+       -1, 686,
        183, 330,
-       243, 388,
-       290, 429,
-       390, 504,
-       402, 513,
-       420, 535,
-       440, 553,
-       868, 1006,
-       872, 1012,
-       886, 1031,
-       892, 1034,
-       942, 1065,
-       991, 1112,
-       1291, 1112,
-       1406, 1438,
-       1408, 1440
+       243, 389,
+       290, 431,
+       391, 506,
+       404, 516,
+       422, 538,
+       442, 556,
+       863, 1000,
+       867, 1006,
+       881, 1025,
+       886, 1028,
+       936, 1059,
+       985, 1106,
+       1285, 1106,
+       1400, 1432,
+       1402, 1434
 };
 static int parser_goto_row33[] = {
        2,
-       -1, 688,
-       686, 800
+       -1, 687,
+       685, 795
 };
 static int parser_goto_row34[] = {
        2,
-       -1, 802,
-       803, 943
+       -1, 797,
+       798, 937
 };
 static int parser_goto_row35[] = {
        26,
-       -1, 1024,
+       -1, 1018,
        142, 281,
-       364, 484,
-       416, 484,
-       482, 595,
-       703, 847,
-       710, 859,
-       760, 908,
-       856, 859,
-       858, 997,
-       862, 998,
-       1019, 484,
-       1020, 1139,
-       1023, 1142,
-       1025, 1149,
-       1026, 1151,
-       1123, 484,
-       1124, 1227,
-       1127, 1232,
-       1128, 1234,
-       1134, 1241,
-       1136, 1244,
-       1237, 1311,
-       1239, 1314,
-       1242, 1318,
-       1312, 1377
+       365, 487,
+       418, 487,
+       485, 597,
+       701, 842,
+       708, 854,
+       755, 902,
+       851, 854,
+       853, 991,
+       857, 992,
+       1013, 487,
+       1014, 1133,
+       1017, 1136,
+       1019, 1143,
+       1020, 1145,
+       1117, 487,
+       1118, 1221,
+       1121, 1226,
+       1122, 1228,
+       1128, 1235,
+       1130, 1238,
+       1231, 1305,
+       1233, 1308,
+       1236, 1312,
+       1306, 1371
 };
 static int parser_goto_row36[] = {
        32,
        -1, 138,
        34, 148,
-       327, 463,
-       459, 571,
-       539, 672,
-       584, 695,
-       593, 706,
-       633, 745,
-       646, 762,
-       648, 148,
-       681, 695,
-       700, 843,
-       785, 929,
-       797, 843,
-       917, 463,
-       981, 1100,
-       994, 1116,
-       1046, 571,
-       1058, 1175,
-       1060, 1100,
-       1113, 1219,
-       1141, 1249,
-       1163, 672,
-       1229, 1301,
-       1246, 1324,
-       1248, 1326,
-       1278, 1347,
-       1298, 1361,
-       1300, 1363,
-       1341, 929,
-       1435, 1175,
-       1457, 1347
+       327, 465,
+       461, 574,
+       542, 671,
+       586, 693,
+       595, 704,
+       632, 740,
+       645, 757,
+       647, 148,
+       680, 693,
+       698, 838,
+       780, 923,
+       792, 838,
+       911, 465,
+       975, 1094,
+       988, 1110,
+       1040, 574,
+       1052, 1169,
+       1054, 1094,
+       1107, 1213,
+       1135, 1243,
+       1157, 671,
+       1223, 1295,
+       1240, 1318,
+       1242, 1320,
+       1272, 1341,
+       1292, 1355,
+       1294, 1357,
+       1335, 923,
+       1429, 1169,
+       1451, 1341
 };
 static int parser_goto_row37[] = {
        1,
@@ -16693,31 +16646,31 @@ static int parser_goto_row37[] = {
 static int parser_goto_row38[] = {
        8,
        -1, 59,
-       662, 782,
-       696, 837,
-       792, 837,
-       844, 983,
-       937, 983,
-       1101, 1211,
-       1178, 1211
+       661, 777,
+       694, 832,
+       787, 832,
+       839, 977,
+       931, 977,
+       1095, 1205,
+       1172, 1205
 };
 static int parser_goto_row39[] = {
        7,
        -1, 276,
-       464, 574,
-       756, 905,
-       792, 905,
-       937, 905,
-       1048, 1168,
-       1178, 905
+       466, 577,
+       751, 899,
+       787, 899,
+       931, 899,
+       1042, 1162,
+       1172, 899
 };
 static int parser_goto_row40[] = {
        5,
        -1, 206,
-       208, 367,
-       419, 367,
-       928, 367,
-       980, 367
+       208, 368,
+       421, 368,
+       922, 368,
+       974, 368
 };
 static int parser_goto_row41[] = {
        24,
@@ -16727,24 +16680,24 @@ static int parser_goto_row41[] = {
        88, 60,
        91, 60,
        140, 277,
-       207, 366,
-       368, 366,
-       418, 366,
-       464, 277,
-       534, 366,
-       538, 658,
-       662, 783,
-       696, 838,
-       756, 277,
-       792, 838,
-       844, 838,
-       937, 838,
-       979, 366,
-       1048, 277,
-       1099, 366,
-       1101, 838,
-       1162, 658,
-       1178, 838
+       207, 367,
+       369, 367,
+       420, 367,
+       466, 277,
+       537, 367,
+       541, 657,
+       661, 778,
+       694, 833,
+       751, 277,
+       787, 833,
+       839, 833,
+       931, 833,
+       973, 367,
+       1042, 277,
+       1093, 367,
+       1095, 833,
+       1156, 657,
+       1172, 833
 };
 static int parser_goto_row42[] = {
        20,
@@ -16752,65 +16705,65 @@ static int parser_goto_row42[] = {
        38, 175,
        141, 278,
        149, 284,
-       651, 768,
-       652, 770,
-       673, 786,
-       697, 839,
-       759, 906,
-       765, 911,
-       794, 933,
-       845, 984,
-       939, 1062,
-       1102, 1212,
-       1176, 1279,
-       1180, 1281,
-       1270, 1342,
-       1348, 1403,
-       1451, 1458,
-       1464, 1467
+       650, 763,
+       651, 765,
+       672, 781,
+       695, 834,
+       754, 900,
+       760, 905,
+       789, 927,
+       840, 978,
+       933, 1056,
+       1096, 1206,
+       1170, 1273,
+       1174, 1275,
+       1264, 1336,
+       1342, 1397,
+       1445, 1452,
+       1458, 1461
 };
 static int parser_goto_row43[] = {
        11,
-       -1, 433,
-       193, 341,
-       315, 454,
-       326, 454,
-       343, 475,
-       456, 475,
-       617, 735,
-       680, 791,
-       685, 791,
-       776, 341,
-       1171, 735
+       -1, 435,
+       193, 342,
+       315, 456,
+       326, 456,
+       344, 478,
+       458, 478,
+       618, 733,
+       679, 786,
+       684, 786,
+       771, 342,
+       1165, 733
 };
 static int parser_goto_row44[] = {
        1,
-       -1, 342
+       -1, 343
 };
 static int parser_goto_row45[] = {
        7,
-       -1, 343,
-       321, 456,
-       326, 456,
-       456, 456,
-       685, 456,
-       776, 456,
-       1171, 456
+       -1, 344,
+       321, 458,
+       326, 458,
+       458, 458,
+       684, 458,
+       771, 458,
+       1165, 458
 };
 static int parser_goto_row46[] = {
        2,
-       -1, 474,
-       455, 569
+       -1, 477,
+       457, 572
 };
 static int parser_goto_row47[] = {
        7,
-       -1, 841,
-       846, 985,
-       940, 985,
-       1103, 1213,
-       1117, 1222,
-       1181, 1213,
-       1220, 1295
+       -1, 836,
+       841, 979,
+       934, 979,
+       1097, 1207,
+       1111, 1216,
+       1175, 1207,
+       1214, 1289
 };
 static int parser_goto_row48[] = {
        1,
@@ -16823,15 +16776,15 @@ static int parser_goto_row49[] = {
 static int parser_goto_row50[] = {
        10,
        -1, 197,
-       192, 339,
-       211, 372,
-       492, 619,
-       616, 734,
-       657, 778,
+       192, 340,
+       211, 373,
+       494, 620,
+       617, 732,
+       656, 773,
+       770, 913,
        775, 919,
-       780, 925,
-       1054, 1173,
-       1170, 1274
+       1048, 1167,
+       1164, 1268
 };
 static int parser_goto_row51[] = {
        1,
@@ -16843,9 +16796,9 @@ static int parser_goto_row52[] = {
 };
 static int parser_goto_row53[] = {
        3,
-       -1, 659,
-       662, 784,
-       782, 927
+       -1, 658,
+       661, 779,
+       777, 921
 };
 static int parser_goto_row54[] = {
        1,
@@ -16866,11 +16819,11 @@ static int parser_goto_row57[] = {
 static int parser_goto_row58[] = {
        2,
        -1, 178,
-       654, 772
+       653, 767
 };
 static int parser_goto_row59[] = {
        43,
-       -1, 842,
+       -1, 837,
        36, 161,
        37, 174,
        38, 176,
@@ -16878,41 +16831,41 @@ static int parser_goto_row59[] = {
        173, 318,
        175, 319,
        178, 323,
-       194, 344,
-       197, 345,
-       338, 470,
-       339, 471,
-       371, 493,
-       372, 494,
-       421, 536,
-       537, 640,
-       618, 736,
-       619, 737,
-       650, 161,
-       651, 174,
-       652, 176,
-       654, 179,
-       712, 861,
-       733, 887,
-       734, 888,
-       746, 861,
-       768, 318,
-       770, 319,
-       772, 323,
-       777, 344,
-       778, 345,
-       918, 470,
-       919, 471,
-       924, 493,
-       925, 494,
-       1040, 536,
-       1161, 640,
-       1172, 736,
-       1173, 737,
-       1273, 887,
-       1274, 888,
-       1325, 861,
-       1362, 861
+       194, 345,
+       197, 346,
+       339, 473,
+       340, 474,
+       372, 495,
+       373, 496,
+       423, 539,
+       540, 639,
+       619, 734,
+       620, 735,
+       649, 161,
+       650, 174,
+       651, 176,
+       653, 179,
+       710, 856,
+       731, 882,
+       732, 883,
+       741, 856,
+       763, 318,
+       765, 319,
+       767, 323,
+       772, 345,
+       773, 346,
+       912, 473,
+       913, 474,
+       918, 495,
+       919, 496,
+       1034, 539,
+       1155, 639,
+       1166, 734,
+       1167, 735,
+       1267, 882,
+       1268, 883,
+       1319, 856,
+       1356, 856
 };
 static int parser_goto_row60[] = {
        73,
@@ -16923,72 +16876,72 @@ static int parser_goto_row60[] = {
        147, 283,
        178, 180,
        189, 335,
-       218, 376,
-       241, 386,
-       249, 393,
-       288, 427,
-       369, 488,
-       373, 495,
-       385, 500,
+       218, 377,
+       241, 387,
+       249, 394,
+       288, 429,
+       370, 394,
+       374, 497,
+       386, 394,
+       649, 180,
        650, 180,
        651, 180,
-       652, 180,
-       654, 180,
-       675, 788,
-       691, 806,
-       740, 890,
-       761, 909,
-       763, 910,
-       768, 180,
-       770, 180,
+       653, 180,
+       674, 783,
+       690, 801,
+       736, 884,
+       756, 903,
+       758, 904,
+       763, 180,
+       765, 180,
+       767, 180,
        772, 180,
-       777, 180,
-       778, 180,
-       790, 932,
-       796, 180,
-       818, 955,
+       773, 180,
+       785, 926,
+       791, 180,
+       813, 949,
+       912, 180,
+       913, 180,
        918, 180,
        919, 180,
-       924, 180,
-       925, 180,
-       930, 1057,
-       940, 180,
-       947, 1066,
-       1040, 180,
-       1161, 180,
-       1172, 180,
-       1173, 180,
-       1181, 180,
-       1253, 1329,
-       1258, 1333,
-       1272, 1344,
-       1273, 180,
-       1274, 180,
-       1280, 1349,
-       1302, 1365,
-       1306, 1369,
-       1315, 1380,
-       1319, 1384,
-       1330, 1391,
-       1331, 1392,
-       1334, 1394,
-       1350, 1404,
-       1366, 1414,
-       1367, 1415,
-       1370, 1417,
-       1374, 1421,
-       1378, 1425,
-       1381, 1427,
-       1382, 1428,
-       1385, 1430,
-       1393, 1432,
-       1401, 1434,
-       1416, 1442,
-       1422, 1444,
-       1423, 1445,
-       1426, 1447,
-       1429, 1448,
-       1446, 1456
+       924, 1051,
+       934, 180,
+       941, 1060,
+       1034, 180,
+       1155, 180,
+       1166, 180,
+       1167, 180,
+       1175, 180,
+       1247, 1323,
+       1252, 1327,
+       1266, 1338,
+       1267, 180,
+       1268, 180,
+       1274, 1343,
+       1296, 1359,
+       1300, 1363,
+       1309, 1374,
+       1313, 1378,
+       1324, 1385,
+       1325, 1386,
+       1328, 1388,
+       1344, 1398,
+       1360, 1408,
+       1361, 1409,
+       1364, 1411,
+       1368, 1415,
+       1372, 1419,
+       1375, 1421,
+       1376, 1422,
+       1379, 1424,
+       1387, 1426,
+       1395, 1428,
+       1410, 1436,
+       1416, 1438,
+       1417, 1439,
+       1420, 1441,
+       1423, 1442,
+       1440, 1450
 };
 static int parser_goto_row61[] = {
        1,
@@ -16997,10 +16950,10 @@ static int parser_goto_row61[] = {
 static int parser_goto_row62[] = {
        5,
        -1, 164,
-       289, 428,
-       434, 547,
-       436, 549,
-       548, 679
+       289, 430,
+       436, 550,
+       438, 552,
+       551, 678
 };
 static int parser_goto_row63[] = {
        1,
@@ -17009,31 +16962,31 @@ static int parser_goto_row63[] = {
 static int parser_goto_row64[] = {
        11,
        -1, 166,
-       437, 550,
-       438, 551,
-       439, 552,
-       443, 556,
-       444, 557,
-       445, 558,
-       446, 559,
-       447, 560,
-       448, 561,
-       449, 562
+       439, 553,
+       440, 554,
+       441, 555,
+       445, 559,
+       446, 560,
+       447, 561,
+       448, 562,
+       449, 563,
+       450, 564,
+       451, 565
 };
 static int parser_goto_row65[] = {
        3,
        -1, 167,
-       441, 554,
-       442, 555
+       443, 557,
+       444, 558
 };
 static int parser_goto_row66[] = {
        6,
        -1, 168,
-       291, 430,
-       294, 432,
-       450, 563,
-       451, 564,
-       452, 565
+       291, 432,
+       294, 434,
+       452, 566,
+       453, 567,
+       454, 568
 };
 static int parser_goto_row67[] = {
        1,
@@ -17061,94 +17014,94 @@ static int parser_goto_row68[] = {
        197, 170,
        207, 69,
        327, 69,
-       338, 170,
        339, 170,
-       368, 69,
-       371, 170,
+       340, 170,
+       369, 69,
        372, 170,
-       418, 69,
-       421, 170,
-       459, 69,
-       464, 69,
-       534, 69,
-       537, 170,
-       538, 660,
-       539, 69,
-       584, 69,
-       593, 69,
-       618, 170,
+       373, 170,
+       420, 69,
+       423, 170,
+       461, 69,
+       466, 69,
+       537, 69,
+       540, 170,
+       541, 659,
+       542, 69,
+       586, 69,
+       595, 69,
        619, 170,
-       633, 69,
-       643, 660,
-       646, 69,
-       648, 660,
+       620, 170,
+       632, 69,
+       642, 659,
+       645, 69,
+       647, 659,
+       649, 181,
        650, 181,
        651, 181,
-       652, 181,
-       654, 181,
-       662, 69,
-       681, 660,
-       696, 69,
-       699, 170,
-       700, 69,
-       712, 170,
-       733, 170,
-       734, 170,
-       746, 170,
-       756, 69,
-       768, 181,
-       770, 181,
+       653, 181,
+       661, 69,
+       680, 659,
+       694, 69,
+       697, 170,
+       698, 69,
+       710, 170,
+       731, 170,
+       732, 170,
+       741, 170,
+       751, 69,
+       763, 181,
+       765, 181,
+       767, 181,
        772, 181,
-       777, 181,
-       778, 181,
-       785, 69,
-       792, 69,
-       796, 181,
-       797, 660,
-       844, 69,
-       846, 170,
-       917, 660,
+       773, 181,
+       780, 69,
+       787, 69,
+       791, 181,
+       792, 659,
+       839, 69,
+       841, 170,
+       911, 659,
+       912, 181,
+       913, 181,
        918, 181,
        919, 181,
-       924, 181,
-       925, 181,
-       937, 69,
-       940, 181,
-       979, 69,
-       981, 69,
-       994, 69,
-       1040, 181,
-       1046, 660,
-       1048, 69,
-       1058, 69,
-       1060, 660,
-       1099, 69,
-       1101, 69,
-       1103, 170,
-       1113, 69,
-       1117, 170,
-       1141, 69,
-       1161, 181,
-       1162, 660,
-       1163, 660,
-       1172, 181,
-       1173, 181,
-       1178, 69,
-       1181, 181,
-       1220, 170,
-       1229, 69,
-       1246, 69,
-       1248, 69,
-       1273, 181,
-       1274, 181,
-       1278, 69,
-       1298, 69,
-       1300, 69,
-       1325, 170,
-       1341, 660,
-       1362, 170,
-       1435, 660,
-       1457, 660
+       931, 69,
+       934, 181,
+       973, 69,
+       975, 69,
+       988, 69,
+       1034, 181,
+       1040, 659,
+       1042, 69,
+       1052, 69,
+       1054, 659,
+       1093, 69,
+       1095, 69,
+       1097, 170,
+       1107, 69,
+       1111, 170,
+       1135, 69,
+       1155, 181,
+       1156, 659,
+       1157, 659,
+       1166, 181,
+       1167, 181,
+       1172, 69,
+       1175, 181,
+       1214, 170,
+       1223, 69,
+       1240, 69,
+       1242, 69,
+       1267, 181,
+       1268, 181,
+       1272, 69,
+       1292, 69,
+       1294, 69,
+       1319, 170,
+       1335, 659,
+       1356, 170,
+       1429, 659,
+       1451, 659
 };
 static int parser_goto_row69[] = {
        60,
@@ -17161,13 +17114,11 @@ static int parser_goto_row69[] = {
        242, 123,
        244, 123,
        250, 123,
-       396, 123,
        398, 123,
-       399, 123,
        400, 123,
        401, 123,
+       402, 123,
        403, 123,
-       404, 123,
        405, 123,
        406, 123,
        407, 123,
@@ -17178,40 +17129,42 @@ static int parser_goto_row69[] = {
        412, 123,
        413, 123,
        414, 123,
-       489, 123,
+       415, 123,
+       416, 123,
        491, 123,
-       508, 123,
-       642, 123,
+       493, 123,
+       511, 123,
+       641, 123,
+       654, 123,
        655, 123,
-       656, 123,
-       692, 826,
-       781, 123,
-       817, 826,
-       948, 826,
-       950, 826,
-       956, 826,
-       1052, 123,
-       1053, 123,
-       1079, 826,
-       1081, 826,
-       1082, 826,
-       1083, 826,
-       1084, 826,
-       1086, 826,
-       1087, 826,
-       1088, 826,
-       1089, 826,
-       1090, 826,
-       1091, 826,
-       1092, 826,
-       1093, 826,
-       1094, 826,
-       1095, 826,
-       1096, 826,
-       1097, 826,
-       1189, 826,
-       1264, 123,
-       1459, 826
+       691, 821,
+       776, 123,
+       812, 821,
+       942, 821,
+       944, 821,
+       950, 821,
+       1046, 123,
+       1047, 123,
+       1073, 821,
+       1075, 821,
+       1076, 821,
+       1077, 821,
+       1078, 821,
+       1080, 821,
+       1081, 821,
+       1082, 821,
+       1083, 821,
+       1084, 821,
+       1085, 821,
+       1086, 821,
+       1087, 821,
+       1088, 821,
+       1089, 821,
+       1090, 821,
+       1091, 821,
+       1183, 821,
+       1258, 123,
+       1453, 821
 };
 static int parser_goto_row70[] = {
        1,
@@ -17224,7 +17177,7 @@ static int parser_goto_row71[] = {
 static int parser_goto_row72[] = {
        2,
        -1, 214,
-       217, 374
+       217, 375
 };
 static int parser_goto_row73[] = {
        1,
@@ -17233,7 +17186,7 @@ static int parser_goto_row73[] = {
 static int parser_goto_row74[] = {
        2,
        -1, 216,
-       217, 375
+       217, 376
 };
 static int parser_goto_row75[] = {
        39,
@@ -17247,50 +17200,50 @@ static int parser_goto_row75[] = {
        159, 295,
        177, 321,
        186, 331,
-       219, 377,
-       252, 395,
-       316, 377,
+       219, 378,
+       252, 397,
+       316, 378,
        322, 321,
-       388, 503,
-       429, 545,
-       489, 613,
-       491, 616,
-       526, 629,
-       528, 631,
-       566, 613,
-       567, 680,
-       572, 685,
-       578, 690,
-       655, 184,
-       656, 775,
-       689, 805,
-       741, 891,
-       781, 377,
-       807, 946,
-       812, 951,
-       820, 957,
-       958, 1076,
-       1052, 613,
-       1053, 1170,
-       1070, 1185,
-       1207, 1287,
-       1209, 1289,
-       1351, 1405
+       389, 505,
+       431, 548,
+       491, 614,
+       493, 617,
+       529, 628,
+       531, 630,
+       569, 614,
+       570, 679,
+       575, 684,
+       581, 689,
+       654, 184,
+       655, 770,
+       688, 800,
+       737, 885,
+       776, 378,
+       802, 940,
+       807, 945,
+       815, 951,
+       952, 1070,
+       1046, 614,
+       1047, 1164,
+       1064, 1179,
+       1201, 1281,
+       1203, 1283,
+       1345, 1399
 };
 static int parser_goto_row76[] = {
        12,
        -1, 125,
        42, 185,
        50, 193,
-       219, 378,
-       489, 614,
-       491, 617,
-       642, 754,
-       655, 774,
-       656, 776,
-       781, 926,
-       1052, 1169,
-       1053, 1171
+       219, 379,
+       491, 615,
+       493, 618,
+       641, 749,
+       654, 769,
+       655, 771,
+       776, 920,
+       1046, 1163,
+       1047, 1165
 };
 static int parser_goto_row77[] = {
        9,
@@ -17302,32 +17255,36 @@ static int parser_goto_row77[] = {
        188, 334,
        248, 272,
        293, 334,
-       660, 780
+       659, 775
 };
 static int parser_goto_row78[] = {
-       4,
-       -1, 582,
-       583, 694,
-       627, 694,
-       739, 694
+       3,
+       -1, 336,
+       249, 395,
+       386, 502
 };
 static int parser_goto_row79[] = {
+       2,
+       -1, 584,
+       585, 692
+};
+static int parser_goto_row80[] = {
        8,
        -1, 287,
-       285, 425,
-       474, 587,
-       569, 684,
-       585, 698,
-       682, 795,
-       766, 913,
-       912, 1044
+       285, 427,
+       477, 589,
+       572, 683,
+       587, 696,
+       681, 790,
+       761, 907,
+       906, 1038
 };
-static int parser_goto_row80[] = {
+static int parser_goto_row81[] = {
        2,
        -1, 237,
-       346, 477
+       347, 480
 };
-static int parser_goto_row81[] = {
+static int parser_goto_row82[] = {
        116,
        -1, 171,
        10, 74,
@@ -17347,14 +17304,12 @@ static int parser_goto_row81[] = {
        244, 126,
        250, 126,
        327, 74,
-       368, 74,
-       396, 126,
+       369, 74,
        398, 126,
-       399, 126,
        400, 126,
        401, 126,
+       402, 126,
        403, 126,
-       404, 126,
        405, 126,
        406, 126,
        407, 126,
@@ -17365,108 +17320,110 @@ static int parser_goto_row81[] = {
        412, 126,
        413, 126,
        414, 126,
-       418, 74,
-       459, 74,
-       464, 74,
-       489, 126,
+       415, 126,
+       416, 126,
+       420, 74,
+       461, 74,
+       466, 74,
        491, 126,
-       508, 126,
-       534, 74,
-       538, 661,
-       539, 74,
-       584, 74,
-       593, 74,
-       633, 74,
-       642, 126,
-       643, 661,
-       646, 74,
-       648, 661,
+       493, 126,
+       511, 126,
+       537, 74,
+       541, 660,
+       542, 74,
+       586, 74,
+       595, 74,
+       632, 74,
+       641, 126,
+       642, 660,
+       645, 74,
+       647, 660,
+       654, 126,
        655, 126,
-       656, 126,
-       662, 74,
-       681, 661,
-       692, 827,
-       696, 74,
-       700, 74,
-       756, 74,
-       781, 126,
-       785, 74,
-       792, 74,
-       797, 661,
-       817, 827,
-       844, 74,
-       917, 661,
-       937, 74,
-       948, 827,
-       950, 827,
-       956, 827,
-       979, 74,
-       981, 74,
-       994, 74,
-       1046, 661,
-       1048, 74,
-       1052, 126,
-       1053, 126,
-       1058, 74,
-       1060, 661,
-       1079, 827,
-       1081, 827,
-       1082, 827,
-       1083, 827,
-       1084, 827,
-       1086, 827,
-       1087, 827,
-       1088, 827,
-       1089, 827,
-       1090, 827,
-       1091, 827,
-       1092, 827,
-       1093, 827,
-       1094, 827,
-       1095, 827,
-       1096, 827,
-       1097, 827,
-       1099, 74,
-       1101, 74,
-       1113, 74,
-       1141, 74,
-       1162, 661,
-       1163, 661,
-       1178, 74,
-       1189, 827,
-       1229, 74,
-       1246, 74,
-       1248, 74,
-       1264, 126,
-       1278, 74,
-       1298, 74,
-       1300, 74,
-       1341, 661,
-       1435, 661,
-       1457, 661,
-       1459, 827
+       661, 74,
+       680, 660,
+       691, 822,
+       694, 74,
+       698, 74,
+       751, 74,
+       776, 126,
+       780, 74,
+       787, 74,
+       792, 660,
+       812, 822,
+       839, 74,
+       911, 660,
+       931, 74,
+       942, 822,
+       944, 822,
+       950, 822,
+       973, 74,
+       975, 74,
+       988, 74,
+       1040, 660,
+       1042, 74,
+       1046, 126,
+       1047, 126,
+       1052, 74,
+       1054, 660,
+       1073, 822,
+       1075, 822,
+       1076, 822,
+       1077, 822,
+       1078, 822,
+       1080, 822,
+       1081, 822,
+       1082, 822,
+       1083, 822,
+       1084, 822,
+       1085, 822,
+       1086, 822,
+       1087, 822,
+       1088, 822,
+       1089, 822,
+       1090, 822,
+       1091, 822,
+       1093, 74,
+       1095, 74,
+       1107, 74,
+       1135, 74,
+       1156, 660,
+       1157, 660,
+       1172, 74,
+       1183, 822,
+       1223, 74,
+       1240, 74,
+       1242, 74,
+       1258, 126,
+       1272, 74,
+       1292, 74,
+       1294, 74,
+       1335, 660,
+       1429, 660,
+       1451, 660,
+       1453, 822
 };
-static int parser_goto_row82[] = {
+static int parser_goto_row83[] = {
        4,
        -1, 75,
        77, 221,
        238, 221,
-       498, 221
+       500, 221
 };
-static int parser_goto_row83[] = {
+static int parser_goto_row84[] = {
        2,
        -1, 76,
        77, 222
 };
-static int parser_goto_row84[] = {
+static int parser_goto_row85[] = {
        5,
        -1, 81,
-       237, 383,
-       476, 588,
-       477, 589,
-       608, 717
+       237, 384,
+       479, 590,
+       480, 591,
+       610, 715
 };
-static int parser_goto_row85[] = {
+static int parser_goto_row86[] = {
        66,
        -1, 102,
        0, 9,
@@ -17486,58 +17443,58 @@ static int parser_goto_row85[] = {
        97, 9,
        98, 9,
        100, 9,
-       208, 368,
+       208, 369,
        225, 9,
        232, 9,
-       277, 418,
-       327, 464,
-       419, 534,
-       459, 464,
-       538, 662,
-       539, 140,
-       584, 696,
-       593, 464,
-       633, 464,
-       643, 756,
-       646, 464,
-       648, 756,
-       681, 792,
-       700, 844,
-       783, 207,
-       785, 464,
-       797, 937,
-       838, 979,
-       857, 996,
-       917, 1048,
-       928, 368,
-       980, 1099,
-       981, 1101,
-       993, 1115,
-       994, 464,
-       1046, 1048,
-       1058, 140,
-       1060, 1178,
-       1113, 464,
-       1116, 1221,
-       1141, 464,
-       1162, 662,
-       1163, 756,
-       1219, 1294,
-       1222, 1296,
-       1229, 464,
-       1246, 464,
-       1248, 464,
-       1278, 140,
-       1295, 1357,
-       1298, 464,
-       1300, 464,
-       1341, 1048,
-       1435, 756,
-       1457, 756
+       277, 420,
+       327, 466,
+       421, 537,
+       461, 466,
+       541, 661,
+       542, 140,
+       586, 694,
+       595, 466,
+       632, 466,
+       642, 751,
+       645, 466,
+       647, 751,
+       680, 787,
+       698, 839,
+       778, 207,
+       780, 466,
+       792, 931,
+       833, 973,
+       852, 990,
+       911, 1042,
+       922, 369,
+       974, 1093,
+       975, 1095,
+       987, 1109,
+       988, 466,
+       1040, 1042,
+       1052, 140,
+       1054, 1172,
+       1107, 466,
+       1110, 1215,
+       1135, 466,
+       1156, 661,
+       1157, 751,
+       1213, 1288,
+       1216, 1290,
+       1223, 466,
+       1240, 466,
+       1242, 466,
+       1272, 140,
+       1289, 1351,
+       1292, 466,
+       1294, 466,
+       1335, 1042,
+       1429, 751,
+       1451, 751
 };
-static int parser_goto_row86[] = {
-       271,
-       -1, 485,
+static int parser_goto_row87[] = {
+       269,
+       -1, 488,
        0, 10,
        4, 20,
        14, 20,
@@ -17573,155 +17530,159 @@ static int parser_goto_row86[] = {
        154, 290,
        155, 291,
        158, 294,
-       190, 336,
-       191, 337,
-       198, 346,
-       205, 365,
-       209, 369,
-       210, 370,
-       215, 373,
+       190, 337,
+       191, 338,
+       198, 347,
+       205, 366,
+       209, 370,
+       210, 371,
+       215, 374,
        225, 91,
        232, 91,
-       235, 382,
-       239, 385,
-       246, 390,
-       253, 396,
-       254, 398,
-       255, 399,
-       256, 400,
-       257, 401,
-       258, 402,
-       259, 403,
-       260, 404,
-       261, 405,
-       262, 406,
-       263, 407,
-       264, 408,
-       265, 409,
-       266, 410,
-       267, 411,
-       268, 412,
-       269, 413,
-       270, 414,
-       271, 415,
-       274, 417,
-       279, 420,
-       280, 421,
-       282, 423,
-       283, 424,
-       287, 426,
-       296, 434,
-       297, 436,
-       298, 437,
-       299, 438,
-       300, 439,
-       301, 440,
-       302, 441,
-       303, 442,
-       304, 443,
-       305, 444,
-       306, 445,
-       307, 446,
-       308, 447,
-       309, 448,
-       310, 449,
-       311, 450,
-       312, 451,
-       313, 452,
-       314, 453,
-       325, 460,
-       333, 468,
-       335, 469,
-       376, 496,
-       386, 501,
-       391, 505,
-       393, 506,
-       397, 508,
-       422, 537,
-       425, 541,
+       235, 383,
+       239, 386,
+       246, 391,
+       253, 398,
+       254, 400,
+       255, 401,
+       256, 402,
+       257, 403,
+       258, 404,
+       259, 405,
+       260, 406,
+       261, 407,
+       262, 408,
+       263, 409,
+       264, 410,
+       265, 411,
+       266, 412,
+       267, 413,
+       268, 414,
+       269, 415,
+       270, 416,
+       271, 417,
+       274, 419,
+       279, 422,
+       280, 423,
+       282, 425,
+       283, 426,
+       287, 428,
+       296, 436,
+       297, 438,
+       298, 439,
+       299, 440,
+       300, 441,
+       301, 442,
+       302, 443,
+       303, 444,
+       304, 445,
+       305, 446,
+       306, 447,
+       307, 448,
+       308, 449,
+       309, 450,
+       310, 451,
+       311, 452,
+       312, 453,
+       313, 454,
+       314, 455,
+       325, 462,
+       333, 470,
+       335, 471,
+       377, 498,
+       387, 503,
+       392, 507,
+       394, 508,
+       399, 511,
+       424, 540,
        427, 544,
-       431, 546,
-       435, 548,
-       466, 576,
-       467, 577,
-       480, 591,
-       482, 596,
-       484, 598,
-       487, 609,
-       488, 612,
-       490, 615,
-       495, 620,
-       500, 622,
-       502, 624,
-       527, 630,
-       532, 636,
-       540, 674,
-       542, 675,
-       543, 676,
-       575, 686,
-       580, 691,
-       581, 692,
-       586, 699,
-       587, 541,
-       595, 708,
-       603, 712,
-       604, 713,
-       605, 714,
-       610, 728,
-       611, 731,
-       623, 740,
-       634, 746,
-       635, 747,
-       637, 751,
-       638, 753,
-       645, 761,
-       647, 763,
-       649, 766,
-       677, 790,
-       683, 796,
-       684, 541,
-       688, 804,
-       698, 541,
-       701, 846,
-       704, 850,
-       715, 865,
-       716, 867,
-       718, 868,
-       723, 872,
-       729, 884,
-       732, 886,
+       429, 547,
+       433, 549,
+       437, 551,
+       468, 579,
+       469, 580,
+       483, 593,
+       485, 598,
+       487, 600,
+       490, 611,
+       492, 616,
+       497, 621,
+       504, 625,
+       530, 629,
+       535, 635,
+       543, 673,
+       545, 674,
+       546, 675,
+       578, 685,
+       582, 690,
+       583, 691,
+       588, 697,
+       589, 544,
+       597, 706,
+       605, 710,
+       606, 711,
+       607, 712,
+       612, 726,
+       613, 729,
+       624, 736,
+       633, 741,
+       634, 742,
+       636, 746,
+       637, 748,
+       644, 756,
+       646, 758,
+       648, 761,
+       676, 785,
+       682, 791,
+       683, 544,
+       687, 799,
+       696, 544,
+       699, 841,
+       702, 845,
+       713, 860,
+       714, 862,
+       716, 863,
+       721, 867,
+       727, 879,
+       730, 881,
+       738, 886,
        743, 892,
-       748, 898,
-       749, 900,
-       752, 902,
-       779, 923,
-       787, 930,
-       788, 931,
-       795, 541,
-       798, 940,
-       800, 941,
-       801, 942,
-       806, 945,
-       808, 947,
-       809, 948,
-       810, 949,
-       811, 950,
-       819, 956,
-       828, 959,
-       848, 987,
-       851, 990,
-       852, 991,
-       863, 1001,
-       866, 1004,
-       890, 1032,
-       899, 1037,
-       907, 1040,
-       909, 1042,
-       910, 1043,
-       913, 1045,
-       932, 1059,
-       952, 1072,
-       960, 1079,
+       744, 894,
+       747, 896,
+       774, 917,
+       782, 924,
+       783, 925,
+       790, 544,
+       793, 934,
+       795, 935,
+       796, 936,
+       801, 939,
+       803, 941,
+       804, 942,
+       805, 943,
+       806, 944,
+       814, 950,
+       823, 953,
+       843, 981,
+       846, 984,
+       847, 985,
+       858, 995,
+       861, 998,
+       884, 1026,
+       893, 1031,
+       901, 1034,
+       903, 1036,
+       904, 1037,
+       907, 1039,
+       926, 1053,
+       946, 1066,
+       954, 1073,
+       955, 1075,
+       956, 1076,
+       957, 1077,
+       958, 1078,
+       959, 1079,
+       960, 1080,
        961, 1081,
        962, 1082,
        963, 1083,
@@ -17734,86 +17695,80 @@ static int parser_goto_row86[] = {
        970, 1090,
        971, 1091,
        972, 1092,
-       973, 1093,
-       974, 1094,
-       975, 1095,
-       976, 1096,
-       977, 1097,
-       978, 1098,
-       982, 1103,
-       995, 1117,
-       999, 1118,
-       1002, 1121,
-       1023, 596,
-       1024, 1144,
-       1030, 1154,
-       1031, 1155,
-       1033, 1157,
-       1034, 1158,
-       1041, 1161,
-       1044, 541,
-       1057, 1174,
-       1061, 1181,
-       1066, 1182,
-       1073, 1187,
-       1080, 1189,
-       1114, 1220,
-       1142, 1251,
-       1146, 1253,
+       976, 1097,
+       989, 1111,
+       993, 1112,
+       996, 1115,
+       1017, 598,
+       1018, 1138,
+       1024, 1148,
+       1025, 1149,
+       1027, 1151,
+       1028, 1152,
+       1035, 1155,
+       1038, 544,
+       1051, 1168,
+       1055, 1175,
+       1060, 1176,
+       1067, 1181,
+       1074, 1183,
+       1108, 1214,
+       1136, 1245,
+       1140, 1247,
+       1144, 1252,
        1150, 1258,
-       1156, 1264,
-       1164, 1271,
-       1165, 1272,
-       1177, 1280,
-       1184, 1284,
-       1208, 1288,
-       1215, 1291,
-       1218, 1293,
-       1230, 1302,
-       1233, 1306,
-       1240, 1315,
-       1243, 1319,
-       1247, 1325,
-       1254, 1330,
-       1256, 1331,
+       1158, 1265,
+       1159, 1266,
+       1171, 1274,
+       1178, 1278,
+       1202, 1282,
+       1209, 1285,
+       1212, 1287,
+       1224, 1296,
+       1227, 1300,
+       1234, 1309,
+       1237, 1313,
+       1241, 1319,
+       1248, 1324,
+       1250, 1325,
+       1253, 1328,
+       1256, 1332,
        1259, 1334,
-       1262, 1338,
-       1265, 1340,
-       1283, 1350,
-       1299, 1362,
-       1303, 1366,
-       1304, 1367,
-       1307, 1370,
-       1310, 1374,
-       1313, 1378,
-       1316, 1381,
-       1317, 1382,
-       1320, 1385,
-       1332, 1393,
-       1343, 1401,
-       1344, 1402,
-       1352, 1406,
-       1354, 1407,
-       1356, 1408,
-       1368, 1416,
-       1375, 1422,
-       1376, 1423,
-       1379, 1426,
-       1383, 1429,
-       1404, 1436,
-       1424, 1446,
+       1277, 1344,
+       1293, 1356,
+       1297, 1360,
+       1298, 1361,
+       1301, 1364,
+       1304, 1368,
+       1307, 1372,
+       1310, 1375,
+       1311, 1376,
+       1314, 1379,
+       1326, 1387,
+       1337, 1395,
+       1338, 1396,
+       1346, 1400,
+       1348, 1401,
+       1350, 1402,
+       1362, 1410,
+       1369, 1416,
+       1370, 1417,
+       1373, 1420,
+       1377, 1423,
+       1398, 1430,
+       1418, 1440,
+       1428, 1443,
+       1431, 1447,
+       1432, 1448,
        1434, 1449,
-       1437, 1453,
-       1438, 1454,
-       1440, 1455,
-       1452, 1459,
-       1460, 1466
+       1446, 1453,
+       1454, 1460
 };
-static int parser_goto_row87[] = {
+static int parser_goto_row88[] = {
        1,
        -1, 11
 };
-static int parser_goto_row88[] = {
+static int parser_goto_row89[] = {
        9,
        -1, 12,
        16, 92,
@@ -17825,276 +17780,272 @@ static int parser_goto_row88[] = {
        225, 92,
        232, 92
 };
-static int parser_goto_row89[] = {
+static int parser_goto_row90[] = {
        1,
        -1, 13
 };
-static int parser_goto_row90[] = {
+static int parser_goto_row91[] = {
        4,
-       -1, 486,
-       416, 531,
-       1019, 1138,
-       1123, 1226
+       -1, 489,
+       418, 534,
+       1013, 1132,
+       1117, 1220
 };
-static int parser_goto_row91[] = {
+static int parser_goto_row92[] = {
        3,
-       -1, 1070,
-       1072, 1186,
-       1085, 1194
+       -1, 1064,
+       1066, 1180,
+       1079, 1188
 };
-static int parser_goto_row92[] = {
+static int parser_goto_row93[] = {
        1,
        -1, -1
 };
-static int parser_goto_row93[] = {
+static int parser_goto_row94[] = {
        2,
-       -1, 828,
-       1459, 1465
+       -1, 823,
+       1453, 1459
 };
-static int parser_goto_row94[] = {
+static int parser_goto_row95[] = {
        1,
-       -1, 829
+       -1, 824
 };
-static int parser_goto_row95[] = {
+static int parser_goto_row96[] = {
        5,
-       -1, 830,
-       948, 1067,
-       1079, 1188,
-       1081, 1190,
-       1189, 1286
+       -1, 825,
+       942, 1061,
+       1073, 1182,
+       1075, 1184,
+       1183, 1280
 };
-static int parser_goto_row96[] = {
+static int parser_goto_row97[] = {
        1,
-       -1, 831
+       -1, 826
 };
-static int parser_goto_row97[] = {
+static int parser_goto_row98[] = {
        11,
-       -1, 832,
+       -1, 827,
+       1076, 1185,
+       1077, 1186,
+       1078, 1187,
        1082, 1191,
        1083, 1192,
        1084, 1193,
-       1088, 1197,
-       1089, 1198,
-       1090, 1199,
-       1091, 1200,
-       1092, 1201,
-       1093, 1202,
-       1094, 1203
-};
-static int parser_goto_row98[] = {
-       3,
-       -1, 833,
+       1085, 1194,
        1086, 1195,
-       1087, 1196
+       1087, 1196,
+       1088, 1197
 };
 static int parser_goto_row99[] = {
-       6,
-       -1, 834,
-       950, 1071,
-       956, 1075,
-       1095, 1204,
-       1096, 1205,
-       1097, 1206
+       3,
+       -1, 828,
+       1080, 1189,
+       1081, 1190
 };
 static int parser_goto_row100[] = {
-       1,
-       -1, 835
+       6,
+       -1, 829,
+       944, 1065,
+       950, 1069,
+       1089, 1198,
+       1090, 1199,
+       1091, 1200
 };
 static int parser_goto_row101[] = {
-       2,
-       -1, 836,
-       817, 954
+       1,
+       -1, 830
 };
 static int parser_goto_row102[] = {
-       11,
-       -1, 757,
-       648, 764,
-       681, 793,
-       797, 938,
-       917, 1049,
-       1046, 1166,
-       1060, 1179,
-       1163, 1269,
-       1341, 1400,
-       1435, 1450,
-       1457, 1463
+       2,
+       -1, 831,
+       812, 948
 };
 static int parser_goto_row103[] = {
-       3,
-       -1, 758,
-       538, 663,
-       1162, 1268
+       11,
+       -1, 752,
+       647, 759,
+       680, 788,
+       792, 932,
+       911, 1043,
+       1040, 1160,
+       1054, 1173,
+       1157, 1263,
+       1335, 1394,
+       1429, 1444,
+       1451, 1457
 };
 static int parser_goto_row104[] = {
-       6,
-       -1, 457,
-       326, 461,
-       456, 570,
-       685, 799,
-       776, 920,
-       1171, 1275
+       3,
+       -1, 753,
+       541, 662,
+       1156, 1262
 };
 static int parser_goto_row105[] = {
-       1,
-       -1, 458
+       6,
+       -1, 459,
+       326, 463,
+       458, 573,
+       684, 794,
+       771, 914,
+       1165, 1269
 };
 static int parser_goto_row106[] = {
-       3,
-       -1, 935,
-       940, 1063,
-       1181, 1282
+       1,
+       -1, 460
 };
 static int parser_goto_row107[] = {
-       1,
-       -1, 664
+       3,
+       -1, 929,
+       934, 1057,
+       1175, 1276
 };
 static int parser_goto_row108[] = {
        1,
-       -1, 665
+       -1, 663
 };
 static int parser_goto_row109[] = {
        1,
-       -1, 666
+       -1, 664
 };
 static int parser_goto_row110[] = {
        1,
-       -1, 667
+       -1, 665
 };
 static int parser_goto_row111[] = {
        1,
-       -1, 668
+       -1, 666
 };
 static int parser_goto_row112[] = {
        1,
-       -1, 669
+       -1, 667
 };
 static int parser_goto_row113[] = {
        1,
-       -1, 670
+       -1, 668
 };
 static int parser_goto_row114[] = {
        1,
-       -1, 671
+       -1, 669
 };
 static int parser_goto_row115[] = {
+       1,
+       -1, 670
+};
+static int parser_goto_row116[] = {
        22,
-       -1, 936,
+       -1, 930,
        40, 182,
        178, 324,
-       650, 767,
-       651, 769,
-       652, 771,
-       654, 773,
-       768, 914,
-       770, 915,
-       772, 916,
-       777, 921,
-       778, 922,
-       918, 1050,
-       919, 1051,
-       924, 1055,
-       925, 1056,
-       1040, 1160,
-       1161, 1267,
-       1172, 1276,
-       1173, 1277,
-       1273, 1345,
-       1274, 1346
+       649, 762,
+       650, 764,
+       651, 766,
+       653, 768,
+       763, 908,
+       765, 909,
+       767, 910,
+       772, 915,
+       773, 916,
+       912, 1044,
+       913, 1045,
+       918, 1049,
+       919, 1050,
+       1034, 1154,
+       1155, 1261,
+       1166, 1270,
+       1167, 1271,
+       1267, 1339,
+       1268, 1340
 };
-static int parser_goto_row116[] = {
+static int parser_goto_row117[] = {
        1,
        -1, -1
 };
-static int parser_goto_row117[] = {
+static int parser_goto_row118[] = {
        16,
        -1, 141,
        34, 149,
-       539, 673,
-       584, 697,
-       643, 759,
-       648, 765,
-       681, 794,
-       700, 845,
-       797, 939,
-       981, 1102,
-       1058, 1176,
-       1060, 1180,
-       1163, 1270,
-       1278, 1348,
-       1435, 1451,
-       1457, 1464
+       542, 672,
+       586, 695,
+       642, 754,
+       647, 760,
+       680, 789,
+       698, 840,
+       792, 933,
+       975, 1096,
+       1052, 1170,
+       1054, 1174,
+       1157, 1264,
+       1272, 1342,
+       1429, 1445,
+       1451, 1458
 };
-static int parser_goto_row118[] = {
+static int parser_goto_row119[] = {
        1,
        -1, -1
 };
-static int parser_goto_row119[] = {
+static int parser_goto_row120[] = {
        1,
        -1, -1
 };
-static int parser_goto_row120[] = {
+static int parser_goto_row121[] = {
        2,
        -1, 127,
-       1264, 1339
+       1258, 1333
 };
-static int parser_goto_row121[] = {
+static int parser_goto_row122[] = {
        1,
        -1, 128
 };
-static int parser_goto_row122[] = {
+static int parser_goto_row123[] = {
        5,
        -1, 129,
-       242, 387,
-       396, 507,
-       398, 509,
-       508, 628
+       242, 388,
+       398, 510,
+       400, 512,
+       511, 627
 };
-static int parser_goto_row123[] = {
+static int parser_goto_row124[] = {
        1,
        -1, 130
 };
-static int parser_goto_row124[] = {
+static int parser_goto_row125[] = {
        11,
        -1, 131,
-       399, 510,
-       400, 511,
-       401, 512,
-       405, 516,
-       406, 517,
-       407, 518,
-       408, 519,
-       409, 520,
-       410, 521,
-       411, 522
+       401, 513,
+       402, 514,
+       403, 515,
+       407, 519,
+       408, 520,
+       409, 521,
+       410, 522,
+       411, 523,
+       412, 524,
+       413, 525
 };
-static int parser_goto_row125[] = {
+static int parser_goto_row126[] = {
        3,
        -1, 132,
-       403, 514,
-       404, 515
+       405, 517,
+       406, 518
 };
-static int parser_goto_row126[] = {
+static int parser_goto_row127[] = {
        6,
        -1, 133,
-       244, 389,
-       250, 394,
-       412, 523,
-       413, 524,
-       414, 525
+       244, 390,
+       250, 396,
+       414, 526,
+       415, 527,
+       416, 528
 };
-static int parser_goto_row127[] = {
+static int parser_goto_row128[] = {
        1,
        -1, 134
 };
-static int parser_goto_row128[] = {
+static int parser_goto_row129[] = {
        2,
        -1, 135,
        114, 248
 };
-static int parser_goto_row129[] = {
-       1,
-       -1, -1
-};
 static int parser_goto_row130[] = {
        1,
        -1, -1
@@ -18144,18 +18095,22 @@ static int parser_goto_row141[] = {
        -1, -1
 };
 static int parser_goto_row142[] = {
+       1,
+       -1, -1
+};
+static int parser_goto_row143[] = {
        2,
        -1, 14,
        4, 21
 };
-static int parser_goto_row143[] = {
+static int parser_goto_row144[] = {
        4,
        -1, 15,
        4, 22,
        14, 84,
        21, 97
 };
-static int parser_goto_row144[] = {
+static int parser_goto_row145[] = {
        8,
        -1, 16,
        4, 23,
@@ -18166,74 +18121,72 @@ static int parser_goto_row144[] = {
        84, 225,
        97, 232
 };
-static int parser_goto_row145[] = {
-       4,
-       -1, 610,
-       532, 637,
-       605, 715,
-       635, 748
-};
 static int parser_goto_row146[] = {
-       8,
-       -1, 611,
-       532, 638,
-       605, 716,
-       610, 729,
-       635, 749,
-       637, 752,
-       715, 866,
-       748, 899
+       4,
+       -1, 612,
+       535, 636,
+       607, 713,
+       634, 743
 };
 static int parser_goto_row147[] = {
-       1,
-       -1, 1002
+       8,
+       -1, 613,
+       535, 637,
+       607, 714,
+       612, 727,
+       634, 744,
+       636, 747,
+       713, 861,
+       743, 893
 };
 static int parser_goto_row148[] = {
        1,
-       -1, 851
+       -1, 996
 };
 static int parser_goto_row149[] = {
        1,
-       -1, 602
+       -1, 846
 };
 static int parser_goto_row150[] = {
        1,
-       -1, 1217
+       -1, 604
 };
 static int parser_goto_row151[] = {
        1,
-       -1, 803
+       -1, 1211
 };
 static int parser_goto_row152[] = {
+       1,
+       -1, 798
+};
+static int parser_goto_row153[] = {
        4,
        -1, 208,
-       277, 419,
-       783, 928,
-       838, 980
+       277, 421,
+       778, 922,
+       833, 974
 };
-static int parser_goto_row153[] = {
+static int parser_goto_row154[] = {
        1,
        -1, 217
 };
-static int parser_goto_row154[] = {
-       3,
-       -1, 583,
-       506, 627,
-       622, 739
-};
 static int parser_goto_row155[] = {
+       1,
+       -1, 585
+};
+static int parser_goto_row156[] = {
        4,
        -1, 77,
        103, 238,
-       346, 238,
-       382, 498
+       347, 238,
+       383, 500
 };
-static int parser_goto_row156[] = {
+static int parser_goto_row157[] = {
        2,
        -1, 17,
        11, 78
 };
-static int parser_goto_row157[] = {
+static int parser_goto_row158[] = {
        3,
        -1, 18,
        17, 94,
@@ -18397,5 +18350,6 @@ const int* const parser_goto_table[] = {
        parser_goto_row154,
        parser_goto_row155,
        parser_goto_row156,
-       parser_goto_row157
+       parser_goto_row157,
+       parser_goto_row158
 };

diff --git a/src/syntax/icode_generation.nit b/src/syntax/icode_generation.nit
index 981f56d..2d67582 100644 (file)
--- a/src/syntax/icode_generation.nit
+++ b/src/syntax/icode_generation.nit
@@ -999,8 +999,9 @@ end
 redef class AArrayExpr
        redef fun generate_icode(v)
        do
-               var recv = v.add_new_array(stype, n_exprs.length)
-               for ne in n_exprs do
+               var nes = n_exprs.n_exprs
+               var recv = v.add_new_array(stype, nes.length)
+               for ne in nes do
                        var e = v.generate_expr(ne)
                        v.add_call_array_add(recv, e)
                end
@@ -1037,12 +1038,13 @@ redef class ASuperExpr
                end
                var args = new Array[IRegister].with_capacity(arity + 1)
                args.add(v.iroutine.params[0])
-               if n_args.length != arity then
+               var nas = n_args.n_exprs
+               if nas.length != arity then
                        for i in [0..arity[ do
                                args.add(v.iroutine.params[i + 1])
                        end
                else
-                       for na in n_args do
+                       for na in nas do
                                args.add(v.generate_expr(na))
                        end
                end

diff --git a/src/syntax/syntax_base.nit b/src/syntax/syntax_base.nit
index 5e5fe8c..b4fb77c 100644 (file)
--- a/src/syntax/syntax_base.nit
+++ b/src/syntax/syntax_base.nit
@@ -848,3 +848,8 @@ redef class AMethid
        # Name of method
        fun name: nullable Symbol is abstract
 end
+
+redef class AExprs
+       # Return an array made of each expr
+       fun to_a: Array[AExpr] do return self.n_exprs.to_a
+end

diff --git a/src/syntax/typing.nit b/src/syntax/typing.nit
index 8f0c77e..77f9779 100644 (file)
--- a/src/syntax/typing.nit
+++ b/src/syntax/typing.nit
@@ -1110,7 +1110,7 @@ end
 redef class AArrayExpr
        redef fun after_typing(v)
        do
-               var stype = v.check_conform_multiexpr(null, n_exprs)
+               var stype = v.check_conform_multiexpr(null, n_exprs.n_exprs)
                if stype != null then do_typing(v, stype)
        end
 
@@ -1168,7 +1168,7 @@ redef class ASuperExpr
                        assert p isa MMMethod
                        _init_in_superclass = p
                        register_super_init_call(v, p)
-                       if n_args.length > 0 then
+                       if n_args.n_exprs.length > 0 then
                                var signature = get_signature(v, v.self_var.stype.as(not null), p, true)
                                process_signature(v, signature, p.name, compute_raw_arguments)
                        end
@@ -1840,7 +1840,7 @@ redef class ACallFormExpr
                                        n = new AClosureCallExpr.init_aclosurecallexpr(n_id, n_args, n_closure_defs)
                                        n._variable = variable
                                else
-                                       if not n_args.is_empty then
+                                       if not n_args.n_exprs.is_empty then
                                                v.error(self, "Error: {name} is variable, not a function.")
                                                return
                                        end

diff --git a/tests/sav/base_closure1_alt2.sav b/tests/sav/base_closure1_alt2.sav
index f0b16a5..a96064e 100644 (file)
--- a/tests/sav/base_closure1_alt2.sav
+++ b/tests/sav/base_closure1_alt2.sav
@@ -1 +1 @@
-alt/base_closure1_alt2.nit:25,3--7: Error: arity mismatch; prototype is 'bar'.
+alt/base_closure1_alt2.nit:25,3--8: Error: arity mismatch; prototype is 'bar'.

diff --git a/tests/sav/base_closure2_alt3.sav b/tests/sav/base_closure2_alt3.sav
index 05bb8b7..6124b95 100644 (file)
--- a/tests/sav/base_closure2_alt3.sav
+++ b/tests/sav/base_closure2_alt3.sav
@@ -1 +1 @@
-alt/base_closure2_alt3.nit:27,11--15: Type error: expected expression.
+alt/base_closure2_alt3.nit:27,11--16: Type error: expected expression.

diff --git a/tests/sav/base_closure3_alt1.sav b/tests/sav/base_closure3_alt1.sav
index fd9b06f..e7a911c 100644 (file)
--- a/tests/sav/base_closure3_alt1.sav
+++ b/tests/sav/base_closure3_alt1.sav
@@ -1 +1 @@
-alt/base_closure3_alt1.nit:25,3--14: Error: arity mismatch; prototype is 'bar(k: Int, l: Int, a: A)'.
+alt/base_closure3_alt1.nit:25,3--15: Error: arity mismatch; prototype is 'bar(k: Int, l: Int, a: A)'.

diff --git a/tests/sav/base_closure4_alt2.sav b/tests/sav/base_closure4_alt2.sav
index 80b595c..81eab86 100644 (file)
--- a/tests/sav/base_closure4_alt2.sav
+++ b/tests/sav/base_closure4_alt2.sav
@@ -1 +1 @@
-alt/base_closure4_alt2.nit:25,3--7: Error: arity mismatch; prototype is 'bar: Int'.
+alt/base_closure4_alt2.nit:25,3--8: Error: arity mismatch; prototype is 'bar: Int'.

diff --git a/tests/sav/base_closure_break2_alt2.sav b/tests/sav/base_closure_break2_alt2.sav
index 61e93cd..3d6552e 100644 (file)
--- a/tests/sav/base_closure_break2_alt2.sav
+++ b/tests/sav/base_closure_break2_alt2.sav
@@ -1 +1 @@
-alt/base_closure_break2_alt2.nit:26,17--21: Error: arity mismatch; prototype is 'bar'.
+alt/base_closure_break2_alt2.nit:26,17--22: Error: arity mismatch; prototype is 'bar'.

diff --git a/tests/sav/base_closure_break_alt2.sav b/tests/sav/base_closure_break_alt2.sav
index e941919..79f287f 100644 (file)
--- a/tests/sav/base_closure_break_alt2.sav
+++ b/tests/sav/base_closure_break_alt2.sav
@@ -1 +1 @@
-alt/base_closure_break_alt2.nit:26,17--21: Error: arity mismatch; prototype is 'bar'.
+alt/base_closure_break_alt2.nit:26,17--22: Error: arity mismatch; prototype is 'bar'.

diff --git a/tests/sav/base_closure_raf_alt13.fail b/tests/sav/base_closure_raf_alt13.fail
index 7347132..25871df 100644 (file)
--- a/tests/sav/base_closure_raf_alt13.fail
+++ b/tests/sav/base_closure_raf_alt13.fail
@@ -1 +1 @@
-alt/base_closure_raf_alt13.nit:27,3--8: Error: arity mismatch; prototype is 'bar'.
+alt/base_closure_raf_alt13.nit:27,3--9: Error: arity mismatch; prototype is 'bar'.

diff --git a/tests/sav/base_closure_raf_alt3.fail b/tests/sav/base_closure_raf_alt3.fail
index a5e47ee..cbf0ff6 100644 (file)
--- a/tests/sav/base_closure_raf_alt3.fail
+++ b/tests/sav/base_closure_raf_alt3.fail
@@ -1 +1 @@
-alt/base_closure_raf_alt3.nit:31,11--15: Type error: expected expression.
+alt/base_closure_raf_alt3.nit:31,11--16: Type error: expected expression.

diff --git a/tests/sav/base_isa_cast2_alt1.sav b/tests/sav/base_isa_cast2_alt1.sav
index 148bc33..a982734 100644 (file)
--- a/tests/sav/base_isa_cast2_alt1.sav
+++ b/tests/sav/base_isa_cast2_alt1.sav
@@ -1 +1 @@
-alt/base_isa_cast2_alt1.nit:35,2--9: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast2_alt1.nit:35,2--10: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast2_alt2.sav b/tests/sav/base_isa_cast2_alt2.sav
index 9e5a166..e4ae9a8 100644 (file)
--- a/tests/sav/base_isa_cast2_alt2.sav
+++ b/tests/sav/base_isa_cast2_alt2.sav
@@ -1 +1 @@
-alt/base_isa_cast2_alt2.nit:37,1--8: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast2_alt2.nit:37,1--9: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast2_alt3.sav b/tests/sav/base_isa_cast2_alt3.sav
index 65186d9..4230d82 100644 (file)
--- a/tests/sav/base_isa_cast2_alt3.sav
+++ b/tests/sav/base_isa_cast2_alt3.sav
@@ -1 +1 @@
-alt/base_isa_cast2_alt3.nit:39,1--8: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast2_alt3.nit:39,1--9: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast2_alt4.sav b/tests/sav/base_isa_cast2_alt4.sav
index 3d2c680..6d59377 100644 (file)
--- a/tests/sav/base_isa_cast2_alt4.sav
+++ b/tests/sav/base_isa_cast2_alt4.sav
@@ -1 +1 @@
-alt/base_isa_cast2_alt4.nit:42,2--9: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast2_alt4.nit:42,2--10: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast2_alt5.sav b/tests/sav/base_isa_cast2_alt5.sav
index 0b93912..02ec11f 100644 (file)
--- a/tests/sav/base_isa_cast2_alt5.sav
+++ b/tests/sav/base_isa_cast2_alt5.sav
@@ -1 +1 @@
-alt/base_isa_cast2_alt5.nit:52,2--9: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast2_alt5.nit:52,2--10: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast2_alt6.sav b/tests/sav/base_isa_cast2_alt6.sav
index 21595bf..4e56b3b 100644 (file)
--- a/tests/sav/base_isa_cast2_alt6.sav
+++ b/tests/sav/base_isa_cast2_alt6.sav
@@ -1 +1 @@
-alt/base_isa_cast2_alt6.nit:54,1--8: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast2_alt6.nit:54,1--9: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast2_alt7.sav b/tests/sav/base_isa_cast2_alt7.sav
index 33bd723..8b543e8 100644 (file)
--- a/tests/sav/base_isa_cast2_alt7.sav
+++ b/tests/sav/base_isa_cast2_alt7.sav
@@ -1 +1 @@
-alt/base_isa_cast2_alt7.nit:57,2--9: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast2_alt7.nit:57,2--10: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast3_alt1.sav b/tests/sav/base_isa_cast3_alt1.sav
index 26dcf6f..6043983 100644 (file)
--- a/tests/sav/base_isa_cast3_alt1.sav
+++ b/tests/sav/base_isa_cast3_alt1.sav
@@ -1 +1 @@
-alt/base_isa_cast3_alt1.nit:34,2--9: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast3_alt1.nit:34,2--10: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast3_alt2.sav b/tests/sav/base_isa_cast3_alt2.sav
index b3e455f..90d9501 100644 (file)
--- a/tests/sav/base_isa_cast3_alt2.sav
+++ b/tests/sav/base_isa_cast3_alt2.sav
@@ -1 +1 @@
-alt/base_isa_cast3_alt2.nit:36,1--8: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast3_alt2.nit:36,1--9: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast3_alt3.sav b/tests/sav/base_isa_cast3_alt3.sav
index ea93124..6dd921f 100644 (file)
--- a/tests/sav/base_isa_cast3_alt3.sav
+++ b/tests/sav/base_isa_cast3_alt3.sav
@@ -1 +1 @@
-alt/base_isa_cast3_alt3.nit:39,2--9: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast3_alt3.nit:39,2--10: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast3_alt4.sav b/tests/sav/base_isa_cast3_alt4.sav
index dcb1bf6..ce132de 100644 (file)
--- a/tests/sav/base_isa_cast3_alt4.sav
+++ b/tests/sav/base_isa_cast3_alt4.sav
@@ -1 +1 @@
-alt/base_isa_cast3_alt4.nit:43,1--8: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast3_alt4.nit:43,1--9: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast3_alt5.sav b/tests/sav/base_isa_cast3_alt5.sav
index d524248..72b28de 100644 (file)
--- a/tests/sav/base_isa_cast3_alt5.sav
+++ b/tests/sav/base_isa_cast3_alt5.sav
@@ -1 +1 @@
-alt/base_isa_cast3_alt5.nit:48,2--9: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast3_alt5.nit:48,2--10: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast3_alt6.sav b/tests/sav/base_isa_cast3_alt6.sav
index 3c9fc0f..9662e6a 100644 (file)
--- a/tests/sav/base_isa_cast3_alt6.sav
+++ b/tests/sav/base_isa_cast3_alt6.sav
@@ -1 +1 @@
-alt/base_isa_cast3_alt6.nit:50,1--8: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast3_alt6.nit:50,1--9: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast3_alt7.sav b/tests/sav/base_isa_cast3_alt7.sav
index a301a75..7f0add5 100644 (file)
--- a/tests/sav/base_isa_cast3_alt7.sav
+++ b/tests/sav/base_isa_cast3_alt7.sav
@@ -1 +1 @@
-alt/base_isa_cast3_alt7.nit:53,2--9: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast3_alt7.nit:53,2--10: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast3_alt8.sav b/tests/sav/base_isa_cast3_alt8.sav
index 6fc6d23..8670269 100644 (file)
--- a/tests/sav/base_isa_cast3_alt8.sav
+++ b/tests/sav/base_isa_cast3_alt8.sav
@@ -1 +1 @@
-alt/base_isa_cast3_alt8.nit:57,1--8: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast3_alt8.nit:57,1--9: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast3_alt9.sav b/tests/sav/base_isa_cast3_alt9.sav
index 3f3996f..2627837 100644 (file)
--- a/tests/sav/base_isa_cast3_alt9.sav
+++ b/tests/sav/base_isa_cast3_alt9.sav
@@ -1 +1 @@
-alt/base_isa_cast3_alt9.nit:64,3--10: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast3_alt9.nit:64,3--11: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast4_alt1.sav b/tests/sav/base_isa_cast4_alt1.sav
index 2ea0fd0..27da19b 100644 (file)
--- a/tests/sav/base_isa_cast4_alt1.sav
+++ b/tests/sav/base_isa_cast4_alt1.sav
@@ -1 +1 @@
-alt/base_isa_cast4_alt1.nit:40,1--7: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast4_alt1.nit:40,1--8: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast4_alt2.sav b/tests/sav/base_isa_cast4_alt2.sav
index 5052496..9d1c0dd 100644 (file)
--- a/tests/sav/base_isa_cast4_alt2.sav
+++ b/tests/sav/base_isa_cast4_alt2.sav
@@ -1 +1 @@
-alt/base_isa_cast4_alt2.nit:49,1--7: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast4_alt2.nit:49,1--8: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast4_alt3.sav b/tests/sav/base_isa_cast4_alt3.sav
index 8c30f37..afc672b 100644 (file)
--- a/tests/sav/base_isa_cast4_alt3.sav
+++ b/tests/sav/base_isa_cast4_alt3.sav
@@ -1 +1 @@
-alt/base_isa_cast4_alt3.nit:58,1--7: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast4_alt3.nit:58,1--8: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_isa_cast4_alt4.sav b/tests/sav/base_isa_cast4_alt4.sav
index 631b853..6cad704 100644 (file)
--- a/tests/sav/base_isa_cast4_alt4.sav
+++ b/tests/sav/base_isa_cast4_alt4.sav
@@ -1 +1 @@
-alt/base_isa_cast4_alt4.nit:74,1--7: Error: Method 'foo' doesn't exists in A.
+alt/base_isa_cast4_alt4.nit:74,1--8: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/base_meth_call_alt1.sav b/tests/sav/base_meth_call_alt1.sav
index bf34c44..0467d93 100644 (file)
--- a/tests/sav/base_meth_call_alt1.sav
+++ b/tests/sav/base_meth_call_alt1.sav
@@ -1 +1 @@
-alt/base_meth_call_alt1.nit:36,3--7: Type error: expected expression.
+alt/base_meth_call_alt1.nit:36,3--8: Type error: expected expression.

diff --git a/tests/sav/base_meth_call_alt2.sav b/tests/sav/base_meth_call_alt2.sav
index a526edf..0faa0c4 100644 (file)
--- a/tests/sav/base_meth_call_alt2.sav
+++ b/tests/sav/base_meth_call_alt2.sav
@@ -1 +1 @@
-alt/base_meth_call_alt2.nit:37,11--15: Type error: expected expression.
+alt/base_meth_call_alt2.nit:37,11--16: Type error: expected expression.

diff --git a/tests/sav/base_meth_call_alt3.sav b/tests/sav/base_meth_call_alt3.sav
index 8b0a295..2acf2fa 100644 (file)
--- a/tests/sav/base_meth_call_alt3.sav
+++ b/tests/sav/base_meth_call_alt3.sav
@@ -1 +1 @@
-alt/base_meth_call_alt3.nit:39,7--11: Type error: expected expression.
+alt/base_meth_call_alt3.nit:39,7--12: Type error: expected expression.

diff --git a/tests/sav/base_meth_call_alt4.sav b/tests/sav/base_meth_call_alt4.sav
index 958c0e3..16b8f27 100644 (file)
--- a/tests/sav/base_meth_call_alt4.sav
+++ b/tests/sav/base_meth_call_alt4.sav
@@ -1 +1 @@
-alt/base_meth_call_alt4.nit:41,7--12: Type error: expected expression.
+alt/base_meth_call_alt4.nit:41,7--13: Type error: expected expression.

diff --git a/tests/sav/base_vararg_alt3.sav b/tests/sav/base_vararg_alt3.sav
index 769fb6c..eb35b9c 100644 (file)
--- a/tests/sav/base_vararg_alt3.sav
+++ b/tests/sav/base_vararg_alt3.sav
@@ -1 +1 @@
-alt/base_vararg_alt3.nit:55,1--7: Error: arity mismatch; prototype is 'bar(b: Char, a: Char)'.
+alt/base_vararg_alt3.nit:55,1--8: Error: arity mismatch; prototype is 'bar(b: Char, a: Char)'.

diff --git a/tests/sav/base_vararg_alt5.sav b/tests/sav/base_vararg_alt5.sav
index aea970c..c2619c6 100644 (file)
--- a/tests/sav/base_vararg_alt5.sav
+++ b/tests/sav/base_vararg_alt5.sav
@@ -1 +1 @@
-alt/base_vararg_alt5.nit:59,1--7: Error: arity mismatch; prototype is 'baz(a: Char, b: Char)'.
+alt/base_vararg_alt5.nit:59,1--8: Error: arity mismatch; prototype is 'baz(a: Char, b: Char)'.

diff --git a/tests/sav/base_vararg_alt7.sav b/tests/sav/base_vararg_alt7.sav
index ea9f0ff..f2e8453 100644 (file)
--- a/tests/sav/base_vararg_alt7.sav
+++ b/tests/sav/base_vararg_alt7.sav
@@ -1 +1 @@
-alt/base_vararg_alt7.nit:63,1--10: Error: arity mismatch; prototype is 'foobar(b: Char, a: Char, c: Char)'.
+alt/base_vararg_alt7.nit:63,1--11: Error: arity mismatch; prototype is 'foobar(b: Char, a: Char, c: Char)'.

diff --git a/tests/sav/base_vararg_alt8.sav b/tests/sav/base_vararg_alt8.sav
index 75c3324..1f3bac2 100644 (file)
--- a/tests/sav/base_vararg_alt8.sav
+++ b/tests/sav/base_vararg_alt8.sav
@@ -1 +1 @@
-alt/base_vararg_alt8.nit:64,1--14: Error: arity mismatch; prototype is 'foobar(b: Char, a: Char, c: Char)'.
+alt/base_vararg_alt8.nit:64,1--15: Error: arity mismatch; prototype is 'foobar(b: Char, a: Char, c: Char)'.

diff --git a/tests/sav/error_expr_not_ok.sav b/tests/sav/error_expr_not_ok.sav
index 129b0b6..13a1835 100644 (file)
--- a/tests/sav/error_expr_not_ok.sav
+++ b/tests/sav/error_expr_not_ok.sav
@@ -127,7 +127,7 @@ error_expr_not_ok.nit:126,7--10: Error: Method or variable 'fail' unknown in Sys
 error_expr_not_ok.nit:127,1--4: Error: Method or variable 'fail' unknown in Sys.
 error_expr_not_ok.nit:128,1--4: Error: Method or variable 'fail' unknown in Sys.
 error_expr_not_ok.nit:131,11--14: Error: Method or variable 'fail' unknown in Sys.
-error_expr_not_ok.nit:131,7--14: Type error: expected A, got Int
+error_expr_not_ok.nit:131,7--15: Type error: expected A, got Int
 error_expr_not_ok.nit:132,10--13: Error: Method or variable 'fail' unknown in Sys.
 error_expr_not_ok.nit:133,11--14: Error: Method or variable 'fail' unknown in Sys.
 error_expr_not_ok.nit:134,7--10: Error: Method or variable 'fail' unknown in Sys.

diff --git a/tests/sav/error_expr_not_ok_alt2.sav b/tests/sav/error_expr_not_ok_alt2.sav
index d8bf036..59d879e 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt2.sav
+++ b/tests/sav/error_expr_not_ok_alt2.sav
@@ -83,8 +83,8 @@ alt/error_expr_not_ok_alt2.nit:124,1--14: Error: Attribute _fail doesn't exists
 alt/error_expr_not_ok_alt2.nit:126,7--13: Error: Attribute _x doesn't exists in Int.
 alt/error_expr_not_ok_alt2.nit:127,1--11: Error: Attribute _x doesn't exists in Int.
 alt/error_expr_not_ok_alt2.nit:128,1--12: Error: Attribute _x doesn't exists in Int.
-alt/error_expr_not_ok_alt2.nit:131,7--14: Type error: expected A, got Int
-alt/error_expr_not_ok_alt2.nit:134,7--12: Error: Method '[]' doesn't exists in Int.
+alt/error_expr_not_ok_alt2.nit:131,7--15: Type error: expected A, got Int
+alt/error_expr_not_ok_alt2.nit:134,7--13: Error: Method '[]' doesn't exists in Int.
 alt/error_expr_not_ok_alt2.nit:135,1--11: Error: Method '[]=' doesn't exists in Int.
 alt/error_expr_not_ok_alt2.nit:136,1--12: Error: Method '[]' doesn't exists in Int.
 alt/error_expr_not_ok_alt2.nit:137,1--17: Error: Method '[]=' doesn't exists in Int.
@@ -94,9 +94,9 @@ alt/error_expr_not_ok_alt2.nit:141,7--18: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt2.nit:142,7--15: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt2.nit:143,7--15: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt2.nit:144,7--18: Type error: expected A, got Range[Int]
-alt/error_expr_not_ok_alt2.nit:145,8--14: Type error: expected A, got Array[Int]
-alt/error_expr_not_ok_alt2.nit:146,8--14: Type error: expected A, got Array[Int]
-alt/error_expr_not_ok_alt2.nit:147,8--17: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt2.nit:145,7--15: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt2.nit:146,7--15: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt2.nit:147,7--18: Type error: expected A, got Array[Int]
 alt/error_expr_not_ok_alt2.nit:149,7--24: Type error: expected A, got String
 alt/error_expr_not_ok_alt2.nit:150,7--18: Type error: expected A, got Int
 alt/error_expr_not_ok_alt2.nit:151,7--23: Type error: expected A, got Int

diff --git a/tests/sav/error_expr_not_ok_alt3.sav b/tests/sav/error_expr_not_ok_alt3.sav
index 7d5e669..371b126 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt3.sav
+++ b/tests/sav/error_expr_not_ok_alt3.sav
@@ -3,7 +3,7 @@ alt/error_expr_not_ok_alt3.nit:21,11--14: Error: Method or variable 'fail' unkno
 alt/error_expr_not_ok_alt3.nit:22,26--29: Error: Method or variable 'fail' unknown in A.
 alt/error_expr_not_ok_alt3.nit:24,8--11: Error: Method or variable 'fail' unknown in A.
 alt/error_expr_not_ok_alt3.nit:25,9--12: Error: Method or variable 'fail' unknown in A.
-alt/error_expr_not_ok_alt3.nit:34,12--17: Error: Method or variable 'fail' unknown in Sys.
+alt/error_expr_not_ok_alt3.nit:34,12--18: Error: Method or variable 'fail' unknown in Sys.
 alt/error_expr_not_ok_alt3.nit:40,1--7: Error: Method 'fail' doesn't exists in Int.
 alt/error_expr_not_ok_alt3.nit:42,7--9: Type error: expected A, got Int
 alt/error_expr_not_ok_alt3.nit:43,1--8: Error: Method 'fail' doesn't exists in Int.
@@ -82,8 +82,8 @@ alt/error_expr_not_ok_alt3.nit:124,1--14: Error: Attribute _fail doesn't exists
 alt/error_expr_not_ok_alt3.nit:126,7--13: Error: Attribute _x doesn't exists in Int.
 alt/error_expr_not_ok_alt3.nit:127,1--11: Error: Attribute _x doesn't exists in Int.
 alt/error_expr_not_ok_alt3.nit:128,1--12: Error: Attribute _x doesn't exists in Int.
-alt/error_expr_not_ok_alt3.nit:131,7--14: Type error: expected A, got Int
-alt/error_expr_not_ok_alt3.nit:134,7--12: Error: Method '[]' doesn't exists in Int.
+alt/error_expr_not_ok_alt3.nit:131,7--15: Type error: expected A, got Int
+alt/error_expr_not_ok_alt3.nit:134,7--13: Error: Method '[]' doesn't exists in Int.
 alt/error_expr_not_ok_alt3.nit:135,1--11: Error: Method '[]=' doesn't exists in Int.
 alt/error_expr_not_ok_alt3.nit:136,1--12: Error: Method '[]' doesn't exists in Int.
 alt/error_expr_not_ok_alt3.nit:137,1--17: Error: Method '[]=' doesn't exists in Int.
@@ -93,9 +93,9 @@ alt/error_expr_not_ok_alt3.nit:141,7--18: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt3.nit:142,7--15: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt3.nit:143,7--15: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt3.nit:144,7--18: Type error: expected A, got Range[Int]
-alt/error_expr_not_ok_alt3.nit:145,8--14: Type error: expected A, got Array[Int]
-alt/error_expr_not_ok_alt3.nit:146,8--14: Type error: expected A, got Array[Int]
-alt/error_expr_not_ok_alt3.nit:147,8--17: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt3.nit:145,7--15: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt3.nit:146,7--15: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt3.nit:147,7--18: Type error: expected A, got Array[Int]
 alt/error_expr_not_ok_alt3.nit:149,7--24: Type error: expected A, got String
 alt/error_expr_not_ok_alt3.nit:150,7--18: Type error: expected A, got Int
 alt/error_expr_not_ok_alt3.nit:151,7--23: Type error: expected A, got Int

diff --git a/tests/sav/error_expr_not_ok_alt4.sav b/tests/sav/error_expr_not_ok_alt4.sav
index 09da141..6a8abea 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt4.sav
+++ b/tests/sav/error_expr_not_ok_alt4.sav
@@ -86,8 +86,8 @@ alt/error_expr_not_ok_alt4.nit:124,1--14: Error: Attribute _fail doesn't exists
 alt/error_expr_not_ok_alt4.nit:126,7--13: Error: Attribute _x doesn't exists in Int.
 alt/error_expr_not_ok_alt4.nit:127,1--11: Error: Attribute _x doesn't exists in Int.
 alt/error_expr_not_ok_alt4.nit:128,1--12: Error: Attribute _x doesn't exists in Int.
-alt/error_expr_not_ok_alt4.nit:131,7--14: Type error: expected A, got Int
-alt/error_expr_not_ok_alt4.nit:134,7--12: Error: Method '[]' doesn't exists in Int.
+alt/error_expr_not_ok_alt4.nit:131,7--15: Type error: expected A, got Int
+alt/error_expr_not_ok_alt4.nit:134,7--13: Error: Method '[]' doesn't exists in Int.
 alt/error_expr_not_ok_alt4.nit:135,1--11: Error: Method '[]=' doesn't exists in Int.
 alt/error_expr_not_ok_alt4.nit:136,1--12: Error: Method '[]' doesn't exists in Int.
 alt/error_expr_not_ok_alt4.nit:137,1--17: Error: Method '[]=' doesn't exists in Int.
@@ -97,9 +97,9 @@ alt/error_expr_not_ok_alt4.nit:141,7--18: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt4.nit:142,7--15: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt4.nit:143,7--15: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt4.nit:144,7--18: Type error: expected A, got Range[Int]
-alt/error_expr_not_ok_alt4.nit:145,8--14: Type error: expected A, got Array[Int]
-alt/error_expr_not_ok_alt4.nit:146,8--14: Type error: expected A, got Array[Int]
-alt/error_expr_not_ok_alt4.nit:147,8--17: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt4.nit:145,7--15: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt4.nit:146,7--15: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt4.nit:147,7--18: Type error: expected A, got Array[Int]
 alt/error_expr_not_ok_alt4.nit:149,7--24: Type error: expected A, got String
 alt/error_expr_not_ok_alt4.nit:150,7--18: Type error: expected A, got Int
 alt/error_expr_not_ok_alt4.nit:151,7--23: Type error: expected A, got Int

diff --git a/tests/sav/error_expr_not_ok_alt5.sav b/tests/sav/error_expr_not_ok_alt5.sav
index 07d2cf6..291daf8 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt5.sav
+++ b/tests/sav/error_expr_not_ok_alt5.sav
@@ -3,7 +3,7 @@ alt/error_expr_not_ok_alt5.nit:21,11--14: Error: Method or variable 'fail' unkno
 alt/error_expr_not_ok_alt5.nit:22,26--29: Error: Method or variable 'fail' unknown in A.
 alt/error_expr_not_ok_alt5.nit:24,8--11: Error: Method or variable 'fail' unknown in A.
 alt/error_expr_not_ok_alt5.nit:25,9--12: Error: Method or variable 'fail' unknown in A.
-alt/error_expr_not_ok_alt5.nit:37,8--14: Error: Method or variable 'fail2' unknown in Sys.
+alt/error_expr_not_ok_alt5.nit:37,8--15: Error: Method or variable 'fail2' unknown in Sys.
 alt/error_expr_not_ok_alt5.nit:40,1--7: Error: Method 'fail' doesn't exists in Int.
 alt/error_expr_not_ok_alt5.nit:41,16--19: Type error: expected Int, got Object
 alt/error_expr_not_ok_alt5.nit:42,7--9: Type error: expected A, got Int
@@ -87,8 +87,8 @@ alt/error_expr_not_ok_alt5.nit:124,1--14: Error: Attribute _fail doesn't exists
 alt/error_expr_not_ok_alt5.nit:126,7--13: Error: Attribute _x doesn't exists in Int.
 alt/error_expr_not_ok_alt5.nit:127,1--11: Error: Attribute _x doesn't exists in Int.
 alt/error_expr_not_ok_alt5.nit:128,1--12: Error: Attribute _x doesn't exists in Int.
-alt/error_expr_not_ok_alt5.nit:131,7--14: Type error: expected A, got Int
-alt/error_expr_not_ok_alt5.nit:134,7--12: Error: Method '[]' doesn't exists in Int.
+alt/error_expr_not_ok_alt5.nit:131,7--15: Type error: expected A, got Int
+alt/error_expr_not_ok_alt5.nit:134,7--13: Error: Method '[]' doesn't exists in Int.
 alt/error_expr_not_ok_alt5.nit:135,1--11: Error: Method '[]=' doesn't exists in Int.
 alt/error_expr_not_ok_alt5.nit:136,1--12: Error: Method '[]' doesn't exists in Int.
 alt/error_expr_not_ok_alt5.nit:137,1--17: Error: Method '[]=' doesn't exists in Int.
@@ -98,9 +98,9 @@ alt/error_expr_not_ok_alt5.nit:141,7--18: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt5.nit:142,7--15: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt5.nit:143,7--15: Type error: expected A, got Range[Int]
 alt/error_expr_not_ok_alt5.nit:144,7--18: Type error: expected A, got Range[Int]
-alt/error_expr_not_ok_alt5.nit:145,8--14: Type error: expected A, got Array[Int]
-alt/error_expr_not_ok_alt5.nit:146,8--14: Type error: expected A, got Array[Int]
-alt/error_expr_not_ok_alt5.nit:147,8--17: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt5.nit:145,7--15: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt5.nit:146,7--15: Type error: expected A, got Array[Int]
+alt/error_expr_not_ok_alt5.nit:147,7--18: Type error: expected A, got Array[Int]
 alt/error_expr_not_ok_alt5.nit:149,7--24: Type error: expected A, got String
 alt/error_expr_not_ok_alt5.nit:150,7--18: Type error: expected A, got Int
 alt/error_expr_not_ok_alt5.nit:151,7--23: Type error: expected A, got Int

diff --git a/tests/sav/error_expr_not_ok_alt6.sav b/tests/sav/error_expr_not_ok_alt6.sav
index b20329d..7fc7a67 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt6.sav
+++ b/tests/sav/error_expr_not_ok_alt6.sav
@@ -102,10 +102,10 @@ alt/error_expr_not_ok_alt6.nit:126,7--13: Error: Attribute '_x' access on 'null'
 alt/error_expr_not_ok_alt6.nit:127,1--11: Error: Attribute '_x' access on 'null'.
 alt/error_expr_not_ok_alt6.nit:128,1--12: Error: Attribute '_x' access on 'null'.
 alt/error_expr_not_ok_alt6.nit:131,11--14: Type error: expected Int, got null
-alt/error_expr_not_ok_alt6.nit:131,7--14: Type error: expected A, got Int
+alt/error_expr_not_ok_alt6.nit:131,7--15: Type error: expected A, got Int
 alt/error_expr_not_ok_alt6.nit:132,10--13: Type error: expected Int, got null
 alt/error_expr_not_ok_alt6.nit:133,11--14: Type error: expected Int, got null
-alt/error_expr_not_ok_alt6.nit:134,7--12: Error: Method '[]' call on 'null'.
+alt/error_expr_not_ok_alt6.nit:134,7--13: Error: Method '[]' call on 'null'.
 alt/error_expr_not_ok_alt6.nit:135,1--11: Error: Method '[]=' call on 'null'.
 alt/error_expr_not_ok_alt6.nit:136,1--12: Error: Method '[]' call on 'null'.
 alt/error_expr_not_ok_alt6.nit:137,1--17: Error: Method '[]=' call on 'null'.
@@ -115,9 +115,9 @@ alt/error_expr_not_ok_alt6.nit:141,8--11: Type error: expected Discrete, got nul
 alt/error_expr_not_ok_alt6.nit:142,7--15: Type error: Int incompatible with null.
 alt/error_expr_not_ok_alt6.nit:143,7--15: Type error: null incompatible with Int.
 alt/error_expr_not_ok_alt6.nit:144,8--11: Type error: expected Discrete, got null
-alt/error_expr_not_ok_alt6.nit:145,8--14: Type error: expected A, got Array[nullable Int]
-alt/error_expr_not_ok_alt6.nit:146,8--14: Type error: expected A, got Array[nullable Int]
-alt/error_expr_not_ok_alt6.nit:147,8--17: Type error: expected A, got Array[null]
+alt/error_expr_not_ok_alt6.nit:145,7--15: Type error: expected A, got Array[nullable Int]
+alt/error_expr_not_ok_alt6.nit:146,7--15: Type error: expected A, got Array[nullable Int]
+alt/error_expr_not_ok_alt6.nit:147,7--18: Type error: expected A, got Array[null]
 alt/error_expr_not_ok_alt6.nit:149,14--17: Type error: expected Object, got null
 alt/error_expr_not_ok_alt6.nit:149,7--24: Type error: expected A, got String
 alt/error_expr_not_ok_alt6.nit:150,7--18: Type error: expected A, got Int

diff --git a/tests/sav/error_init_auto.sav b/tests/sav/error_init_auto.sav
index 17122af..dcb1968 100644 (file)
--- a/tests/sav/error_init_auto.sav
+++ b/tests/sav/error_init_auto.sav
@@ -1,4 +1,4 @@
 error_init_auto.nit:34,5--9: Error: arity mismatch; prototype is 'init(x: Int)'.
-error_init_auto.nit:36,5--14: Error: arity mismatch; prototype is 'init(x: Int)'.
-error_init_auto.nit:37,5--17: Error: arity mismatch; prototype is 'init(x: Int)'.
-error_init_auto.nit:38,5--15: Error: Method 'foo' doesn't exists in A.
+error_init_auto.nit:36,5--15: Error: arity mismatch; prototype is 'init(x: Int)'.
+error_init_auto.nit:37,5--18: Error: arity mismatch; prototype is 'init(x: Int)'.
+error_init_auto.nit:38,5--16: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/error_init_auto_alt1.sav b/tests/sav/error_init_auto_alt1.sav
index 8c3f211..af45a76 100644 (file)
--- a/tests/sav/error_init_auto_alt1.sav
+++ b/tests/sav/error_init_auto_alt1.sav
@@ -1,4 +1,4 @@
-alt/error_init_auto_alt1.nit:34,5--11: Error: arity mismatch; prototype is 'init'.
-alt/error_init_auto_alt1.nit:35,5--14: Error: arity mismatch; prototype is 'init'.
-alt/error_init_auto_alt1.nit:36,5--17: Error: arity mismatch; prototype is 'init'.
-alt/error_init_auto_alt1.nit:37,5--15: Error: Method 'foo' doesn't exists in A.
+alt/error_init_auto_alt1.nit:34,5--12: Error: arity mismatch; prototype is 'init'.
+alt/error_init_auto_alt1.nit:35,5--15: Error: arity mismatch; prototype is 'init'.
+alt/error_init_auto_alt1.nit:36,5--18: Error: arity mismatch; prototype is 'init'.
+alt/error_init_auto_alt1.nit:37,5--16: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/error_init_auto_alt2.sav b/tests/sav/error_init_auto_alt2.sav
index 3fdbc48..337594c 100644 (file)
--- a/tests/sav/error_init_auto_alt2.sav
+++ b/tests/sav/error_init_auto_alt2.sav
@@ -1,4 +1,4 @@
 alt/error_init_auto_alt2.nit:33,5--9: Error: arity mismatch; prototype is 'init(x: Int, y: Int)'.
-alt/error_init_auto_alt2.nit:34,5--11: Error: arity mismatch; prototype is 'init(x: Int, y: Int)'.
-alt/error_init_auto_alt2.nit:36,5--17: Error: arity mismatch; prototype is 'init(x: Int, y: Int)'.
-alt/error_init_auto_alt2.nit:37,5--15: Error: Method 'foo' doesn't exists in A.
+alt/error_init_auto_alt2.nit:34,5--12: Error: arity mismatch; prototype is 'init(x: Int, y: Int)'.
+alt/error_init_auto_alt2.nit:36,5--18: Error: arity mismatch; prototype is 'init(x: Int, y: Int)'.
+alt/error_init_auto_alt2.nit:37,5--16: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/error_init_auto_alt3.sav b/tests/sav/error_init_auto_alt3.sav
index c3598ce..d51f75a 100644 (file)
--- a/tests/sav/error_init_auto_alt3.sav
+++ b/tests/sav/error_init_auto_alt3.sav
@@ -1,4 +1,4 @@
 alt/error_init_auto_alt3.nit:34,5--9: Error: arity mismatch; prototype is 'init(xx: Int)'.
-alt/error_init_auto_alt3.nit:36,5--14: Error: arity mismatch; prototype is 'init(xx: Int)'.
-alt/error_init_auto_alt3.nit:37,5--17: Error: arity mismatch; prototype is 'init(xx: Int)'.
-alt/error_init_auto_alt3.nit:38,5--15: Error: Method 'foo' doesn't exists in A.
+alt/error_init_auto_alt3.nit:36,5--15: Error: arity mismatch; prototype is 'init(xx: Int)'.
+alt/error_init_auto_alt3.nit:37,5--18: Error: arity mismatch; prototype is 'init(xx: Int)'.
+alt/error_init_auto_alt3.nit:38,5--16: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/error_init_auto_alt4.sav b/tests/sav/error_init_auto_alt4.sav
index d17504c..3fbb2e0 100644 (file)
--- a/tests/sav/error_init_auto_alt4.sav
+++ b/tests/sav/error_init_auto_alt4.sav
@@ -1,4 +1,4 @@
 alt/error_init_auto_alt4.nit:34,5--9: Error: Method 'init' doesn't exists in A.
-alt/error_init_auto_alt4.nit:35,5--11: Error: Method 'init' doesn't exists in A.
-alt/error_init_auto_alt4.nit:36,5--14: Error: Method 'init' doesn't exists in A.
-alt/error_init_auto_alt4.nit:37,5--17: Error: Method 'init' doesn't exists in A.
+alt/error_init_auto_alt4.nit:35,5--12: Error: Method 'init' doesn't exists in A.
+alt/error_init_auto_alt4.nit:36,5--15: Error: Method 'init' doesn't exists in A.
+alt/error_init_auto_alt4.nit:37,5--18: Error: Method 'init' doesn't exists in A.

diff --git a/tests/sav/error_var_args.sav b/tests/sav/error_var_args.sav
index 6f8753d..b07eae7 100644 (file)
--- a/tests/sav/error_var_args.sav
+++ b/tests/sav/error_var_args.sav
@@ -1 +1 @@
-error_var_args.nit:18,1--3: Error: t is variable, not a function.
+error_var_args.nit:18,1--4: Error: t is variable, not a function.

diff --git a/tests/sav/test_parser_args1.sav b/tests/sav/test_parser_args1.sav
index e25dc74..d2a7d92 100644 (file)
--- a/tests/sav/test_parser_args1.sav
+++ b/tests/sav/test_parser_args1.sav
@@ -44,27 +44,36 @@
             ../src/syntax/typing.nit:27,20--30
               type identifier 'ToolContext' ... ../src/syntax/typing.nit:27,20--30
         ../src/syntax/typing.nit:29,3--31,4
-          ../src/syntax/typing.nit:29,3--37
+          ../src/syntax/typing.nit:29,3--38
             keyword 'var' ... ../src/syntax/typing.nit:29,3--5
             identifier 'tv' ... ../src/syntax/typing.nit:29,7--8
             '=' ... ../src/syntax/typing.nit:29,10
-            ../src/syntax/typing.nit:29,12--37
+            ../src/syntax/typing.nit:29,12--38
               keyword 'new' ... ../src/syntax/typing.nit:29,12--14
               ../src/syntax/typing.nit:29,16--28
                 type identifier 'TypingVisitor' ... ../src/syntax/typing.nit:29,16--28
-              ../src/syntax/typing.nit:29,30--31
-                ../src/syntax/typing.nit:29,30
-                identifier 'tc' ... ../src/syntax/typing.nit:29,30--31
-              ../src/syntax/typing.nit:29,34--37
-                keyword 'self' ... ../src/syntax/typing.nit:29,34--37
-          ../src/syntax/typing.nit:30,3--21
+              ../src/syntax/typing.nit:29,29--38
+                '(' ... ../src/syntax/typing.nit:29,29
+                ../src/syntax/typing.nit:29,30--31
+                  ../src/syntax/typing.nit:29,30
+                  identifier 'tc' ... ../src/syntax/typing.nit:29,30--31
+                  ../src/syntax/typing.nit:29,30
+                ../src/syntax/typing.nit:29,34--37
+                  keyword 'self' ... ../src/syntax/typing.nit:29,34--37
+                ')' ... ../src/syntax/typing.nit:29,38
+          ../src/syntax/typing.nit:30,3--22
             ../src/syntax/typing.nit:30,3--4
               ../src/syntax/typing.nit:30,3
               identifier 'tv' ... ../src/syntax/typing.nit:30,3--4
+              ../src/syntax/typing.nit:30,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:30,6--16
-            ../src/syntax/typing.nit:30,18--21
-              ../src/syntax/typing.nit:30,18
-              identifier 'node' ... ../src/syntax/typing.nit:30,18--21
+            ../src/syntax/typing.nit:30,17--22
+              '(' ... ../src/syntax/typing.nit:30,17
+              ../src/syntax/typing.nit:30,18--21
+                ../src/syntax/typing.nit:30,18
+                identifier 'node' ... ../src/syntax/typing.nit:30,18--21
+                ../src/syntax/typing.nit:30,18
+              ')' ... ../src/syntax/typing.nit:30,22
           keyword 'end' ... ../src/syntax/typing.nit:31,2--4
       keyword 'end' ... ../src/syntax/typing.nit:32,1--3
     ../src/syntax/typing.nit:34,1--162,3
@@ -98,23 +107,28 @@
           ../src/syntax/typing.nit:41,18
             identifier 'n' ... ../src/syntax/typing.nit:41,18
         ../src/syntax/typing.nit:43,3--44,4
-          ../src/syntax/typing.nit:43,3--40
+          ../src/syntax/typing.nit:43,3--41
             keyword 'if' ... ../src/syntax/typing.nit:43,3--4
             ../src/syntax/typing.nit:43,6--14
               ../src/syntax/typing.nit:43,6
                 ../src/syntax/typing.nit:43,6
                 identifier 'n' ... ../src/syntax/typing.nit:43,6
+                ../src/syntax/typing.nit:43,6
               ../src/syntax/typing.nit:43,11--14
                 keyword 'null' ... ../src/syntax/typing.nit:43,11--14
-            ../src/syntax/typing.nit:43,21--40
+            ../src/syntax/typing.nit:43,21--41
               ../src/syntax/typing.nit:43,21
                 ../src/syntax/typing.nit:43,21
                 identifier 'n' ... ../src/syntax/typing.nit:43,21
+                ../src/syntax/typing.nit:43,21
               identifier 'accept_typing' ... ../src/syntax/typing.nit:43,23--35
-              ../src/syntax/typing.nit:43,37--40
-                keyword 'self' ... ../src/syntax/typing.nit:43,37--40
+              ../src/syntax/typing.nit:43,36--41
+                '(' ... ../src/syntax/typing.nit:43,36
+                ../src/syntax/typing.nit:43,37--40
+                  keyword 'self' ... ../src/syntax/typing.nit:43,37--40
+                ')' ... ../src/syntax/typing.nit:43,41
           keyword 'end' ... ../src/syntax/typing.nit:44,2--4
-      ../src/syntax/typing.nit:46,2--47,62
+      ../src/syntax/typing.nit:46,2--47,63
         ../src/syntax/typing.nit:46,2--47,0
           '# Current knowledge about scoped things (variable, labels, etc.)
 ' ... ../src/syntax/typing.nit:46,2--47,0
@@ -125,12 +139,15 @@
         attribute '_scope_ctx' ... ../src/syntax/typing.nit:47,15--24
         ../src/syntax/typing.nit:47,27--38
           type identifier 'ScopeContext' ... ../src/syntax/typing.nit:47,27--38
-        ../src/syntax/typing.nit:47,42--62
+        ../src/syntax/typing.nit:47,42--63
           keyword 'new' ... ../src/syntax/typing.nit:47,42--44
           ../src/syntax/typing.nit:47,46--57
             type identifier 'ScopeContext' ... ../src/syntax/typing.nit:47,46--57
-          ../src/syntax/typing.nit:47,59--62
-            keyword 'self' ... ../src/syntax/typing.nit:47,59--62
+          ../src/syntax/typing.nit:47,58--63
+            '(' ... ../src/syntax/typing.nit:47,58
+            ../src/syntax/typing.nit:47,59--62
+              keyword 'self' ... ../src/syntax/typing.nit:47,59--62
+            ')' ... ../src/syntax/typing.nit:47,63
       ../src/syntax/typing.nit:49,2--50,59
         ../src/syntax/typing.nit:49,2--50,0
           '# Current knowledge about control flow
@@ -178,28 +195,39 @@
         ../src/syntax/typing.nit:56,3--58,4
           ../src/syntax/typing.nit:56,3--36
             keyword 'if' ... ../src/syntax/typing.nit:56,3--4
-            ../src/syntax/typing.nit:56,6--23
+            ../src/syntax/typing.nit:56,6--24
               ../src/syntax/typing.nit:56,6--13
                 ../src/syntax/typing.nit:56,6
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:56,6--13
+                ../src/syntax/typing.nit:56,6
               identifier 'is_set' ... ../src/syntax/typing.nit:56,15--20
-              ../src/syntax/typing.nit:56,22--23
-                ../src/syntax/typing.nit:56,22
-                identifier 'va' ... ../src/syntax/typing.nit:56,22--23
+              ../src/syntax/typing.nit:56,21--24
+                '(' ... ../src/syntax/typing.nit:56,21
+                ../src/syntax/typing.nit:56,22--23
+                  ../src/syntax/typing.nit:56,22
+                  identifier 'va' ... ../src/syntax/typing.nit:56,22--23
+                  ../src/syntax/typing.nit:56,22
+                ')' ... ../src/syntax/typing.nit:56,24
             ../src/syntax/typing.nit:56,31--36
               keyword 'return' ... ../src/syntax/typing.nit:56,31--36
-          ../src/syntax/typing.nit:57,3--40
+          ../src/syntax/typing.nit:57,3--41
             ../src/syntax/typing.nit:57,14
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:57,3--10
+            ../src/syntax/typing.nit:57,14
             '=' ... ../src/syntax/typing.nit:57,12
-            ../src/syntax/typing.nit:57,14--40
+            ../src/syntax/typing.nit:57,14--41
               ../src/syntax/typing.nit:57,14--21
                 ../src/syntax/typing.nit:57,14
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:57,14--21
+                ../src/syntax/typing.nit:57,14
               identifier 'sub_setvariable' ... ../src/syntax/typing.nit:57,23--37
-              ../src/syntax/typing.nit:57,39--40
-                ../src/syntax/typing.nit:57,39
-                identifier 'va' ... ../src/syntax/typing.nit:57,39--40
+              ../src/syntax/typing.nit:57,38--41
+                '(' ... ../src/syntax/typing.nit:57,38
+                ../src/syntax/typing.nit:57,39--40
+                  ../src/syntax/typing.nit:57,39
+                  identifier 'va' ... ../src/syntax/typing.nit:57,39--40
+                  ../src/syntax/typing.nit:57,39
+                ')' ... ../src/syntax/typing.nit:57,41
           keyword 'end' ... ../src/syntax/typing.nit:58,2--4
       ../src/syntax/typing.nit:60,2--64,4
         ../src/syntax/typing.nit:60,2--61,0
@@ -215,18 +243,24 @@
             ../src/syntax/typing.nit:61,22--26
               type identifier 'ANode' ... ../src/syntax/typing.nit:61,22--26
         ../src/syntax/typing.nit:63,3--64,4
-          ../src/syntax/typing.nit:63,3--35
+          ../src/syntax/typing.nit:63,3--36
             ../src/syntax/typing.nit:63,14
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:63,3--10
+            ../src/syntax/typing.nit:63,14
             '=' ... ../src/syntax/typing.nit:63,12
-            ../src/syntax/typing.nit:63,14--35
+            ../src/syntax/typing.nit:63,14--36
               ../src/syntax/typing.nit:63,14--21
                 ../src/syntax/typing.nit:63,14
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:63,14--21
+                ../src/syntax/typing.nit:63,14
               identifier 'sub_unreash' ... ../src/syntax/typing.nit:63,23--33
-              ../src/syntax/typing.nit:63,35
+              ../src/syntax/typing.nit:63,34--36
+                '(' ... ../src/syntax/typing.nit:63,34
                 ../src/syntax/typing.nit:63,35
-                identifier 'n' ... ../src/syntax/typing.nit:63,35
+                  ../src/syntax/typing.nit:63,35
+                  identifier 'n' ... ../src/syntax/typing.nit:63,35
+                  ../src/syntax/typing.nit:63,35
+                ')' ... ../src/syntax/typing.nit:63,36
           keyword 'end' ... ../src/syntax/typing.nit:64,2--4
       ../src/syntax/typing.nit:66,2--73,4
         ../src/syntax/typing.nit:66,2--67,0
@@ -249,29 +283,41 @@
               ../src/syntax/typing.nit:69,6--9
                 ../src/syntax/typing.nit:69,6
                 identifier 'node' ... ../src/syntax/typing.nit:69,6--9
+                ../src/syntax/typing.nit:69,6
               ../src/syntax/typing.nit:69,14--17
                 keyword 'null' ... ../src/syntax/typing.nit:69,14--17
             ../src/syntax/typing.nit:69,24--29
               keyword 'return' ... ../src/syntax/typing.nit:69,24--29
-          ../src/syntax/typing.nit:70,3--21
+          ../src/syntax/typing.nit:70,3--22
             ../src/syntax/typing.nit:70,3--11
               ../src/syntax/typing.nit:70,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:70,3--11
+              ../src/syntax/typing.nit:70,3
             identifier 'push' ... ../src/syntax/typing.nit:70,13--16
-            ../src/syntax/typing.nit:70,18--21
-              ../src/syntax/typing.nit:70,18
-              identifier 'node' ... ../src/syntax/typing.nit:70,18--21
-          ../src/syntax/typing.nit:71,3--18
+            ../src/syntax/typing.nit:70,17--22
+              '(' ... ../src/syntax/typing.nit:70,17
+              ../src/syntax/typing.nit:70,18--21
+                ../src/syntax/typing.nit:70,18
+                identifier 'node' ... ../src/syntax/typing.nit:70,18--21
+                ../src/syntax/typing.nit:70,18
+              ')' ... ../src/syntax/typing.nit:70,22
+          ../src/syntax/typing.nit:71,3--19
             ../src/syntax/typing.nit:71,15
             identifier 'enter_visit' ... ../src/syntax/typing.nit:71,3--13
-            ../src/syntax/typing.nit:71,15--18
-              ../src/syntax/typing.nit:71,15
-              identifier 'node' ... ../src/syntax/typing.nit:71,15--18
+            ../src/syntax/typing.nit:71,14--19
+              '(' ... ../src/syntax/typing.nit:71,14
+              ../src/syntax/typing.nit:71,15--18
+                ../src/syntax/typing.nit:71,15
+                identifier 'node' ... ../src/syntax/typing.nit:71,15--18
+                ../src/syntax/typing.nit:71,15
+              ')' ... ../src/syntax/typing.nit:71,19
           ../src/syntax/typing.nit:72,3--15
             ../src/syntax/typing.nit:72,3--11
               ../src/syntax/typing.nit:72,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:72,3--11
+              ../src/syntax/typing.nit:72,3
             identifier 'pop' ... ../src/syntax/typing.nit:72,13--15
+            ../src/syntax/typing.nit:72,3
           keyword 'end' ... ../src/syntax/typing.nit:73,2--4
       ../src/syntax/typing.nit:75,2--76,69
         ../src/syntax/typing.nit:75,2--76,0
@@ -403,22 +449,27 @@
               ../src/syntax/typing.nit:95,13
                 ../src/syntax/typing.nit:95,13
                 identifier 'e' ... ../src/syntax/typing.nit:95,13
+                ../src/syntax/typing.nit:95,13
               identifier 'if_true_flow_ctx' ... ../src/syntax/typing.nit:95,15--30
+              ../src/syntax/typing.nit:95,13
           ../src/syntax/typing.nit:96,3--36
             keyword 'if' ... ../src/syntax/typing.nit:96,3--4
             ../src/syntax/typing.nit:96,6--16
               ../src/syntax/typing.nit:96,6--8
                 ../src/syntax/typing.nit:96,6
                 identifier 'ctx' ... ../src/syntax/typing.nit:96,6--8
+                ../src/syntax/typing.nit:96,6
               ../src/syntax/typing.nit:96,13--16
                 keyword 'null' ... ../src/syntax/typing.nit:96,13--16
             ../src/syntax/typing.nit:96,23--36
               ../src/syntax/typing.nit:96,34
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:96,23--30
+              ../src/syntax/typing.nit:96,34
               '=' ... ../src/syntax/typing.nit:96,32
               ../src/syntax/typing.nit:96,34--36
                 ../src/syntax/typing.nit:96,34
                 identifier 'ctx' ... ../src/syntax/typing.nit:96,34--36
+                ../src/syntax/typing.nit:96,34
           keyword 'end' ... ../src/syntax/typing.nit:97,2--4
       ../src/syntax/typing.nit:99,2--104,4
         ../src/syntax/typing.nit:99,2--100,0
@@ -443,22 +494,27 @@
               ../src/syntax/typing.nit:102,13
                 ../src/syntax/typing.nit:102,13
                 identifier 'e' ... ../src/syntax/typing.nit:102,13
+                ../src/syntax/typing.nit:102,13
               identifier 'if_false_flow_ctx' ... ../src/syntax/typing.nit:102,15--31
+              ../src/syntax/typing.nit:102,13
           ../src/syntax/typing.nit:103,3--36
             keyword 'if' ... ../src/syntax/typing.nit:103,3--4
             ../src/syntax/typing.nit:103,6--16
               ../src/syntax/typing.nit:103,6--8
                 ../src/syntax/typing.nit:103,6
                 identifier 'ctx' ... ../src/syntax/typing.nit:103,6--8
+                ../src/syntax/typing.nit:103,6
               ../src/syntax/typing.nit:103,13--16
                 keyword 'null' ... ../src/syntax/typing.nit:103,13--16
             ../src/syntax/typing.nit:103,23--36
               ../src/syntax/typing.nit:103,34
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:103,23--30
+              ../src/syntax/typing.nit:103,34
               '=' ... ../src/syntax/typing.nit:103,32
               ../src/syntax/typing.nit:103,34--36
                 ../src/syntax/typing.nit:103,34
                 identifier 'ctx' ... ../src/syntax/typing.nit:103,34--36
+                ../src/syntax/typing.nit:103,34
           keyword 'end' ... ../src/syntax/typing.nit:104,2--4
       ../src/syntax/typing.nit:106,2--107,67
         ../src/syntax/typing.nit:106,2--107,0
@@ -500,6 +556,7 @@
             identifier 'mod' ... ../src/syntax/typing.nit:112,11--13
         ../src/syntax/typing.nit:112,19--23
           keyword 'super' ... ../src/syntax/typing.nit:112,19--23
+          ../src/syntax/typing.nit:112,19
       ../src/syntax/typing.nit:114,2--161,4
         ../src/syntax/typing.nit:114,2--8
           keyword 'private' ... ../src/syntax/typing.nit:114,2--8
@@ -539,6 +596,7 @@
                 type identifier 'Array' ... ../src/syntax/typing.nit:119,24--28
                 ../src/syntax/typing.nit:119,30--37
                   type identifier 'MMMethod' ... ../src/syntax/typing.nit:119,30--37
+              ../src/syntax/typing.nit:119,20
           ../src/syntax/typing.nit:120,3--43
             keyword 'var' ... ../src/syntax/typing.nit:120,3--5
             identifier 'false_candidates' ... ../src/syntax/typing.nit:120,7--22
@@ -549,6 +607,7 @@
                 type identifier 'Array' ... ../src/syntax/typing.nit:120,30--34
                 ../src/syntax/typing.nit:120,36--43
                   type identifier 'MMMethod' ... ../src/syntax/typing.nit:120,36--43
+              ../src/syntax/typing.nit:120,26
           ../src/syntax/typing.nit:121,3--35
             keyword 'var' ... ../src/syntax/typing.nit:121,3--5
             identifier 'parity' ... ../src/syntax/typing.nit:121,7--12
@@ -558,8 +617,11 @@
                 ../src/syntax/typing.nit:121,16--19
                   ../src/syntax/typing.nit:121,16
                   identifier 'prop' ... ../src/syntax/typing.nit:121,16--19
+                  ../src/syntax/typing.nit:121,16
                 identifier 'signature' ... ../src/syntax/typing.nit:121,21--29
+                ../src/syntax/typing.nit:121,16
               identifier 'arity' ... ../src/syntax/typing.nit:121,31--35
+              ../src/syntax/typing.nit:121,16
           ../src/syntax/typing.nit:122,3--140,5
             keyword 'for' ... ../src/syntax/typing.nit:122,3--5
             identifier 'g' ... ../src/syntax/typing.nit:122,7
@@ -567,54 +629,73 @@
               ../src/syntax/typing.nit:122,12
                 ../src/syntax/typing.nit:122,12
                 identifier 'c' ... ../src/syntax/typing.nit:122,12
+                ../src/syntax/typing.nit:122,12
               identifier 'global_properties' ... ../src/syntax/typing.nit:122,14--30
+              ../src/syntax/typing.nit:122,12
             keyword 'do' ... ../src/syntax/typing.nit:122,32--33
             ../src/syntax/typing.nit:123,4--140,5
               ../src/syntax/typing.nit:123,4--40
                 keyword 'if' ... ../src/syntax/typing.nit:123,4--5
-                ../src/syntax/typing.nit:123,7--25
+                ../src/syntax/typing.nit:123,7--26
                   keyword 'not' ... ../src/syntax/typing.nit:123,7--9
-                  ../src/syntax/typing.nit:123,11--25
+                  ../src/syntax/typing.nit:123,11--26
                     ../src/syntax/typing.nit:123,11
                       ../src/syntax/typing.nit:123,11
                       identifier 'g' ... ../src/syntax/typing.nit:123,11
+                      ../src/syntax/typing.nit:123,11
                     identifier 'is_init_for' ... ../src/syntax/typing.nit:123,13--23
-                    ../src/syntax/typing.nit:123,25
+                    ../src/syntax/typing.nit:123,24--26
+                      '(' ... ../src/syntax/typing.nit:123,24
                       ../src/syntax/typing.nit:123,25
-                      identifier 'c' ... ../src/syntax/typing.nit:123,25
+                        ../src/syntax/typing.nit:123,25
+                        identifier 'c' ... ../src/syntax/typing.nit:123,25
+                        ../src/syntax/typing.nit:123,25
+                      ')' ... ../src/syntax/typing.nit:123,26
                 ../src/syntax/typing.nit:123,33--40
                   keyword 'continue' ... ../src/syntax/typing.nit:123,33--40
-              ../src/syntax/typing.nit:124,4--15
+              ../src/syntax/typing.nit:124,4--16
                 keyword 'var' ... ../src/syntax/typing.nit:124,4--6
                 identifier 'gp' ... ../src/syntax/typing.nit:124,8--9
                 '=' ... ../src/syntax/typing.nit:124,11
-                ../src/syntax/typing.nit:124,13--15
+                ../src/syntax/typing.nit:124,13--16
                   ../src/syntax/typing.nit:124,13
                     ../src/syntax/typing.nit:124,13
                     identifier 'c' ... ../src/syntax/typing.nit:124,13
-                  ../src/syntax/typing.nit:124,15
+                    ../src/syntax/typing.nit:124,13
+                  ../src/syntax/typing.nit:124,14--16
+                    '[' ... ../src/syntax/typing.nit:124,14
                     ../src/syntax/typing.nit:124,15
-                    identifier 'g' ... ../src/syntax/typing.nit:124,15
-              ../src/syntax/typing.nit:125,4--40
+                      ../src/syntax/typing.nit:124,15
+                      identifier 'g' ... ../src/syntax/typing.nit:124,15
+                      ../src/syntax/typing.nit:124,15
+                    ']' ... ../src/syntax/typing.nit:124,16
+              ../src/syntax/typing.nit:125,4--41
                 keyword 'var' ... ../src/syntax/typing.nit:125,4--6
                 identifier 'gps' ... ../src/syntax/typing.nit:125,8--10
                 '=' ... ../src/syntax/typing.nit:125,12
-                ../src/syntax/typing.nit:125,14--40
+                ../src/syntax/typing.nit:125,14--41
                   ../src/syntax/typing.nit:125,14--15
                     ../src/syntax/typing.nit:125,14
                     identifier 'gp' ... ../src/syntax/typing.nit:125,14--15
+                    ../src/syntax/typing.nit:125,14
                   identifier 'signature_for' ... ../src/syntax/typing.nit:125,17--29
-                  ../src/syntax/typing.nit:125,31--40
-                    ../src/syntax/typing.nit:125,31
+                  ../src/syntax/typing.nit:125,30--41
+                    '(' ... ../src/syntax/typing.nit:125,30
+                    ../src/syntax/typing.nit:125,31--40
+                      ../src/syntax/typing.nit:125,31
+                        ../src/syntax/typing.nit:125,31
+                        identifier 'c' ... ../src/syntax/typing.nit:125,31
+                        ../src/syntax/typing.nit:125,31
+                      identifier 'get_type' ... ../src/syntax/typing.nit:125,33--40
                       ../src/syntax/typing.nit:125,31
-                      identifier 'c' ... ../src/syntax/typing.nit:125,31
-                    identifier 'get_type' ... ../src/syntax/typing.nit:125,33--40
+                    ')' ... ../src/syntax/typing.nit:125,41
               ../src/syntax/typing.nit:126,4--28
                 keyword 'assert' ... ../src/syntax/typing.nit:126,4--9
                 ../src/syntax/typing.nit:126,11--28
                   ../src/syntax/typing.nit:126,11--12
                     ../src/syntax/typing.nit:126,11
                     identifier 'gp' ... ../src/syntax/typing.nit:126,11--12
+                    ../src/syntax/typing.nit:126,11
                   ../src/syntax/typing.nit:126,18--28
                     type identifier 'MMSrcMethod' ... ../src/syntax/typing.nit:126,18--28
               ../src/syntax/typing.nit:127,4--25
@@ -625,7 +706,9 @@
                   ../src/syntax/typing.nit:127,17--19
                     ../src/syntax/typing.nit:127,17
                     identifier 'gps' ... ../src/syntax/typing.nit:127,17--19
+                    ../src/syntax/typing.nit:127,17
                   identifier 'arity' ... ../src/syntax/typing.nit:127,21--25
+                  ../src/syntax/typing.nit:127,17
               ../src/syntax/typing.nit:128,4--139,6
                 keyword 'if' ... ../src/syntax/typing.nit:128,4--5
                 ../src/syntax/typing.nit:128,7--26
@@ -633,12 +716,16 @@
                     ../src/syntax/typing.nit:128,7--8
                       ../src/syntax/typing.nit:128,7
                       identifier 'gp' ... ../src/syntax/typing.nit:128,7--8
+                      ../src/syntax/typing.nit:128,7
                     identifier 'name' ... ../src/syntax/typing.nit:128,10--13
+                    ../src/syntax/typing.nit:128,7
                   ../src/syntax/typing.nit:128,18--26
                     ../src/syntax/typing.nit:128,18--21
                       ../src/syntax/typing.nit:128,18
                       identifier 'prop' ... ../src/syntax/typing.nit:128,18--21
+                      ../src/syntax/typing.nit:128,18
                     identifier 'name' ... ../src/syntax/typing.nit:128,23--26
+                    ../src/syntax/typing.nit:128,18
                 ../src/syntax/typing.nit:129,5--133,7
                   ../src/syntax/typing.nit:129,5--133,7
                     keyword 'if' ... ../src/syntax/typing.nit:129,5--6
@@ -647,6 +734,7 @@
                         ../src/syntax/typing.nit:129,8--13
                           ../src/syntax/typing.nit:129,8
                           identifier 'garity' ... ../src/syntax/typing.nit:129,8--13
+                          ../src/syntax/typing.nit:129,8
                         ../src/syntax/typing.nit:129,18
                           literal value '0' ... ../src/syntax/typing.nit:129,18
                       ../src/syntax/typing.nit:129,23--65
@@ -656,18 +744,23 @@
                             ../src/syntax/typing.nit:129,24--29
                               ../src/syntax/typing.nit:129,24
                               identifier 'parity' ... ../src/syntax/typing.nit:129,24--29
+                              ../src/syntax/typing.nit:129,24
                             ../src/syntax/typing.nit:129,34--39
                               ../src/syntax/typing.nit:129,34
                               identifier 'garity' ... ../src/syntax/typing.nit:129,34--39
+                              ../src/syntax/typing.nit:129,34
                           ../src/syntax/typing.nit:129,45--64
                             ../src/syntax/typing.nit:129,45--58
                               ../src/syntax/typing.nit:129,45--48
                                 ../src/syntax/typing.nit:129,45
                                 identifier 'prop' ... ../src/syntax/typing.nit:129,45--48
+                                ../src/syntax/typing.nit:129,45
                               identifier 'signature' ... ../src/syntax/typing.nit:129,50--58
+                              ../src/syntax/typing.nit:129,45
                             ../src/syntax/typing.nit:129,62--64
                               ../src/syntax/typing.nit:129,62
                               identifier 'gps' ... ../src/syntax/typing.nit:129,62--64
+                              ../src/syntax/typing.nit:129,62
                         ')' ... ../src/syntax/typing.nit:129,65
                     ../src/syntax/typing.nit:130,6--14
                       ../src/syntax/typing.nit:130,6--14
@@ -675,15 +768,21 @@
                         ../src/syntax/typing.nit:130,13--14
                           ../src/syntax/typing.nit:130,13
                           identifier 'gp' ... ../src/syntax/typing.nit:130,13--14
+                          ../src/syntax/typing.nit:130,13
                     ../src/syntax/typing.nit:132,6--133,7
-                      ../src/syntax/typing.nit:132,6--28
+                      ../src/syntax/typing.nit:132,6--29
                         ../src/syntax/typing.nit:132,6--21
                           ../src/syntax/typing.nit:132,6
                           identifier 'false_candidates' ... ../src/syntax/typing.nit:132,6--21
+                          ../src/syntax/typing.nit:132,6
                         identifier 'add' ... ../src/syntax/typing.nit:132,23--25
-                        ../src/syntax/typing.nit:132,27--28
-                          ../src/syntax/typing.nit:132,27
-                          identifier 'gp' ... ../src/syntax/typing.nit:132,27--28
+                        ../src/syntax/typing.nit:132,26--29
+                          '(' ... ../src/syntax/typing.nit:132,26
+                          ../src/syntax/typing.nit:132,27--28
+                            ../src/syntax/typing.nit:132,27
+                            identifier 'gp' ... ../src/syntax/typing.nit:132,27--28
+                            ../src/syntax/typing.nit:132,27
+                          ')' ... ../src/syntax/typing.nit:132,29
                       keyword 'end' ... ../src/syntax/typing.nit:133,5--7
                 ../src/syntax/typing.nit:134,9--139,6
                   keyword 'if' ... ../src/syntax/typing.nit:134,9--10
@@ -692,6 +791,7 @@
                       ../src/syntax/typing.nit:134,12--17
                         ../src/syntax/typing.nit:134,12
                         identifier 'garity' ... ../src/syntax/typing.nit:134,12--17
+                        ../src/syntax/typing.nit:134,12
                       ../src/syntax/typing.nit:134,22
                         literal value '0' ... ../src/syntax/typing.nit:134,22
                     ../src/syntax/typing.nit:134,28--61
@@ -699,7 +799,9 @@
                         ../src/syntax/typing.nit:134,28--29
                           ../src/syntax/typing.nit:134,28
                           identifier 'gp' ... ../src/syntax/typing.nit:134,28--29
+                          ../src/syntax/typing.nit:134,28
                         identifier 'name' ... ../src/syntax/typing.nit:134,31--34
+                        ../src/syntax/typing.nit:134,28
                       ../src/syntax/typing.nit:134,39--61
                         keyword 'once' ... ../src/syntax/typing.nit:134,39--42
                         ../src/syntax/typing.nit:134,44--61
@@ -708,33 +810,49 @@
                             ../src/syntax/typing.nit:134,45--50
                               literal value '"init"' ... ../src/syntax/typing.nit:134,45--50
                             identifier 'to_symbol' ... ../src/syntax/typing.nit:134,52--60
+                            ../src/syntax/typing.nit:134,45
                           ')' ... ../src/syntax/typing.nit:134,61
-                  ../src/syntax/typing.nit:135,5--136,27
-                    ../src/syntax/typing.nit:135,5--21
+                  ../src/syntax/typing.nit:135,5--136,28
+                    ../src/syntax/typing.nit:135,5--22
                       ../src/syntax/typing.nit:135,5--14
                         ../src/syntax/typing.nit:135,5
                         identifier 'candidates' ... ../src/syntax/typing.nit:135,5--14
+                        ../src/syntax/typing.nit:135,5
                       identifier 'add' ... ../src/syntax/typing.nit:135,16--18
-                      ../src/syntax/typing.nit:135,20--21
-                        ../src/syntax/typing.nit:135,20
-                        identifier 'gp' ... ../src/syntax/typing.nit:135,20--21
-                    ../src/syntax/typing.nit:136,5--27
+                      ../src/syntax/typing.nit:135,19--22
+                        '(' ... ../src/syntax/typing.nit:135,19
+                        ../src/syntax/typing.nit:135,20--21
+                          ../src/syntax/typing.nit:135,20
+                          identifier 'gp' ... ../src/syntax/typing.nit:135,20--21
+                          ../src/syntax/typing.nit:135,20
+                        ')' ... ../src/syntax/typing.nit:135,22
+                    ../src/syntax/typing.nit:136,5--28
                       ../src/syntax/typing.nit:136,5--20
                         ../src/syntax/typing.nit:136,5
                         identifier 'false_candidates' ... ../src/syntax/typing.nit:136,5--20
+                        ../src/syntax/typing.nit:136,5
                       identifier 'add' ... ../src/syntax/typing.nit:136,22--24
-                      ../src/syntax/typing.nit:136,26--27
-                        ../src/syntax/typing.nit:136,26
-                        identifier 'gp' ... ../src/syntax/typing.nit:136,26--27
+                      ../src/syntax/typing.nit:136,25--28
+                        '(' ... ../src/syntax/typing.nit:136,25
+                        ../src/syntax/typing.nit:136,26--27
+                          ../src/syntax/typing.nit:136,26
+                          identifier 'gp' ... ../src/syntax/typing.nit:136,26--27
+                          ../src/syntax/typing.nit:136,26
+                        ')' ... ../src/syntax/typing.nit:136,28
                   ../src/syntax/typing.nit:138,5--139,6
-                    ../src/syntax/typing.nit:138,5--27
+                    ../src/syntax/typing.nit:138,5--28
                       ../src/syntax/typing.nit:138,5--20
                         ../src/syntax/typing.nit:138,5
                         identifier 'false_candidates' ... ../src/syntax/typing.nit:138,5--20
+                        ../src/syntax/typing.nit:138,5
                       identifier 'add' ... ../src/syntax/typing.nit:138,22--24
-                      ../src/syntax/typing.nit:138,26--27
-                        ../src/syntax/typing.nit:138,26
-                        identifier 'gp' ... ../src/syntax/typing.nit:138,26--27
+                      ../src/syntax/typing.nit:138,25--28
+                        '(' ... ../src/syntax/typing.nit:138,25
+                        ../src/syntax/typing.nit:138,26--27
+                          ../src/syntax/typing.nit:138,26
+                          identifier 'gp' ... ../src/syntax/typing.nit:138,26--27
+                          ../src/syntax/typing.nit:138,26
+                        ')' ... ../src/syntax/typing.nit:138,28
                     keyword 'end' ... ../src/syntax/typing.nit:139,4--6
               keyword 'end' ... ../src/syntax/typing.nit:140,3--5
           ../src/syntax/typing.nit:141,3--160,5
@@ -744,7 +862,9 @@
                 ../src/syntax/typing.nit:141,6--15
                   ../src/syntax/typing.nit:141,6
                   identifier 'candidates' ... ../src/syntax/typing.nit:141,6--15
+                  ../src/syntax/typing.nit:141,6
                 identifier 'length' ... ../src/syntax/typing.nit:141,17--22
+                ../src/syntax/typing.nit:141,6
               ../src/syntax/typing.nit:141,27
                 literal value '1' ... ../src/syntax/typing.nit:141,27
             ../src/syntax/typing.nit:142,4--26
@@ -754,7 +874,9 @@
                   ../src/syntax/typing.nit:142,11--20
                     ../src/syntax/typing.nit:142,11
                     identifier 'candidates' ... ../src/syntax/typing.nit:142,11--20
+                    ../src/syntax/typing.nit:142,11
                   identifier 'first' ... ../src/syntax/typing.nit:142,22--26
+                  ../src/syntax/typing.nit:142,11
             ../src/syntax/typing.nit:143,8--160,5
               keyword 'if' ... ../src/syntax/typing.nit:143,8--9
               ../src/syntax/typing.nit:143,11--31
@@ -762,7 +884,9 @@
                   ../src/syntax/typing.nit:143,11--20
                     ../src/syntax/typing.nit:143,11
                     identifier 'candidates' ... ../src/syntax/typing.nit:143,11--20
+                    ../src/syntax/typing.nit:143,11
                   identifier 'length' ... ../src/syntax/typing.nit:143,22--27
+                  ../src/syntax/typing.nit:143,11
                 ../src/syntax/typing.nit:143,31
                   literal value '0' ... ../src/syntax/typing.nit:143,31
               ../src/syntax/typing.nit:144,4--149,14
@@ -776,68 +900,88 @@
                       type identifier 'Array' ... ../src/syntax/typing.nit:144,16--20
                       ../src/syntax/typing.nit:144,22--27
                         type identifier 'String' ... ../src/syntax/typing.nit:144,22--27
+                    ../src/syntax/typing.nit:144,12
                 ../src/syntax/typing.nit:145,4--147,6
                   keyword 'for' ... ../src/syntax/typing.nit:145,4--6
                   identifier 'p' ... ../src/syntax/typing.nit:145,8
                   ../src/syntax/typing.nit:145,13--22
                     ../src/syntax/typing.nit:145,13
                     identifier 'candidates' ... ../src/syntax/typing.nit:145,13--22
+                    ../src/syntax/typing.nit:145,13
                   keyword 'do' ... ../src/syntax/typing.nit:145,24--25
                   ../src/syntax/typing.nit:146,5--147,6
-                    ../src/syntax/typing.nit:146,5--51
+                    ../src/syntax/typing.nit:146,5--52
                       ../src/syntax/typing.nit:146,5
                         ../src/syntax/typing.nit:146,5
                         identifier 'a' ... ../src/syntax/typing.nit:146,5
+                        ../src/syntax/typing.nit:146,5
                       identifier 'add' ... ../src/syntax/typing.nit:146,7--9
-                      ../src/syntax/typing.nit:146,11--51
-                        ../src/syntax/typing.nit:146,11--12
-                          literal value '"{' ... ../src/syntax/typing.nit:146,11--12
-                        ../src/syntax/typing.nit:146,13--23
-                          ../src/syntax/typing.nit:146,13
+                      ../src/syntax/typing.nit:146,10--52
+                        '(' ... ../src/syntax/typing.nit:146,10
+                        ../src/syntax/typing.nit:146,11--51
+                          ../src/syntax/typing.nit:146,11--12
+                            literal value '"{' ... ../src/syntax/typing.nit:146,11--12
+                          ../src/syntax/typing.nit:146,13--23
+                            ../src/syntax/typing.nit:146,13
+                              ../src/syntax/typing.nit:146,13
+                              identifier 'p' ... ../src/syntax/typing.nit:146,13
+                              ../src/syntax/typing.nit:146,13
+                            identifier 'full_name' ... ../src/syntax/typing.nit:146,15--23
                             ../src/syntax/typing.nit:146,13
-                            identifier 'p' ... ../src/syntax/typing.nit:146,13
-                          identifier 'full_name' ... ../src/syntax/typing.nit:146,15--23
-                        ../src/syntax/typing.nit:146,24--25
-                          literal value '}{' ... ../src/syntax/typing.nit:146,24--25
-                        ../src/syntax/typing.nit:146,26--49
-                          ../src/syntax/typing.nit:146,26--36
-                            ../src/syntax/typing.nit:146,26
+                          ../src/syntax/typing.nit:146,24--25
+                            literal value '}{' ... ../src/syntax/typing.nit:146,24--25
+                          ../src/syntax/typing.nit:146,26--49
+                            ../src/syntax/typing.nit:146,26--36
                               ../src/syntax/typing.nit:146,26
-                              identifier 'p' ... ../src/syntax/typing.nit:146,26
-                            identifier 'signature' ... ../src/syntax/typing.nit:146,28--36
-                          keyword 'as' ... ../src/syntax/typing.nit:146,38--39
-                          '(' ... ../src/syntax/typing.nit:146,40
-                          keyword 'not' ... ../src/syntax/typing.nit:146,41--43
-                          keyword 'null' ... ../src/syntax/typing.nit:146,45--48
-                          ')' ... ../src/syntax/typing.nit:146,49
-                        ../src/syntax/typing.nit:146,50--51
-                          '}"' ... ../src/syntax/typing.nit:146,50--51
+                                ../src/syntax/typing.nit:146,26
+                                identifier 'p' ... ../src/syntax/typing.nit:146,26
+                                ../src/syntax/typing.nit:146,26
+                              identifier 'signature' ... ../src/syntax/typing.nit:146,28--36
+                              ../src/syntax/typing.nit:146,26
+                            keyword 'as' ... ../src/syntax/typing.nit:146,38--39
+                            '(' ... ../src/syntax/typing.nit:146,40
+                            keyword 'not' ... ../src/syntax/typing.nit:146,41--43
+                            keyword 'null' ... ../src/syntax/typing.nit:146,45--48
+                            ')' ... ../src/syntax/typing.nit:146,49
+                          ../src/syntax/typing.nit:146,50--51
+                            '}"' ... ../src/syntax/typing.nit:146,50--51
+                        ')' ... ../src/syntax/typing.nit:146,52
                     keyword 'end' ... ../src/syntax/typing.nit:147,4--6
-                ../src/syntax/typing.nit:148,4--87
+                ../src/syntax/typing.nit:148,4--88
                   ../src/syntax/typing.nit:148,4
                     ../src/syntax/typing.nit:148,4
                     identifier 'v' ... ../src/syntax/typing.nit:148,4
+                    ../src/syntax/typing.nit:148,4
                   identifier 'error' ... ../src/syntax/typing.nit:148,6--10
-                  ../src/syntax/typing.nit:148,12
+                  ../src/syntax/typing.nit:148,11--88
+                    '(' ... ../src/syntax/typing.nit:148,11
                     ../src/syntax/typing.nit:148,12
-                    identifier 'n' ... ../src/syntax/typing.nit:148,12
-                  ../src/syntax/typing.nit:148,15--87
-                    ../src/syntax/typing.nit:148,15--67
-                      literal value '"Error: Conflicting default constructor to call for {' ... ../src/syntax/typing.nit:148,15--67
-                    ../src/syntax/typing.nit:148,68
+                      ../src/syntax/typing.nit:148,12
+                      identifier 'n' ... ../src/syntax/typing.nit:148,12
+                      ../src/syntax/typing.nit:148,12
+                    ../src/syntax/typing.nit:148,15--87
+                      ../src/syntax/typing.nit:148,15--67
+                        literal value '"Error: Conflicting default constructor to call for {' ... ../src/syntax/typing.nit:148,15--67
                       ../src/syntax/typing.nit:148,68
-                      identifier 'c' ... ../src/syntax/typing.nit:148,68
-                    ../src/syntax/typing.nit:148,69--72
-                      literal value '}: {' ... ../src/syntax/typing.nit:148,69--72
-                    ../src/syntax/typing.nit:148,73--83
-                      ../src/syntax/typing.nit:148,73
+                        ../src/syntax/typing.nit:148,68
+                        identifier 'c' ... ../src/syntax/typing.nit:148,68
+                        ../src/syntax/typing.nit:148,68
+                      ../src/syntax/typing.nit:148,69--72
+                        literal value '}: {' ... ../src/syntax/typing.nit:148,69--72
+                      ../src/syntax/typing.nit:148,73--84
                         ../src/syntax/typing.nit:148,73
-                        identifier 'a' ... ../src/syntax/typing.nit:148,73
-                      identifier 'join' ... ../src/syntax/typing.nit:148,75--78
-                      ../src/syntax/typing.nit:148,80--83
-                        literal value '", "' ... ../src/syntax/typing.nit:148,80--83
-                    ../src/syntax/typing.nit:148,85--87
-                      '}."' ... ../src/syntax/typing.nit:148,85--87
+                          ../src/syntax/typing.nit:148,73
+                          identifier 'a' ... ../src/syntax/typing.nit:148,73
+                          ../src/syntax/typing.nit:148,73
+                        identifier 'join' ... ../src/syntax/typing.nit:148,75--78
+                        ../src/syntax/typing.nit:148,79--84
+                          '(' ... ../src/syntax/typing.nit:148,79
+                          ../src/syntax/typing.nit:148,80--83
+                            literal value '", "' ... ../src/syntax/typing.nit:148,80--83
+                          ')' ... ../src/syntax/typing.nit:148,84
+                      ../src/syntax/typing.nit:148,85--87
+                        '}."' ... ../src/syntax/typing.nit:148,85--87
+                    ')' ... ../src/syntax/typing.nit:148,88
                 ../src/syntax/typing.nit:149,4--14
                   keyword 'return' ... ../src/syntax/typing.nit:149,4--9
                   ../src/syntax/typing.nit:149,11--14
@@ -849,7 +993,9 @@
                     ../src/syntax/typing.nit:150,11--26
                       ../src/syntax/typing.nit:150,11
                       identifier 'false_candidates' ... ../src/syntax/typing.nit:150,11--26
+                      ../src/syntax/typing.nit:150,11
                     identifier 'length' ... ../src/syntax/typing.nit:150,28--33
+                    ../src/syntax/typing.nit:150,11
                   ../src/syntax/typing.nit:150,37
                     literal value '0' ... ../src/syntax/typing.nit:150,37
                 ../src/syntax/typing.nit:151,4--156,14
@@ -863,89 +1009,115 @@
                         type identifier 'Array' ... ../src/syntax/typing.nit:151,16--20
                         ../src/syntax/typing.nit:151,22--27
                           type identifier 'String' ... ../src/syntax/typing.nit:151,22--27
+                      ../src/syntax/typing.nit:151,12
                   ../src/syntax/typing.nit:152,4--154,6
                     keyword 'for' ... ../src/syntax/typing.nit:152,4--6
                     identifier 'p' ... ../src/syntax/typing.nit:152,8
                     ../src/syntax/typing.nit:152,13--28
                       ../src/syntax/typing.nit:152,13
                       identifier 'false_candidates' ... ../src/syntax/typing.nit:152,13--28
+                      ../src/syntax/typing.nit:152,13
                     keyword 'do' ... ../src/syntax/typing.nit:152,30--31
                     ../src/syntax/typing.nit:153,5--154,6
-                      ../src/syntax/typing.nit:153,5--51
+                      ../src/syntax/typing.nit:153,5--52
                         ../src/syntax/typing.nit:153,5
                           ../src/syntax/typing.nit:153,5
                           identifier 'a' ... ../src/syntax/typing.nit:153,5
+                          ../src/syntax/typing.nit:153,5
                         identifier 'add' ... ../src/syntax/typing.nit:153,7--9
-                        ../src/syntax/typing.nit:153,11--51
-                          ../src/syntax/typing.nit:153,11--12
-                            literal value '"{' ... ../src/syntax/typing.nit:153,11--12
-                          ../src/syntax/typing.nit:153,13--23
-                            ../src/syntax/typing.nit:153,13
+                        ../src/syntax/typing.nit:153,10--52
+                          '(' ... ../src/syntax/typing.nit:153,10
+                          ../src/syntax/typing.nit:153,11--51
+                            ../src/syntax/typing.nit:153,11--12
+                              literal value '"{' ... ../src/syntax/typing.nit:153,11--12
+                            ../src/syntax/typing.nit:153,13--23
+                              ../src/syntax/typing.nit:153,13
+                                ../src/syntax/typing.nit:153,13
+                                identifier 'p' ... ../src/syntax/typing.nit:153,13
+                                ../src/syntax/typing.nit:153,13
+                              identifier 'full_name' ... ../src/syntax/typing.nit:153,15--23
                               ../src/syntax/typing.nit:153,13
-                              identifier 'p' ... ../src/syntax/typing.nit:153,13
-                            identifier 'full_name' ... ../src/syntax/typing.nit:153,15--23
-                          ../src/syntax/typing.nit:153,24--25
-                            literal value '}{' ... ../src/syntax/typing.nit:153,24--25
-                          ../src/syntax/typing.nit:153,26--49
-                            ../src/syntax/typing.nit:153,26--36
-                              ../src/syntax/typing.nit:153,26
+                            ../src/syntax/typing.nit:153,24--25
+                              literal value '}{' ... ../src/syntax/typing.nit:153,24--25
+                            ../src/syntax/typing.nit:153,26--49
+                              ../src/syntax/typing.nit:153,26--36
                                 ../src/syntax/typing.nit:153,26
-                                identifier 'p' ... ../src/syntax/typing.nit:153,26
-                              identifier 'signature' ... ../src/syntax/typing.nit:153,28--36
-                            keyword 'as' ... ../src/syntax/typing.nit:153,38--39
-                            '(' ... ../src/syntax/typing.nit:153,40
-                            keyword 'not' ... ../src/syntax/typing.nit:153,41--43
-                            keyword 'null' ... ../src/syntax/typing.nit:153,45--48
-                            ')' ... ../src/syntax/typing.nit:153,49
-                          ../src/syntax/typing.nit:153,50--51
-                            '}"' ... ../src/syntax/typing.nit:153,50--51
+                                  ../src/syntax/typing.nit:153,26
+                                  identifier 'p' ... ../src/syntax/typing.nit:153,26
+                                  ../src/syntax/typing.nit:153,26
+                                identifier 'signature' ... ../src/syntax/typing.nit:153,28--36
+                                ../src/syntax/typing.nit:153,26
+                              keyword 'as' ... ../src/syntax/typing.nit:153,38--39
+                              '(' ... ../src/syntax/typing.nit:153,40
+                              keyword 'not' ... ../src/syntax/typing.nit:153,41--43
+                              keyword 'null' ... ../src/syntax/typing.nit:153,45--48
+                              ')' ... ../src/syntax/typing.nit:153,49
+                            ../src/syntax/typing.nit:153,50--51
+                              '}"' ... ../src/syntax/typing.nit:153,50--51
+                          ')' ... ../src/syntax/typing.nit:153,52
                       keyword 'end' ... ../src/syntax/typing.nit:154,4--6
-                  ../src/syntax/typing.nit:155,4--116
+                  ../src/syntax/typing.nit:155,4--117
                     ../src/syntax/typing.nit:155,4
                       ../src/syntax/typing.nit:155,4
                       identifier 'v' ... ../src/syntax/typing.nit:155,4
+                      ../src/syntax/typing.nit:155,4
                     identifier 'error' ... ../src/syntax/typing.nit:155,6--10
-                    ../src/syntax/typing.nit:155,12
+                    ../src/syntax/typing.nit:155,11--117
+                      '(' ... ../src/syntax/typing.nit:155,11
                       ../src/syntax/typing.nit:155,12
-                      identifier 'n' ... ../src/syntax/typing.nit:155,12
-                    ../src/syntax/typing.nit:155,15--116
-                      ../src/syntax/typing.nit:155,15--71
-                        literal value '"Error: there is no available compatible constructor in {' ... ../src/syntax/typing.nit:155,15--71
-                      ../src/syntax/typing.nit:155,72
+                        ../src/syntax/typing.nit:155,12
+                        identifier 'n' ... ../src/syntax/typing.nit:155,12
+                        ../src/syntax/typing.nit:155,12
+                      ../src/syntax/typing.nit:155,15--116
+                        ../src/syntax/typing.nit:155,15--71
+                          literal value '"Error: there is no available compatible constructor in {' ... ../src/syntax/typing.nit:155,15--71
                         ../src/syntax/typing.nit:155,72
-                        identifier 'c' ... ../src/syntax/typing.nit:155,72
-                      ../src/syntax/typing.nit:155,73--101
-                        literal value '}. Discarded candidates are {' ... ../src/syntax/typing.nit:155,73--101
-                      ../src/syntax/typing.nit:155,102--112
-                        ../src/syntax/typing.nit:155,102
+                          ../src/syntax/typing.nit:155,72
+                          identifier 'c' ... ../src/syntax/typing.nit:155,72
+                          ../src/syntax/typing.nit:155,72
+                        ../src/syntax/typing.nit:155,73--101
+                          literal value '}. Discarded candidates are {' ... ../src/syntax/typing.nit:155,73--101
+                        ../src/syntax/typing.nit:155,102--113
                           ../src/syntax/typing.nit:155,102
-                          identifier 'a' ... ../src/syntax/typing.nit:155,102
-                        identifier 'join' ... ../src/syntax/typing.nit:155,104--107
-                        ../src/syntax/typing.nit:155,109--112
-                          literal value '", "' ... ../src/syntax/typing.nit:155,109--112
-                      ../src/syntax/typing.nit:155,114--116
-                        '}."' ... ../src/syntax/typing.nit:155,114--116
+                            ../src/syntax/typing.nit:155,102
+                            identifier 'a' ... ../src/syntax/typing.nit:155,102
+                            ../src/syntax/typing.nit:155,102
+                          identifier 'join' ... ../src/syntax/typing.nit:155,104--107
+                          ../src/syntax/typing.nit:155,108--113
+                            '(' ... ../src/syntax/typing.nit:155,108
+                            ../src/syntax/typing.nit:155,109--112
+                              literal value '", "' ... ../src/syntax/typing.nit:155,109--112
+                            ')' ... ../src/syntax/typing.nit:155,113
+                        ../src/syntax/typing.nit:155,114--116
+                          '}."' ... ../src/syntax/typing.nit:155,114--116
+                      ')' ... ../src/syntax/typing.nit:155,117
                   ../src/syntax/typing.nit:156,4--14
                     keyword 'return' ... ../src/syntax/typing.nit:156,4--9
                     ../src/syntax/typing.nit:156,11--14
                       keyword 'null' ... ../src/syntax/typing.nit:156,11--14
                 ../src/syntax/typing.nit:158,4--160,5
-                  ../src/syntax/typing.nit:158,4--75
+                  ../src/syntax/typing.nit:158,4--76
                     ../src/syntax/typing.nit:158,4
                       ../src/syntax/typing.nit:158,4
                       identifier 'v' ... ../src/syntax/typing.nit:158,4
+                      ../src/syntax/typing.nit:158,4
                     identifier 'error' ... ../src/syntax/typing.nit:158,6--10
-                    ../src/syntax/typing.nit:158,12
+                    ../src/syntax/typing.nit:158,11--76
+                      '(' ... ../src/syntax/typing.nit:158,11
                       ../src/syntax/typing.nit:158,12
-                      identifier 'n' ... ../src/syntax/typing.nit:158,12
-                    ../src/syntax/typing.nit:158,15--75
-                      ../src/syntax/typing.nit:158,15--71
-                        literal value '"Error: there is no available compatible constructor in {' ... ../src/syntax/typing.nit:158,15--71
-                      ../src/syntax/typing.nit:158,72
+                        ../src/syntax/typing.nit:158,12
+                        identifier 'n' ... ../src/syntax/typing.nit:158,12
+                        ../src/syntax/typing.nit:158,12
+                      ../src/syntax/typing.nit:158,15--75
+                        ../src/syntax/typing.nit:158,15--71
+                          literal value '"Error: there is no available compatible constructor in {' ... ../src/syntax/typing.nit:158,15--71
                         ../src/syntax/typing.nit:158,72
-                        identifier 'c' ... ../src/syntax/typing.nit:158,72
-                      ../src/syntax/typing.nit:158,73--75
-                        '}."' ... ../src/syntax/typing.nit:158,73--75
+                          ../src/syntax/typing.nit:158,72
+                          identifier 'c' ... ../src/syntax/typing.nit:158,72
+                          ../src/syntax/typing.nit:158,72
+                        ../src/syntax/typing.nit:158,73--75
+                          '}."' ... ../src/syntax/typing.nit:158,73--75
+                      ')' ... ../src/syntax/typing.nit:158,76
                   ../src/syntax/typing.nit:159,4--14
                     keyword 'return' ... ../src/syntax/typing.nit:159,4--9
                     ../src/syntax/typing.nit:159,11--14
@@ -971,18 +1143,26 @@
             ../src/syntax/typing.nit:168,31--43
               type identifier 'TypingVisitor' ... ../src/syntax/typing.nit:168,31--43
         ../src/syntax/typing.nit:170,3--172,4
-          ../src/syntax/typing.nit:170,3--29
+          ../src/syntax/typing.nit:170,3--30
             ../src/syntax/typing.nit:170,29
             identifier 'accept_abs_syntax_visitor' ... ../src/syntax/typing.nit:170,3--27
-            ../src/syntax/typing.nit:170,29
+            ../src/syntax/typing.nit:170,28--30
+              '(' ... ../src/syntax/typing.nit:170,28
               ../src/syntax/typing.nit:170,29
-              identifier 'v' ... ../src/syntax/typing.nit:170,29
-          ../src/syntax/typing.nit:171,3--16
+                ../src/syntax/typing.nit:170,29
+                identifier 'v' ... ../src/syntax/typing.nit:170,29
+                ../src/syntax/typing.nit:170,29
+              ')' ... ../src/syntax/typing.nit:170,30
+          ../src/syntax/typing.nit:171,3--17
             ../src/syntax/typing.nit:171,16
             identifier 'after_typing' ... ../src/syntax/typing.nit:171,3--14
-            ../src/syntax/typing.nit:171,16
+            ../src/syntax/typing.nit:171,15--17
+              '(' ... ../src/syntax/typing.nit:171,15
               ../src/syntax/typing.nit:171,16
-              identifier 'v' ... ../src/syntax/typing.nit:171,16
+                ../src/syntax/typing.nit:171,16
+                identifier 'v' ... ../src/syntax/typing.nit:171,16
+                ../src/syntax/typing.nit:171,16
+              ')' ... ../src/syntax/typing.nit:171,17
           keyword 'end' ... ../src/syntax/typing.nit:172,2--4
       ../src/syntax/typing.nit:173,2--50
         ../src/syntax/typing.nit:173,2--8
@@ -1014,37 +1194,49 @@
           ../src/syntax/typing.nit:177,26
             identifier 'v' ... ../src/syntax/typing.nit:177,26
         ../src/syntax/typing.nit:179,3--182,4
-          ../src/syntax/typing.nit:179,3--55
+          ../src/syntax/typing.nit:179,3--56
             ../src/syntax/typing.nit:179,3
               ../src/syntax/typing.nit:179,3
               identifier 'v' ... ../src/syntax/typing.nit:179,3
+              ../src/syntax/typing.nit:179,3
             identifier 'self_var' ... ../src/syntax/typing.nit:179,5--12
+            ../src/syntax/typing.nit:179,20
             '=' ... ../src/syntax/typing.nit:179,14
-            ../src/syntax/typing.nit:179,16--55
+            ../src/syntax/typing.nit:179,16--56
               keyword 'new' ... ../src/syntax/typing.nit:179,16--18
               ../src/syntax/typing.nit:179,20--32
                 type identifier 'ParamVariable' ... ../src/syntax/typing.nit:179,20--32
-              ../src/syntax/typing.nit:179,34--49
-                ../src/syntax/typing.nit:179,34--39
-                  literal value '"self"' ... ../src/syntax/typing.nit:179,34--39
-                identifier 'to_symbol' ... ../src/syntax/typing.nit:179,41--49
-              ../src/syntax/typing.nit:179,52--55
-                keyword 'self' ... ../src/syntax/typing.nit:179,52--55
+              ../src/syntax/typing.nit:179,33--56
+                '(' ... ../src/syntax/typing.nit:179,33
+                ../src/syntax/typing.nit:179,34--49
+                  ../src/syntax/typing.nit:179,34--39
+                    literal value '"self"' ... ../src/syntax/typing.nit:179,34--39
+                  identifier 'to_symbol' ... ../src/syntax/typing.nit:179,41--49
+                  ../src/syntax/typing.nit:179,34
+                ../src/syntax/typing.nit:179,52--55
+                  keyword 'self' ... ../src/syntax/typing.nit:179,52--55
+                ')' ... ../src/syntax/typing.nit:179,56
           ../src/syntax/typing.nit:180,3--41
             ../src/syntax/typing.nit:180,3--12
               ../src/syntax/typing.nit:180,3
                 ../src/syntax/typing.nit:180,3
                 identifier 'v' ... ../src/syntax/typing.nit:180,3
+                ../src/syntax/typing.nit:180,3
               identifier 'self_var' ... ../src/syntax/typing.nit:180,5--12
+              ../src/syntax/typing.nit:180,3
             identifier 'stype' ... ../src/syntax/typing.nit:180,14--18
+            ../src/syntax/typing.nit:180,22
             '=' ... ../src/syntax/typing.nit:180,20
             ../src/syntax/typing.nit:180,22--41
               ../src/syntax/typing.nit:180,22--32
                 ../src/syntax/typing.nit:180,22
                 identifier 'local_class' ... ../src/syntax/typing.nit:180,22--32
+                ../src/syntax/typing.nit:180,22
               identifier 'get_type' ... ../src/syntax/typing.nit:180,34--41
+              ../src/syntax/typing.nit:180,22
           ../src/syntax/typing.nit:181,3--7
             keyword 'super' ... ../src/syntax/typing.nit:181,3--7
+            ../src/syntax/typing.nit:181,3
           keyword 'end' ... ../src/syntax/typing.nit:182,2--4
       keyword 'end' ... ../src/syntax/typing.nit:183,1--3
     ../src/syntax/typing.nit:185,1--188,3
@@ -1095,41 +1287,56 @@
           ../src/syntax/typing.nit:191,26
             identifier 'v' ... ../src/syntax/typing.nit:191,26
         ../src/syntax/typing.nit:193,3--203,4
-          ../src/syntax/typing.nit:193,3--42
+          ../src/syntax/typing.nit:193,3--43
             ../src/syntax/typing.nit:193,3
               ../src/syntax/typing.nit:193,3
               identifier 'v' ... ../src/syntax/typing.nit:193,3
+              ../src/syntax/typing.nit:193,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:193,5--12
+            ../src/syntax/typing.nit:193,20
             '=' ... ../src/syntax/typing.nit:193,14
-            ../src/syntax/typing.nit:193,16--42
+            ../src/syntax/typing.nit:193,16--43
               keyword 'new' ... ../src/syntax/typing.nit:193,16--18
               ../src/syntax/typing.nit:193,20--34
                 type identifier 'RootFlowContext' ... ../src/syntax/typing.nit:193,20--34
-              ../src/syntax/typing.nit:193,36
+              ../src/syntax/typing.nit:193,35--43
+                '(' ... ../src/syntax/typing.nit:193,35
                 ../src/syntax/typing.nit:193,36
-                identifier 'v' ... ../src/syntax/typing.nit:193,36
-              ../src/syntax/typing.nit:193,39--42
-                keyword 'self' ... ../src/syntax/typing.nit:193,39--42
+                  ../src/syntax/typing.nit:193,36
+                  identifier 'v' ... ../src/syntax/typing.nit:193,36
+                  ../src/syntax/typing.nit:193,36
+                ../src/syntax/typing.nit:193,39--42
+                  keyword 'self' ... ../src/syntax/typing.nit:193,39--42
+                ')' ... ../src/syntax/typing.nit:193,43
           ../src/syntax/typing.nit:194,3--30
             ../src/syntax/typing.nit:194,3
               ../src/syntax/typing.nit:194,3
               identifier 'v' ... ../src/syntax/typing.nit:194,3
+              ../src/syntax/typing.nit:194,3
             identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:194,5--17
+            ../src/syntax/typing.nit:194,21
             '=' ... ../src/syntax/typing.nit:194,19
             ../src/syntax/typing.nit:194,21--30
               ../src/syntax/typing.nit:194,21
                 ../src/syntax/typing.nit:194,21
                 identifier 'v' ... ../src/syntax/typing.nit:194,21
+                ../src/syntax/typing.nit:194,21
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:194,23--30
-          ../src/syntax/typing.nit:196,3--23
+              ../src/syntax/typing.nit:194,21
+          ../src/syntax/typing.nit:196,3--24
             ../src/syntax/typing.nit:196,3--13
               ../src/syntax/typing.nit:196,3
                 ../src/syntax/typing.nit:196,3
                 identifier 'v' ... ../src/syntax/typing.nit:196,3
+                ../src/syntax/typing.nit:196,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:196,5--13
+              ../src/syntax/typing.nit:196,3
             identifier 'push' ... ../src/syntax/typing.nit:196,15--18
-            ../src/syntax/typing.nit:196,20--23
-              keyword 'self' ... ../src/syntax/typing.nit:196,20--23
+            ../src/syntax/typing.nit:196,19--24
+              '(' ... ../src/syntax/typing.nit:196,19
+              ../src/syntax/typing.nit:196,20--23
+                keyword 'self' ... ../src/syntax/typing.nit:196,20--23
+              ')' ... ../src/syntax/typing.nit:196,24
           ../src/syntax/typing.nit:197,3--24
             ../src/syntax/typing.nit:197,15
             attribute '_self_var' ... ../src/syntax/typing.nit:197,3--11
@@ -1138,45 +1345,57 @@
               ../src/syntax/typing.nit:197,15
                 ../src/syntax/typing.nit:197,15
                 identifier 'v' ... ../src/syntax/typing.nit:197,15
+                ../src/syntax/typing.nit:197,15
               identifier 'self_var' ... ../src/syntax/typing.nit:197,17--24
+              ../src/syntax/typing.nit:197,15
           ../src/syntax/typing.nit:198,3--7
             keyword 'super' ... ../src/syntax/typing.nit:198,3--7
+            ../src/syntax/typing.nit:198,3
           ../src/syntax/typing.nit:199,3--201,5
             keyword 'if' ... ../src/syntax/typing.nit:199,3--4
             ../src/syntax/typing.nit:199,6--19
               ../src/syntax/typing.nit:199,6--11
                 ../src/syntax/typing.nit:199,6
                 identifier 'n_expr' ... ../src/syntax/typing.nit:199,6--11
+                ../src/syntax/typing.nit:199,6
               ../src/syntax/typing.nit:199,16--19
                 keyword 'null' ... ../src/syntax/typing.nit:199,16--19
-            ../src/syntax/typing.nit:200,4--84
-              ../src/syntax/typing.nit:200,4--84
+            ../src/syntax/typing.nit:200,4--85
+              ../src/syntax/typing.nit:200,4--85
                 ../src/syntax/typing.nit:200,4
                   ../src/syntax/typing.nit:200,4
                   identifier 'v' ... ../src/syntax/typing.nit:200,4
+                  ../src/syntax/typing.nit:200,4
                 identifier 'check_conform_expr' ... ../src/syntax/typing.nit:200,6--23
-                ../src/syntax/typing.nit:200,25--43
-                  ../src/syntax/typing.nit:200,25--30
-                    ../src/syntax/typing.nit:200,25
-                    identifier 'n_expr' ... ../src/syntax/typing.nit:200,25--30
-                  keyword 'as' ... ../src/syntax/typing.nit:200,32--33
-                  '(' ... ../src/syntax/typing.nit:200,34
-                  keyword 'not' ... ../src/syntax/typing.nit:200,35--37
-                  keyword 'null' ... ../src/syntax/typing.nit:200,39--42
-                  ')' ... ../src/syntax/typing.nit:200,43
-                ../src/syntax/typing.nit:200,46--84
-                  ../src/syntax/typing.nit:200,46--71
-                    ../src/syntax/typing.nit:200,46--59
-                      ../src/syntax/typing.nit:200,46--49
+                ../src/syntax/typing.nit:200,24--85
+                  '(' ... ../src/syntax/typing.nit:200,24
+                  ../src/syntax/typing.nit:200,25--43
+                    ../src/syntax/typing.nit:200,25--30
+                      ../src/syntax/typing.nit:200,25
+                      identifier 'n_expr' ... ../src/syntax/typing.nit:200,25--30
+                      ../src/syntax/typing.nit:200,25
+                    keyword 'as' ... ../src/syntax/typing.nit:200,32--33
+                    '(' ... ../src/syntax/typing.nit:200,34
+                    keyword 'not' ... ../src/syntax/typing.nit:200,35--37
+                    keyword 'null' ... ../src/syntax/typing.nit:200,39--42
+                    ')' ... ../src/syntax/typing.nit:200,43
+                  ../src/syntax/typing.nit:200,46--84
+                    ../src/syntax/typing.nit:200,46--71
+                      ../src/syntax/typing.nit:200,46--59
+                        ../src/syntax/typing.nit:200,46--49
+                          ../src/syntax/typing.nit:200,46
+                          identifier 'prop' ... ../src/syntax/typing.nit:200,46--49
+                          ../src/syntax/typing.nit:200,46
+                        identifier 'signature' ... ../src/syntax/typing.nit:200,51--59
                         ../src/syntax/typing.nit:200,46
-                        identifier 'prop' ... ../src/syntax/typing.nit:200,46--49
-                      identifier 'signature' ... ../src/syntax/typing.nit:200,51--59
-                    identifier 'return_type' ... ../src/syntax/typing.nit:200,61--71
-                  keyword 'as' ... ../src/syntax/typing.nit:200,73--74
-                  '(' ... ../src/syntax/typing.nit:200,75
-                  keyword 'not' ... ../src/syntax/typing.nit:200,76--78
-                  keyword 'null' ... ../src/syntax/typing.nit:200,80--83
-                  ')' ... ../src/syntax/typing.nit:200,84
+                      identifier 'return_type' ... ../src/syntax/typing.nit:200,61--71
+                      ../src/syntax/typing.nit:200,46
+                    keyword 'as' ... ../src/syntax/typing.nit:200,73--74
+                    '(' ... ../src/syntax/typing.nit:200,75
+                    keyword 'not' ... ../src/syntax/typing.nit:200,76--78
+                    keyword 'null' ... ../src/syntax/typing.nit:200,80--83
+                    ')' ... ../src/syntax/typing.nit:200,84
+                  ')' ... ../src/syntax/typing.nit:200,85
             ../src/syntax/typing.nit:201,3--5
               keyword 'end' ... ../src/syntax/typing.nit:201,3--5
           ../src/syntax/typing.nit:202,3--17
@@ -1184,8 +1403,11 @@
               ../src/syntax/typing.nit:202,3
                 ../src/syntax/typing.nit:202,3
                 identifier 'v' ... ../src/syntax/typing.nit:202,3
+                ../src/syntax/typing.nit:202,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:202,5--13
+              ../src/syntax/typing.nit:202,3
             identifier 'pop' ... ../src/syntax/typing.nit:202,15--17
+            ../src/syntax/typing.nit:202,3
           keyword 'end' ... ../src/syntax/typing.nit:203,2--4
       keyword 'end' ... ../src/syntax/typing.nit:204,1--3
     ../src/syntax/typing.nit:206,1--217,3
@@ -1204,41 +1426,56 @@
           ../src/syntax/typing.nit:207,26
             identifier 'v' ... ../src/syntax/typing.nit:207,26
         ../src/syntax/typing.nit:209,3--216,4
-          ../src/syntax/typing.nit:209,3--42
+          ../src/syntax/typing.nit:209,3--43
             ../src/syntax/typing.nit:209,3
               ../src/syntax/typing.nit:209,3
               identifier 'v' ... ../src/syntax/typing.nit:209,3
+              ../src/syntax/typing.nit:209,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:209,5--12
+            ../src/syntax/typing.nit:209,20
             '=' ... ../src/syntax/typing.nit:209,14
-            ../src/syntax/typing.nit:209,16--42
+            ../src/syntax/typing.nit:209,16--43
               keyword 'new' ... ../src/syntax/typing.nit:209,16--18
               ../src/syntax/typing.nit:209,20--34
                 type identifier 'RootFlowContext' ... ../src/syntax/typing.nit:209,20--34
-              ../src/syntax/typing.nit:209,36
+              ../src/syntax/typing.nit:209,35--43
+                '(' ... ../src/syntax/typing.nit:209,35
                 ../src/syntax/typing.nit:209,36
-                identifier 'v' ... ../src/syntax/typing.nit:209,36
-              ../src/syntax/typing.nit:209,39--42
-                keyword 'self' ... ../src/syntax/typing.nit:209,39--42
+                  ../src/syntax/typing.nit:209,36
+                  identifier 'v' ... ../src/syntax/typing.nit:209,36
+                  ../src/syntax/typing.nit:209,36
+                ../src/syntax/typing.nit:209,39--42
+                  keyword 'self' ... ../src/syntax/typing.nit:209,39--42
+                ')' ... ../src/syntax/typing.nit:209,43
           ../src/syntax/typing.nit:210,3--30
             ../src/syntax/typing.nit:210,3
               ../src/syntax/typing.nit:210,3
               identifier 'v' ... ../src/syntax/typing.nit:210,3
+              ../src/syntax/typing.nit:210,3
             identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:210,5--17
+            ../src/syntax/typing.nit:210,21
             '=' ... ../src/syntax/typing.nit:210,19
             ../src/syntax/typing.nit:210,21--30
               ../src/syntax/typing.nit:210,21
                 ../src/syntax/typing.nit:210,21
                 identifier 'v' ... ../src/syntax/typing.nit:210,21
+                ../src/syntax/typing.nit:210,21
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:210,23--30
-          ../src/syntax/typing.nit:212,3--23
+              ../src/syntax/typing.nit:210,21
+          ../src/syntax/typing.nit:212,3--24
             ../src/syntax/typing.nit:212,3--13
               ../src/syntax/typing.nit:212,3
                 ../src/syntax/typing.nit:212,3
                 identifier 'v' ... ../src/syntax/typing.nit:212,3
+                ../src/syntax/typing.nit:212,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:212,5--13
+              ../src/syntax/typing.nit:212,3
             identifier 'push' ... ../src/syntax/typing.nit:212,15--18
-            ../src/syntax/typing.nit:212,20--23
-              keyword 'self' ... ../src/syntax/typing.nit:212,20--23
+            ../src/syntax/typing.nit:212,19--24
+              '(' ... ../src/syntax/typing.nit:212,19
+              ../src/syntax/typing.nit:212,20--23
+                keyword 'self' ... ../src/syntax/typing.nit:212,20--23
+              ')' ... ../src/syntax/typing.nit:212,24
           ../src/syntax/typing.nit:213,3--24
             ../src/syntax/typing.nit:213,15
             attribute '_self_var' ... ../src/syntax/typing.nit:213,3--11
@@ -1247,16 +1484,22 @@
               ../src/syntax/typing.nit:213,15
                 ../src/syntax/typing.nit:213,15
                 identifier 'v' ... ../src/syntax/typing.nit:213,15
+                ../src/syntax/typing.nit:213,15
               identifier 'self_var' ... ../src/syntax/typing.nit:213,17--24
+              ../src/syntax/typing.nit:213,15
           ../src/syntax/typing.nit:214,3--7
             keyword 'super' ... ../src/syntax/typing.nit:214,3--7
+            ../src/syntax/typing.nit:214,3
           ../src/syntax/typing.nit:215,3--17
             ../src/syntax/typing.nit:215,3--13
               ../src/syntax/typing.nit:215,3
                 ../src/syntax/typing.nit:215,3
                 identifier 'v' ... ../src/syntax/typing.nit:215,3
+                ../src/syntax/typing.nit:215,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:215,5--13
+              ../src/syntax/typing.nit:215,3
             identifier 'pop' ... ../src/syntax/typing.nit:215,15--17
+            ../src/syntax/typing.nit:215,3
           keyword 'end' ... ../src/syntax/typing.nit:216,2--4
       keyword 'end' ... ../src/syntax/typing.nit:217,1--3
     ../src/syntax/typing.nit:219,1--227,3
@@ -1277,6 +1520,7 @@
         ../src/syntax/typing.nit:222,3--226,4
           ../src/syntax/typing.nit:222,3--7
             keyword 'super' ... ../src/syntax/typing.nit:222,3--7
+            ../src/syntax/typing.nit:222,3
           ../src/syntax/typing.nit:223,3--225,5
             keyword 'if' ... ../src/syntax/typing.nit:223,3--4
             ../src/syntax/typing.nit:223,6--68
@@ -1287,28 +1531,38 @@
                     ../src/syntax/typing.nit:223,10
                       ../src/syntax/typing.nit:223,10
                       identifier 'v' ... ../src/syntax/typing.nit:223,10
+                      ../src/syntax/typing.nit:223,10
                     identifier 'flow_ctx' ... ../src/syntax/typing.nit:223,12--19
+                    ../src/syntax/typing.nit:223,10
                   identifier 'unreash' ... ../src/syntax/typing.nit:223,21--27
+                  ../src/syntax/typing.nit:223,10
               ../src/syntax/typing.nit:223,33--68
                 ../src/syntax/typing.nit:223,33--60
                   ../src/syntax/typing.nit:223,33--48
                     ../src/syntax/typing.nit:223,33--38
                       ../src/syntax/typing.nit:223,33
                       identifier 'method' ... ../src/syntax/typing.nit:223,33--38
+                      ../src/syntax/typing.nit:223,33
                     identifier 'signature' ... ../src/syntax/typing.nit:223,40--48
+                    ../src/syntax/typing.nit:223,33
                   identifier 'return_type' ... ../src/syntax/typing.nit:223,50--60
+                  ../src/syntax/typing.nit:223,33
                 ../src/syntax/typing.nit:223,65--68
                   keyword 'null' ... ../src/syntax/typing.nit:223,65--68
-            ../src/syntax/typing.nit:224,4--97
-              ../src/syntax/typing.nit:224,4--97
+            ../src/syntax/typing.nit:224,4--98
+              ../src/syntax/typing.nit:224,4--98
                 ../src/syntax/typing.nit:224,4
                   ../src/syntax/typing.nit:224,4
                   identifier 'v' ... ../src/syntax/typing.nit:224,4
+                  ../src/syntax/typing.nit:224,4
                 identifier 'error' ... ../src/syntax/typing.nit:224,6--10
-                ../src/syntax/typing.nit:224,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:224,12--15
-                ../src/syntax/typing.nit:224,18--97
-                  literal value '"Control error: Reached end of function (a 'return' with a value was expected)."' ... ../src/syntax/typing.nit:224,18--97
+                ../src/syntax/typing.nit:224,11--98
+                  '(' ... ../src/syntax/typing.nit:224,11
+                  ../src/syntax/typing.nit:224,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:224,12--15
+                  ../src/syntax/typing.nit:224,18--97
+                    literal value '"Control error: Reached end of function (a 'return' with a value was expected)."' ... ../src/syntax/typing.nit:224,18--97
+                  ')' ... ../src/syntax/typing.nit:224,98
             ../src/syntax/typing.nit:225,3--5
               keyword 'end' ... ../src/syntax/typing.nit:225,3--5
           keyword 'end' ... ../src/syntax/typing.nit:226,2--4
@@ -1333,30 +1587,39 @@
             ../src/syntax/typing.nit:232,3
               ../src/syntax/typing.nit:232,3
               identifier 'v' ... ../src/syntax/typing.nit:232,3
+              ../src/syntax/typing.nit:232,3
             identifier 'top_block' ... ../src/syntax/typing.nit:232,5--13
+            ../src/syntax/typing.nit:232,17
             '=' ... ../src/syntax/typing.nit:232,15
             ../src/syntax/typing.nit:232,17--23
               ../src/syntax/typing.nit:232,17
               identifier 'n_block' ... ../src/syntax/typing.nit:232,17--23
+              ../src/syntax/typing.nit:232,17
           ../src/syntax/typing.nit:233,3--57
             ../src/syntax/typing.nit:233,3
               ../src/syntax/typing.nit:233,3
               identifier 'v' ... ../src/syntax/typing.nit:233,3
+              ../src/syntax/typing.nit:233,3
             identifier 'explicit_super_init_calls' ... ../src/syntax/typing.nit:233,5--29
+            ../src/syntax/typing.nit:233,33
             '=' ... ../src/syntax/typing.nit:233,31
             ../src/syntax/typing.nit:233,33--57
               ../src/syntax/typing.nit:233,33
               identifier 'explicit_super_init_calls' ... ../src/syntax/typing.nit:233,33--57
+              ../src/syntax/typing.nit:233,33
           ../src/syntax/typing.nit:234,3--36
             ../src/syntax/typing.nit:234,3
               ../src/syntax/typing.nit:234,3
               identifier 'v' ... ../src/syntax/typing.nit:234,3
+              ../src/syntax/typing.nit:234,3
             identifier 'explicit_other_init_call' ... ../src/syntax/typing.nit:234,5--28
+            ../src/syntax/typing.nit:234,32
             '=' ... ../src/syntax/typing.nit:234,30
             ../src/syntax/typing.nit:234,32--36
               keyword 'false' ... ../src/syntax/typing.nit:234,32--36
           ../src/syntax/typing.nit:235,3--7
             keyword 'super' ... ../src/syntax/typing.nit:235,3--7
+            ../src/syntax/typing.nit:235,3
           keyword 'end' ... ../src/syntax/typing.nit:236,2--4
       ../src/syntax/typing.nit:238,2--277,4
         keyword 'redef' ... ../src/syntax/typing.nit:238,2--6
@@ -1370,6 +1633,7 @@
         ../src/syntax/typing.nit:240,3--277,4
           ../src/syntax/typing.nit:240,3--7
             keyword 'super' ... ../src/syntax/typing.nit:240,3--7
+            ../src/syntax/typing.nit:240,3
           ../src/syntax/typing.nit:241,3--276,5
             keyword 'if' ... ../src/syntax/typing.nit:241,3--4
             ../src/syntax/typing.nit:241,6--64
@@ -1377,18 +1641,24 @@
                 ../src/syntax/typing.nit:241,6
                   ../src/syntax/typing.nit:241,6
                   identifier 'v' ... ../src/syntax/typing.nit:241,6
+                  ../src/syntax/typing.nit:241,6
                 identifier 'explicit_other_init_call' ... ../src/syntax/typing.nit:241,8--31
+                ../src/syntax/typing.nit:241,6
               ../src/syntax/typing.nit:241,36--64
                 ../src/syntax/typing.nit:241,36--54
                   ../src/syntax/typing.nit:241,36--48
                     ../src/syntax/typing.nit:241,36--41
                       ../src/syntax/typing.nit:241,36
                       identifier 'method' ... ../src/syntax/typing.nit:241,36--41
+                      ../src/syntax/typing.nit:241,36
                     identifier 'global' ... ../src/syntax/typing.nit:241,43--48
+                    ../src/syntax/typing.nit:241,36
                   identifier 'intro' ... ../src/syntax/typing.nit:241,50--54
+                  ../src/syntax/typing.nit:241,36
                 ../src/syntax/typing.nit:241,59--64
                   ../src/syntax/typing.nit:241,59
                   identifier 'method' ... ../src/syntax/typing.nit:241,59--64
+                  ../src/syntax/typing.nit:241,59
             ../src/syntax/typing.nit:244,4--276,5
               ../src/syntax/typing.nit:244,4--12
                 keyword 'var' ... ../src/syntax/typing.nit:244,4--6
@@ -1404,7 +1674,9 @@
                   ../src/syntax/typing.nit:245,12--36
                     ../src/syntax/typing.nit:245,12
                     identifier 'explicit_super_init_calls' ... ../src/syntax/typing.nit:245,12--36
+                    ../src/syntax/typing.nit:245,12
                   identifier 'length' ... ../src/syntax/typing.nit:245,38--43
+                  ../src/syntax/typing.nit:245,12
               ../src/syntax/typing.nit:246,4--38
                 keyword 'var' ... ../src/syntax/typing.nit:246,4--6
                 identifier 'cur_m' ... ../src/syntax/typing.nit:246,8--12
@@ -1429,41 +1701,59 @@
                   ../src/syntax/typing.nit:248,7
                     ../src/syntax/typing.nit:248,7
                     identifier 'i' ... ../src/syntax/typing.nit:248,7
+                    ../src/syntax/typing.nit:248,7
                   ../src/syntax/typing.nit:248,11
                     ../src/syntax/typing.nit:248,11
                     identifier 'l' ... ../src/syntax/typing.nit:248,11
-                ../src/syntax/typing.nit:249,5--250,64
-                  ../src/syntax/typing.nit:249,5--39
+                    ../src/syntax/typing.nit:248,11
+                ../src/syntax/typing.nit:249,5--250,65
+                  ../src/syntax/typing.nit:249,5--40
                     ../src/syntax/typing.nit:249,13
                     identifier 'cur_m' ... ../src/syntax/typing.nit:249,5--9
+                    ../src/syntax/typing.nit:249,13
                     '=' ... ../src/syntax/typing.nit:249,11
-                    ../src/syntax/typing.nit:249,13--39
+                    ../src/syntax/typing.nit:249,13--40
                       ../src/syntax/typing.nit:249,13--37
                         ../src/syntax/typing.nit:249,13
                         identifier 'explicit_super_init_calls' ... ../src/syntax/typing.nit:249,13--37
-                      ../src/syntax/typing.nit:249,39
+                        ../src/syntax/typing.nit:249,13
+                      ../src/syntax/typing.nit:249,38--40
+                        '[' ... ../src/syntax/typing.nit:249,38
                         ../src/syntax/typing.nit:249,39
-                        identifier 'i' ... ../src/syntax/typing.nit:249,39
-                  ../src/syntax/typing.nit:250,5--64
+                          ../src/syntax/typing.nit:249,39
+                          identifier 'i' ... ../src/syntax/typing.nit:249,39
+                          ../src/syntax/typing.nit:249,39
+                        ']' ... ../src/syntax/typing.nit:249,40
+                  ../src/syntax/typing.nit:250,5--65
                     ../src/syntax/typing.nit:250,13
                     identifier 'cur_c' ... ../src/syntax/typing.nit:250,5--9
+                    ../src/syntax/typing.nit:250,13
                     '=' ... ../src/syntax/typing.nit:250,11
-                    ../src/syntax/typing.nit:250,13--64
+                    ../src/syntax/typing.nit:250,13--65
                       ../src/syntax/typing.nit:250,13--42
                         ../src/syntax/typing.nit:250,13--30
                           ../src/syntax/typing.nit:250,13--24
                             ../src/syntax/typing.nit:250,13--17
                               ../src/syntax/typing.nit:250,13
                               identifier 'cur_m' ... ../src/syntax/typing.nit:250,13--17
+                              ../src/syntax/typing.nit:250,13
                             identifier 'global' ... ../src/syntax/typing.nit:250,19--24
+                            ../src/syntax/typing.nit:250,13
                           identifier 'intro' ... ../src/syntax/typing.nit:250,26--30
+                          ../src/syntax/typing.nit:250,13
                         identifier 'local_class' ... ../src/syntax/typing.nit:250,32--42
+                        ../src/syntax/typing.nit:250,13
                       identifier 'for_module' ... ../src/syntax/typing.nit:250,44--53
-                      ../src/syntax/typing.nit:250,55--64
-                        ../src/syntax/typing.nit:250,55
+                      ../src/syntax/typing.nit:250,54--65
+                        '(' ... ../src/syntax/typing.nit:250,54
+                        ../src/syntax/typing.nit:250,55--64
+                          ../src/syntax/typing.nit:250,55
+                            ../src/syntax/typing.nit:250,55
+                            identifier 'v' ... ../src/syntax/typing.nit:250,55
+                            ../src/syntax/typing.nit:250,55
+                          identifier 'mmmodule' ... ../src/syntax/typing.nit:250,57--64
                           ../src/syntax/typing.nit:250,55
-                          identifier 'v' ... ../src/syntax/typing.nit:250,55
-                        identifier 'mmmodule' ... ../src/syntax/typing.nit:250,57--64
+                        ')' ... ../src/syntax/typing.nit:250,65
                 ../src/syntax/typing.nit:251,4--6
                   keyword 'end' ... ../src/syntax/typing.nit:251,4--6
               ../src/syntax/typing.nit:252,4--12
@@ -1478,6 +1768,7 @@
                   ../src/syntax/typing.nit:253,10
                     ../src/syntax/typing.nit:253,10
                     identifier 'j' ... ../src/syntax/typing.nit:253,10
+                    ../src/syntax/typing.nit:253,10
                   ../src/syntax/typing.nit:253,14--54
                     ../src/syntax/typing.nit:253,14--47
                       ../src/syntax/typing.nit:253,14--31
@@ -1485,29 +1776,42 @@
                           ../src/syntax/typing.nit:253,14
                             ../src/syntax/typing.nit:253,14
                             identifier 'v' ... ../src/syntax/typing.nit:253,14
+                            ../src/syntax/typing.nit:253,14
                           identifier 'local_class' ... ../src/syntax/typing.nit:253,16--26
+                          ../src/syntax/typing.nit:253,14
                         identifier 'cshe' ... ../src/syntax/typing.nit:253,28--31
+                        ../src/syntax/typing.nit:253,14
                       identifier 'direct_greaters' ... ../src/syntax/typing.nit:253,33--47
+                      ../src/syntax/typing.nit:253,14
                     identifier 'length' ... ../src/syntax/typing.nit:253,49--54
+                    ../src/syntax/typing.nit:253,14
                 keyword 'do' ... ../src/syntax/typing.nit:253,56--57
                 ../src/syntax/typing.nit:254,5--275,6
-                  ../src/syntax/typing.nit:254,5--48
+                  ../src/syntax/typing.nit:254,5--49
                     keyword 'var' ... ../src/syntax/typing.nit:254,5--7
                     identifier 'c' ... ../src/syntax/typing.nit:254,9
                     '=' ... ../src/syntax/typing.nit:254,11
-                    ../src/syntax/typing.nit:254,13--48
+                    ../src/syntax/typing.nit:254,13--49
                       ../src/syntax/typing.nit:254,13--46
                         ../src/syntax/typing.nit:254,13--30
                           ../src/syntax/typing.nit:254,13--25
                             ../src/syntax/typing.nit:254,13
                               ../src/syntax/typing.nit:254,13
                               identifier 'v' ... ../src/syntax/typing.nit:254,13
+                              ../src/syntax/typing.nit:254,13
                             identifier 'local_class' ... ../src/syntax/typing.nit:254,15--25
+                            ../src/syntax/typing.nit:254,13
                           identifier 'cshe' ... ../src/syntax/typing.nit:254,27--30
+                          ../src/syntax/typing.nit:254,13
                         identifier 'direct_greaters' ... ../src/syntax/typing.nit:254,32--46
-                      ../src/syntax/typing.nit:254,48
+                        ../src/syntax/typing.nit:254,13
+                      ../src/syntax/typing.nit:254,47--49
+                        '[' ... ../src/syntax/typing.nit:254,47
                         ../src/syntax/typing.nit:254,48
-                        identifier 'j' ... ../src/syntax/typing.nit:254,48
+                          ../src/syntax/typing.nit:254,48
+                          identifier 'j' ... ../src/syntax/typing.nit:254,48
+                          ../src/syntax/typing.nit:254,48
+                        ']' ... ../src/syntax/typing.nit:254,49
                   ../src/syntax/typing.nit:255,5--274,7
                     keyword 'if' ... ../src/syntax/typing.nit:255,5--6
                     ../src/syntax/typing.nit:255,8--91
@@ -1518,33 +1822,46 @@
                               ../src/syntax/typing.nit:255,8
                                 ../src/syntax/typing.nit:255,8
                                 identifier 'c' ... ../src/syntax/typing.nit:255,8
+                                ../src/syntax/typing.nit:255,8
                               identifier 'global' ... ../src/syntax/typing.nit:255,10--15
+                              ../src/syntax/typing.nit:255,8
                             identifier 'is_interface' ... ../src/syntax/typing.nit:255,17--28
+                            ../src/syntax/typing.nit:255,8
                           ../src/syntax/typing.nit:255,33--48
                             ../src/syntax/typing.nit:255,33--40
                               ../src/syntax/typing.nit:255,33
                                 ../src/syntax/typing.nit:255,33
                                 identifier 'c' ... ../src/syntax/typing.nit:255,33
+                                ../src/syntax/typing.nit:255,33
                               identifier 'global' ... ../src/syntax/typing.nit:255,35--40
+                              ../src/syntax/typing.nit:255,33
                             identifier 'is_enum' ... ../src/syntax/typing.nit:255,42--48
+                            ../src/syntax/typing.nit:255,33
                         ../src/syntax/typing.nit:255,53--70
                           ../src/syntax/typing.nit:255,53--60
                             ../src/syntax/typing.nit:255,53
                               ../src/syntax/typing.nit:255,53
                               identifier 'c' ... ../src/syntax/typing.nit:255,53
+                              ../src/syntax/typing.nit:255,53
                             identifier 'global' ... ../src/syntax/typing.nit:255,55--60
+                            ../src/syntax/typing.nit:255,53
                           identifier 'is_extern' ... ../src/syntax/typing.nit:255,62--70
+                          ../src/syntax/typing.nit:255,53
                       ../src/syntax/typing.nit:255,75--91
                         ../src/syntax/typing.nit:255,75--82
                           ../src/syntax/typing.nit:255,75
                             ../src/syntax/typing.nit:255,75
                             identifier 'c' ... ../src/syntax/typing.nit:255,75
+                            ../src/syntax/typing.nit:255,75
                           identifier 'global' ... ../src/syntax/typing.nit:255,77--82
+                          ../src/syntax/typing.nit:255,75
                         identifier 'is_mixin' ... ../src/syntax/typing.nit:255,84--91
+                        ../src/syntax/typing.nit:255,75
                     ../src/syntax/typing.nit:256,6--11
                       ../src/syntax/typing.nit:256,6--11
                         ../src/syntax/typing.nit:256,8
                         identifier 'j' ... ../src/syntax/typing.nit:256,6
+                        ../src/syntax/typing.nit:256,8
                         ../src/syntax/typing.nit:256,8--9
                           operator '+=' ... ../src/syntax/typing.nit:256,8--9
                         ../src/syntax/typing.nit:256,11
@@ -1556,6 +1873,7 @@
                           ../src/syntax/typing.nit:257,13--17
                             ../src/syntax/typing.nit:257,13
                             identifier 'cur_c' ... ../src/syntax/typing.nit:257,13--17
+                            ../src/syntax/typing.nit:257,13
                           ../src/syntax/typing.nit:257,22--25
                             keyword 'null' ... ../src/syntax/typing.nit:257,22--25
                         ../src/syntax/typing.nit:257,31--72
@@ -1566,17 +1884,23 @@
                                 ../src/syntax/typing.nit:257,32
                                   ../src/syntax/typing.nit:257,32
                                   identifier 'c' ... ../src/syntax/typing.nit:257,32
+                                  ../src/syntax/typing.nit:257,32
                                 identifier 'cshe' ... ../src/syntax/typing.nit:257,34--37
+                                ../src/syntax/typing.nit:257,32
                               ../src/syntax/typing.nit:257,42--46
                                 ../src/syntax/typing.nit:257,42
                                 identifier 'cur_c' ... ../src/syntax/typing.nit:257,42--46
+                                ../src/syntax/typing.nit:257,42
                             ../src/syntax/typing.nit:257,51--71
                               ../src/syntax/typing.nit:257,51--62
                                 ../src/syntax/typing.nit:257,51--55
                                   ../src/syntax/typing.nit:257,51
                                   identifier 'cur_c' ... ../src/syntax/typing.nit:257,51--55
+                                  ../src/syntax/typing.nit:257,51
                                 identifier 'global' ... ../src/syntax/typing.nit:257,57--62
+                                ../src/syntax/typing.nit:257,51
                               identifier 'is_mixin' ... ../src/syntax/typing.nit:257,64--71
+                              ../src/syntax/typing.nit:257,51
                           ')' ... ../src/syntax/typing.nit:257,72
                       ../src/syntax/typing.nit:258,6--267,8
                         ../src/syntax/typing.nit:258,6--30
@@ -1585,33 +1909,42 @@
                             ../src/syntax/typing.nit:258,9
                               ../src/syntax/typing.nit:258,9
                               identifier 'c' ... ../src/syntax/typing.nit:258,9
+                              ../src/syntax/typing.nit:258,9
                             ../src/syntax/typing.nit:258,14--18
                               ../src/syntax/typing.nit:258,14
                               identifier 'cur_c' ... ../src/syntax/typing.nit:258,14--18
+                              ../src/syntax/typing.nit:258,14
                           ../src/syntax/typing.nit:258,25--30
                             ../src/syntax/typing.nit:258,27
                             identifier 'j' ... ../src/syntax/typing.nit:258,25
+                            ../src/syntax/typing.nit:258,27
                             ../src/syntax/typing.nit:258,27--28
                               operator '+=' ... ../src/syntax/typing.nit:258,27--28
                             ../src/syntax/typing.nit:258,30
                               literal value '1' ... ../src/syntax/typing.nit:258,30
-                        ../src/syntax/typing.nit:259,6--44
+                        ../src/syntax/typing.nit:259,6--45
                           ../src/syntax/typing.nit:259,6--21
                             ../src/syntax/typing.nit:259,6
                             identifier 'super_init_calls' ... ../src/syntax/typing.nit:259,6--21
+                            ../src/syntax/typing.nit:259,6
                           identifier 'add' ... ../src/syntax/typing.nit:259,23--25
-                          ../src/syntax/typing.nit:259,27--44
-                            ../src/syntax/typing.nit:259,27--31
-                              ../src/syntax/typing.nit:259,27
-                              identifier 'cur_m' ... ../src/syntax/typing.nit:259,27--31
-                            keyword 'as' ... ../src/syntax/typing.nit:259,33--34
-                            '(' ... ../src/syntax/typing.nit:259,35
-                            keyword 'not' ... ../src/syntax/typing.nit:259,36--38
-                            keyword 'null' ... ../src/syntax/typing.nit:259,40--43
-                            ')' ... ../src/syntax/typing.nit:259,44
+                          ../src/syntax/typing.nit:259,26--45
+                            '(' ... ../src/syntax/typing.nit:259,26
+                            ../src/syntax/typing.nit:259,27--44
+                              ../src/syntax/typing.nit:259,27--31
+                                ../src/syntax/typing.nit:259,27
+                                identifier 'cur_m' ... ../src/syntax/typing.nit:259,27--31
+                                ../src/syntax/typing.nit:259,27
+                              keyword 'as' ... ../src/syntax/typing.nit:259,33--34
+                              '(' ... ../src/syntax/typing.nit:259,35
+                              keyword 'not' ... ../src/syntax/typing.nit:259,36--38
+                              keyword 'null' ... ../src/syntax/typing.nit:259,40--43
+                              ')' ... ../src/syntax/typing.nit:259,44
+                            ')' ... ../src/syntax/typing.nit:259,45
                         ../src/syntax/typing.nit:260,6--11
                           ../src/syntax/typing.nit:260,8
                           identifier 'i' ... ../src/syntax/typing.nit:260,6
+                          ../src/syntax/typing.nit:260,8
                           ../src/syntax/typing.nit:260,8--9
                             operator '+=' ... ../src/syntax/typing.nit:260,8--9
                           ../src/syntax/typing.nit:260,11
@@ -1622,95 +1955,128 @@
                             ../src/syntax/typing.nit:261,9
                               ../src/syntax/typing.nit:261,9
                               identifier 'i' ... ../src/syntax/typing.nit:261,9
+                              ../src/syntax/typing.nit:261,9
                             ../src/syntax/typing.nit:261,13
                               ../src/syntax/typing.nit:261,13
                               identifier 'l' ... ../src/syntax/typing.nit:261,13
-                          ../src/syntax/typing.nit:262,7--263,66
-                            ../src/syntax/typing.nit:262,7--41
+                              ../src/syntax/typing.nit:261,13
+                          ../src/syntax/typing.nit:262,7--263,67
+                            ../src/syntax/typing.nit:262,7--42
                               ../src/syntax/typing.nit:262,15
                               identifier 'cur_m' ... ../src/syntax/typing.nit:262,7--11
+                              ../src/syntax/typing.nit:262,15
                               '=' ... ../src/syntax/typing.nit:262,13
-                              ../src/syntax/typing.nit:262,15--41
+                              ../src/syntax/typing.nit:262,15--42
                                 ../src/syntax/typing.nit:262,15--39
                                   ../src/syntax/typing.nit:262,15
                                   identifier 'explicit_super_init_calls' ... ../src/syntax/typing.nit:262,15--39
-                                ../src/syntax/typing.nit:262,41
+                                  ../src/syntax/typing.nit:262,15
+                                ../src/syntax/typing.nit:262,40--42
+                                  '[' ... ../src/syntax/typing.nit:262,40
                                   ../src/syntax/typing.nit:262,41
-                                  identifier 'i' ... ../src/syntax/typing.nit:262,41
-                            ../src/syntax/typing.nit:263,7--66
+                                    ../src/syntax/typing.nit:262,41
+                                    identifier 'i' ... ../src/syntax/typing.nit:262,41
+                                    ../src/syntax/typing.nit:262,41
+                                  ']' ... ../src/syntax/typing.nit:262,42
+                            ../src/syntax/typing.nit:263,7--67
                               ../src/syntax/typing.nit:263,15
                               identifier 'cur_c' ... ../src/syntax/typing.nit:263,7--11
+                              ../src/syntax/typing.nit:263,15
                               '=' ... ../src/syntax/typing.nit:263,13
-                              ../src/syntax/typing.nit:263,15--66
+                              ../src/syntax/typing.nit:263,15--67
                                 ../src/syntax/typing.nit:263,15--44
                                   ../src/syntax/typing.nit:263,15--32
                                     ../src/syntax/typing.nit:263,15--26
                                       ../src/syntax/typing.nit:263,15--19
                                         ../src/syntax/typing.nit:263,15
                                         identifier 'cur_m' ... ../src/syntax/typing.nit:263,15--19
+                                        ../src/syntax/typing.nit:263,15
                                       identifier 'global' ... ../src/syntax/typing.nit:263,21--26
+                                      ../src/syntax/typing.nit:263,15
                                     identifier 'intro' ... ../src/syntax/typing.nit:263,28--32
+                                    ../src/syntax/typing.nit:263,15
                                   identifier 'local_class' ... ../src/syntax/typing.nit:263,34--44
+                                  ../src/syntax/typing.nit:263,15
                                 identifier 'for_module' ... ../src/syntax/typing.nit:263,46--55
-                                ../src/syntax/typing.nit:263,57--66
-                                  ../src/syntax/typing.nit:263,57
+                                ../src/syntax/typing.nit:263,56--67
+                                  '(' ... ../src/syntax/typing.nit:263,56
+                                  ../src/syntax/typing.nit:263,57--66
                                     ../src/syntax/typing.nit:263,57
-                                    identifier 'v' ... ../src/syntax/typing.nit:263,57
-                                  identifier 'mmmodule' ... ../src/syntax/typing.nit:263,59--66
+                                      ../src/syntax/typing.nit:263,57
+                                      identifier 'v' ... ../src/syntax/typing.nit:263,57
+                                      ../src/syntax/typing.nit:263,57
+                                    identifier 'mmmodule' ... ../src/syntax/typing.nit:263,59--66
+                                    ../src/syntax/typing.nit:263,57
+                                  ')' ... ../src/syntax/typing.nit:263,67
                           ../src/syntax/typing.nit:265,7--267,8
                             ../src/syntax/typing.nit:265,7--18
                               ../src/syntax/typing.nit:265,15
                               identifier 'cur_m' ... ../src/syntax/typing.nit:265,7--11
+                              ../src/syntax/typing.nit:265,15
                               '=' ... ../src/syntax/typing.nit:265,13
                               ../src/syntax/typing.nit:265,15--18
                                 keyword 'null' ... ../src/syntax/typing.nit:265,15--18
                             ../src/syntax/typing.nit:266,7--18
                               ../src/syntax/typing.nit:266,15
                               identifier 'cur_c' ... ../src/syntax/typing.nit:266,7--11
+                              ../src/syntax/typing.nit:266,15
                               '=' ... ../src/syntax/typing.nit:266,13
                               ../src/syntax/typing.nit:266,15--18
                                 keyword 'null' ... ../src/syntax/typing.nit:266,15--18
                             keyword 'end' ... ../src/syntax/typing.nit:267,6--8
                       ../src/syntax/typing.nit:269,6--274,7
-                        ../src/syntax/typing.nit:269,6--58
+                        ../src/syntax/typing.nit:269,6--59
                           keyword 'var' ... ../src/syntax/typing.nit:269,6--8
                           identifier 'p' ... ../src/syntax/typing.nit:269,10
                           '=' ... ../src/syntax/typing.nit:269,12
-                          ../src/syntax/typing.nit:269,14--58
+                          ../src/syntax/typing.nit:269,14--59
                             ../src/syntax/typing.nit:269,14
                               ../src/syntax/typing.nit:269,14
                               identifier 'v' ... ../src/syntax/typing.nit:269,14
+                              ../src/syntax/typing.nit:269,14
                             identifier 'get_default_constructor_for' ... ../src/syntax/typing.nit:269,16--42
-                            ../src/syntax/typing.nit:269,44--47
-                              keyword 'self' ... ../src/syntax/typing.nit:269,44--47
-                            ../src/syntax/typing.nit:269,50
+                            ../src/syntax/typing.nit:269,43--59
+                              '(' ... ../src/syntax/typing.nit:269,43
+                              ../src/syntax/typing.nit:269,44--47
+                                keyword 'self' ... ../src/syntax/typing.nit:269,44--47
                               ../src/syntax/typing.nit:269,50
-                              identifier 'c' ... ../src/syntax/typing.nit:269,50
-                            ../src/syntax/typing.nit:269,53--58
-                              ../src/syntax/typing.nit:269,53
-                              identifier 'method' ... ../src/syntax/typing.nit:269,53--58
+                                ../src/syntax/typing.nit:269,50
+                                identifier 'c' ... ../src/syntax/typing.nit:269,50
+                                ../src/syntax/typing.nit:269,50
+                              ../src/syntax/typing.nit:269,53--58
+                                ../src/syntax/typing.nit:269,53
+                                identifier 'method' ... ../src/syntax/typing.nit:269,53--58
+                                ../src/syntax/typing.nit:269,53
+                              ')' ... ../src/syntax/typing.nit:269,59
                         ../src/syntax/typing.nit:270,6--272,8
                           keyword 'if' ... ../src/syntax/typing.nit:270,6--7
                           ../src/syntax/typing.nit:270,9--17
                             ../src/syntax/typing.nit:270,9
                               ../src/syntax/typing.nit:270,9
                               identifier 'p' ... ../src/syntax/typing.nit:270,9
+                              ../src/syntax/typing.nit:270,9
                             ../src/syntax/typing.nit:270,14--17
                               keyword 'null' ... ../src/syntax/typing.nit:270,14--17
-                          ../src/syntax/typing.nit:271,7--28
-                            ../src/syntax/typing.nit:271,7--28
+                          ../src/syntax/typing.nit:271,7--29
+                            ../src/syntax/typing.nit:271,7--29
                               ../src/syntax/typing.nit:271,7--22
                                 ../src/syntax/typing.nit:271,7
                                 identifier 'super_init_calls' ... ../src/syntax/typing.nit:271,7--22
+                                ../src/syntax/typing.nit:271,7
                               identifier 'add' ... ../src/syntax/typing.nit:271,24--26
-                              ../src/syntax/typing.nit:271,28
+                              ../src/syntax/typing.nit:271,27--29
+                                '(' ... ../src/syntax/typing.nit:271,27
                                 ../src/syntax/typing.nit:271,28
-                                identifier 'p' ... ../src/syntax/typing.nit:271,28
+                                  ../src/syntax/typing.nit:271,28
+                                  identifier 'p' ... ../src/syntax/typing.nit:271,28
+                                  ../src/syntax/typing.nit:271,28
+                                ')' ... ../src/syntax/typing.nit:271,29
                           ../src/syntax/typing.nit:272,6--8
                             keyword 'end' ... ../src/syntax/typing.nit:272,6--8
                         ../src/syntax/typing.nit:273,6--11
                           ../src/syntax/typing.nit:273,8
                           identifier 'j' ... ../src/syntax/typing.nit:273,6
+                          ../src/syntax/typing.nit:273,8
                           ../src/syntax/typing.nit:273,8--9
                             operator '+=' ... ../src/syntax/typing.nit:273,8--9
                           ../src/syntax/typing.nit:273,11
@@ -1740,12 +2106,15 @@
             ../src/syntax/typing.nit:283,3
               ../src/syntax/typing.nit:283,3
               identifier 'v' ... ../src/syntax/typing.nit:283,3
+              ../src/syntax/typing.nit:283,3
             identifier 'explicit_other_init_call' ... ../src/syntax/typing.nit:283,5--28
+            ../src/syntax/typing.nit:283,32
             '=' ... ../src/syntax/typing.nit:283,30
             ../src/syntax/typing.nit:283,32--36
               keyword 'false' ... ../src/syntax/typing.nit:283,32--36
           ../src/syntax/typing.nit:284,3--7
             keyword 'super' ... ../src/syntax/typing.nit:284,3--7
+            ../src/syntax/typing.nit:284,3
           keyword 'end' ... ../src/syntax/typing.nit:285,2--4
       ../src/syntax/typing.nit:286,2--289,4
         keyword 'redef' ... ../src/syntax/typing.nit:286,2--6
@@ -1759,6 +2128,7 @@
         ../src/syntax/typing.nit:288,3--289,4
           ../src/syntax/typing.nit:288,3--7
             keyword 'super' ... ../src/syntax/typing.nit:288,3--7
+            ../src/syntax/typing.nit:288,3
           keyword 'end' ... ../src/syntax/typing.nit:289,2--4
       keyword 'end' ... ../src/syntax/typing.nit:290,1--3
     ../src/syntax/typing.nit:292,1--297,3
@@ -1777,16 +2147,22 @@
           ../src/syntax/typing.nit:293,25
             identifier 'v' ... ../src/syntax/typing.nit:293,25
         ../src/syntax/typing.nit:295,3--296,4
-          ../src/syntax/typing.nit:295,3--35
+          ../src/syntax/typing.nit:295,3--36
             ../src/syntax/typing.nit:295,3--13
               ../src/syntax/typing.nit:295,3
                 ../src/syntax/typing.nit:295,3
                 identifier 'v' ... ../src/syntax/typing.nit:295,3
+                ../src/syntax/typing.nit:295,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:295,5--13
+              ../src/syntax/typing.nit:295,3
             identifier 'add_variable' ... ../src/syntax/typing.nit:295,15--26
-            ../src/syntax/typing.nit:295,28--35
-              ../src/syntax/typing.nit:295,28
-              identifier 'variable' ... ../src/syntax/typing.nit:295,28--35
+            ../src/syntax/typing.nit:295,27--36
+              '(' ... ../src/syntax/typing.nit:295,27
+              ../src/syntax/typing.nit:295,28--35
+                ../src/syntax/typing.nit:295,28
+                identifier 'variable' ... ../src/syntax/typing.nit:295,28--35
+                ../src/syntax/typing.nit:295,28
+              ')' ... ../src/syntax/typing.nit:295,36
           keyword 'end' ... ../src/syntax/typing.nit:296,2--4
       keyword 'end' ... ../src/syntax/typing.nit:297,1--3
     ../src/syntax/typing.nit:299,1--342,3
@@ -1817,16 +2193,22 @@
           ../src/syntax/typing.nit:303,26
             identifier 'v' ... ../src/syntax/typing.nit:303,26
         ../src/syntax/typing.nit:306,3--341,4
-          ../src/syntax/typing.nit:306,3--35
+          ../src/syntax/typing.nit:306,3--36
             ../src/syntax/typing.nit:306,3--13
               ../src/syntax/typing.nit:306,3
                 ../src/syntax/typing.nit:306,3
                 identifier 'v' ... ../src/syntax/typing.nit:306,3
+                ../src/syntax/typing.nit:306,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:306,5--13
+              ../src/syntax/typing.nit:306,3
             identifier 'add_variable' ... ../src/syntax/typing.nit:306,15--26
-            ../src/syntax/typing.nit:306,28--35
-              ../src/syntax/typing.nit:306,28
-              identifier 'variable' ... ../src/syntax/typing.nit:306,28--35
+            ../src/syntax/typing.nit:306,27--36
+              '(' ... ../src/syntax/typing.nit:306,27
+              ../src/syntax/typing.nit:306,28--35
+                ../src/syntax/typing.nit:306,28
+                identifier 'variable' ... ../src/syntax/typing.nit:306,28--35
+                ../src/syntax/typing.nit:306,28
+              ')' ... ../src/syntax/typing.nit:306,36
           ../src/syntax/typing.nit:308,3--31
             keyword 'var' ... ../src/syntax/typing.nit:308,3--5
             identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:308,7--18
@@ -1835,7 +2217,9 @@
               ../src/syntax/typing.nit:308,22
                 ../src/syntax/typing.nit:308,22
                 identifier 'v' ... ../src/syntax/typing.nit:308,22
+                ../src/syntax/typing.nit:308,22
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:308,24--31
+              ../src/syntax/typing.nit:308,22
           ../src/syntax/typing.nit:309,3--41
             keyword 'var' ... ../src/syntax/typing.nit:309,3--5
             identifier 'old_base_flow_ctx' ... ../src/syntax/typing.nit:309,7--23
@@ -1844,18 +2228,24 @@
               ../src/syntax/typing.nit:309,27
                 ../src/syntax/typing.nit:309,27
                 identifier 'v' ... ../src/syntax/typing.nit:309,27
+                ../src/syntax/typing.nit:309,27
               identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:309,29--41
+              ../src/syntax/typing.nit:309,27
           ../src/syntax/typing.nit:310,3--30
             ../src/syntax/typing.nit:310,3
               ../src/syntax/typing.nit:310,3
               identifier 'v' ... ../src/syntax/typing.nit:310,3
+              ../src/syntax/typing.nit:310,3
             identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:310,5--17
+            ../src/syntax/typing.nit:310,21
             '=' ... ../src/syntax/typing.nit:310,19
             ../src/syntax/typing.nit:310,21--30
               ../src/syntax/typing.nit:310,21
                 ../src/syntax/typing.nit:310,21
                 identifier 'v' ... ../src/syntax/typing.nit:310,21
+                ../src/syntax/typing.nit:310,21
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:310,23--30
+              ../src/syntax/typing.nit:310,21
           ../src/syntax/typing.nit:312,3--41
             keyword 'var' ... ../src/syntax/typing.nit:312,3--5
             identifier 'blist' ... ../src/syntax/typing.nit:312,7--11
@@ -1877,20 +2267,26 @@
                   ../src/syntax/typing.nit:313,11
                     ../src/syntax/typing.nit:313,11
                     identifier 'v' ... ../src/syntax/typing.nit:313,11
+                    ../src/syntax/typing.nit:313,11
                   identifier 'local_property' ... ../src/syntax/typing.nit:313,13--26
+                  ../src/syntax/typing.nit:313,11
                 identifier 'signature' ... ../src/syntax/typing.nit:313,28--36
+                ../src/syntax/typing.nit:313,11
               identifier 'return_type' ... ../src/syntax/typing.nit:313,38--48
+              ../src/syntax/typing.nit:313,11
           ../src/syntax/typing.nit:314,3--43
             keyword 'if' ... ../src/syntax/typing.nit:314,3--4
             ../src/syntax/typing.nit:314,6--14
               ../src/syntax/typing.nit:314,6
                 ../src/syntax/typing.nit:314,6
                 identifier 't' ... ../src/syntax/typing.nit:314,6
+                ../src/syntax/typing.nit:314,6
               ../src/syntax/typing.nit:314,11--14
                 keyword 'null' ... ../src/syntax/typing.nit:314,11--14
             ../src/syntax/typing.nit:314,21--43
               ../src/syntax/typing.nit:314,39
               identifier 'blist' ... ../src/syntax/typing.nit:314,21--25
+              ../src/syntax/typing.nit:314,39
               '=' ... ../src/syntax/typing.nit:314,27
               ../src/syntax/typing.nit:314,29--43
                 keyword 'new' ... ../src/syntax/typing.nit:314,29--31
@@ -1898,24 +2294,31 @@
                   type identifier 'Array' ... ../src/syntax/typing.nit:314,33--37
                   ../src/syntax/typing.nit:314,39--43
                     type identifier 'AExpr' ... ../src/syntax/typing.nit:314,39--43
-          ../src/syntax/typing.nit:315,3--68
+                ../src/syntax/typing.nit:314,29
+          ../src/syntax/typing.nit:315,3--69
             keyword 'var' ... ../src/syntax/typing.nit:315,3--5
             identifier 'escapable' ... ../src/syntax/typing.nit:315,7--15
             '=' ... ../src/syntax/typing.nit:315,17
-            ../src/syntax/typing.nit:315,19--68
+            ../src/syntax/typing.nit:315,19--69
               keyword 'new' ... ../src/syntax/typing.nit:315,19--21
               ../src/syntax/typing.nit:315,23--38
                 type identifier 'EscapableClosure' ... ../src/syntax/typing.nit:315,23--38
-              ../src/syntax/typing.nit:315,40--43
-                keyword 'self' ... ../src/syntax/typing.nit:315,40--43
-              ../src/syntax/typing.nit:315,46--61
-                ../src/syntax/typing.nit:315,46--53
+              ../src/syntax/typing.nit:315,39--69
+                '(' ... ../src/syntax/typing.nit:315,39
+                ../src/syntax/typing.nit:315,40--43
+                  keyword 'self' ... ../src/syntax/typing.nit:315,40--43
+                ../src/syntax/typing.nit:315,46--61
+                  ../src/syntax/typing.nit:315,46--53
+                    ../src/syntax/typing.nit:315,46
+                    identifier 'variable' ... ../src/syntax/typing.nit:315,46--53
+                    ../src/syntax/typing.nit:315,46
+                  identifier 'closure' ... ../src/syntax/typing.nit:315,55--61
                   ../src/syntax/typing.nit:315,46
-                  identifier 'variable' ... ../src/syntax/typing.nit:315,46--53
-                identifier 'closure' ... ../src/syntax/typing.nit:315,55--61
-              ../src/syntax/typing.nit:315,64--68
-                ../src/syntax/typing.nit:315,64
-                identifier 'blist' ... ../src/syntax/typing.nit:315,64--68
+                ../src/syntax/typing.nit:315,64--68
+                  ../src/syntax/typing.nit:315,64
+                  identifier 'blist' ... ../src/syntax/typing.nit:315,64--68
+                  ../src/syntax/typing.nit:315,64
+                ')' ... ../src/syntax/typing.nit:315,69
           ../src/syntax/typing.nit:316,3--24
             ../src/syntax/typing.nit:316,16
             attribute '_escapable' ... ../src/syntax/typing.nit:316,3--12
@@ -1923,33 +2326,45 @@
             ../src/syntax/typing.nit:316,16--24
               ../src/syntax/typing.nit:316,16
               identifier 'escapable' ... ../src/syntax/typing.nit:316,16--24
-          ../src/syntax/typing.nit:317,3--44
+              ../src/syntax/typing.nit:316,16
+          ../src/syntax/typing.nit:317,3--45
             ../src/syntax/typing.nit:317,3--13
               ../src/syntax/typing.nit:317,3
                 ../src/syntax/typing.nit:317,3
                 identifier 'v' ... ../src/syntax/typing.nit:317,3
+                ../src/syntax/typing.nit:317,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:317,5--13
+              ../src/syntax/typing.nit:317,3
             identifier 'push_escapable' ... ../src/syntax/typing.nit:317,15--28
-            ../src/syntax/typing.nit:317,30--38
-              ../src/syntax/typing.nit:317,30
-              identifier 'escapable' ... ../src/syntax/typing.nit:317,30--38
-            ../src/syntax/typing.nit:317,41--44
-              keyword 'null' ... ../src/syntax/typing.nit:317,41--44
+            ../src/syntax/typing.nit:317,29--45
+              '(' ... ../src/syntax/typing.nit:317,29
+              ../src/syntax/typing.nit:317,30--38
+                ../src/syntax/typing.nit:317,30
+                identifier 'escapable' ... ../src/syntax/typing.nit:317,30--38
+                ../src/syntax/typing.nit:317,30
+              ../src/syntax/typing.nit:317,41--44
+                keyword 'null' ... ../src/syntax/typing.nit:317,41--44
+              ')' ... ../src/syntax/typing.nit:317,45
           ../src/syntax/typing.nit:319,3--40
             ../src/syntax/typing.nit:319,3
               ../src/syntax/typing.nit:319,3
               identifier 'v' ... ../src/syntax/typing.nit:319,3
+              ../src/syntax/typing.nit:319,3
             identifier 'is_default_closure_definition' ... ../src/syntax/typing.nit:319,5--33
+            ../src/syntax/typing.nit:319,37
             '=' ... ../src/syntax/typing.nit:319,35
             ../src/syntax/typing.nit:319,37--40
               keyword 'true' ... ../src/syntax/typing.nit:319,37--40
           ../src/syntax/typing.nit:321,3--7
             keyword 'super' ... ../src/syntax/typing.nit:321,3--7
+            ../src/syntax/typing.nit:321,3
           ../src/syntax/typing.nit:323,3--41
             ../src/syntax/typing.nit:323,3
               ../src/syntax/typing.nit:323,3
               identifier 'v' ... ../src/syntax/typing.nit:323,3
+              ../src/syntax/typing.nit:323,3
             identifier 'is_default_closure_definition' ... ../src/syntax/typing.nit:323,5--33
+            ../src/syntax/typing.nit:323,37
             '=' ... ../src/syntax/typing.nit:323,35
             ../src/syntax/typing.nit:323,37--41
               keyword 'false' ... ../src/syntax/typing.nit:323,37--41
@@ -1959,6 +2374,7 @@
               ../src/syntax/typing.nit:325,6--11
                 ../src/syntax/typing.nit:325,6
                 identifier 'n_expr' ... ../src/syntax/typing.nit:325,6--11
+                ../src/syntax/typing.nit:325,6
               ../src/syntax/typing.nit:325,16--19
                 keyword 'null' ... ../src/syntax/typing.nit:325,16--19
             ../src/syntax/typing.nit:326,4--332,6
@@ -1970,8 +2386,11 @@
                       ../src/syntax/typing.nit:326,7
                         ../src/syntax/typing.nit:326,7
                         identifier 'v' ... ../src/syntax/typing.nit:326,7
+                        ../src/syntax/typing.nit:326,7
                       identifier 'flow_ctx' ... ../src/syntax/typing.nit:326,9--16
+                      ../src/syntax/typing.nit:326,7
                     identifier 'unreash' ... ../src/syntax/typing.nit:326,18--24
+                    ../src/syntax/typing.nit:326,7
                   ../src/syntax/typing.nit:326,29--33
                     keyword 'false' ... ../src/syntax/typing.nit:326,29--33
                 ../src/syntax/typing.nit:327,5--331,7
@@ -1984,21 +2403,29 @@
                             ../src/syntax/typing.nit:327,8--15
                               ../src/syntax/typing.nit:327,8
                               identifier 'variable' ... ../src/syntax/typing.nit:327,8--15
+                              ../src/syntax/typing.nit:327,8
                             identifier 'closure' ... ../src/syntax/typing.nit:327,17--23
+                            ../src/syntax/typing.nit:327,8
                           identifier 'signature' ... ../src/syntax/typing.nit:327,25--33
+                          ../src/syntax/typing.nit:327,8
                         identifier 'return_type' ... ../src/syntax/typing.nit:327,35--45
+                        ../src/syntax/typing.nit:327,8
                       ../src/syntax/typing.nit:327,50--53
                         keyword 'null' ... ../src/syntax/typing.nit:327,50--53
-                    ../src/syntax/typing.nit:328,6--98
-                      ../src/syntax/typing.nit:328,6--98
+                    ../src/syntax/typing.nit:328,6--99
+                      ../src/syntax/typing.nit:328,6--99
                         ../src/syntax/typing.nit:328,6
                           ../src/syntax/typing.nit:328,6
                           identifier 'v' ... ../src/syntax/typing.nit:328,6
+                          ../src/syntax/typing.nit:328,6
                         identifier 'error' ... ../src/syntax/typing.nit:328,8--12
-                        ../src/syntax/typing.nit:328,14--17
-                          keyword 'self' ... ../src/syntax/typing.nit:328,14--17
-                        ../src/syntax/typing.nit:328,20--98
-                          literal value '"Control error: Reached end of block (a 'continue' with a value was expected)."' ... ../src/syntax/typing.nit:328,20--98
+                        ../src/syntax/typing.nit:328,13--99
+                          '(' ... ../src/syntax/typing.nit:328,13
+                          ../src/syntax/typing.nit:328,14--17
+                            keyword 'self' ... ../src/syntax/typing.nit:328,14--17
+                          ../src/syntax/typing.nit:328,20--98
+                            literal value '"Control error: Reached end of block (a 'continue' with a value was expected)."' ... ../src/syntax/typing.nit:328,20--98
+                          ')' ... ../src/syntax/typing.nit:328,99
                     ../src/syntax/typing.nit:329,10--331,7
                       keyword 'if' ... ../src/syntax/typing.nit:329,10--11
                       ../src/syntax/typing.nit:329,13--70
@@ -2007,26 +2434,35 @@
                             ../src/syntax/typing.nit:329,13--20
                               ../src/syntax/typing.nit:329,13
                               identifier 'variable' ... ../src/syntax/typing.nit:329,13--20
+                              ../src/syntax/typing.nit:329,13
                             identifier 'closure' ... ../src/syntax/typing.nit:329,22--28
+                            ../src/syntax/typing.nit:329,13
                           identifier 'is_break' ... ../src/syntax/typing.nit:329,30--37
+                          ../src/syntax/typing.nit:329,13
                         ../src/syntax/typing.nit:329,43--70
                           ../src/syntax/typing.nit:329,43--62
                             ../src/syntax/typing.nit:329,43--51
                               ../src/syntax/typing.nit:329,43
                               identifier 'escapable' ... ../src/syntax/typing.nit:329,43--51
+                              ../src/syntax/typing.nit:329,43
                             identifier 'break_list' ... ../src/syntax/typing.nit:329,53--62
+                            ../src/syntax/typing.nit:329,43
                           ../src/syntax/typing.nit:329,67--70
                             keyword 'null' ... ../src/syntax/typing.nit:329,67--70
-                      ../src/syntax/typing.nit:330,6--101
-                        ../src/syntax/typing.nit:330,6--101
+                      ../src/syntax/typing.nit:330,6--102
+                        ../src/syntax/typing.nit:330,6--102
                           ../src/syntax/typing.nit:330,6
                             ../src/syntax/typing.nit:330,6
                             identifier 'v' ... ../src/syntax/typing.nit:330,6
+                            ../src/syntax/typing.nit:330,6
                           identifier 'error' ... ../src/syntax/typing.nit:330,8--12
-                          ../src/syntax/typing.nit:330,14--17
-                            keyword 'self' ... ../src/syntax/typing.nit:330,14--17
-                          ../src/syntax/typing.nit:330,20--101
-                            literal value '"Control error: Reached end of break block (a 'break' with a value was expected)."' ... ../src/syntax/typing.nit:330,20--101
+                          ../src/syntax/typing.nit:330,13--102
+                            '(' ... ../src/syntax/typing.nit:330,13
+                            ../src/syntax/typing.nit:330,14--17
+                              keyword 'self' ... ../src/syntax/typing.nit:330,14--17
+                            ../src/syntax/typing.nit:330,20--101
+                              literal value '"Control error: Reached end of break block (a 'break' with a value was expected)."' ... ../src/syntax/typing.nit:330,20--101
+                            ')' ... ../src/syntax/typing.nit:330,102
                       ../src/syntax/typing.nit:331,5--7
                         keyword 'end' ... ../src/syntax/typing.nit:331,5--7
                 ../src/syntax/typing.nit:332,4--6
@@ -2039,6 +2475,7 @@
               ../src/syntax/typing.nit:334,6--10
                 ../src/syntax/typing.nit:334,6
                 identifier 'blist' ... ../src/syntax/typing.nit:334,6--10
+                ../src/syntax/typing.nit:334,6
               ../src/syntax/typing.nit:334,15--18
                 keyword 'null' ... ../src/syntax/typing.nit:334,15--18
             ../src/syntax/typing.nit:334,25--336,5
@@ -2047,45 +2484,61 @@
               ../src/syntax/typing.nit:334,34--38
                 ../src/syntax/typing.nit:334,34
                 identifier 'blist' ... ../src/syntax/typing.nit:334,34--38
+                ../src/syntax/typing.nit:334,34
               keyword 'do' ... ../src/syntax/typing.nit:334,40--41
               ../src/syntax/typing.nit:335,4--336,5
-                ../src/syntax/typing.nit:335,4--28
+                ../src/syntax/typing.nit:335,4--29
                   ../src/syntax/typing.nit:335,4
                     ../src/syntax/typing.nit:335,4
                     identifier 'v' ... ../src/syntax/typing.nit:335,4
+                    ../src/syntax/typing.nit:335,4
                   identifier 'check_conform_expr' ... ../src/syntax/typing.nit:335,6--23
-                  ../src/syntax/typing.nit:335,25
+                  ../src/syntax/typing.nit:335,24--29
+                    '(' ... ../src/syntax/typing.nit:335,24
                     ../src/syntax/typing.nit:335,25
-                    identifier 'x' ... ../src/syntax/typing.nit:335,25
-                  ../src/syntax/typing.nit:335,28
+                      ../src/syntax/typing.nit:335,25
+                      identifier 'x' ... ../src/syntax/typing.nit:335,25
+                      ../src/syntax/typing.nit:335,25
                     ../src/syntax/typing.nit:335,28
-                    identifier 't' ... ../src/syntax/typing.nit:335,28
+                      ../src/syntax/typing.nit:335,28
+                      identifier 't' ... ../src/syntax/typing.nit:335,28
+                      ../src/syntax/typing.nit:335,28
+                    ')' ... ../src/syntax/typing.nit:335,29
                 keyword 'end' ... ../src/syntax/typing.nit:336,3--5
           ../src/syntax/typing.nit:338,3--27
             ../src/syntax/typing.nit:338,3
               ../src/syntax/typing.nit:338,3
               identifier 'v' ... ../src/syntax/typing.nit:338,3
+              ../src/syntax/typing.nit:338,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:338,5--12
+            ../src/syntax/typing.nit:338,16
             '=' ... ../src/syntax/typing.nit:338,14
             ../src/syntax/typing.nit:338,16--27
               ../src/syntax/typing.nit:338,16
               identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:338,16--27
+              ../src/syntax/typing.nit:338,16
           ../src/syntax/typing.nit:339,3--37
             ../src/syntax/typing.nit:339,3
               ../src/syntax/typing.nit:339,3
               identifier 'v' ... ../src/syntax/typing.nit:339,3
+              ../src/syntax/typing.nit:339,3
             identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:339,5--17
+            ../src/syntax/typing.nit:339,21
             '=' ... ../src/syntax/typing.nit:339,19
             ../src/syntax/typing.nit:339,21--37
               ../src/syntax/typing.nit:339,21
               identifier 'old_base_flow_ctx' ... ../src/syntax/typing.nit:339,21--37
+              ../src/syntax/typing.nit:339,21
           ../src/syntax/typing.nit:340,3--17
             ../src/syntax/typing.nit:340,3--13
               ../src/syntax/typing.nit:340,3
                 ../src/syntax/typing.nit:340,3
                 identifier 'v' ... ../src/syntax/typing.nit:340,3
+                ../src/syntax/typing.nit:340,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:340,5--13
+              ../src/syntax/typing.nit:340,3
             identifier 'pop' ... ../src/syntax/typing.nit:340,15--17
+            ../src/syntax/typing.nit:340,3
           keyword 'end' ... ../src/syntax/typing.nit:341,2--4
       keyword 'end' ... ../src/syntax/typing.nit:342,1--3
     ../src/syntax/typing.nit:344,1--353,3
@@ -2148,16 +2601,20 @@
           ../src/syntax/typing.nit:349,25
             identifier 'v' ... ../src/syntax/typing.nit:349,25
         ../src/syntax/typing.nit:351,3--352,4
-          ../src/syntax/typing.nit:351,3--22
+          ../src/syntax/typing.nit:351,3--23
             ../src/syntax/typing.nit:351,22
             attribute '_stype' ... ../src/syntax/typing.nit:351,3--8
             '=' ... ../src/syntax/typing.nit:351,10
-            ../src/syntax/typing.nit:351,12--22
+            ../src/syntax/typing.nit:351,12--23
               ../src/syntax/typing.nit:351,22
               identifier 'get_stype' ... ../src/syntax/typing.nit:351,12--20
-              ../src/syntax/typing.nit:351,22
+              ../src/syntax/typing.nit:351,21--23
+                '(' ... ../src/syntax/typing.nit:351,21
                 ../src/syntax/typing.nit:351,22
-                identifier 'v' ... ../src/syntax/typing.nit:351,22
+                  ../src/syntax/typing.nit:351,22
+                  identifier 'v' ... ../src/syntax/typing.nit:351,22
+                  ../src/syntax/typing.nit:351,22
+                ')' ... ../src/syntax/typing.nit:351,23
           keyword 'end' ... ../src/syntax/typing.nit:352,2--4
       keyword 'end' ... ../src/syntax/typing.nit:353,1--3
     ../src/syntax/typing.nit:355,1--397,3
@@ -2209,18 +2666,21 @@
               ../src/syntax/typing.nit:360,10--17
                 ../src/syntax/typing.nit:360,10
                 identifier 'is_typed' ... ../src/syntax/typing.nit:360,10--17
+                ../src/syntax/typing.nit:360,10
             ../src/syntax/typing.nit:361,4--362,8
               ../src/syntax/typing.nit:361,4--35
                 ../src/syntax/typing.nit:361,10
                 identifier 'print' ... ../src/syntax/typing.nit:361,4--8
                 ../src/syntax/typing.nit:361,10--35
-                  ../src/syntax/typing.nit:361,10--11
-                    literal value '"{' ... ../src/syntax/typing.nit:361,10--11
-                  ../src/syntax/typing.nit:361,12--19
-                    ../src/syntax/typing.nit:361,12
-                    identifier 'location' ... ../src/syntax/typing.nit:361,12--19
-                  ../src/syntax/typing.nit:361,20--35
-                    '}: not is_typed"' ... ../src/syntax/typing.nit:361,20--35
+                  ../src/syntax/typing.nit:361,10--35
+                    ../src/syntax/typing.nit:361,10--11
+                      literal value '"{' ... ../src/syntax/typing.nit:361,10--11
+                    ../src/syntax/typing.nit:361,12--19
+                      ../src/syntax/typing.nit:361,12
+                      identifier 'location' ... ../src/syntax/typing.nit:361,12--19
+                      ../src/syntax/typing.nit:361,12
+                    ../src/syntax/typing.nit:361,20--35
+                      '}: not is_typed"' ... ../src/syntax/typing.nit:361,20--35
               ../src/syntax/typing.nit:362,4--8
                 keyword 'abort' ... ../src/syntax/typing.nit:362,4--8
             ../src/syntax/typing.nit:363,3--5
@@ -2230,18 +2690,21 @@
             ../src/syntax/typing.nit:364,6--17
               ../src/syntax/typing.nit:364,6
               identifier 'is_statement' ... ../src/syntax/typing.nit:364,6--17
+              ../src/syntax/typing.nit:364,6
             ../src/syntax/typing.nit:365,4--366,8
               ../src/syntax/typing.nit:365,4--35
                 ../src/syntax/typing.nit:365,10
                 identifier 'print' ... ../src/syntax/typing.nit:365,4--8
                 ../src/syntax/typing.nit:365,10--35
-                  ../src/syntax/typing.nit:365,10--11
-                    literal value '"{' ... ../src/syntax/typing.nit:365,10--11
-                  ../src/syntax/typing.nit:365,12--19
-                    ../src/syntax/typing.nit:365,12
-                    identifier 'location' ... ../src/syntax/typing.nit:365,12--19
-                  ../src/syntax/typing.nit:365,20--35
-                    '}: is_statement"' ... ../src/syntax/typing.nit:365,20--35
+                  ../src/syntax/typing.nit:365,10--35
+                    ../src/syntax/typing.nit:365,10--11
+                      literal value '"{' ... ../src/syntax/typing.nit:365,10--11
+                    ../src/syntax/typing.nit:365,12--19
+                      ../src/syntax/typing.nit:365,12
+                      identifier 'location' ... ../src/syntax/typing.nit:365,12--19
+                      ../src/syntax/typing.nit:365,12
+                    ../src/syntax/typing.nit:365,20--35
+                      '}: is_statement"' ... ../src/syntax/typing.nit:365,20--35
               ../src/syntax/typing.nit:366,4--8
                 keyword 'abort' ... ../src/syntax/typing.nit:366,4--8
             ../src/syntax/typing.nit:367,3--5
@@ -2387,15 +2850,19 @@
           ../src/syntax/typing.nit:400,29
             identifier 'v' ... ../src/syntax/typing.nit:400,29
         ../src/syntax/typing.nit:402,3--403,4
-          ../src/syntax/typing.nit:402,3--53
+          ../src/syntax/typing.nit:402,3--54
             ../src/syntax/typing.nit:402,3
               ../src/syntax/typing.nit:402,3
               identifier 'v' ... ../src/syntax/typing.nit:402,3
+              ../src/syntax/typing.nit:402,3
             identifier 'warning' ... ../src/syntax/typing.nit:402,5--11
-            ../src/syntax/typing.nit:402,13--16
-              keyword 'self' ... ../src/syntax/typing.nit:402,13--16
-            ../src/syntax/typing.nit:402,19--53
-              literal value '"Warning: superfluous parentheses."' ... ../src/syntax/typing.nit:402,19--53
+            ../src/syntax/typing.nit:402,12--54
+              '(' ... ../src/syntax/typing.nit:402,12
+              ../src/syntax/typing.nit:402,13--16
+                keyword 'self' ... ../src/syntax/typing.nit:402,13--16
+              ../src/syntax/typing.nit:402,19--53
+                literal value '"Warning: superfluous parentheses."' ... ../src/syntax/typing.nit:402,19--53
+              ')' ... ../src/syntax/typing.nit:402,54
           keyword 'end' ... ../src/syntax/typing.nit:403,2--4
       keyword 'end' ... ../src/syntax/typing.nit:404,1--3
     ../src/syntax/typing.nit:406,1--432,3
@@ -2439,22 +2906,28 @@
           ../src/syntax/typing.nit:410,25
             identifier 'v' ... ../src/syntax/typing.nit:410,25
         ../src/syntax/typing.nit:412,3--431,4
-          ../src/syntax/typing.nit:412,3--47
+          ../src/syntax/typing.nit:412,3--48
             keyword 'var' ... ../src/syntax/typing.nit:412,3--5
             identifier 'va' ... ../src/syntax/typing.nit:412,7--8
             '=' ... ../src/syntax/typing.nit:412,10
-            ../src/syntax/typing.nit:412,12--47
+            ../src/syntax/typing.nit:412,12--48
               keyword 'new' ... ../src/syntax/typing.nit:412,12--14
               ../src/syntax/typing.nit:412,16--26
                 type identifier 'VarVariable' ... ../src/syntax/typing.nit:412,16--26
-              ../src/syntax/typing.nit:412,28--41
-                ../src/syntax/typing.nit:412,28--31
+              ../src/syntax/typing.nit:412,27--48
+                '(' ... ../src/syntax/typing.nit:412,27
+                ../src/syntax/typing.nit:412,28--41
+                  ../src/syntax/typing.nit:412,28--31
+                    ../src/syntax/typing.nit:412,28
+                    identifier 'n_id' ... ../src/syntax/typing.nit:412,28--31
+                    ../src/syntax/typing.nit:412,28
+                  identifier 'to_symbol' ... ../src/syntax/typing.nit:412,33--41
                   ../src/syntax/typing.nit:412,28
-                  identifier 'n_id' ... ../src/syntax/typing.nit:412,28--31
-                identifier 'to_symbol' ... ../src/syntax/typing.nit:412,33--41
-              ../src/syntax/typing.nit:412,44--47
-                ../src/syntax/typing.nit:412,44
-                identifier 'n_id' ... ../src/syntax/typing.nit:412,44--47
+                ../src/syntax/typing.nit:412,44--47
+                  ../src/syntax/typing.nit:412,44
+                  identifier 'n_id' ... ../src/syntax/typing.nit:412,44--47
+                  ../src/syntax/typing.nit:412,44
+                ')' ... ../src/syntax/typing.nit:412,48
           ../src/syntax/typing.nit:413,3--16
             ../src/syntax/typing.nit:413,15
             attribute '_variable' ... ../src/syntax/typing.nit:413,3--11
@@ -2462,16 +2935,23 @@
             ../src/syntax/typing.nit:413,15--16
               ../src/syntax/typing.nit:413,15
               identifier 'va' ... ../src/syntax/typing.nit:413,15--16
-          ../src/syntax/typing.nit:414,3--29
+              ../src/syntax/typing.nit:413,15
+          ../src/syntax/typing.nit:414,3--30
             ../src/syntax/typing.nit:414,3--13
               ../src/syntax/typing.nit:414,3
                 ../src/syntax/typing.nit:414,3
                 identifier 'v' ... ../src/syntax/typing.nit:414,3
+                ../src/syntax/typing.nit:414,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:414,5--13
+              ../src/syntax/typing.nit:414,3
             identifier 'add_variable' ... ../src/syntax/typing.nit:414,15--26
-            ../src/syntax/typing.nit:414,28--29
-              ../src/syntax/typing.nit:414,28
-              identifier 'va' ... ../src/syntax/typing.nit:414,28--29
+            ../src/syntax/typing.nit:414,27--30
+              '(' ... ../src/syntax/typing.nit:414,27
+              ../src/syntax/typing.nit:414,28--29
+                ../src/syntax/typing.nit:414,28
+                identifier 'va' ... ../src/syntax/typing.nit:414,28--29
+                ../src/syntax/typing.nit:414,28
+              ')' ... ../src/syntax/typing.nit:414,30
           ../src/syntax/typing.nit:415,3--17
             keyword 'var' ... ../src/syntax/typing.nit:415,3--5
             identifier 'ne' ... ../src/syntax/typing.nit:415,7--8
@@ -2479,28 +2959,36 @@
             ../src/syntax/typing.nit:415,12--17
               ../src/syntax/typing.nit:415,12
               identifier 'n_expr' ... ../src/syntax/typing.nit:415,12--17
-          ../src/syntax/typing.nit:416,3--37
+              ../src/syntax/typing.nit:415,12
+          ../src/syntax/typing.nit:416,3--38
             keyword 'if' ... ../src/syntax/typing.nit:416,3--4
             ../src/syntax/typing.nit:416,6--15
               ../src/syntax/typing.nit:416,6--7
                 ../src/syntax/typing.nit:416,6
                 identifier 'ne' ... ../src/syntax/typing.nit:416,6--7
+                ../src/syntax/typing.nit:416,6
               ../src/syntax/typing.nit:416,12--15
                 keyword 'null' ... ../src/syntax/typing.nit:416,12--15
-            ../src/syntax/typing.nit:416,22--37
+            ../src/syntax/typing.nit:416,22--38
               ../src/syntax/typing.nit:416,22
                 ../src/syntax/typing.nit:416,22
                 identifier 'v' ... ../src/syntax/typing.nit:416,22
+                ../src/syntax/typing.nit:416,22
               identifier 'mark_is_set' ... ../src/syntax/typing.nit:416,24--34
-              ../src/syntax/typing.nit:416,36--37
-                ../src/syntax/typing.nit:416,36
-                identifier 'va' ... ../src/syntax/typing.nit:416,36--37
+              ../src/syntax/typing.nit:416,35--38
+                '(' ... ../src/syntax/typing.nit:416,35
+                ../src/syntax/typing.nit:416,36--37
+                  ../src/syntax/typing.nit:416,36
+                  identifier 'va' ... ../src/syntax/typing.nit:416,36--37
+                  ../src/syntax/typing.nit:416,36
+                ')' ... ../src/syntax/typing.nit:416,38
           ../src/syntax/typing.nit:418,3--429,5
             keyword 'if' ... ../src/syntax/typing.nit:418,3--4
             ../src/syntax/typing.nit:418,6--19
               ../src/syntax/typing.nit:418,6--11
                 ../src/syntax/typing.nit:418,6
                 identifier 'n_type' ... ../src/syntax/typing.nit:418,6--11
+                ../src/syntax/typing.nit:418,6
               ../src/syntax/typing.nit:418,16--19
                 keyword 'null' ... ../src/syntax/typing.nit:418,16--19
             ../src/syntax/typing.nit:419,4--423,6
@@ -2512,42 +3000,56 @@
                     ../src/syntax/typing.nit:419,11--16
                       ../src/syntax/typing.nit:419,11
                       identifier 'n_type' ... ../src/syntax/typing.nit:419,11--16
+                      ../src/syntax/typing.nit:419,11
                     identifier 'is_typed' ... ../src/syntax/typing.nit:419,18--25
+                    ../src/syntax/typing.nit:419,11
                 ../src/syntax/typing.nit:419,32--37
                   keyword 'return' ... ../src/syntax/typing.nit:419,32--37
               ../src/syntax/typing.nit:420,4--26
                 ../src/syntax/typing.nit:420,4--5
                   ../src/syntax/typing.nit:420,4
                   identifier 'va' ... ../src/syntax/typing.nit:420,4--5
+                  ../src/syntax/typing.nit:420,4
                 identifier 'stype' ... ../src/syntax/typing.nit:420,7--11
+                ../src/syntax/typing.nit:420,15
                 '=' ... ../src/syntax/typing.nit:420,13
                 ../src/syntax/typing.nit:420,15--26
                   ../src/syntax/typing.nit:420,15--20
                     ../src/syntax/typing.nit:420,15
                     identifier 'n_type' ... ../src/syntax/typing.nit:420,15--20
+                    ../src/syntax/typing.nit:420,15
                   identifier 'stype' ... ../src/syntax/typing.nit:420,22--26
+                  ../src/syntax/typing.nit:420,15
               ../src/syntax/typing.nit:421,4--423,6
                 keyword 'if' ... ../src/syntax/typing.nit:421,4--5
                 ../src/syntax/typing.nit:421,7--16
                   ../src/syntax/typing.nit:421,7--8
                     ../src/syntax/typing.nit:421,7
                     identifier 'ne' ... ../src/syntax/typing.nit:421,7--8
+                    ../src/syntax/typing.nit:421,7
                   ../src/syntax/typing.nit:421,13--16
                     keyword 'null' ... ../src/syntax/typing.nit:421,13--16
-                ../src/syntax/typing.nit:422,5--37
-                  ../src/syntax/typing.nit:422,5--37
+                ../src/syntax/typing.nit:422,5--38
+                  ../src/syntax/typing.nit:422,5--38
                     ../src/syntax/typing.nit:422,5
                       ../src/syntax/typing.nit:422,5
                       identifier 'v' ... ../src/syntax/typing.nit:422,5
+                      ../src/syntax/typing.nit:422,5
                     identifier 'check_conform_expr' ... ../src/syntax/typing.nit:422,7--24
-                    ../src/syntax/typing.nit:422,26--27
-                      ../src/syntax/typing.nit:422,26
-                      identifier 'ne' ... ../src/syntax/typing.nit:422,26--27
-                    ../src/syntax/typing.nit:422,30--37
-                      ../src/syntax/typing.nit:422,30--31
+                    ../src/syntax/typing.nit:422,25--38
+                      '(' ... ../src/syntax/typing.nit:422,25
+                      ../src/syntax/typing.nit:422,26--27
+                        ../src/syntax/typing.nit:422,26
+                        identifier 'ne' ... ../src/syntax/typing.nit:422,26--27
+                        ../src/syntax/typing.nit:422,26
+                      ../src/syntax/typing.nit:422,30--37
+                        ../src/syntax/typing.nit:422,30--31
+                          ../src/syntax/typing.nit:422,30
+                          identifier 'va' ... ../src/syntax/typing.nit:422,30--31
+                          ../src/syntax/typing.nit:422,30
+                        identifier 'stype' ... ../src/syntax/typing.nit:422,33--37
                         ../src/syntax/typing.nit:422,30
-                        identifier 'va' ... ../src/syntax/typing.nit:422,30--31
-                      identifier 'stype' ... ../src/syntax/typing.nit:422,33--37
+                      ')' ... ../src/syntax/typing.nit:422,38
                 ../src/syntax/typing.nit:423,4--6
                   keyword 'end' ... ../src/syntax/typing.nit:423,4--6
             ../src/syntax/typing.nit:424,8--429,5
@@ -2556,48 +3058,63 @@
                 ../src/syntax/typing.nit:424,11--12
                   ../src/syntax/typing.nit:424,11
                   identifier 'ne' ... ../src/syntax/typing.nit:424,11--12
+                  ../src/syntax/typing.nit:424,11
                 ../src/syntax/typing.nit:424,17--20
                   keyword 'null' ... ../src/syntax/typing.nit:424,17--20
               ../src/syntax/typing.nit:425,4--426,22
                 ../src/syntax/typing.nit:425,4--38
                   keyword 'if' ... ../src/syntax/typing.nit:425,4--5
-                  ../src/syntax/typing.nit:425,7--25
+                  ../src/syntax/typing.nit:425,7--26
                     keyword 'not' ... ../src/syntax/typing.nit:425,7--9
-                    ../src/syntax/typing.nit:425,11--25
+                    ../src/syntax/typing.nit:425,11--26
                       ../src/syntax/typing.nit:425,11
                         ../src/syntax/typing.nit:425,11
                         identifier 'v' ... ../src/syntax/typing.nit:425,11
+                        ../src/syntax/typing.nit:425,11
                       identifier 'check_expr' ... ../src/syntax/typing.nit:425,13--22
-                      ../src/syntax/typing.nit:425,24--25
-                        ../src/syntax/typing.nit:425,24
-                        identifier 'ne' ... ../src/syntax/typing.nit:425,24--25
+                      ../src/syntax/typing.nit:425,23--26
+                        '(' ... ../src/syntax/typing.nit:425,23
+                        ../src/syntax/typing.nit:425,24--25
+                          ../src/syntax/typing.nit:425,24
+                          identifier 'ne' ... ../src/syntax/typing.nit:425,24--25
+                          ../src/syntax/typing.nit:425,24
+                        ')' ... ../src/syntax/typing.nit:425,26
                   ../src/syntax/typing.nit:425,33--38
                     keyword 'return' ... ../src/syntax/typing.nit:425,33--38
                 ../src/syntax/typing.nit:426,4--22
                   ../src/syntax/typing.nit:426,4--5
                     ../src/syntax/typing.nit:426,4
                     identifier 'va' ... ../src/syntax/typing.nit:426,4--5
+                    ../src/syntax/typing.nit:426,4
                   identifier 'stype' ... ../src/syntax/typing.nit:426,7--11
+                  ../src/syntax/typing.nit:426,15
                   '=' ... ../src/syntax/typing.nit:426,13
                   ../src/syntax/typing.nit:426,15--22
                     ../src/syntax/typing.nit:426,15--16
                       ../src/syntax/typing.nit:426,15
                       identifier 'ne' ... ../src/syntax/typing.nit:426,15--16
+                      ../src/syntax/typing.nit:426,15
                     identifier 'stype' ... ../src/syntax/typing.nit:426,18--22
+                    ../src/syntax/typing.nit:426,15
               ../src/syntax/typing.nit:428,4--429,5
                 ../src/syntax/typing.nit:428,4--39
                   ../src/syntax/typing.nit:428,4--5
                     ../src/syntax/typing.nit:428,4
                     identifier 'va' ... ../src/syntax/typing.nit:428,4--5
+                    ../src/syntax/typing.nit:428,4
                   identifier 'stype' ... ../src/syntax/typing.nit:428,7--11
+                  ../src/syntax/typing.nit:428,15
                   '=' ... ../src/syntax/typing.nit:428,13
                   ../src/syntax/typing.nit:428,15--39
                     ../src/syntax/typing.nit:428,15--27
                       ../src/syntax/typing.nit:428,15
                         ../src/syntax/typing.nit:428,15
                         identifier 'v' ... ../src/syntax/typing.nit:428,15
+                        ../src/syntax/typing.nit:428,15
                       identifier 'type_object' ... ../src/syntax/typing.nit:428,17--27
+                      ../src/syntax/typing.nit:428,15
                     identifier 'as_nullable' ... ../src/syntax/typing.nit:428,29--39
+                    ../src/syntax/typing.nit:428,15
                 keyword 'end' ... ../src/syntax/typing.nit:429,3--5
           ../src/syntax/typing.nit:430,3--18
             ../src/syntax/typing.nit:430,15
@@ -2629,6 +3146,7 @@
             ../src/syntax/typing.nit:437,12--17
               ../src/syntax/typing.nit:437,12
               identifier 'n_expr' ... ../src/syntax/typing.nit:437,12--17
+              ../src/syntax/typing.nit:437,12
             keyword 'do' ... ../src/syntax/typing.nit:437,19--20
             ../src/syntax/typing.nit:438,4--444,5
               ../src/syntax/typing.nit:438,4--443,6
@@ -2640,17 +3158,25 @@
                       ../src/syntax/typing.nit:438,11
                         ../src/syntax/typing.nit:438,11
                         identifier 'v' ... ../src/syntax/typing.nit:438,11
+                        ../src/syntax/typing.nit:438,11
                       identifier 'flow_ctx' ... ../src/syntax/typing.nit:438,13--20
+                      ../src/syntax/typing.nit:438,11
                     identifier 'unreash' ... ../src/syntax/typing.nit:438,22--28
-                ../src/syntax/typing.nit:439,5--19
-                  ../src/syntax/typing.nit:439,5--19
+                    ../src/syntax/typing.nit:438,11
+                ../src/syntax/typing.nit:439,5--20
+                  ../src/syntax/typing.nit:439,5--20
                     ../src/syntax/typing.nit:439,5
                       ../src/syntax/typing.nit:439,5
                       identifier 'v' ... ../src/syntax/typing.nit:439,5
+                      ../src/syntax/typing.nit:439,5
                     identifier 'enter_visit' ... ../src/syntax/typing.nit:439,7--17
-                    ../src/syntax/typing.nit:439,19
+                    ../src/syntax/typing.nit:439,18--20
+                      '(' ... ../src/syntax/typing.nit:439,18
                       ../src/syntax/typing.nit:439,19
-                      identifier 'e' ... ../src/syntax/typing.nit:439,19
+                        ../src/syntax/typing.nit:439,19
+                        identifier 'e' ... ../src/syntax/typing.nit:439,19
+                        ../src/syntax/typing.nit:439,19
+                      ')' ... ../src/syntax/typing.nit:439,20
                 ../src/syntax/typing.nit:440,9--443,6
                   keyword 'if' ... ../src/syntax/typing.nit:440,9--10
                   ../src/syntax/typing.nit:440,12--41
@@ -2660,29 +3186,40 @@
                         ../src/syntax/typing.nit:440,16
                           ../src/syntax/typing.nit:440,16
                           identifier 'v' ... ../src/syntax/typing.nit:440,16
+                          ../src/syntax/typing.nit:440,16
                         identifier 'flow_ctx' ... ../src/syntax/typing.nit:440,18--25
+                        ../src/syntax/typing.nit:440,16
                       identifier 'already_unreash' ... ../src/syntax/typing.nit:440,27--41
-                  ../src/syntax/typing.nit:441,5--442,46
+                      ../src/syntax/typing.nit:440,16
+                  ../src/syntax/typing.nit:441,5--442,47
                     ../src/syntax/typing.nit:441,5--37
                       ../src/syntax/typing.nit:441,5--14
                         ../src/syntax/typing.nit:441,5
                           ../src/syntax/typing.nit:441,5
                           identifier 'v' ... ../src/syntax/typing.nit:441,5
+                          ../src/syntax/typing.nit:441,5
                         identifier 'flow_ctx' ... ../src/syntax/typing.nit:441,7--14
+                        ../src/syntax/typing.nit:441,5
                       identifier 'already_unreash' ... ../src/syntax/typing.nit:441,16--30
+                      ../src/syntax/typing.nit:441,34
                       '=' ... ../src/syntax/typing.nit:441,32
                       ../src/syntax/typing.nit:441,34--37
                         keyword 'true' ... ../src/syntax/typing.nit:441,34--37
-                    ../src/syntax/typing.nit:442,5--46
+                    ../src/syntax/typing.nit:442,5--47
                       ../src/syntax/typing.nit:442,5
                         ../src/syntax/typing.nit:442,5
                         identifier 'v' ... ../src/syntax/typing.nit:442,5
+                        ../src/syntax/typing.nit:442,5
                       identifier 'error' ... ../src/syntax/typing.nit:442,7--11
-                      ../src/syntax/typing.nit:442,13
+                      ../src/syntax/typing.nit:442,12--47
+                        '(' ... ../src/syntax/typing.nit:442,12
                         ../src/syntax/typing.nit:442,13
-                        identifier 'e' ... ../src/syntax/typing.nit:442,13
-                      ../src/syntax/typing.nit:442,16--46
-                        literal value '"Error: unreachable statement."' ... ../src/syntax/typing.nit:442,16--46
+                          ../src/syntax/typing.nit:442,13
+                          identifier 'e' ... ../src/syntax/typing.nit:442,13
+                          ../src/syntax/typing.nit:442,13
+                        ../src/syntax/typing.nit:442,16--46
+                          literal value '"Error: unreachable statement."' ... ../src/syntax/typing.nit:442,16--46
+                        ')' ... ../src/syntax/typing.nit:442,47
                   ../src/syntax/typing.nit:443,4--6
                     keyword 'end' ... ../src/syntax/typing.nit:443,4--6
               keyword 'end' ... ../src/syntax/typing.nit:444,3--5
@@ -2710,13 +3247,17 @@
           ../src/syntax/typing.nit:451,25
             identifier 'v' ... ../src/syntax/typing.nit:451,25
         ../src/syntax/typing.nit:453,3--473,4
-          ../src/syntax/typing.nit:453,3--21
+          ../src/syntax/typing.nit:453,3--22
             ../src/syntax/typing.nit:453,3
               ../src/syntax/typing.nit:453,3
               identifier 'v' ... ../src/syntax/typing.nit:453,3
+              ../src/syntax/typing.nit:453,3
             identifier 'mark_unreash' ... ../src/syntax/typing.nit:453,5--16
-            ../src/syntax/typing.nit:453,18--21
-              keyword 'self' ... ../src/syntax/typing.nit:453,18--21
+            ../src/syntax/typing.nit:453,17--22
+              '(' ... ../src/syntax/typing.nit:453,17
+              ../src/syntax/typing.nit:453,18--21
+                keyword 'self' ... ../src/syntax/typing.nit:453,18--21
+              ')' ... ../src/syntax/typing.nit:453,22
           ../src/syntax/typing.nit:454,3--48
             keyword 'var' ... ../src/syntax/typing.nit:454,3--5
             identifier 't' ... ../src/syntax/typing.nit:454,7
@@ -2727,26 +3268,36 @@
                   ../src/syntax/typing.nit:454,11
                     ../src/syntax/typing.nit:454,11
                     identifier 'v' ... ../src/syntax/typing.nit:454,11
+                    ../src/syntax/typing.nit:454,11
                   identifier 'local_property' ... ../src/syntax/typing.nit:454,13--26
+                  ../src/syntax/typing.nit:454,11
                 identifier 'signature' ... ../src/syntax/typing.nit:454,28--36
+                ../src/syntax/typing.nit:454,11
               identifier 'return_type' ... ../src/syntax/typing.nit:454,38--48
+              ../src/syntax/typing.nit:454,11
           ../src/syntax/typing.nit:456,3--459,5
             keyword 'if' ... ../src/syntax/typing.nit:456,3--4
             ../src/syntax/typing.nit:456,6--36
               ../src/syntax/typing.nit:456,6
                 ../src/syntax/typing.nit:456,6
                 identifier 'v' ... ../src/syntax/typing.nit:456,6
+                ../src/syntax/typing.nit:456,6
               identifier 'is_default_closure_definition' ... ../src/syntax/typing.nit:456,8--36
+              ../src/syntax/typing.nit:456,6
             ../src/syntax/typing.nit:457,4--458,9
-              ../src/syntax/typing.nit:457,4--101
+              ../src/syntax/typing.nit:457,4--102
                 ../src/syntax/typing.nit:457,4
                   ../src/syntax/typing.nit:457,4
                   identifier 'v' ... ../src/syntax/typing.nit:457,4
+                  ../src/syntax/typing.nit:457,4
                 identifier 'error' ... ../src/syntax/typing.nit:457,6--10
-                ../src/syntax/typing.nit:457,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:457,12--15
-                ../src/syntax/typing.nit:457,18--101
-                  literal value '"Error: 'return' invalid in default closure definitions. Use 'continue' or 'break'."' ... ../src/syntax/typing.nit:457,18--101
+                ../src/syntax/typing.nit:457,11--102
+                  '(' ... ../src/syntax/typing.nit:457,11
+                  ../src/syntax/typing.nit:457,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:457,12--15
+                  ../src/syntax/typing.nit:457,18--101
+                    literal value '"Error: 'return' invalid in default closure definitions. Use 'continue' or 'break'."' ... ../src/syntax/typing.nit:457,18--101
+                  ')' ... ../src/syntax/typing.nit:457,102
               ../src/syntax/typing.nit:458,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:458,4--9
             ../src/syntax/typing.nit:459,3--5
@@ -2758,6 +3309,7 @@
             ../src/syntax/typing.nit:461,11--16
               ../src/syntax/typing.nit:461,11
               identifier 'n_expr' ... ../src/syntax/typing.nit:461,11--16
+              ../src/syntax/typing.nit:461,11
           ../src/syntax/typing.nit:462,3--468,5
             keyword 'if' ... ../src/syntax/typing.nit:462,3--4
             ../src/syntax/typing.nit:462,6--28
@@ -2765,24 +3317,30 @@
                 ../src/syntax/typing.nit:462,6
                   ../src/syntax/typing.nit:462,6
                   identifier 'e' ... ../src/syntax/typing.nit:462,6
+                  ../src/syntax/typing.nit:462,6
                 ../src/syntax/typing.nit:462,11--14
                   keyword 'null' ... ../src/syntax/typing.nit:462,11--14
               ../src/syntax/typing.nit:462,20--28
                 ../src/syntax/typing.nit:462,20
                   ../src/syntax/typing.nit:462,20
                   identifier 't' ... ../src/syntax/typing.nit:462,20
+                  ../src/syntax/typing.nit:462,20
                 ../src/syntax/typing.nit:462,25--28
                   keyword 'null' ... ../src/syntax/typing.nit:462,25--28
-            ../src/syntax/typing.nit:463,4--61
-              ../src/syntax/typing.nit:463,4--61
+            ../src/syntax/typing.nit:463,4--62
+              ../src/syntax/typing.nit:463,4--62
                 ../src/syntax/typing.nit:463,4
                   ../src/syntax/typing.nit:463,4
                   identifier 'v' ... ../src/syntax/typing.nit:463,4
+                  ../src/syntax/typing.nit:463,4
                 identifier 'error' ... ../src/syntax/typing.nit:463,6--10
-                ../src/syntax/typing.nit:463,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:463,12--15
-                ../src/syntax/typing.nit:463,18--61
-                  literal value '"Error: Return without value in a function."' ... ../src/syntax/typing.nit:463,18--61
+                ../src/syntax/typing.nit:463,11--62
+                  '(' ... ../src/syntax/typing.nit:463,11
+                  ../src/syntax/typing.nit:463,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:463,12--15
+                  ../src/syntax/typing.nit:463,18--61
+                    literal value '"Error: Return without value in a function."' ... ../src/syntax/typing.nit:463,18--61
+                  ')' ... ../src/syntax/typing.nit:463,62
             ../src/syntax/typing.nit:464,8--468,5
               keyword 'if' ... ../src/syntax/typing.nit:464,8--9
               ../src/syntax/typing.nit:464,11--33
@@ -2790,24 +3348,30 @@
                   ../src/syntax/typing.nit:464,11
                     ../src/syntax/typing.nit:464,11
                     identifier 'e' ... ../src/syntax/typing.nit:464,11
+                    ../src/syntax/typing.nit:464,11
                   ../src/syntax/typing.nit:464,16--19
                     keyword 'null' ... ../src/syntax/typing.nit:464,16--19
                 ../src/syntax/typing.nit:464,25--33
                   ../src/syntax/typing.nit:464,25
                     ../src/syntax/typing.nit:464,25
                     identifier 't' ... ../src/syntax/typing.nit:464,25
+                    ../src/syntax/typing.nit:464,25
                   ../src/syntax/typing.nit:464,30--33
                     keyword 'null' ... ../src/syntax/typing.nit:464,30--33
-              ../src/syntax/typing.nit:465,4--59
-                ../src/syntax/typing.nit:465,4--59
+              ../src/syntax/typing.nit:465,4--60
+                ../src/syntax/typing.nit:465,4--60
                   ../src/syntax/typing.nit:465,4
                     ../src/syntax/typing.nit:465,4
                     identifier 'v' ... ../src/syntax/typing.nit:465,4
+                    ../src/syntax/typing.nit:465,4
                   identifier 'error' ... ../src/syntax/typing.nit:465,6--10
-                  ../src/syntax/typing.nit:465,12--15
-                    keyword 'self' ... ../src/syntax/typing.nit:465,12--15
-                  ../src/syntax/typing.nit:465,18--59
-                    literal value '"Error: Return with value in a procedure."' ... ../src/syntax/typing.nit:465,18--59
+                  ../src/syntax/typing.nit:465,11--60
+                    '(' ... ../src/syntax/typing.nit:465,11
+                    ../src/syntax/typing.nit:465,12--15
+                      keyword 'self' ... ../src/syntax/typing.nit:465,12--15
+                    ../src/syntax/typing.nit:465,18--59
+                      literal value '"Error: Return with value in a procedure."' ... ../src/syntax/typing.nit:465,18--59
+                    ')' ... ../src/syntax/typing.nit:465,60
               ../src/syntax/typing.nit:466,8--468,5
                 keyword 'if' ... ../src/syntax/typing.nit:466,8--9
                 ../src/syntax/typing.nit:466,11--33
@@ -2815,26 +3379,34 @@
                     ../src/syntax/typing.nit:466,11
                       ../src/syntax/typing.nit:466,11
                       identifier 'e' ... ../src/syntax/typing.nit:466,11
+                      ../src/syntax/typing.nit:466,11
                     ../src/syntax/typing.nit:466,16--19
                       keyword 'null' ... ../src/syntax/typing.nit:466,16--19
                   ../src/syntax/typing.nit:466,25--33
                     ../src/syntax/typing.nit:466,25
                       ../src/syntax/typing.nit:466,25
                       identifier 't' ... ../src/syntax/typing.nit:466,25
+                      ../src/syntax/typing.nit:466,25
                     ../src/syntax/typing.nit:466,30--33
                       keyword 'null' ... ../src/syntax/typing.nit:466,30--33
-                ../src/syntax/typing.nit:467,4--28
-                  ../src/syntax/typing.nit:467,4--28
+                ../src/syntax/typing.nit:467,4--29
+                  ../src/syntax/typing.nit:467,4--29
                     ../src/syntax/typing.nit:467,4
                       ../src/syntax/typing.nit:467,4
                       identifier 'v' ... ../src/syntax/typing.nit:467,4
+                      ../src/syntax/typing.nit:467,4
                     identifier 'check_conform_expr' ... ../src/syntax/typing.nit:467,6--23
-                    ../src/syntax/typing.nit:467,25
+                    ../src/syntax/typing.nit:467,24--29
+                      '(' ... ../src/syntax/typing.nit:467,24
                       ../src/syntax/typing.nit:467,25
-                      identifier 'e' ... ../src/syntax/typing.nit:467,25
-                    ../src/syntax/typing.nit:467,28
+                        ../src/syntax/typing.nit:467,25
+                        identifier 'e' ... ../src/syntax/typing.nit:467,25
+                        ../src/syntax/typing.nit:467,25
                       ../src/syntax/typing.nit:467,28
-                      identifier 't' ... ../src/syntax/typing.nit:467,28
+                        ../src/syntax/typing.nit:467,28
+                        identifier 't' ... ../src/syntax/typing.nit:467,28
+                        ../src/syntax/typing.nit:467,28
+                      ')' ... ../src/syntax/typing.nit:467,29
                 ../src/syntax/typing.nit:468,3--5
                   keyword 'end' ... ../src/syntax/typing.nit:468,3--5
           ../src/syntax/typing.nit:469,3--471,5
@@ -2843,17 +3415,23 @@
               ../src/syntax/typing.nit:469,6
                 ../src/syntax/typing.nit:469,6
                 identifier 'e' ... ../src/syntax/typing.nit:469,6
+                ../src/syntax/typing.nit:469,6
               ../src/syntax/typing.nit:469,11--14
                 keyword 'null' ... ../src/syntax/typing.nit:469,11--14
-            ../src/syntax/typing.nit:470,4--23
-              ../src/syntax/typing.nit:470,4--23
+            ../src/syntax/typing.nit:470,4--24
+              ../src/syntax/typing.nit:470,4--24
                 ../src/syntax/typing.nit:470,4
                   ../src/syntax/typing.nit:470,4
                   identifier 'e' ... ../src/syntax/typing.nit:470,4
+                  ../src/syntax/typing.nit:470,4
                 identifier 'warn_parentheses' ... ../src/syntax/typing.nit:470,6--21
-                ../src/syntax/typing.nit:470,23
+                ../src/syntax/typing.nit:470,22--24
+                  '(' ... ../src/syntax/typing.nit:470,22
                   ../src/syntax/typing.nit:470,23
-                  identifier 'v' ... ../src/syntax/typing.nit:470,23
+                    ../src/syntax/typing.nit:470,23
+                    identifier 'v' ... ../src/syntax/typing.nit:470,23
+                    ../src/syntax/typing.nit:470,23
+                  ')' ... ../src/syntax/typing.nit:470,24
             ../src/syntax/typing.nit:471,3--5
               keyword 'end' ... ../src/syntax/typing.nit:471,3--5
           ../src/syntax/typing.nit:472,3--18
@@ -2880,31 +3458,41 @@
           ../src/syntax/typing.nit:477,25
             identifier 'v' ... ../src/syntax/typing.nit:477,25
         ../src/syntax/typing.nit:479,3--501,4
-          ../src/syntax/typing.nit:479,3--21
+          ../src/syntax/typing.nit:479,3--22
             ../src/syntax/typing.nit:479,3
               ../src/syntax/typing.nit:479,3
               identifier 'v' ... ../src/syntax/typing.nit:479,3
+              ../src/syntax/typing.nit:479,3
             identifier 'mark_unreash' ... ../src/syntax/typing.nit:479,5--16
-            ../src/syntax/typing.nit:479,18--21
-              keyword 'self' ... ../src/syntax/typing.nit:479,18--21
-          ../src/syntax/typing.nit:480,3--47
+            ../src/syntax/typing.nit:479,17--22
+              '(' ... ../src/syntax/typing.nit:479,17
+              ../src/syntax/typing.nit:479,18--21
+                keyword 'self' ... ../src/syntax/typing.nit:479,18--21
+              ')' ... ../src/syntax/typing.nit:479,22
+          ../src/syntax/typing.nit:480,3--48
             keyword 'var' ... ../src/syntax/typing.nit:480,3--5
             identifier 'esc' ... ../src/syntax/typing.nit:480,7--9
             '=' ... ../src/syntax/typing.nit:480,11
-            ../src/syntax/typing.nit:480,13--47
+            ../src/syntax/typing.nit:480,13--48
               ../src/syntax/typing.nit:480,37
               identifier 'compute_escapable_block' ... ../src/syntax/typing.nit:480,13--35
-              ../src/syntax/typing.nit:480,37--47
-                ../src/syntax/typing.nit:480,37
+              ../src/syntax/typing.nit:480,36--48
+                '(' ... ../src/syntax/typing.nit:480,36
+                ../src/syntax/typing.nit:480,37--47
                   ../src/syntax/typing.nit:480,37
-                  identifier 'v' ... ../src/syntax/typing.nit:480,37
-                identifier 'scope_ctx' ... ../src/syntax/typing.nit:480,39--47
+                    ../src/syntax/typing.nit:480,37
+                    identifier 'v' ... ../src/syntax/typing.nit:480,37
+                    ../src/syntax/typing.nit:480,37
+                  identifier 'scope_ctx' ... ../src/syntax/typing.nit:480,39--47
+                  ../src/syntax/typing.nit:480,37
+                ')' ... ../src/syntax/typing.nit:480,48
           ../src/syntax/typing.nit:481,3--28
             keyword 'if' ... ../src/syntax/typing.nit:481,3--4
             ../src/syntax/typing.nit:481,6--16
               ../src/syntax/typing.nit:481,6--8
                 ../src/syntax/typing.nit:481,6
                 identifier 'esc' ... ../src/syntax/typing.nit:481,6--8
+                ../src/syntax/typing.nit:481,6
               ../src/syntax/typing.nit:481,13--16
                 keyword 'null' ... ../src/syntax/typing.nit:481,13--16
             ../src/syntax/typing.nit:481,23--28
@@ -2915,17 +3503,23 @@
               ../src/syntax/typing.nit:483,6--8
                 ../src/syntax/typing.nit:483,6
                 identifier 'esc' ... ../src/syntax/typing.nit:483,6--8
+                ../src/syntax/typing.nit:483,6
               identifier 'is_break_block' ... ../src/syntax/typing.nit:483,10--23
+              ../src/syntax/typing.nit:483,6
             ../src/syntax/typing.nit:484,4--485,9
-              ../src/syntax/typing.nit:484,4--58
+              ../src/syntax/typing.nit:484,4--59
                 ../src/syntax/typing.nit:484,4
                   ../src/syntax/typing.nit:484,4
                   identifier 'v' ... ../src/syntax/typing.nit:484,4
+                  ../src/syntax/typing.nit:484,4
                 identifier 'error' ... ../src/syntax/typing.nit:484,6--10
-                ../src/syntax/typing.nit:484,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:484,12--15
-                ../src/syntax/typing.nit:484,18--58
-                  literal value '"Error: cannot 'continue', only 'break'."' ... ../src/syntax/typing.nit:484,18--58
+                ../src/syntax/typing.nit:484,11--59
+                  '(' ... ../src/syntax/typing.nit:484,11
+                  ../src/syntax/typing.nit:484,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:484,12--15
+                  ../src/syntax/typing.nit:484,18--58
+                    literal value '"Error: cannot 'continue', only 'break'."' ... ../src/syntax/typing.nit:484,18--58
+                  ')' ... ../src/syntax/typing.nit:484,59
               ../src/syntax/typing.nit:485,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:485,4--9
             ../src/syntax/typing.nit:486,3--5
@@ -2938,7 +3532,9 @@
               ../src/syntax/typing.nit:488,11--13
                 ../src/syntax/typing.nit:488,11
                 identifier 'esc' ... ../src/syntax/typing.nit:488,11--13
+                ../src/syntax/typing.nit:488,11
               identifier 'continue_stype' ... ../src/syntax/typing.nit:488,15--28
+              ../src/syntax/typing.nit:488,11
           ../src/syntax/typing.nit:489,3--16
             keyword 'var' ... ../src/syntax/typing.nit:489,3--5
             identifier 'e' ... ../src/syntax/typing.nit:489,7
@@ -2946,6 +3542,7 @@
             ../src/syntax/typing.nit:489,11--16
               ../src/syntax/typing.nit:489,11
               identifier 'n_expr' ... ../src/syntax/typing.nit:489,11--16
+              ../src/syntax/typing.nit:489,11
           ../src/syntax/typing.nit:490,3--496,5
             keyword 'if' ... ../src/syntax/typing.nit:490,3--4
             ../src/syntax/typing.nit:490,6--28
@@ -2953,24 +3550,30 @@
                 ../src/syntax/typing.nit:490,6
                   ../src/syntax/typing.nit:490,6
                   identifier 'e' ... ../src/syntax/typing.nit:490,6
+                  ../src/syntax/typing.nit:490,6
                 ../src/syntax/typing.nit:490,11--14
                   keyword 'null' ... ../src/syntax/typing.nit:490,11--14
               ../src/syntax/typing.nit:490,20--28
                 ../src/syntax/typing.nit:490,20
                   ../src/syntax/typing.nit:490,20
                   identifier 't' ... ../src/syntax/typing.nit:490,20
+                  ../src/syntax/typing.nit:490,20
                 ../src/syntax/typing.nit:490,25--28
                   keyword 'null' ... ../src/syntax/typing.nit:490,25--28
-            ../src/syntax/typing.nit:491,4--71
-              ../src/syntax/typing.nit:491,4--71
+            ../src/syntax/typing.nit:491,4--72
+              ../src/syntax/typing.nit:491,4--72
                 ../src/syntax/typing.nit:491,4
                   ../src/syntax/typing.nit:491,4
                   identifier 'v' ... ../src/syntax/typing.nit:491,4
+                  ../src/syntax/typing.nit:491,4
                 identifier 'error' ... ../src/syntax/typing.nit:491,6--10
-                ../src/syntax/typing.nit:491,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:491,12--15
-                ../src/syntax/typing.nit:491,18--71
-                  literal value '"Error: continue with a value required in this block."' ... ../src/syntax/typing.nit:491,18--71
+                ../src/syntax/typing.nit:491,11--72
+                  '(' ... ../src/syntax/typing.nit:491,11
+                  ../src/syntax/typing.nit:491,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:491,12--15
+                  ../src/syntax/typing.nit:491,18--71
+                    literal value '"Error: continue with a value required in this block."' ... ../src/syntax/typing.nit:491,18--71
+                  ')' ... ../src/syntax/typing.nit:491,72
             ../src/syntax/typing.nit:492,8--496,5
               keyword 'if' ... ../src/syntax/typing.nit:492,8--9
               ../src/syntax/typing.nit:492,11--33
@@ -2978,24 +3581,30 @@
                   ../src/syntax/typing.nit:492,11
                     ../src/syntax/typing.nit:492,11
                     identifier 'e' ... ../src/syntax/typing.nit:492,11
+                    ../src/syntax/typing.nit:492,11
                   ../src/syntax/typing.nit:492,16--19
                     keyword 'null' ... ../src/syntax/typing.nit:492,16--19
                 ../src/syntax/typing.nit:492,25--33
                   ../src/syntax/typing.nit:492,25
                     ../src/syntax/typing.nit:492,25
                     identifier 't' ... ../src/syntax/typing.nit:492,25
+                    ../src/syntax/typing.nit:492,25
                   ../src/syntax/typing.nit:492,30--33
                     keyword 'null' ... ../src/syntax/typing.nit:492,30--33
-              ../src/syntax/typing.nit:493,4--72
-                ../src/syntax/typing.nit:493,4--72
+              ../src/syntax/typing.nit:493,4--73
+                ../src/syntax/typing.nit:493,4--73
                   ../src/syntax/typing.nit:493,4
                     ../src/syntax/typing.nit:493,4
                     identifier 'v' ... ../src/syntax/typing.nit:493,4
+                    ../src/syntax/typing.nit:493,4
                   identifier 'error' ... ../src/syntax/typing.nit:493,6--10
-                  ../src/syntax/typing.nit:493,12--15
-                    keyword 'self' ... ../src/syntax/typing.nit:493,12--15
-                  ../src/syntax/typing.nit:493,18--72
-                    literal value '"Error: continue without value required in this block."' ... ../src/syntax/typing.nit:493,18--72
+                  ../src/syntax/typing.nit:493,11--73
+                    '(' ... ../src/syntax/typing.nit:493,11
+                    ../src/syntax/typing.nit:493,12--15
+                      keyword 'self' ... ../src/syntax/typing.nit:493,12--15
+                    ../src/syntax/typing.nit:493,18--72
+                      literal value '"Error: continue without value required in this block."' ... ../src/syntax/typing.nit:493,18--72
+                    ')' ... ../src/syntax/typing.nit:493,73
               ../src/syntax/typing.nit:494,8--496,5
                 keyword 'if' ... ../src/syntax/typing.nit:494,8--9
                 ../src/syntax/typing.nit:494,11--33
@@ -3003,26 +3612,34 @@
                     ../src/syntax/typing.nit:494,11
                       ../src/syntax/typing.nit:494,11
                       identifier 'e' ... ../src/syntax/typing.nit:494,11
+                      ../src/syntax/typing.nit:494,11
                     ../src/syntax/typing.nit:494,16--19
                       keyword 'null' ... ../src/syntax/typing.nit:494,16--19
                   ../src/syntax/typing.nit:494,25--33
                     ../src/syntax/typing.nit:494,25
                       ../src/syntax/typing.nit:494,25
                       identifier 't' ... ../src/syntax/typing.nit:494,25
+                      ../src/syntax/typing.nit:494,25
                     ../src/syntax/typing.nit:494,30--33
                       keyword 'null' ... ../src/syntax/typing.nit:494,30--33
-                ../src/syntax/typing.nit:495,4--28
-                  ../src/syntax/typing.nit:495,4--28
+                ../src/syntax/typing.nit:495,4--29
+                  ../src/syntax/typing.nit:495,4--29
                     ../src/syntax/typing.nit:495,4
                       ../src/syntax/typing.nit:495,4
                       identifier 'v' ... ../src/syntax/typing.nit:495,4
+                      ../src/syntax/typing.nit:495,4
                     identifier 'check_conform_expr' ... ../src/syntax/typing.nit:495,6--23
-                    ../src/syntax/typing.nit:495,25
+                    ../src/syntax/typing.nit:495,24--29
+                      '(' ... ../src/syntax/typing.nit:495,24
                       ../src/syntax/typing.nit:495,25
-                      identifier 'e' ... ../src/syntax/typing.nit:495,25
-                    ../src/syntax/typing.nit:495,28
+                        ../src/syntax/typing.nit:495,25
+                        identifier 'e' ... ../src/syntax/typing.nit:495,25
+                        ../src/syntax/typing.nit:495,25
                       ../src/syntax/typing.nit:495,28
-                      identifier 't' ... ../src/syntax/typing.nit:495,28
+                        ../src/syntax/typing.nit:495,28
+                        identifier 't' ... ../src/syntax/typing.nit:495,28
+                        ../src/syntax/typing.nit:495,28
+                      ')' ... ../src/syntax/typing.nit:495,29
                 ../src/syntax/typing.nit:496,3--5
                   keyword 'end' ... ../src/syntax/typing.nit:496,3--5
           ../src/syntax/typing.nit:497,3--499,5
@@ -3031,17 +3648,23 @@
               ../src/syntax/typing.nit:497,6
                 ../src/syntax/typing.nit:497,6
                 identifier 'e' ... ../src/syntax/typing.nit:497,6
+                ../src/syntax/typing.nit:497,6
               ../src/syntax/typing.nit:497,11--14
                 keyword 'null' ... ../src/syntax/typing.nit:497,11--14
-            ../src/syntax/typing.nit:498,4--23
-              ../src/syntax/typing.nit:498,4--23
+            ../src/syntax/typing.nit:498,4--24
+              ../src/syntax/typing.nit:498,4--24
                 ../src/syntax/typing.nit:498,4
                   ../src/syntax/typing.nit:498,4
                   identifier 'e' ... ../src/syntax/typing.nit:498,4
+                  ../src/syntax/typing.nit:498,4
                 identifier 'warn_parentheses' ... ../src/syntax/typing.nit:498,6--21
-                ../src/syntax/typing.nit:498,23
+                ../src/syntax/typing.nit:498,22--24
+                  '(' ... ../src/syntax/typing.nit:498,22
                   ../src/syntax/typing.nit:498,23
-                  identifier 'v' ... ../src/syntax/typing.nit:498,23
+                    ../src/syntax/typing.nit:498,23
+                    identifier 'v' ... ../src/syntax/typing.nit:498,23
+                    ../src/syntax/typing.nit:498,23
+                  ')' ... ../src/syntax/typing.nit:498,24
             ../src/syntax/typing.nit:499,3--5
               keyword 'end' ... ../src/syntax/typing.nit:499,3--5
           ../src/syntax/typing.nit:500,3--18
@@ -3076,46 +3699,64 @@
               ../src/syntax/typing.nit:507,22
                 ../src/syntax/typing.nit:507,22
                 identifier 'v' ... ../src/syntax/typing.nit:507,22
+                ../src/syntax/typing.nit:507,22
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:507,24--31
-          ../src/syntax/typing.nit:508,3--21
+              ../src/syntax/typing.nit:507,22
+          ../src/syntax/typing.nit:508,3--22
             ../src/syntax/typing.nit:508,3
               ../src/syntax/typing.nit:508,3
               identifier 'v' ... ../src/syntax/typing.nit:508,3
+              ../src/syntax/typing.nit:508,3
             identifier 'mark_unreash' ... ../src/syntax/typing.nit:508,5--16
-            ../src/syntax/typing.nit:508,18--21
-              keyword 'self' ... ../src/syntax/typing.nit:508,18--21
-          ../src/syntax/typing.nit:509,3--47
+            ../src/syntax/typing.nit:508,17--22
+              '(' ... ../src/syntax/typing.nit:508,17
+              ../src/syntax/typing.nit:508,18--21
+                keyword 'self' ... ../src/syntax/typing.nit:508,18--21
+              ')' ... ../src/syntax/typing.nit:508,22
+          ../src/syntax/typing.nit:509,3--48
             keyword 'var' ... ../src/syntax/typing.nit:509,3--5
             identifier 'esc' ... ../src/syntax/typing.nit:509,7--9
             '=' ... ../src/syntax/typing.nit:509,11
-            ../src/syntax/typing.nit:509,13--47
+            ../src/syntax/typing.nit:509,13--48
               ../src/syntax/typing.nit:509,37
               identifier 'compute_escapable_block' ... ../src/syntax/typing.nit:509,13--35
-              ../src/syntax/typing.nit:509,37--47
-                ../src/syntax/typing.nit:509,37
+              ../src/syntax/typing.nit:509,36--48
+                '(' ... ../src/syntax/typing.nit:509,36
+                ../src/syntax/typing.nit:509,37--47
                   ../src/syntax/typing.nit:509,37
-                  identifier 'v' ... ../src/syntax/typing.nit:509,37
-                identifier 'scope_ctx' ... ../src/syntax/typing.nit:509,39--47
+                    ../src/syntax/typing.nit:509,37
+                    identifier 'v' ... ../src/syntax/typing.nit:509,37
+                    ../src/syntax/typing.nit:509,37
+                  identifier 'scope_ctx' ... ../src/syntax/typing.nit:509,39--47
+                  ../src/syntax/typing.nit:509,37
+                ')' ... ../src/syntax/typing.nit:509,48
           ../src/syntax/typing.nit:510,3--28
             keyword 'if' ... ../src/syntax/typing.nit:510,3--4
             ../src/syntax/typing.nit:510,6--16
               ../src/syntax/typing.nit:510,6--8
                 ../src/syntax/typing.nit:510,6
                 identifier 'esc' ... ../src/syntax/typing.nit:510,6--8
+                ../src/syntax/typing.nit:510,6
               ../src/syntax/typing.nit:510,13--16
                 keyword 'null' ... ../src/syntax/typing.nit:510,13--16
             ../src/syntax/typing.nit:510,23--28
               keyword 'return' ... ../src/syntax/typing.nit:510,23--28
-          ../src/syntax/typing.nit:512,3--42
+          ../src/syntax/typing.nit:512,3--43
             ../src/syntax/typing.nit:512,3--25
               ../src/syntax/typing.nit:512,3--5
                 ../src/syntax/typing.nit:512,3
                 identifier 'esc' ... ../src/syntax/typing.nit:512,3--5
+                ../src/syntax/typing.nit:512,3
               identifier 'break_flow_contexts' ... ../src/syntax/typing.nit:512,7--25
+              ../src/syntax/typing.nit:512,3
             identifier 'add' ... ../src/syntax/typing.nit:512,27--29
-            ../src/syntax/typing.nit:512,31--42
-              ../src/syntax/typing.nit:512,31
-              identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:512,31--42
+            ../src/syntax/typing.nit:512,30--43
+              '(' ... ../src/syntax/typing.nit:512,30
+              ../src/syntax/typing.nit:512,31--42
+                ../src/syntax/typing.nit:512,31
+                identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:512,31--42
+                ../src/syntax/typing.nit:512,31
+              ')' ... ../src/syntax/typing.nit:512,43
           ../src/syntax/typing.nit:514,3--25
             keyword 'var' ... ../src/syntax/typing.nit:514,3--5
             identifier 'bl' ... ../src/syntax/typing.nit:514,7--8
@@ -3124,7 +3765,9 @@
               ../src/syntax/typing.nit:514,12--14
                 ../src/syntax/typing.nit:514,12
                 identifier 'esc' ... ../src/syntax/typing.nit:514,12--14
+                ../src/syntax/typing.nit:514,12
               identifier 'break_list' ... ../src/syntax/typing.nit:514,16--25
+              ../src/syntax/typing.nit:514,12
           ../src/syntax/typing.nit:515,3--16
             keyword 'var' ... ../src/syntax/typing.nit:515,3--5
             identifier 'e' ... ../src/syntax/typing.nit:515,7
@@ -3132,6 +3775,7 @@
             ../src/syntax/typing.nit:515,11--16
               ../src/syntax/typing.nit:515,11
               identifier 'n_expr' ... ../src/syntax/typing.nit:515,11--16
+              ../src/syntax/typing.nit:515,11
           ../src/syntax/typing.nit:516,3--523,5
             keyword 'if' ... ../src/syntax/typing.nit:516,3--4
             ../src/syntax/typing.nit:516,6--29
@@ -3139,24 +3783,30 @@
                 ../src/syntax/typing.nit:516,6
                   ../src/syntax/typing.nit:516,6
                   identifier 'e' ... ../src/syntax/typing.nit:516,6
+                  ../src/syntax/typing.nit:516,6
                 ../src/syntax/typing.nit:516,11--14
                   keyword 'null' ... ../src/syntax/typing.nit:516,11--14
               ../src/syntax/typing.nit:516,20--29
                 ../src/syntax/typing.nit:516,20--21
                   ../src/syntax/typing.nit:516,20
                   identifier 'bl' ... ../src/syntax/typing.nit:516,20--21
+                  ../src/syntax/typing.nit:516,20
                 ../src/syntax/typing.nit:516,26--29
                   keyword 'null' ... ../src/syntax/typing.nit:516,26--29
-            ../src/syntax/typing.nit:517,4--68
-              ../src/syntax/typing.nit:517,4--68
+            ../src/syntax/typing.nit:517,4--69
+              ../src/syntax/typing.nit:517,4--69
                 ../src/syntax/typing.nit:517,4
                   ../src/syntax/typing.nit:517,4
                   identifier 'v' ... ../src/syntax/typing.nit:517,4
+                  ../src/syntax/typing.nit:517,4
                 identifier 'error' ... ../src/syntax/typing.nit:517,6--10
-                ../src/syntax/typing.nit:517,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:517,12--15
-                ../src/syntax/typing.nit:517,18--68
-                  literal value '"Error: break with a value required in this block."' ... ../src/syntax/typing.nit:517,18--68
+                ../src/syntax/typing.nit:517,11--69
+                  '(' ... ../src/syntax/typing.nit:517,11
+                  ../src/syntax/typing.nit:517,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:517,12--15
+                  ../src/syntax/typing.nit:517,18--68
+                    literal value '"Error: break with a value required in this block."' ... ../src/syntax/typing.nit:517,18--68
+                  ')' ... ../src/syntax/typing.nit:517,69
             ../src/syntax/typing.nit:518,8--523,5
               keyword 'if' ... ../src/syntax/typing.nit:518,8--9
               ../src/syntax/typing.nit:518,11--34
@@ -3164,24 +3814,30 @@
                   ../src/syntax/typing.nit:518,11
                     ../src/syntax/typing.nit:518,11
                     identifier 'e' ... ../src/syntax/typing.nit:518,11
+                    ../src/syntax/typing.nit:518,11
                   ../src/syntax/typing.nit:518,16--19
                     keyword 'null' ... ../src/syntax/typing.nit:518,16--19
                 ../src/syntax/typing.nit:518,25--34
                   ../src/syntax/typing.nit:518,25--26
                     ../src/syntax/typing.nit:518,25
                     identifier 'bl' ... ../src/syntax/typing.nit:518,25--26
+                    ../src/syntax/typing.nit:518,25
                   ../src/syntax/typing.nit:518,31--34
                     keyword 'null' ... ../src/syntax/typing.nit:518,31--34
-              ../src/syntax/typing.nit:519,4--69
-                ../src/syntax/typing.nit:519,4--69
+              ../src/syntax/typing.nit:519,4--70
+                ../src/syntax/typing.nit:519,4--70
                   ../src/syntax/typing.nit:519,4
                     ../src/syntax/typing.nit:519,4
                     identifier 'v' ... ../src/syntax/typing.nit:519,4
+                    ../src/syntax/typing.nit:519,4
                   identifier 'error' ... ../src/syntax/typing.nit:519,6--10
-                  ../src/syntax/typing.nit:519,12--15
-                    keyword 'self' ... ../src/syntax/typing.nit:519,12--15
-                  ../src/syntax/typing.nit:519,18--69
-                    literal value '"Error: break without value required in this block."' ... ../src/syntax/typing.nit:519,18--69
+                  ../src/syntax/typing.nit:519,11--70
+                    '(' ... ../src/syntax/typing.nit:519,11
+                    ../src/syntax/typing.nit:519,12--15
+                      keyword 'self' ... ../src/syntax/typing.nit:519,12--15
+                    ../src/syntax/typing.nit:519,18--69
+                      literal value '"Error: break without value required in this block."' ... ../src/syntax/typing.nit:519,18--69
+                    ')' ... ../src/syntax/typing.nit:519,70
               ../src/syntax/typing.nit:520,8--523,5
                 keyword 'if' ... ../src/syntax/typing.nit:520,8--9
                 ../src/syntax/typing.nit:520,11--34
@@ -3189,23 +3845,30 @@
                     ../src/syntax/typing.nit:520,11
                       ../src/syntax/typing.nit:520,11
                       identifier 'e' ... ../src/syntax/typing.nit:520,11
+                      ../src/syntax/typing.nit:520,11
                     ../src/syntax/typing.nit:520,16--19
                       keyword 'null' ... ../src/syntax/typing.nit:520,16--19
                   ../src/syntax/typing.nit:520,25--34
                     ../src/syntax/typing.nit:520,25--26
                       ../src/syntax/typing.nit:520,25
                       identifier 'bl' ... ../src/syntax/typing.nit:520,25--26
+                      ../src/syntax/typing.nit:520,25
                     ../src/syntax/typing.nit:520,31--34
                       keyword 'null' ... ../src/syntax/typing.nit:520,31--34
-                ../src/syntax/typing.nit:522,4--11
-                  ../src/syntax/typing.nit:522,4--11
+                ../src/syntax/typing.nit:522,4--12
+                  ../src/syntax/typing.nit:522,4--12
                     ../src/syntax/typing.nit:522,4--5
                       ../src/syntax/typing.nit:522,4
                       identifier 'bl' ... ../src/syntax/typing.nit:522,4--5
+                      ../src/syntax/typing.nit:522,4
                     identifier 'add' ... ../src/syntax/typing.nit:522,7--9
-                    ../src/syntax/typing.nit:522,11
+                    ../src/syntax/typing.nit:522,10--12
+                      '(' ... ../src/syntax/typing.nit:522,10
                       ../src/syntax/typing.nit:522,11
-                      identifier 'e' ... ../src/syntax/typing.nit:522,11
+                        ../src/syntax/typing.nit:522,11
+                        identifier 'e' ... ../src/syntax/typing.nit:522,11
+                        ../src/syntax/typing.nit:522,11
+                      ')' ... ../src/syntax/typing.nit:522,12
                 ../src/syntax/typing.nit:523,3--5
                   keyword 'end' ... ../src/syntax/typing.nit:523,3--5
           ../src/syntax/typing.nit:524,3--526,5
@@ -3214,17 +3877,23 @@
               ../src/syntax/typing.nit:524,6
                 ../src/syntax/typing.nit:524,6
                 identifier 'e' ... ../src/syntax/typing.nit:524,6
+                ../src/syntax/typing.nit:524,6
               ../src/syntax/typing.nit:524,11--14
                 keyword 'null' ... ../src/syntax/typing.nit:524,11--14
-            ../src/syntax/typing.nit:525,4--23
-              ../src/syntax/typing.nit:525,4--23
+            ../src/syntax/typing.nit:525,4--24
+              ../src/syntax/typing.nit:525,4--24
                 ../src/syntax/typing.nit:525,4
                   ../src/syntax/typing.nit:525,4
                   identifier 'e' ... ../src/syntax/typing.nit:525,4
+                  ../src/syntax/typing.nit:525,4
                 identifier 'warn_parentheses' ... ../src/syntax/typing.nit:525,6--21
-                ../src/syntax/typing.nit:525,23
+                ../src/syntax/typing.nit:525,22--24
+                  '(' ... ../src/syntax/typing.nit:525,22
                   ../src/syntax/typing.nit:525,23
-                  identifier 'v' ... ../src/syntax/typing.nit:525,23
+                    ../src/syntax/typing.nit:525,23
+                    identifier 'v' ... ../src/syntax/typing.nit:525,23
+                    ../src/syntax/typing.nit:525,23
+                  ')' ... ../src/syntax/typing.nit:525,24
             ../src/syntax/typing.nit:526,3--5
               keyword 'end' ... ../src/syntax/typing.nit:526,3--5
           ../src/syntax/typing.nit:527,3--18
@@ -3251,13 +3920,17 @@
           ../src/syntax/typing.nit:532,25
             identifier 'v' ... ../src/syntax/typing.nit:532,25
         ../src/syntax/typing.nit:534,3--536,4
-          ../src/syntax/typing.nit:534,3--21
+          ../src/syntax/typing.nit:534,3--22
             ../src/syntax/typing.nit:534,3
               ../src/syntax/typing.nit:534,3
               identifier 'v' ... ../src/syntax/typing.nit:534,3
+              ../src/syntax/typing.nit:534,3
             identifier 'mark_unreash' ... ../src/syntax/typing.nit:534,5--16
-            ../src/syntax/typing.nit:534,18--21
-              keyword 'self' ... ../src/syntax/typing.nit:534,18--21
+            ../src/syntax/typing.nit:534,17--22
+              '(' ... ../src/syntax/typing.nit:534,17
+              ../src/syntax/typing.nit:534,18--21
+                keyword 'self' ... ../src/syntax/typing.nit:534,18--21
+              ')' ... ../src/syntax/typing.nit:534,22
           ../src/syntax/typing.nit:535,3--18
             ../src/syntax/typing.nit:535,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:535,3--11
@@ -3325,19 +3998,27 @@
             ../src/syntax/typing.nit:549,16--24
               ../src/syntax/typing.nit:549,16
               identifier 'escapable' ... ../src/syntax/typing.nit:549,16--24
-          ../src/syntax/typing.nit:550,3--47
+              ../src/syntax/typing.nit:549,16
+          ../src/syntax/typing.nit:550,3--48
             ../src/syntax/typing.nit:550,3--13
               ../src/syntax/typing.nit:550,3
                 ../src/syntax/typing.nit:550,3
                 identifier 'v' ... ../src/syntax/typing.nit:550,3
+                ../src/syntax/typing.nit:550,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:550,5--13
+              ../src/syntax/typing.nit:550,3
             identifier 'push_escapable' ... ../src/syntax/typing.nit:550,15--28
-            ../src/syntax/typing.nit:550,30--38
-              ../src/syntax/typing.nit:550,30
-              identifier 'escapable' ... ../src/syntax/typing.nit:550,30--38
-            ../src/syntax/typing.nit:550,41--47
-              ../src/syntax/typing.nit:550,41
-              identifier 'n_label' ... ../src/syntax/typing.nit:550,41--47
+            ../src/syntax/typing.nit:550,29--48
+              '(' ... ../src/syntax/typing.nit:550,29
+              ../src/syntax/typing.nit:550,30--38
+                ../src/syntax/typing.nit:550,30
+                identifier 'escapable' ... ../src/syntax/typing.nit:550,30--38
+                ../src/syntax/typing.nit:550,30
+              ../src/syntax/typing.nit:550,41--47
+                ../src/syntax/typing.nit:550,41
+                identifier 'n_label' ... ../src/syntax/typing.nit:550,41--47
+                ../src/syntax/typing.nit:550,41
+              ')' ... ../src/syntax/typing.nit:550,48
           ../src/syntax/typing.nit:553,3--31
             keyword 'var' ... ../src/syntax/typing.nit:553,3--5
             identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:553,7--18
@@ -3346,7 +4027,9 @@
               ../src/syntax/typing.nit:553,22
                 ../src/syntax/typing.nit:553,22
                 identifier 'v' ... ../src/syntax/typing.nit:553,22
+                ../src/syntax/typing.nit:553,22
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:553,24--31
+              ../src/syntax/typing.nit:553,22
           ../src/syntax/typing.nit:554,3--41
             keyword 'var' ... ../src/syntax/typing.nit:554,3--5
             identifier 'old_base_flow_ctx' ... ../src/syntax/typing.nit:554,7--23
@@ -3355,29 +4038,40 @@
               ../src/syntax/typing.nit:554,27
                 ../src/syntax/typing.nit:554,27
                 identifier 'v' ... ../src/syntax/typing.nit:554,27
+                ../src/syntax/typing.nit:554,27
               identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:554,29--41
+              ../src/syntax/typing.nit:554,27
           ../src/syntax/typing.nit:555,3--46
             keyword 'if' ... ../src/syntax/typing.nit:555,3--4
             ../src/syntax/typing.nit:555,6--12
               ../src/syntax/typing.nit:555,6
               identifier 'is_loop' ... ../src/syntax/typing.nit:555,6--12
+              ../src/syntax/typing.nit:555,6
             ../src/syntax/typing.nit:555,19--46
               ../src/syntax/typing.nit:555,19
                 ../src/syntax/typing.nit:555,19
                 identifier 'v' ... ../src/syntax/typing.nit:555,19
+                ../src/syntax/typing.nit:555,19
               identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:555,21--33
+              ../src/syntax/typing.nit:555,37
               '=' ... ../src/syntax/typing.nit:555,35
               ../src/syntax/typing.nit:555,37--46
                 ../src/syntax/typing.nit:555,37
                   ../src/syntax/typing.nit:555,37
                   identifier 'v' ... ../src/syntax/typing.nit:555,37
+                  ../src/syntax/typing.nit:555,37
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:555,39--46
-          ../src/syntax/typing.nit:558,3--26
+                ../src/syntax/typing.nit:555,37
+          ../src/syntax/typing.nit:558,3--27
             ../src/syntax/typing.nit:558,26
             identifier 'process_control_inside' ... ../src/syntax/typing.nit:558,3--24
-            ../src/syntax/typing.nit:558,26
+            ../src/syntax/typing.nit:558,25--27
+              '(' ... ../src/syntax/typing.nit:558,25
               ../src/syntax/typing.nit:558,26
-              identifier 'v' ... ../src/syntax/typing.nit:558,26
+                ../src/syntax/typing.nit:558,26
+                identifier 'v' ... ../src/syntax/typing.nit:558,26
+                ../src/syntax/typing.nit:558,26
+              ')' ... ../src/syntax/typing.nit:558,27
           ../src/syntax/typing.nit:561,3--563,5
             keyword 'if' ... ../src/syntax/typing.nit:561,3--4
             ../src/syntax/typing.nit:561,6--27
@@ -3387,21 +4081,31 @@
                   ../src/syntax/typing.nit:561,10
                     ../src/syntax/typing.nit:561,10
                     identifier 'v' ... ../src/syntax/typing.nit:561,10
+                    ../src/syntax/typing.nit:561,10
                   identifier 'flow_ctx' ... ../src/syntax/typing.nit:561,12--19
+                  ../src/syntax/typing.nit:561,10
                 identifier 'unreash' ... ../src/syntax/typing.nit:561,21--27
-            ../src/syntax/typing.nit:562,4--47
-              ../src/syntax/typing.nit:562,4--47
+                ../src/syntax/typing.nit:561,10
+            ../src/syntax/typing.nit:562,4--48
+              ../src/syntax/typing.nit:562,4--48
                 ../src/syntax/typing.nit:562,4--32
                   ../src/syntax/typing.nit:562,4--12
                     ../src/syntax/typing.nit:562,4
                     identifier 'escapable' ... ../src/syntax/typing.nit:562,4--12
+                    ../src/syntax/typing.nit:562,4
                   identifier 'break_flow_contexts' ... ../src/syntax/typing.nit:562,14--32
+                  ../src/syntax/typing.nit:562,4
                 identifier 'add' ... ../src/syntax/typing.nit:562,34--36
-                ../src/syntax/typing.nit:562,38--47
-                  ../src/syntax/typing.nit:562,38
+                ../src/syntax/typing.nit:562,37--48
+                  '(' ... ../src/syntax/typing.nit:562,37
+                  ../src/syntax/typing.nit:562,38--47
+                    ../src/syntax/typing.nit:562,38
+                      ../src/syntax/typing.nit:562,38
+                      identifier 'v' ... ../src/syntax/typing.nit:562,38
+                      ../src/syntax/typing.nit:562,38
+                    identifier 'flow_ctx' ... ../src/syntax/typing.nit:562,40--47
                     ../src/syntax/typing.nit:562,38
-                    identifier 'v' ... ../src/syntax/typing.nit:562,38
-                  identifier 'flow_ctx' ... ../src/syntax/typing.nit:562,40--47
+                  ')' ... ../src/syntax/typing.nit:562,48
             ../src/syntax/typing.nit:563,3--5
               keyword 'end' ... ../src/syntax/typing.nit:563,3--5
           ../src/syntax/typing.nit:566,3--571,5
@@ -3411,66 +4115,91 @@
                 ../src/syntax/typing.nit:566,6--14
                   ../src/syntax/typing.nit:566,6
                   identifier 'escapable' ... ../src/syntax/typing.nit:566,6--14
+                  ../src/syntax/typing.nit:566,6
                 identifier 'break_flow_contexts' ... ../src/syntax/typing.nit:566,16--34
+                ../src/syntax/typing.nit:566,6
               identifier 'is_empty' ... ../src/syntax/typing.nit:566,36--43
-            ../src/syntax/typing.nit:567,4--568,22
+              ../src/syntax/typing.nit:566,6
+            ../src/syntax/typing.nit:567,4--568,23
               ../src/syntax/typing.nit:567,4--28
                 ../src/syntax/typing.nit:567,4
                   ../src/syntax/typing.nit:567,4
                   identifier 'v' ... ../src/syntax/typing.nit:567,4
+                  ../src/syntax/typing.nit:567,4
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:567,6--13
+                ../src/syntax/typing.nit:567,17
                 '=' ... ../src/syntax/typing.nit:567,15
                 ../src/syntax/typing.nit:567,17--28
                   ../src/syntax/typing.nit:567,17
                   identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:567,17--28
-              ../src/syntax/typing.nit:568,4--22
+                  ../src/syntax/typing.nit:567,17
+              ../src/syntax/typing.nit:568,4--23
                 ../src/syntax/typing.nit:568,4
                   ../src/syntax/typing.nit:568,4
                   identifier 'v' ... ../src/syntax/typing.nit:568,4
+                  ../src/syntax/typing.nit:568,4
                 identifier 'mark_unreash' ... ../src/syntax/typing.nit:568,6--17
-                ../src/syntax/typing.nit:568,19--22
-                  keyword 'self' ... ../src/syntax/typing.nit:568,19--22
+                ../src/syntax/typing.nit:568,18--23
+                  '(' ... ../src/syntax/typing.nit:568,18
+                  ../src/syntax/typing.nit:568,19--22
+                    keyword 'self' ... ../src/syntax/typing.nit:568,19--22
+                  ')' ... ../src/syntax/typing.nit:568,23
             ../src/syntax/typing.nit:570,4--571,5
-              ../src/syntax/typing.nit:570,4--75
+              ../src/syntax/typing.nit:570,4--76
                 ../src/syntax/typing.nit:570,4
                   ../src/syntax/typing.nit:570,4
                   identifier 'v' ... ../src/syntax/typing.nit:570,4
+                  ../src/syntax/typing.nit:570,4
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:570,6--13
+                ../src/syntax/typing.nit:570,17
                 '=' ... ../src/syntax/typing.nit:570,15
-                ../src/syntax/typing.nit:570,17--75
+                ../src/syntax/typing.nit:570,17--76
                   ../src/syntax/typing.nit:570,17--33
                     ../src/syntax/typing.nit:570,17
                     identifier 'old_base_flow_ctx' ... ../src/syntax/typing.nit:570,17--33
+                    ../src/syntax/typing.nit:570,17
                   identifier 'merge' ... ../src/syntax/typing.nit:570,35--39
-                  ../src/syntax/typing.nit:570,41--44
-                    keyword 'self' ... ../src/syntax/typing.nit:570,41--44
-                  ../src/syntax/typing.nit:570,47--75
-                    ../src/syntax/typing.nit:570,47--55
+                  ../src/syntax/typing.nit:570,40--76
+                    '(' ... ../src/syntax/typing.nit:570,40
+                    ../src/syntax/typing.nit:570,41--44
+                      keyword 'self' ... ../src/syntax/typing.nit:570,41--44
+                    ../src/syntax/typing.nit:570,47--75
+                      ../src/syntax/typing.nit:570,47--55
+                        ../src/syntax/typing.nit:570,47
+                        identifier 'escapable' ... ../src/syntax/typing.nit:570,47--55
+                        ../src/syntax/typing.nit:570,47
+                      identifier 'break_flow_contexts' ... ../src/syntax/typing.nit:570,57--75
                       ../src/syntax/typing.nit:570,47
-                      identifier 'escapable' ... ../src/syntax/typing.nit:570,47--55
-                    identifier 'break_flow_contexts' ... ../src/syntax/typing.nit:570,57--75
+                    ')' ... ../src/syntax/typing.nit:570,76
               keyword 'end' ... ../src/syntax/typing.nit:571,3--5
           ../src/syntax/typing.nit:573,3--53
             keyword 'if' ... ../src/syntax/typing.nit:573,3--4
             ../src/syntax/typing.nit:573,6--12
               ../src/syntax/typing.nit:573,6
               identifier 'is_loop' ... ../src/syntax/typing.nit:573,6--12
+              ../src/syntax/typing.nit:573,6
             ../src/syntax/typing.nit:573,19--53
               ../src/syntax/typing.nit:573,19
                 ../src/syntax/typing.nit:573,19
                 identifier 'v' ... ../src/syntax/typing.nit:573,19
+                ../src/syntax/typing.nit:573,19
               identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:573,21--33
+              ../src/syntax/typing.nit:573,37
               '=' ... ../src/syntax/typing.nit:573,35
               ../src/syntax/typing.nit:573,37--53
                 ../src/syntax/typing.nit:573,37
                 identifier 'old_base_flow_ctx' ... ../src/syntax/typing.nit:573,37--53
+                ../src/syntax/typing.nit:573,37
           ../src/syntax/typing.nit:574,3--17
             ../src/syntax/typing.nit:574,3--13
               ../src/syntax/typing.nit:574,3
                 ../src/syntax/typing.nit:574,3
                 identifier 'v' ... ../src/syntax/typing.nit:574,3
+                ../src/syntax/typing.nit:574,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:574,5--13
+              ../src/syntax/typing.nit:574,3
             identifier 'pop' ... ../src/syntax/typing.nit:574,15--17
+            ../src/syntax/typing.nit:574,3
           ../src/syntax/typing.nit:575,3--18
             ../src/syntax/typing.nit:575,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:575,3--11
@@ -3513,23 +4242,31 @@
           ../src/syntax/typing.nit:584,26
             identifier 'v' ... ../src/syntax/typing.nit:584,26
         ../src/syntax/typing.nit:586,3--587,4
-          ../src/syntax/typing.nit:586,3--70
+          ../src/syntax/typing.nit:586,3--71
             ../src/syntax/typing.nit:586,19
             identifier 'process_control' ... ../src/syntax/typing.nit:586,3--17
-            ../src/syntax/typing.nit:586,19
+            ../src/syntax/typing.nit:586,18--71
+              '(' ... ../src/syntax/typing.nit:586,18
               ../src/syntax/typing.nit:586,19
-              identifier 'v' ... ../src/syntax/typing.nit:586,19
-            ../src/syntax/typing.nit:586,22--53
-              keyword 'new' ... ../src/syntax/typing.nit:586,22--24
-              ../src/syntax/typing.nit:586,26--48
-                type identifier 'BreakOnlyEscapableBlock' ... ../src/syntax/typing.nit:586,26--48
-              ../src/syntax/typing.nit:586,50--53
-                keyword 'self' ... ../src/syntax/typing.nit:586,50--53
-            ../src/syntax/typing.nit:586,57--63
-              ../src/syntax/typing.nit:586,57
-              identifier 'n_label' ... ../src/syntax/typing.nit:586,57--63
-            ../src/syntax/typing.nit:586,66--70
-              keyword 'false' ... ../src/syntax/typing.nit:586,66--70
+                ../src/syntax/typing.nit:586,19
+                identifier 'v' ... ../src/syntax/typing.nit:586,19
+                ../src/syntax/typing.nit:586,19
+              ../src/syntax/typing.nit:586,22--54
+                keyword 'new' ... ../src/syntax/typing.nit:586,22--24
+                ../src/syntax/typing.nit:586,26--48
+                  type identifier 'BreakOnlyEscapableBlock' ... ../src/syntax/typing.nit:586,26--48
+                ../src/syntax/typing.nit:586,49--54
+                  '(' ... ../src/syntax/typing.nit:586,49
+                  ../src/syntax/typing.nit:586,50--53
+                    keyword 'self' ... ../src/syntax/typing.nit:586,50--53
+                  ')' ... ../src/syntax/typing.nit:586,54
+              ../src/syntax/typing.nit:586,57--63
+                ../src/syntax/typing.nit:586,57
+                identifier 'n_label' ... ../src/syntax/typing.nit:586,57--63
+                ../src/syntax/typing.nit:586,57
+              ../src/syntax/typing.nit:586,66--70
+                keyword 'false' ... ../src/syntax/typing.nit:586,66--70
+              ')' ... ../src/syntax/typing.nit:586,71
           keyword 'end' ... ../src/syntax/typing.nit:587,2--4
       ../src/syntax/typing.nit:589,2--592,4
         keyword 'redef' ... ../src/syntax/typing.nit:589,2--6
@@ -3541,14 +4278,19 @@
           ../src/syntax/typing.nit:589,35
             identifier 'v' ... ../src/syntax/typing.nit:589,35
         ../src/syntax/typing.nit:591,3--592,4
-          ../src/syntax/typing.nit:591,3--29
+          ../src/syntax/typing.nit:591,3--30
             ../src/syntax/typing.nit:591,3
               ../src/syntax/typing.nit:591,3
               identifier 'v' ... ../src/syntax/typing.nit:591,3
+              ../src/syntax/typing.nit:591,3
             identifier 'enter_visit_block' ... ../src/syntax/typing.nit:591,5--21
-            ../src/syntax/typing.nit:591,23--29
-              ../src/syntax/typing.nit:591,23
-              identifier 'n_block' ... ../src/syntax/typing.nit:591,23--29
+            ../src/syntax/typing.nit:591,22--30
+              '(' ... ../src/syntax/typing.nit:591,22
+              ../src/syntax/typing.nit:591,23--29
+                ../src/syntax/typing.nit:591,23
+                identifier 'n_block' ... ../src/syntax/typing.nit:591,23--29
+                ../src/syntax/typing.nit:591,23
+              ')' ... ../src/syntax/typing.nit:591,30
           keyword 'end' ... ../src/syntax/typing.nit:592,2--4
       keyword 'end' ... ../src/syntax/typing.nit:593,1--3
     ../src/syntax/typing.nit:595,1--624,3
@@ -3567,35 +4309,52 @@
           ../src/syntax/typing.nit:596,26
             identifier 'v' ... ../src/syntax/typing.nit:596,26
         ../src/syntax/typing.nit:598,3--623,4
-          ../src/syntax/typing.nit:598,3--22
+          ../src/syntax/typing.nit:598,3--23
             ../src/syntax/typing.nit:598,3
               ../src/syntax/typing.nit:598,3
               identifier 'v' ... ../src/syntax/typing.nit:598,3
+              ../src/syntax/typing.nit:598,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:598,5--15
-            ../src/syntax/typing.nit:598,17--22
-              ../src/syntax/typing.nit:598,17
-              identifier 'n_expr' ... ../src/syntax/typing.nit:598,17--22
-          ../src/syntax/typing.nit:599,3--42
+            ../src/syntax/typing.nit:598,16--23
+              '(' ... ../src/syntax/typing.nit:598,16
+              ../src/syntax/typing.nit:598,17--22
+                ../src/syntax/typing.nit:598,17
+                identifier 'n_expr' ... ../src/syntax/typing.nit:598,17--22
+                ../src/syntax/typing.nit:598,17
+              ')' ... ../src/syntax/typing.nit:598,23
+          ../src/syntax/typing.nit:599,3--43
             ../src/syntax/typing.nit:599,3
               ../src/syntax/typing.nit:599,3
               identifier 'v' ... ../src/syntax/typing.nit:599,3
+              ../src/syntax/typing.nit:599,3
             identifier 'check_conform_expr' ... ../src/syntax/typing.nit:599,5--22
-            ../src/syntax/typing.nit:599,24--29
-              ../src/syntax/typing.nit:599,24
-              identifier 'n_expr' ... ../src/syntax/typing.nit:599,24--29
-            ../src/syntax/typing.nit:599,32--42
-              ../src/syntax/typing.nit:599,32
+            ../src/syntax/typing.nit:599,23--43
+              '(' ... ../src/syntax/typing.nit:599,23
+              ../src/syntax/typing.nit:599,24--29
+                ../src/syntax/typing.nit:599,24
+                identifier 'n_expr' ... ../src/syntax/typing.nit:599,24--29
+                ../src/syntax/typing.nit:599,24
+              ../src/syntax/typing.nit:599,32--42
+                ../src/syntax/typing.nit:599,32
+                  ../src/syntax/typing.nit:599,32
+                  identifier 'v' ... ../src/syntax/typing.nit:599,32
+                  ../src/syntax/typing.nit:599,32
+                identifier 'type_bool' ... ../src/syntax/typing.nit:599,34--42
                 ../src/syntax/typing.nit:599,32
-                identifier 'v' ... ../src/syntax/typing.nit:599,32
-              identifier 'type_bool' ... ../src/syntax/typing.nit:599,34--42
-          ../src/syntax/typing.nit:601,3--27
+              ')' ... ../src/syntax/typing.nit:599,43
+          ../src/syntax/typing.nit:601,3--28
             ../src/syntax/typing.nit:601,3--8
               ../src/syntax/typing.nit:601,3
               identifier 'n_expr' ... ../src/syntax/typing.nit:601,3--8
+              ../src/syntax/typing.nit:601,3
             identifier 'warn_parentheses' ... ../src/syntax/typing.nit:601,10--25
-            ../src/syntax/typing.nit:601,27
+            ../src/syntax/typing.nit:601,26--28
+              '(' ... ../src/syntax/typing.nit:601,26
               ../src/syntax/typing.nit:601,27
-              identifier 'v' ... ../src/syntax/typing.nit:601,27
+                ../src/syntax/typing.nit:601,27
+                identifier 'v' ... ../src/syntax/typing.nit:601,27
+                ../src/syntax/typing.nit:601,27
+              ')' ... ../src/syntax/typing.nit:601,28
           ../src/syntax/typing.nit:604,3--31
             keyword 'var' ... ../src/syntax/typing.nit:604,3--5
             identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:604,7--18
@@ -3604,23 +4363,35 @@
               ../src/syntax/typing.nit:604,22
                 ../src/syntax/typing.nit:604,22
                 identifier 'v' ... ../src/syntax/typing.nit:604,22
+                ../src/syntax/typing.nit:604,22
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:604,24--31
-          ../src/syntax/typing.nit:605,3--31
+              ../src/syntax/typing.nit:604,22
+          ../src/syntax/typing.nit:605,3--32
             ../src/syntax/typing.nit:605,3
               ../src/syntax/typing.nit:605,3
               identifier 'v' ... ../src/syntax/typing.nit:605,3
+              ../src/syntax/typing.nit:605,3
             identifier 'use_if_true_flow_ctx' ... ../src/syntax/typing.nit:605,5--24
-            ../src/syntax/typing.nit:605,26--31
-              ../src/syntax/typing.nit:605,26
-              identifier 'n_expr' ... ../src/syntax/typing.nit:605,26--31
-          ../src/syntax/typing.nit:608,3--28
+            ../src/syntax/typing.nit:605,25--32
+              '(' ... ../src/syntax/typing.nit:605,25
+              ../src/syntax/typing.nit:605,26--31
+                ../src/syntax/typing.nit:605,26
+                identifier 'n_expr' ... ../src/syntax/typing.nit:605,26--31
+                ../src/syntax/typing.nit:605,26
+              ')' ... ../src/syntax/typing.nit:605,32
+          ../src/syntax/typing.nit:608,3--29
             ../src/syntax/typing.nit:608,3
               ../src/syntax/typing.nit:608,3
               identifier 'v' ... ../src/syntax/typing.nit:608,3
+              ../src/syntax/typing.nit:608,3
             identifier 'enter_visit_block' ... ../src/syntax/typing.nit:608,5--21
-            ../src/syntax/typing.nit:608,23--28
-              ../src/syntax/typing.nit:608,23
-              identifier 'n_then' ... ../src/syntax/typing.nit:608,23--28
+            ../src/syntax/typing.nit:608,22--29
+              '(' ... ../src/syntax/typing.nit:608,22
+              ../src/syntax/typing.nit:608,23--28
+                ../src/syntax/typing.nit:608,23
+                identifier 'n_then' ... ../src/syntax/typing.nit:608,23--28
+                ../src/syntax/typing.nit:608,23
+              ')' ... ../src/syntax/typing.nit:608,29
           ../src/syntax/typing.nit:611,3--32
             keyword 'var' ... ../src/syntax/typing.nit:611,3--5
             identifier 'then_flow_ctx' ... ../src/syntax/typing.nit:611,7--19
@@ -3629,55 +4400,80 @@
               ../src/syntax/typing.nit:611,23
                 ../src/syntax/typing.nit:611,23
                 identifier 'v' ... ../src/syntax/typing.nit:611,23
+                ../src/syntax/typing.nit:611,23
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:611,25--32
+              ../src/syntax/typing.nit:611,23
           ../src/syntax/typing.nit:614,3--27
             ../src/syntax/typing.nit:614,3
               ../src/syntax/typing.nit:614,3
               identifier 'v' ... ../src/syntax/typing.nit:614,3
+              ../src/syntax/typing.nit:614,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:614,5--12
+            ../src/syntax/typing.nit:614,16
             '=' ... ../src/syntax/typing.nit:614,14
             ../src/syntax/typing.nit:614,16--27
               ../src/syntax/typing.nit:614,16
               identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:614,16--27
-          ../src/syntax/typing.nit:615,3--32
+              ../src/syntax/typing.nit:614,16
+          ../src/syntax/typing.nit:615,3--33
             ../src/syntax/typing.nit:615,3
               ../src/syntax/typing.nit:615,3
               identifier 'v' ... ../src/syntax/typing.nit:615,3
+              ../src/syntax/typing.nit:615,3
             identifier 'use_if_false_flow_ctx' ... ../src/syntax/typing.nit:615,5--25
-            ../src/syntax/typing.nit:615,27--32
-              ../src/syntax/typing.nit:615,27
-              identifier 'n_expr' ... ../src/syntax/typing.nit:615,27--32
-          ../src/syntax/typing.nit:618,3--28
+            ../src/syntax/typing.nit:615,26--33
+              '(' ... ../src/syntax/typing.nit:615,26
+              ../src/syntax/typing.nit:615,27--32
+                ../src/syntax/typing.nit:615,27
+                identifier 'n_expr' ... ../src/syntax/typing.nit:615,27--32
+                ../src/syntax/typing.nit:615,27
+              ')' ... ../src/syntax/typing.nit:615,33
+          ../src/syntax/typing.nit:618,3--29
             ../src/syntax/typing.nit:618,3
               ../src/syntax/typing.nit:618,3
               identifier 'v' ... ../src/syntax/typing.nit:618,3
+              ../src/syntax/typing.nit:618,3
             identifier 'enter_visit_block' ... ../src/syntax/typing.nit:618,5--21
-            ../src/syntax/typing.nit:618,23--28
-              ../src/syntax/typing.nit:618,23
-              identifier 'n_else' ... ../src/syntax/typing.nit:618,23--28
-          ../src/syntax/typing.nit:621,3--74
+            ../src/syntax/typing.nit:618,22--29
+              '(' ... ../src/syntax/typing.nit:618,22
+              ../src/syntax/typing.nit:618,23--28
+                ../src/syntax/typing.nit:618,23
+                identifier 'n_else' ... ../src/syntax/typing.nit:618,23--28
+                ../src/syntax/typing.nit:618,23
+              ')' ... ../src/syntax/typing.nit:618,29
+          ../src/syntax/typing.nit:621,3--75
             ../src/syntax/typing.nit:621,3
               ../src/syntax/typing.nit:621,3
               identifier 'v' ... ../src/syntax/typing.nit:621,3
+              ../src/syntax/typing.nit:621,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:621,5--12
+            ../src/syntax/typing.nit:621,16
             '=' ... ../src/syntax/typing.nit:621,14
-            ../src/syntax/typing.nit:621,16--74
+            ../src/syntax/typing.nit:621,16--75
               ../src/syntax/typing.nit:621,16--30
                 ../src/syntax/typing.nit:621,16
                   ../src/syntax/typing.nit:621,16
                   identifier 'v' ... ../src/syntax/typing.nit:621,16
+                  ../src/syntax/typing.nit:621,16
                 identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:621,18--30
+                ../src/syntax/typing.nit:621,16
               identifier 'merge_reash' ... ../src/syntax/typing.nit:621,32--42
-              ../src/syntax/typing.nit:621,44--47
-                keyword 'self' ... ../src/syntax/typing.nit:621,44--47
-              ../src/syntax/typing.nit:621,50--62
-                ../src/syntax/typing.nit:621,50
-                identifier 'then_flow_ctx' ... ../src/syntax/typing.nit:621,50--62
-              ../src/syntax/typing.nit:621,65--74
-                ../src/syntax/typing.nit:621,65
+              ../src/syntax/typing.nit:621,43--75
+                '(' ... ../src/syntax/typing.nit:621,43
+                ../src/syntax/typing.nit:621,44--47
+                  keyword 'self' ... ../src/syntax/typing.nit:621,44--47
+                ../src/syntax/typing.nit:621,50--62
+                  ../src/syntax/typing.nit:621,50
+                  identifier 'then_flow_ctx' ... ../src/syntax/typing.nit:621,50--62
+                  ../src/syntax/typing.nit:621,50
+                ../src/syntax/typing.nit:621,65--74
                   ../src/syntax/typing.nit:621,65
-                  identifier 'v' ... ../src/syntax/typing.nit:621,65
-                identifier 'flow_ctx' ... ../src/syntax/typing.nit:621,67--74
+                    ../src/syntax/typing.nit:621,65
+                    identifier 'v' ... ../src/syntax/typing.nit:621,65
+                    ../src/syntax/typing.nit:621,65
+                  identifier 'flow_ctx' ... ../src/syntax/typing.nit:621,67--74
+                  ../src/syntax/typing.nit:621,65
+                ')' ... ../src/syntax/typing.nit:621,75
           ../src/syntax/typing.nit:622,3--18
             ../src/syntax/typing.nit:622,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:622,3--11
@@ -3706,23 +4502,31 @@
           ../src/syntax/typing.nit:628,26
             identifier 'v' ... ../src/syntax/typing.nit:628,26
         ../src/syntax/typing.nit:630,3--631,4
-          ../src/syntax/typing.nit:630,3--60
+          ../src/syntax/typing.nit:630,3--61
             ../src/syntax/typing.nit:630,19
             identifier 'process_control' ... ../src/syntax/typing.nit:630,3--17
-            ../src/syntax/typing.nit:630,19
+            ../src/syntax/typing.nit:630,18--61
+              '(' ... ../src/syntax/typing.nit:630,18
               ../src/syntax/typing.nit:630,19
-              identifier 'v' ... ../src/syntax/typing.nit:630,19
-            ../src/syntax/typing.nit:630,22--44
-              keyword 'new' ... ../src/syntax/typing.nit:630,22--24
-              ../src/syntax/typing.nit:630,26--39
-                type identifier 'EscapableBlock' ... ../src/syntax/typing.nit:630,26--39
-              ../src/syntax/typing.nit:630,41--44
-                keyword 'self' ... ../src/syntax/typing.nit:630,41--44
-            ../src/syntax/typing.nit:630,48--54
-              ../src/syntax/typing.nit:630,48
-              identifier 'n_label' ... ../src/syntax/typing.nit:630,48--54
-            ../src/syntax/typing.nit:630,57--60
-              keyword 'true' ... ../src/syntax/typing.nit:630,57--60
+                ../src/syntax/typing.nit:630,19
+                identifier 'v' ... ../src/syntax/typing.nit:630,19
+                ../src/syntax/typing.nit:630,19
+              ../src/syntax/typing.nit:630,22--45
+                keyword 'new' ... ../src/syntax/typing.nit:630,22--24
+                ../src/syntax/typing.nit:630,26--39
+                  type identifier 'EscapableBlock' ... ../src/syntax/typing.nit:630,26--39
+                ../src/syntax/typing.nit:630,40--45
+                  '(' ... ../src/syntax/typing.nit:630,40
+                  ../src/syntax/typing.nit:630,41--44
+                    keyword 'self' ... ../src/syntax/typing.nit:630,41--44
+                  ')' ... ../src/syntax/typing.nit:630,45
+              ../src/syntax/typing.nit:630,48--54
+                ../src/syntax/typing.nit:630,48
+                identifier 'n_label' ... ../src/syntax/typing.nit:630,48--54
+                ../src/syntax/typing.nit:630,48
+              ../src/syntax/typing.nit:630,57--60
+                keyword 'true' ... ../src/syntax/typing.nit:630,57--60
+              ')' ... ../src/syntax/typing.nit:630,61
           keyword 'end' ... ../src/syntax/typing.nit:631,2--4
       ../src/syntax/typing.nit:633,2--657,4
         keyword 'redef' ... ../src/syntax/typing.nit:633,2--6
@@ -3742,101 +4546,150 @@
               ../src/syntax/typing.nit:635,22
                 ../src/syntax/typing.nit:635,22
                 identifier 'v' ... ../src/syntax/typing.nit:635,22
+                ../src/syntax/typing.nit:635,22
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:635,24--31
-          ../src/syntax/typing.nit:638,3--22
+              ../src/syntax/typing.nit:635,22
+          ../src/syntax/typing.nit:638,3--23
             ../src/syntax/typing.nit:638,3
               ../src/syntax/typing.nit:638,3
               identifier 'v' ... ../src/syntax/typing.nit:638,3
+              ../src/syntax/typing.nit:638,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:638,5--15
-            ../src/syntax/typing.nit:638,17--22
-              ../src/syntax/typing.nit:638,17
-              identifier 'n_expr' ... ../src/syntax/typing.nit:638,17--22
-          ../src/syntax/typing.nit:639,3--42
+            ../src/syntax/typing.nit:638,16--23
+              '(' ... ../src/syntax/typing.nit:638,16
+              ../src/syntax/typing.nit:638,17--22
+                ../src/syntax/typing.nit:638,17
+                identifier 'n_expr' ... ../src/syntax/typing.nit:638,17--22
+                ../src/syntax/typing.nit:638,17
+              ')' ... ../src/syntax/typing.nit:638,23
+          ../src/syntax/typing.nit:639,3--43
             ../src/syntax/typing.nit:639,3
               ../src/syntax/typing.nit:639,3
               identifier 'v' ... ../src/syntax/typing.nit:639,3
+              ../src/syntax/typing.nit:639,3
             identifier 'check_conform_expr' ... ../src/syntax/typing.nit:639,5--22
-            ../src/syntax/typing.nit:639,24--29
-              ../src/syntax/typing.nit:639,24
-              identifier 'n_expr' ... ../src/syntax/typing.nit:639,24--29
-            ../src/syntax/typing.nit:639,32--42
-              ../src/syntax/typing.nit:639,32
+            ../src/syntax/typing.nit:639,23--43
+              '(' ... ../src/syntax/typing.nit:639,23
+              ../src/syntax/typing.nit:639,24--29
+                ../src/syntax/typing.nit:639,24
+                identifier 'n_expr' ... ../src/syntax/typing.nit:639,24--29
+                ../src/syntax/typing.nit:639,24
+              ../src/syntax/typing.nit:639,32--42
+                ../src/syntax/typing.nit:639,32
+                  ../src/syntax/typing.nit:639,32
+                  identifier 'v' ... ../src/syntax/typing.nit:639,32
+                  ../src/syntax/typing.nit:639,32
+                identifier 'type_bool' ... ../src/syntax/typing.nit:639,34--42
                 ../src/syntax/typing.nit:639,32
-                identifier 'v' ... ../src/syntax/typing.nit:639,32
-              identifier 'type_bool' ... ../src/syntax/typing.nit:639,34--42
+              ')' ... ../src/syntax/typing.nit:639,43
           ../src/syntax/typing.nit:641,3--645,5
             keyword 'if' ... ../src/syntax/typing.nit:641,3--4
             ../src/syntax/typing.nit:641,6--25
               ../src/syntax/typing.nit:641,6--11
                 ../src/syntax/typing.nit:641,6
                 identifier 'n_expr' ... ../src/syntax/typing.nit:641,6--11
+                ../src/syntax/typing.nit:641,6
               ../src/syntax/typing.nit:641,17--25
                 type identifier 'ATrueExpr' ... ../src/syntax/typing.nit:641,17--25
-            ../src/syntax/typing.nit:642,4--68
-              ../src/syntax/typing.nit:642,4--68
+            ../src/syntax/typing.nit:642,4--69
+              ../src/syntax/typing.nit:642,4--69
                 ../src/syntax/typing.nit:642,4
                   ../src/syntax/typing.nit:642,4
                   identifier 'v' ... ../src/syntax/typing.nit:642,4
+                  ../src/syntax/typing.nit:642,4
                 identifier 'warning' ... ../src/syntax/typing.nit:642,6--12
-                ../src/syntax/typing.nit:642,14--17
-                  keyword 'self' ... ../src/syntax/typing.nit:642,14--17
-                ../src/syntax/typing.nit:642,20--68
-                  literal value '"Warning: use 'loop' instead of 'while true do'."' ... ../src/syntax/typing.nit:642,20--68
+                ../src/syntax/typing.nit:642,13--69
+                  '(' ... ../src/syntax/typing.nit:642,13
+                  ../src/syntax/typing.nit:642,14--17
+                    keyword 'self' ... ../src/syntax/typing.nit:642,14--17
+                  ../src/syntax/typing.nit:642,20--68
+                    literal value '"Warning: use 'loop' instead of 'while true do'."' ... ../src/syntax/typing.nit:642,20--68
+                  ')' ... ../src/syntax/typing.nit:642,69
             ../src/syntax/typing.nit:644,4--645,5
-              ../src/syntax/typing.nit:644,4--28
+              ../src/syntax/typing.nit:644,4--29
                 ../src/syntax/typing.nit:644,4--9
                   ../src/syntax/typing.nit:644,4
                   identifier 'n_expr' ... ../src/syntax/typing.nit:644,4--9
+                  ../src/syntax/typing.nit:644,4
                 identifier 'warn_parentheses' ... ../src/syntax/typing.nit:644,11--26
-                ../src/syntax/typing.nit:644,28
+                ../src/syntax/typing.nit:644,27--29
+                  '(' ... ../src/syntax/typing.nit:644,27
                   ../src/syntax/typing.nit:644,28
-                  identifier 'v' ... ../src/syntax/typing.nit:644,28
+                    ../src/syntax/typing.nit:644,28
+                    identifier 'v' ... ../src/syntax/typing.nit:644,28
+                    ../src/syntax/typing.nit:644,28
+                  ')' ... ../src/syntax/typing.nit:644,29
               keyword 'end' ... ../src/syntax/typing.nit:645,3--5
-          ../src/syntax/typing.nit:648,3--31
+          ../src/syntax/typing.nit:648,3--32
             ../src/syntax/typing.nit:648,3
               ../src/syntax/typing.nit:648,3
               identifier 'v' ... ../src/syntax/typing.nit:648,3
+              ../src/syntax/typing.nit:648,3
             identifier 'use_if_true_flow_ctx' ... ../src/syntax/typing.nit:648,5--24
-            ../src/syntax/typing.nit:648,26--31
-              ../src/syntax/typing.nit:648,26
-              identifier 'n_expr' ... ../src/syntax/typing.nit:648,26--31
-          ../src/syntax/typing.nit:651,3--29
+            ../src/syntax/typing.nit:648,25--32
+              '(' ... ../src/syntax/typing.nit:648,25
+              ../src/syntax/typing.nit:648,26--31
+                ../src/syntax/typing.nit:648,26
+                identifier 'n_expr' ... ../src/syntax/typing.nit:648,26--31
+                ../src/syntax/typing.nit:648,26
+              ')' ... ../src/syntax/typing.nit:648,32
+          ../src/syntax/typing.nit:651,3--30
             ../src/syntax/typing.nit:651,3
               ../src/syntax/typing.nit:651,3
               identifier 'v' ... ../src/syntax/typing.nit:651,3
+              ../src/syntax/typing.nit:651,3
             identifier 'enter_visit_block' ... ../src/syntax/typing.nit:651,5--21
-            ../src/syntax/typing.nit:651,23--29
-              ../src/syntax/typing.nit:651,23
-              identifier 'n_block' ... ../src/syntax/typing.nit:651,23--29
+            ../src/syntax/typing.nit:651,22--30
+              '(' ... ../src/syntax/typing.nit:651,22
+              ../src/syntax/typing.nit:651,23--29
+                ../src/syntax/typing.nit:651,23
+                identifier 'n_block' ... ../src/syntax/typing.nit:651,23--29
+                ../src/syntax/typing.nit:651,23
+              ')' ... ../src/syntax/typing.nit:651,30
           ../src/syntax/typing.nit:654,3--27
             ../src/syntax/typing.nit:654,3
               ../src/syntax/typing.nit:654,3
               identifier 'v' ... ../src/syntax/typing.nit:654,3
+              ../src/syntax/typing.nit:654,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:654,5--12
+            ../src/syntax/typing.nit:654,16
             '=' ... ../src/syntax/typing.nit:654,14
             ../src/syntax/typing.nit:654,16--27
               ../src/syntax/typing.nit:654,16
               identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:654,16--27
-          ../src/syntax/typing.nit:655,3--32
+              ../src/syntax/typing.nit:654,16
+          ../src/syntax/typing.nit:655,3--33
             ../src/syntax/typing.nit:655,3
               ../src/syntax/typing.nit:655,3
               identifier 'v' ... ../src/syntax/typing.nit:655,3
+              ../src/syntax/typing.nit:655,3
             identifier 'use_if_false_flow_ctx' ... ../src/syntax/typing.nit:655,5--25
-            ../src/syntax/typing.nit:655,27--32
-              ../src/syntax/typing.nit:655,27
-              identifier 'n_expr' ... ../src/syntax/typing.nit:655,27--32
-          ../src/syntax/typing.nit:656,3--46
+            ../src/syntax/typing.nit:655,26--33
+              '(' ... ../src/syntax/typing.nit:655,26
+              ../src/syntax/typing.nit:655,27--32
+                ../src/syntax/typing.nit:655,27
+                identifier 'n_expr' ... ../src/syntax/typing.nit:655,27--32
+                ../src/syntax/typing.nit:655,27
+              ')' ... ../src/syntax/typing.nit:655,33
+          ../src/syntax/typing.nit:656,3--47
             ../src/syntax/typing.nit:656,3--31
               ../src/syntax/typing.nit:656,3--11
                 ../src/syntax/typing.nit:656,3
                 identifier 'escapable' ... ../src/syntax/typing.nit:656,3--11
+                ../src/syntax/typing.nit:656,3
               identifier 'break_flow_contexts' ... ../src/syntax/typing.nit:656,13--31
+              ../src/syntax/typing.nit:656,3
             identifier 'add' ... ../src/syntax/typing.nit:656,33--35
-            ../src/syntax/typing.nit:656,37--46
-              ../src/syntax/typing.nit:656,37
+            ../src/syntax/typing.nit:656,36--47
+              '(' ... ../src/syntax/typing.nit:656,36
+              ../src/syntax/typing.nit:656,37--46
                 ../src/syntax/typing.nit:656,37
-                identifier 'v' ... ../src/syntax/typing.nit:656,37
-              identifier 'flow_ctx' ... ../src/syntax/typing.nit:656,39--46
+                  ../src/syntax/typing.nit:656,37
+                  identifier 'v' ... ../src/syntax/typing.nit:656,37
+                  ../src/syntax/typing.nit:656,37
+                identifier 'flow_ctx' ... ../src/syntax/typing.nit:656,39--46
+                ../src/syntax/typing.nit:656,37
+              ')' ... ../src/syntax/typing.nit:656,47
           keyword 'end' ... ../src/syntax/typing.nit:657,2--4
       keyword 'end' ... ../src/syntax/typing.nit:658,1--3
     ../src/syntax/typing.nit:660,1--675,3
@@ -3859,23 +4712,31 @@
           ../src/syntax/typing.nit:662,26
             identifier 'v' ... ../src/syntax/typing.nit:662,26
         ../src/syntax/typing.nit:664,3--665,4
-          ../src/syntax/typing.nit:664,3--60
+          ../src/syntax/typing.nit:664,3--61
             ../src/syntax/typing.nit:664,19
             identifier 'process_control' ... ../src/syntax/typing.nit:664,3--17
-            ../src/syntax/typing.nit:664,19
+            ../src/syntax/typing.nit:664,18--61
+              '(' ... ../src/syntax/typing.nit:664,18
               ../src/syntax/typing.nit:664,19
-              identifier 'v' ... ../src/syntax/typing.nit:664,19
-            ../src/syntax/typing.nit:664,22--44
-              keyword 'new' ... ../src/syntax/typing.nit:664,22--24
-              ../src/syntax/typing.nit:664,26--39
-                type identifier 'EscapableBlock' ... ../src/syntax/typing.nit:664,26--39
-              ../src/syntax/typing.nit:664,41--44
-                keyword 'self' ... ../src/syntax/typing.nit:664,41--44
-            ../src/syntax/typing.nit:664,48--54
-              ../src/syntax/typing.nit:664,48
-              identifier 'n_label' ... ../src/syntax/typing.nit:664,48--54
-            ../src/syntax/typing.nit:664,57--60
-              keyword 'true' ... ../src/syntax/typing.nit:664,57--60
+                ../src/syntax/typing.nit:664,19
+                identifier 'v' ... ../src/syntax/typing.nit:664,19
+                ../src/syntax/typing.nit:664,19
+              ../src/syntax/typing.nit:664,22--45
+                keyword 'new' ... ../src/syntax/typing.nit:664,22--24
+                ../src/syntax/typing.nit:664,26--39
+                  type identifier 'EscapableBlock' ... ../src/syntax/typing.nit:664,26--39
+                ../src/syntax/typing.nit:664,40--45
+                  '(' ... ../src/syntax/typing.nit:664,40
+                  ../src/syntax/typing.nit:664,41--44
+                    keyword 'self' ... ../src/syntax/typing.nit:664,41--44
+                  ')' ... ../src/syntax/typing.nit:664,45
+              ../src/syntax/typing.nit:664,48--54
+                ../src/syntax/typing.nit:664,48
+                identifier 'n_label' ... ../src/syntax/typing.nit:664,48--54
+                ../src/syntax/typing.nit:664,48
+              ../src/syntax/typing.nit:664,57--60
+                keyword 'true' ... ../src/syntax/typing.nit:664,57--60
+              ')' ... ../src/syntax/typing.nit:664,61
           keyword 'end' ... ../src/syntax/typing.nit:665,2--4
       ../src/syntax/typing.nit:667,2--674,4
         keyword 'redef' ... ../src/syntax/typing.nit:667,2--6
@@ -3887,21 +4748,30 @@
           ../src/syntax/typing.nit:667,35
             identifier 'v' ... ../src/syntax/typing.nit:667,35
         ../src/syntax/typing.nit:670,3--674,4
-          ../src/syntax/typing.nit:670,3--29
+          ../src/syntax/typing.nit:670,3--30
             ../src/syntax/typing.nit:670,3
               ../src/syntax/typing.nit:670,3
               identifier 'v' ... ../src/syntax/typing.nit:670,3
+              ../src/syntax/typing.nit:670,3
             identifier 'enter_visit_block' ... ../src/syntax/typing.nit:670,5--21
-            ../src/syntax/typing.nit:670,23--29
-              ../src/syntax/typing.nit:670,23
-              identifier 'n_block' ... ../src/syntax/typing.nit:670,23--29
-          ../src/syntax/typing.nit:673,3--21
+            ../src/syntax/typing.nit:670,22--30
+              '(' ... ../src/syntax/typing.nit:670,22
+              ../src/syntax/typing.nit:670,23--29
+                ../src/syntax/typing.nit:670,23
+                identifier 'n_block' ... ../src/syntax/typing.nit:670,23--29
+                ../src/syntax/typing.nit:670,23
+              ')' ... ../src/syntax/typing.nit:670,30
+          ../src/syntax/typing.nit:673,3--22
             ../src/syntax/typing.nit:673,3
               ../src/syntax/typing.nit:673,3
               identifier 'v' ... ../src/syntax/typing.nit:673,3
+              ../src/syntax/typing.nit:673,3
             identifier 'mark_unreash' ... ../src/syntax/typing.nit:673,5--16
-            ../src/syntax/typing.nit:673,18--21
-              keyword 'self' ... ../src/syntax/typing.nit:673,18--21
+            ../src/syntax/typing.nit:673,17--22
+              '(' ... ../src/syntax/typing.nit:673,17
+              ../src/syntax/typing.nit:673,18--21
+                keyword 'self' ... ../src/syntax/typing.nit:673,18--21
+              ')' ... ../src/syntax/typing.nit:673,22
           keyword 'end' ... ../src/syntax/typing.nit:674,2--4
       keyword 'end' ... ../src/syntax/typing.nit:675,1--3
     ../src/syntax/typing.nit:677,1--760,3
@@ -3951,23 +4821,31 @@
           ../src/syntax/typing.nit:682,26
             identifier 'v' ... ../src/syntax/typing.nit:682,26
         ../src/syntax/typing.nit:684,3--685,4
-          ../src/syntax/typing.nit:684,3--60
+          ../src/syntax/typing.nit:684,3--61
             ../src/syntax/typing.nit:684,19
             identifier 'process_control' ... ../src/syntax/typing.nit:684,3--17
-            ../src/syntax/typing.nit:684,19
+            ../src/syntax/typing.nit:684,18--61
+              '(' ... ../src/syntax/typing.nit:684,18
               ../src/syntax/typing.nit:684,19
-              identifier 'v' ... ../src/syntax/typing.nit:684,19
-            ../src/syntax/typing.nit:684,22--44
-              keyword 'new' ... ../src/syntax/typing.nit:684,22--24
-              ../src/syntax/typing.nit:684,26--39
-                type identifier 'EscapableBlock' ... ../src/syntax/typing.nit:684,26--39
-              ../src/syntax/typing.nit:684,41--44
-                keyword 'self' ... ../src/syntax/typing.nit:684,41--44
-            ../src/syntax/typing.nit:684,48--54
-              ../src/syntax/typing.nit:684,48
-              identifier 'n_label' ... ../src/syntax/typing.nit:684,48--54
-            ../src/syntax/typing.nit:684,57--60
-              keyword 'true' ... ../src/syntax/typing.nit:684,57--60
+                ../src/syntax/typing.nit:684,19
+                identifier 'v' ... ../src/syntax/typing.nit:684,19
+                ../src/syntax/typing.nit:684,19
+              ../src/syntax/typing.nit:684,22--45
+                keyword 'new' ... ../src/syntax/typing.nit:684,22--24
+                ../src/syntax/typing.nit:684,26--39
+                  type identifier 'EscapableBlock' ... ../src/syntax/typing.nit:684,26--39
+                ../src/syntax/typing.nit:684,40--45
+                  '(' ... ../src/syntax/typing.nit:684,40
+                  ../src/syntax/typing.nit:684,41--44
+                    keyword 'self' ... ../src/syntax/typing.nit:684,41--44
+                  ')' ... ../src/syntax/typing.nit:684,45
+              ../src/syntax/typing.nit:684,48--54
+                ../src/syntax/typing.nit:684,48
+                identifier 'n_label' ... ../src/syntax/typing.nit:684,48--54
+                ../src/syntax/typing.nit:684,48
+              ../src/syntax/typing.nit:684,57--60
+                keyword 'true' ... ../src/syntax/typing.nit:684,57--60
+              ')' ... ../src/syntax/typing.nit:684,61
           keyword 'end' ... ../src/syntax/typing.nit:685,2--4
       ../src/syntax/typing.nit:687,2--700,4
         keyword 'redef' ... ../src/syntax/typing.nit:687,2--6
@@ -3979,15 +4857,20 @@
           ../src/syntax/typing.nit:687,35
             identifier 'v' ... ../src/syntax/typing.nit:687,35
         ../src/syntax/typing.nit:689,3--700,4
-          ../src/syntax/typing.nit:689,3--23
+          ../src/syntax/typing.nit:689,3--24
             ../src/syntax/typing.nit:689,3--13
               ../src/syntax/typing.nit:689,3
                 ../src/syntax/typing.nit:689,3
                 identifier 'v' ... ../src/syntax/typing.nit:689,3
+                ../src/syntax/typing.nit:689,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:689,5--13
+              ../src/syntax/typing.nit:689,3
             identifier 'push' ... ../src/syntax/typing.nit:689,15--18
-            ../src/syntax/typing.nit:689,20--23
-              keyword 'self' ... ../src/syntax/typing.nit:689,20--23
+            ../src/syntax/typing.nit:689,19--24
+              '(' ... ../src/syntax/typing.nit:689,19
+              ../src/syntax/typing.nit:689,20--23
+                keyword 'self' ... ../src/syntax/typing.nit:689,20--23
+              ')' ... ../src/syntax/typing.nit:689,24
           ../src/syntax/typing.nit:690,3--31
             keyword 'var' ... ../src/syntax/typing.nit:690,3--5
             identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:690,7--18
@@ -3996,37 +4879,54 @@
               ../src/syntax/typing.nit:690,22
                 ../src/syntax/typing.nit:690,22
                 identifier 'v' ... ../src/syntax/typing.nit:690,22
+                ../src/syntax/typing.nit:690,22
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:690,24--31
-          ../src/syntax/typing.nit:692,3--13
+              ../src/syntax/typing.nit:690,22
+          ../src/syntax/typing.nit:692,3--14
             ../src/syntax/typing.nit:692,13
             identifier 'do_typing' ... ../src/syntax/typing.nit:692,3--11
-            ../src/syntax/typing.nit:692,13
+            ../src/syntax/typing.nit:692,12--14
+              '(' ... ../src/syntax/typing.nit:692,12
               ../src/syntax/typing.nit:692,13
-              identifier 'v' ... ../src/syntax/typing.nit:692,13
-          ../src/syntax/typing.nit:695,3--29
+                ../src/syntax/typing.nit:692,13
+                identifier 'v' ... ../src/syntax/typing.nit:692,13
+                ../src/syntax/typing.nit:692,13
+              ')' ... ../src/syntax/typing.nit:692,14
+          ../src/syntax/typing.nit:695,3--30
             ../src/syntax/typing.nit:695,3
               ../src/syntax/typing.nit:695,3
               identifier 'v' ... ../src/syntax/typing.nit:695,3
+              ../src/syntax/typing.nit:695,3
             identifier 'enter_visit_block' ... ../src/syntax/typing.nit:695,5--21
-            ../src/syntax/typing.nit:695,23--29
-              ../src/syntax/typing.nit:695,23
-              identifier 'n_block' ... ../src/syntax/typing.nit:695,23--29
+            ../src/syntax/typing.nit:695,22--30
+              '(' ... ../src/syntax/typing.nit:695,22
+              ../src/syntax/typing.nit:695,23--29
+                ../src/syntax/typing.nit:695,23
+                identifier 'n_block' ... ../src/syntax/typing.nit:695,23--29
+                ../src/syntax/typing.nit:695,23
+              ')' ... ../src/syntax/typing.nit:695,30
           ../src/syntax/typing.nit:698,3--27
             ../src/syntax/typing.nit:698,3
               ../src/syntax/typing.nit:698,3
               identifier 'v' ... ../src/syntax/typing.nit:698,3
+              ../src/syntax/typing.nit:698,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:698,5--12
+            ../src/syntax/typing.nit:698,16
             '=' ... ../src/syntax/typing.nit:698,14
             ../src/syntax/typing.nit:698,16--27
               ../src/syntax/typing.nit:698,16
               identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:698,16--27
+              ../src/syntax/typing.nit:698,16
           ../src/syntax/typing.nit:699,3--17
             ../src/syntax/typing.nit:699,3--13
               ../src/syntax/typing.nit:699,3
                 ../src/syntax/typing.nit:699,3
                 identifier 'v' ... ../src/syntax/typing.nit:699,3
+                ../src/syntax/typing.nit:699,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:699,5--13
+              ../src/syntax/typing.nit:699,3
             identifier 'pop' ... ../src/syntax/typing.nit:699,15--17
+            ../src/syntax/typing.nit:699,3
           keyword 'end' ... ../src/syntax/typing.nit:700,2--4
       ../src/syntax/typing.nit:702,2--759,4
         ../src/syntax/typing.nit:702,2--8
@@ -4050,48 +4950,67 @@
                 type identifier 'Array' ... ../src/syntax/typing.nit:705,17--21
                 ../src/syntax/typing.nit:705,23--34
                   type identifier 'AutoVariable' ... ../src/syntax/typing.nit:705,23--34
+              ../src/syntax/typing.nit:705,13
           ../src/syntax/typing.nit:706,3--710,5
             keyword 'for' ... ../src/syntax/typing.nit:706,3--5
             identifier 'n_id' ... ../src/syntax/typing.nit:706,7--10
             ../src/syntax/typing.nit:706,15--19
               ../src/syntax/typing.nit:706,15
               identifier 'n_ids' ... ../src/syntax/typing.nit:706,15--19
+              ../src/syntax/typing.nit:706,15
             keyword 'do' ... ../src/syntax/typing.nit:706,21--22
             ../src/syntax/typing.nit:707,4--710,5
-              ../src/syntax/typing.nit:707,4--49
+              ../src/syntax/typing.nit:707,4--50
                 keyword 'var' ... ../src/syntax/typing.nit:707,4--6
                 identifier 'va' ... ../src/syntax/typing.nit:707,8--9
                 '=' ... ../src/syntax/typing.nit:707,11
-                ../src/syntax/typing.nit:707,13--49
+                ../src/syntax/typing.nit:707,13--50
                   keyword 'new' ... ../src/syntax/typing.nit:707,13--15
                   ../src/syntax/typing.nit:707,17--28
                     type identifier 'AutoVariable' ... ../src/syntax/typing.nit:707,17--28
-                  ../src/syntax/typing.nit:707,30--43
-                    ../src/syntax/typing.nit:707,30--33
+                  ../src/syntax/typing.nit:707,29--50
+                    '(' ... ../src/syntax/typing.nit:707,29
+                    ../src/syntax/typing.nit:707,30--43
+                      ../src/syntax/typing.nit:707,30--33
+                        ../src/syntax/typing.nit:707,30
+                        identifier 'n_id' ... ../src/syntax/typing.nit:707,30--33
+                        ../src/syntax/typing.nit:707,30
+                      identifier 'to_symbol' ... ../src/syntax/typing.nit:707,35--43
                       ../src/syntax/typing.nit:707,30
-                      identifier 'n_id' ... ../src/syntax/typing.nit:707,30--33
-                    identifier 'to_symbol' ... ../src/syntax/typing.nit:707,35--43
-                  ../src/syntax/typing.nit:707,46--49
-                    ../src/syntax/typing.nit:707,46
-                    identifier 'n_id' ... ../src/syntax/typing.nit:707,46--49
-              ../src/syntax/typing.nit:708,4--30
+                    ../src/syntax/typing.nit:707,46--49
+                      ../src/syntax/typing.nit:707,46
+                      identifier 'n_id' ... ../src/syntax/typing.nit:707,46--49
+                      ../src/syntax/typing.nit:707,46
+                    ')' ... ../src/syntax/typing.nit:707,50
+              ../src/syntax/typing.nit:708,4--31
                 ../src/syntax/typing.nit:708,4--14
                   ../src/syntax/typing.nit:708,4
                     ../src/syntax/typing.nit:708,4
                     identifier 'v' ... ../src/syntax/typing.nit:708,4
+                    ../src/syntax/typing.nit:708,4
                   identifier 'scope_ctx' ... ../src/syntax/typing.nit:708,6--14
+                  ../src/syntax/typing.nit:708,4
                 identifier 'add_variable' ... ../src/syntax/typing.nit:708,16--27
-                ../src/syntax/typing.nit:708,29--30
-                  ../src/syntax/typing.nit:708,29
-                  identifier 'va' ... ../src/syntax/typing.nit:708,29--30
-              ../src/syntax/typing.nit:709,4--13
+                ../src/syntax/typing.nit:708,28--31
+                  '(' ... ../src/syntax/typing.nit:708,28
+                  ../src/syntax/typing.nit:708,29--30
+                    ../src/syntax/typing.nit:708,29
+                    identifier 'va' ... ../src/syntax/typing.nit:708,29--30
+                    ../src/syntax/typing.nit:708,29
+                  ')' ... ../src/syntax/typing.nit:708,31
+              ../src/syntax/typing.nit:709,4--14
                 ../src/syntax/typing.nit:709,4--6
                   ../src/syntax/typing.nit:709,4
                   identifier 'vas' ... ../src/syntax/typing.nit:709,4--6
+                  ../src/syntax/typing.nit:709,4
                 identifier 'add' ... ../src/syntax/typing.nit:709,8--10
-                ../src/syntax/typing.nit:709,12--13
-                  ../src/syntax/typing.nit:709,12
-                  identifier 'va' ... ../src/syntax/typing.nit:709,12--13
+                ../src/syntax/typing.nit:709,11--14
+                  '(' ... ../src/syntax/typing.nit:709,11
+                  ../src/syntax/typing.nit:709,12--13
+                    ../src/syntax/typing.nit:709,12
+                    identifier 'va' ... ../src/syntax/typing.nit:709,12--13
+                    ../src/syntax/typing.nit:709,12
+                  ')' ... ../src/syntax/typing.nit:709,14
               keyword 'end' ... ../src/syntax/typing.nit:710,3--5
           ../src/syntax/typing.nit:711,3--18
             ../src/syntax/typing.nit:711,16
@@ -4100,26 +5019,37 @@
             ../src/syntax/typing.nit:711,16--18
               ../src/syntax/typing.nit:711,16
               identifier 'vas' ... ../src/syntax/typing.nit:711,16--18
-          ../src/syntax/typing.nit:714,3--22
+              ../src/syntax/typing.nit:711,16
+          ../src/syntax/typing.nit:714,3--23
             ../src/syntax/typing.nit:714,3
               ../src/syntax/typing.nit:714,3
               identifier 'v' ... ../src/syntax/typing.nit:714,3
+              ../src/syntax/typing.nit:714,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:714,5--15
-            ../src/syntax/typing.nit:714,17--22
-              ../src/syntax/typing.nit:714,17
-              identifier 'n_expr' ... ../src/syntax/typing.nit:714,17--22
+            ../src/syntax/typing.nit:714,16--23
+              '(' ... ../src/syntax/typing.nit:714,16
+              ../src/syntax/typing.nit:714,17--22
+                ../src/syntax/typing.nit:714,17
+                identifier 'n_expr' ... ../src/syntax/typing.nit:714,17--22
+                ../src/syntax/typing.nit:714,17
+              ')' ... ../src/syntax/typing.nit:714,23
           ../src/syntax/typing.nit:715,3--41
             keyword 'if' ... ../src/syntax/typing.nit:715,3--4
-            ../src/syntax/typing.nit:715,6--28
+            ../src/syntax/typing.nit:715,6--29
               keyword 'not' ... ../src/syntax/typing.nit:715,6--8
-              ../src/syntax/typing.nit:715,10--28
+              ../src/syntax/typing.nit:715,10--29
                 ../src/syntax/typing.nit:715,10
                   ../src/syntax/typing.nit:715,10
                   identifier 'v' ... ../src/syntax/typing.nit:715,10
+                  ../src/syntax/typing.nit:715,10
                 identifier 'check_expr' ... ../src/syntax/typing.nit:715,12--21
-                ../src/syntax/typing.nit:715,23--28
-                  ../src/syntax/typing.nit:715,23
-                  identifier 'n_expr' ... ../src/syntax/typing.nit:715,23--28
+                ../src/syntax/typing.nit:715,22--29
+                  '(' ... ../src/syntax/typing.nit:715,22
+                  ../src/syntax/typing.nit:715,23--28
+                    ../src/syntax/typing.nit:715,23
+                    identifier 'n_expr' ... ../src/syntax/typing.nit:715,23--28
+                    ../src/syntax/typing.nit:715,23
+                  ')' ... ../src/syntax/typing.nit:715,29
             ../src/syntax/typing.nit:715,36--41
               keyword 'return' ... ../src/syntax/typing.nit:715,36--41
           ../src/syntax/typing.nit:716,3--30
@@ -4130,37 +5060,51 @@
               ../src/syntax/typing.nit:716,19--24
                 ../src/syntax/typing.nit:716,19
                 identifier 'n_expr' ... ../src/syntax/typing.nit:716,19--24
+                ../src/syntax/typing.nit:716,19
               identifier 'stype' ... ../src/syntax/typing.nit:716,26--30
+              ../src/syntax/typing.nit:716,19
           ../src/syntax/typing.nit:718,3--721,5
             keyword 'if' ... ../src/syntax/typing.nit:718,3--4
             ../src/syntax/typing.nit:718,6--26
               ../src/syntax/typing.nit:718,6--14
                 ../src/syntax/typing.nit:718,6
                 identifier 'expr_type' ... ../src/syntax/typing.nit:718,6--14
+                ../src/syntax/typing.nit:718,6
               identifier 'is_nullable' ... ../src/syntax/typing.nit:718,16--26
+              ../src/syntax/typing.nit:718,6
             ../src/syntax/typing.nit:719,4--720,9
-              ../src/syntax/typing.nit:719,4--64
+              ../src/syntax/typing.nit:719,4--65
                 ../src/syntax/typing.nit:719,4
                   ../src/syntax/typing.nit:719,4
                   identifier 'v' ... ../src/syntax/typing.nit:719,4
+                  ../src/syntax/typing.nit:719,4
                 identifier 'error' ... ../src/syntax/typing.nit:719,6--10
-                ../src/syntax/typing.nit:719,12--17
-                  ../src/syntax/typing.nit:719,12
-                  identifier 'n_expr' ... ../src/syntax/typing.nit:719,12--17
-                ../src/syntax/typing.nit:719,20--64
-                  literal value '"Type error: 'for' on a nullable expression."' ... ../src/syntax/typing.nit:719,20--64
+                ../src/syntax/typing.nit:719,11--65
+                  '(' ... ../src/syntax/typing.nit:719,11
+                  ../src/syntax/typing.nit:719,12--17
+                    ../src/syntax/typing.nit:719,12
+                    identifier 'n_expr' ... ../src/syntax/typing.nit:719,12--17
+                    ../src/syntax/typing.nit:719,12
+                  ../src/syntax/typing.nit:719,20--64
+                    literal value '"Type error: 'for' on a nullable expression."' ... ../src/syntax/typing.nit:719,20--64
+                  ')' ... ../src/syntax/typing.nit:719,65
               ../src/syntax/typing.nit:720,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:720,4--9
             ../src/syntax/typing.nit:721,3--5
               keyword 'end' ... ../src/syntax/typing.nit:721,3--5
-          ../src/syntax/typing.nit:722,3--27
+          ../src/syntax/typing.nit:722,3--28
             ../src/syntax/typing.nit:722,3--8
               ../src/syntax/typing.nit:722,3
               identifier 'n_expr' ... ../src/syntax/typing.nit:722,3--8
+              ../src/syntax/typing.nit:722,3
             identifier 'warn_parentheses' ... ../src/syntax/typing.nit:722,10--25
-            ../src/syntax/typing.nit:722,27
+            ../src/syntax/typing.nit:722,26--28
+              '(' ... ../src/syntax/typing.nit:722,26
               ../src/syntax/typing.nit:722,27
-              identifier 'v' ... ../src/syntax/typing.nit:722,27
+                ../src/syntax/typing.nit:722,27
+                identifier 'v' ... ../src/syntax/typing.nit:722,27
+                ../src/syntax/typing.nit:722,27
+              ')' ... ../src/syntax/typing.nit:722,28
           ../src/syntax/typing.nit:725,3--45
             keyword 'var' ... ../src/syntax/typing.nit:725,3--5
             identifier 'iterate_name' ... ../src/syntax/typing.nit:725,7--18
@@ -4171,89 +5115,123 @@
                 ../src/syntax/typing.nit:725,27--35
                   literal value '"iterate"' ... ../src/syntax/typing.nit:725,27--35
                 identifier 'to_symbol' ... ../src/syntax/typing.nit:725,37--45
+                ../src/syntax/typing.nit:725,27
           ../src/syntax/typing.nit:726,3--729,5
             keyword 'if' ... ../src/syntax/typing.nit:726,3--4
-            ../src/syntax/typing.nit:726,6--71
+            ../src/syntax/typing.nit:726,6--72
               keyword 'not' ... ../src/syntax/typing.nit:726,6--8
-              ../src/syntax/typing.nit:726,10--71
+              ../src/syntax/typing.nit:726,10--72
                 ../src/syntax/typing.nit:726,10--30
                   ../src/syntax/typing.nit:726,10--18
                     ../src/syntax/typing.nit:726,10
                     identifier 'expr_type' ... ../src/syntax/typing.nit:726,10--18
+                    ../src/syntax/typing.nit:726,10
                   identifier 'local_class' ... ../src/syntax/typing.nit:726,20--30
+                  ../src/syntax/typing.nit:726,10
                 identifier 'has_global_property_by_name' ... ../src/syntax/typing.nit:726,32--58
-                ../src/syntax/typing.nit:726,60--71
-                  ../src/syntax/typing.nit:726,60
-                  identifier 'iterate_name' ... ../src/syntax/typing.nit:726,60--71
+                ../src/syntax/typing.nit:726,59--72
+                  '(' ... ../src/syntax/typing.nit:726,59
+                  ../src/syntax/typing.nit:726,60--71
+                    ../src/syntax/typing.nit:726,60
+                    identifier 'iterate_name' ... ../src/syntax/typing.nit:726,60--71
+                    ../src/syntax/typing.nit:726,60
+                  ')' ... ../src/syntax/typing.nit:726,72
             ../src/syntax/typing.nit:727,4--728,9
-              ../src/syntax/typing.nit:727,4--93
+              ../src/syntax/typing.nit:727,4--94
                 ../src/syntax/typing.nit:727,4
                   ../src/syntax/typing.nit:727,4
                   identifier 'v' ... ../src/syntax/typing.nit:727,4
+                  ../src/syntax/typing.nit:727,4
                 identifier 'error' ... ../src/syntax/typing.nit:727,6--10
-                ../src/syntax/typing.nit:727,12--17
-                  ../src/syntax/typing.nit:727,12
-                  identifier 'n_expr' ... ../src/syntax/typing.nit:727,12--17
-                ../src/syntax/typing.nit:727,20--93
-                  ../src/syntax/typing.nit:727,20--81
-                    literal value '"Type error: Expected a type with an 'iterate' method. Found {' ... ../src/syntax/typing.nit:727,20--81
-                  ../src/syntax/typing.nit:727,82--90
-                    ../src/syntax/typing.nit:727,82
-                    identifier 'expr_type' ... ../src/syntax/typing.nit:727,82--90
-                  ../src/syntax/typing.nit:727,91--93
-                    '}."' ... ../src/syntax/typing.nit:727,91--93
+                ../src/syntax/typing.nit:727,11--94
+                  '(' ... ../src/syntax/typing.nit:727,11
+                  ../src/syntax/typing.nit:727,12--17
+                    ../src/syntax/typing.nit:727,12
+                    identifier 'n_expr' ... ../src/syntax/typing.nit:727,12--17
+                    ../src/syntax/typing.nit:727,12
+                  ../src/syntax/typing.nit:727,20--93
+                    ../src/syntax/typing.nit:727,20--81
+                      literal value '"Type error: Expected a type with an 'iterate' method. Found {' ... ../src/syntax/typing.nit:727,20--81
+                    ../src/syntax/typing.nit:727,82--90
+                      ../src/syntax/typing.nit:727,82
+                      identifier 'expr_type' ... ../src/syntax/typing.nit:727,82--90
+                      ../src/syntax/typing.nit:727,82
+                    ../src/syntax/typing.nit:727,91--93
+                      '}."' ... ../src/syntax/typing.nit:727,91--93
+                  ')' ... ../src/syntax/typing.nit:727,94
               ../src/syntax/typing.nit:728,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:728,4--9
             ../src/syntax/typing.nit:729,3--5
               keyword 'end' ... ../src/syntax/typing.nit:729,3--5
-          ../src/syntax/typing.nit:730,3--61
+          ../src/syntax/typing.nit:730,3--62
             keyword 'var' ... ../src/syntax/typing.nit:730,3--5
             identifier 'prop' ... ../src/syntax/typing.nit:730,7--10
             '=' ... ../src/syntax/typing.nit:730,12
-            ../src/syntax/typing.nit:730,14--61
+            ../src/syntax/typing.nit:730,14--62
               ../src/syntax/typing.nit:730,14--34
                 ../src/syntax/typing.nit:730,14--22
                   ../src/syntax/typing.nit:730,14
                   identifier 'expr_type' ... ../src/syntax/typing.nit:730,14--22
+                  ../src/syntax/typing.nit:730,14
                 identifier 'local_class' ... ../src/syntax/typing.nit:730,24--34
+                ../src/syntax/typing.nit:730,14
               identifier 'select_method' ... ../src/syntax/typing.nit:730,36--48
-              ../src/syntax/typing.nit:730,50--61
-                ../src/syntax/typing.nit:730,50
-                identifier 'iterate_name' ... ../src/syntax/typing.nit:730,50--61
-          ../src/syntax/typing.nit:731,3--66
+              ../src/syntax/typing.nit:730,49--62
+                '(' ... ../src/syntax/typing.nit:730,49
+                ../src/syntax/typing.nit:730,50--61
+                  ../src/syntax/typing.nit:730,50
+                  identifier 'iterate_name' ... ../src/syntax/typing.nit:730,50--61
+                  ../src/syntax/typing.nit:730,50
+                ')' ... ../src/syntax/typing.nit:730,62
+          ../src/syntax/typing.nit:731,3--67
             ../src/syntax/typing.nit:731,3--13
               ../src/syntax/typing.nit:731,3--6
                 ../src/syntax/typing.nit:731,3
                 identifier 'prop' ... ../src/syntax/typing.nit:731,3--6
+                ../src/syntax/typing.nit:731,3
               identifier 'global' ... ../src/syntax/typing.nit:731,8--13
+              ../src/syntax/typing.nit:731,3
             identifier 'check_visibility' ... ../src/syntax/typing.nit:731,15--30
-            ../src/syntax/typing.nit:731,32
+            ../src/syntax/typing.nit:731,31--67
+              '(' ... ../src/syntax/typing.nit:731,31
               ../src/syntax/typing.nit:731,32
-              identifier 'v' ... ../src/syntax/typing.nit:731,32
-            ../src/syntax/typing.nit:731,35--38
-              keyword 'self' ... ../src/syntax/typing.nit:731,35--38
-            ../src/syntax/typing.nit:731,41--50
-              ../src/syntax/typing.nit:731,41
+                ../src/syntax/typing.nit:731,32
+                identifier 'v' ... ../src/syntax/typing.nit:731,32
+                ../src/syntax/typing.nit:731,32
+              ../src/syntax/typing.nit:731,35--38
+                keyword 'self' ... ../src/syntax/typing.nit:731,35--38
+              ../src/syntax/typing.nit:731,41--50
+                ../src/syntax/typing.nit:731,41
+                  ../src/syntax/typing.nit:731,41
+                  identifier 'v' ... ../src/syntax/typing.nit:731,41
+                  ../src/syntax/typing.nit:731,41
+                identifier 'mmmodule' ... ../src/syntax/typing.nit:731,43--50
                 ../src/syntax/typing.nit:731,41
-                identifier 'v' ... ../src/syntax/typing.nit:731,41
-              identifier 'mmmodule' ... ../src/syntax/typing.nit:731,43--50
-            ../src/syntax/typing.nit:731,53--66
-              ../src/syntax/typing.nit:731,53--58
+              ../src/syntax/typing.nit:731,53--66
+                ../src/syntax/typing.nit:731,53--58
+                  ../src/syntax/typing.nit:731,53
+                  identifier 'n_expr' ... ../src/syntax/typing.nit:731,53--58
+                  ../src/syntax/typing.nit:731,53
+                identifier 'is_self' ... ../src/syntax/typing.nit:731,60--66
                 ../src/syntax/typing.nit:731,53
-                identifier 'n_expr' ... ../src/syntax/typing.nit:731,53--58
-              identifier 'is_self' ... ../src/syntax/typing.nit:731,60--66
-          ../src/syntax/typing.nit:732,3--41
+              ')' ... ../src/syntax/typing.nit:731,67
+          ../src/syntax/typing.nit:732,3--42
             keyword 'var' ... ../src/syntax/typing.nit:732,3--5
             identifier 'psig' ... ../src/syntax/typing.nit:732,7--10
             '=' ... ../src/syntax/typing.nit:732,12
-            ../src/syntax/typing.nit:732,14--41
+            ../src/syntax/typing.nit:732,14--42
               ../src/syntax/typing.nit:732,14--17
                 ../src/syntax/typing.nit:732,14
                 identifier 'prop' ... ../src/syntax/typing.nit:732,14--17
+                ../src/syntax/typing.nit:732,14
               identifier 'signature_for' ... ../src/syntax/typing.nit:732,19--31
-              ../src/syntax/typing.nit:732,33--41
-                ../src/syntax/typing.nit:732,33
-                identifier 'expr_type' ... ../src/syntax/typing.nit:732,33--41
+              ../src/syntax/typing.nit:732,32--42
+                '(' ... ../src/syntax/typing.nit:732,32
+                ../src/syntax/typing.nit:732,33--41
+                  ../src/syntax/typing.nit:732,33
+                  identifier 'expr_type' ... ../src/syntax/typing.nit:732,33--41
+                  ../src/syntax/typing.nit:732,33
+                ')' ... ../src/syntax/typing.nit:732,42
           ../src/syntax/typing.nit:733,3--53
             keyword 'if' ... ../src/syntax/typing.nit:733,3--4
             ../src/syntax/typing.nit:733,6--23
@@ -4262,16 +5240,21 @@
                 ../src/syntax/typing.nit:733,10--15
                   ../src/syntax/typing.nit:733,10
                   identifier 'n_expr' ... ../src/syntax/typing.nit:733,10--15
+                  ../src/syntax/typing.nit:733,10
                 identifier 'is_self' ... ../src/syntax/typing.nit:733,17--23
+                ../src/syntax/typing.nit:733,10
             ../src/syntax/typing.nit:733,30--53
               ../src/syntax/typing.nit:733,37
               identifier 'psig' ... ../src/syntax/typing.nit:733,30--33
+              ../src/syntax/typing.nit:733,37
               '=' ... ../src/syntax/typing.nit:733,35
               ../src/syntax/typing.nit:733,37--53
                 ../src/syntax/typing.nit:733,37--40
                   ../src/syntax/typing.nit:733,37
                   identifier 'psig' ... ../src/syntax/typing.nit:733,37--40
+                  ../src/syntax/typing.nit:733,37
                 identifier 'not_for_self' ... ../src/syntax/typing.nit:733,42--53
+                ../src/syntax/typing.nit:733,37
           ../src/syntax/typing.nit:734,3--740,5
             keyword 'if' ... ../src/syntax/typing.nit:734,3--4
             ../src/syntax/typing.nit:734,6--20
@@ -4279,19 +5262,25 @@
                 ../src/syntax/typing.nit:734,6--9
                   ../src/syntax/typing.nit:734,6
                   identifier 'psig' ... ../src/syntax/typing.nit:734,6--9
+                  ../src/syntax/typing.nit:734,6
                 identifier 'arity' ... ../src/syntax/typing.nit:734,11--15
+                ../src/syntax/typing.nit:734,6
               ../src/syntax/typing.nit:734,20
                 literal value '0' ... ../src/syntax/typing.nit:734,20
             ../src/syntax/typing.nit:735,4--736,9
-              ../src/syntax/typing.nit:735,4--82
+              ../src/syntax/typing.nit:735,4--83
                 ../src/syntax/typing.nit:735,4
                   ../src/syntax/typing.nit:735,4
                   identifier 'v' ... ../src/syntax/typing.nit:735,4
+                  ../src/syntax/typing.nit:735,4
                 identifier 'error' ... ../src/syntax/typing.nit:735,6--10
-                ../src/syntax/typing.nit:735,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:735,12--15
-                ../src/syntax/typing.nit:735,18--82
-                  literal value '"Error: 'iterate' incompatible with 'for': require no arguments."' ... ../src/syntax/typing.nit:735,18--82
+                ../src/syntax/typing.nit:735,11--83
+                  '(' ... ../src/syntax/typing.nit:735,11
+                  ../src/syntax/typing.nit:735,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:735,12--15
+                  ../src/syntax/typing.nit:735,18--82
+                    literal value '"Error: 'iterate' incompatible with 'for': require no arguments."' ... ../src/syntax/typing.nit:735,18--82
+                  ')' ... ../src/syntax/typing.nit:735,83
               ../src/syntax/typing.nit:736,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:736,4--9
             ../src/syntax/typing.nit:737,8--740,5
@@ -4302,20 +5291,27 @@
                     ../src/syntax/typing.nit:737,11--14
                       ../src/syntax/typing.nit:737,11
                       identifier 'psig' ... ../src/syntax/typing.nit:737,11--14
+                      ../src/syntax/typing.nit:737,11
                     identifier 'closures' ... ../src/syntax/typing.nit:737,16--23
+                    ../src/syntax/typing.nit:737,11
                   identifier 'length' ... ../src/syntax/typing.nit:737,25--30
+                  ../src/syntax/typing.nit:737,11
                 ../src/syntax/typing.nit:737,35
                   literal value '1' ... ../src/syntax/typing.nit:737,35
               ../src/syntax/typing.nit:738,4--739,9
-                ../src/syntax/typing.nit:738,4--81
+                ../src/syntax/typing.nit:738,4--82
                   ../src/syntax/typing.nit:738,4
                     ../src/syntax/typing.nit:738,4
                     identifier 'v' ... ../src/syntax/typing.nit:738,4
+                    ../src/syntax/typing.nit:738,4
                   identifier 'error' ... ../src/syntax/typing.nit:738,6--10
-                  ../src/syntax/typing.nit:738,12--15
-                    keyword 'self' ... ../src/syntax/typing.nit:738,12--15
-                  ../src/syntax/typing.nit:738,18--81
-                    literal value '"Error: 'iterate' incompatible with 'for': require one closure."' ... ../src/syntax/typing.nit:738,18--81
+                  ../src/syntax/typing.nit:738,11--82
+                    '(' ... ../src/syntax/typing.nit:738,11
+                    ../src/syntax/typing.nit:738,12--15
+                      keyword 'self' ... ../src/syntax/typing.nit:738,12--15
+                    ../src/syntax/typing.nit:738,18--81
+                      literal value '"Error: 'iterate' incompatible with 'for': require one closure."' ... ../src/syntax/typing.nit:738,18--81
+                    ')' ... ../src/syntax/typing.nit:738,82
                 ../src/syntax/typing.nit:739,4--9
                   keyword 'return' ... ../src/syntax/typing.nit:739,4--9
               ../src/syntax/typing.nit:740,3--5
@@ -4323,6 +5319,7 @@
           ../src/syntax/typing.nit:741,3--38
             ../src/syntax/typing.nit:741,10
             identifier 'psig' ... ../src/syntax/typing.nit:741,3--6
+            ../src/syntax/typing.nit:741,10
             '=' ... ../src/syntax/typing.nit:741,8
             ../src/syntax/typing.nit:741,10--38
               ../src/syntax/typing.nit:741,10--28
@@ -4330,9 +5327,13 @@
                   ../src/syntax/typing.nit:741,10--13
                     ../src/syntax/typing.nit:741,10
                     identifier 'psig' ... ../src/syntax/typing.nit:741,10--13
+                    ../src/syntax/typing.nit:741,10
                   identifier 'closures' ... ../src/syntax/typing.nit:741,15--22
+                  ../src/syntax/typing.nit:741,10
                 identifier 'first' ... ../src/syntax/typing.nit:741,24--28
+                ../src/syntax/typing.nit:741,10
               identifier 'signature' ... ../src/syntax/typing.nit:741,30--38
+              ../src/syntax/typing.nit:741,10
           ../src/syntax/typing.nit:742,3--745,5
             keyword 'if' ... ../src/syntax/typing.nit:742,3--4
             ../src/syntax/typing.nit:742,6--29
@@ -4340,19 +5341,25 @@
                 ../src/syntax/typing.nit:742,6--9
                   ../src/syntax/typing.nit:742,6
                   identifier 'psig' ... ../src/syntax/typing.nit:742,6--9
+                  ../src/syntax/typing.nit:742,6
                 identifier 'return_type' ... ../src/syntax/typing.nit:742,11--21
+                ../src/syntax/typing.nit:742,6
               ../src/syntax/typing.nit:742,26--29
                 keyword 'null' ... ../src/syntax/typing.nit:742,26--29
             ../src/syntax/typing.nit:743,4--744,9
-              ../src/syntax/typing.nit:743,4--92
+              ../src/syntax/typing.nit:743,4--93
                 ../src/syntax/typing.nit:743,4
                   ../src/syntax/typing.nit:743,4
                   identifier 'v' ... ../src/syntax/typing.nit:743,4
+                  ../src/syntax/typing.nit:743,4
                 identifier 'error' ... ../src/syntax/typing.nit:743,6--10
-                ../src/syntax/typing.nit:743,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:743,12--15
-                ../src/syntax/typing.nit:743,18--92
-                  literal value '"Error: 'iterate' incompatible with 'for': require one procedural closure."' ... ../src/syntax/typing.nit:743,18--92
+                ../src/syntax/typing.nit:743,11--93
+                  '(' ... ../src/syntax/typing.nit:743,11
+                  ../src/syntax/typing.nit:743,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:743,12--15
+                  ../src/syntax/typing.nit:743,18--92
+                    literal value '"Error: 'iterate' incompatible with 'for': require one procedural closure."' ... ../src/syntax/typing.nit:743,18--92
+                  ')' ... ../src/syntax/typing.nit:743,93
               ../src/syntax/typing.nit:744,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:744,4--9
             ../src/syntax/typing.nit:745,3--5
@@ -4364,12 +5371,16 @@
                 ../src/syntax/typing.nit:746,6--8
                   ../src/syntax/typing.nit:746,6
                   identifier 'vas' ... ../src/syntax/typing.nit:746,6--8
+                  ../src/syntax/typing.nit:746,6
                 identifier 'length' ... ../src/syntax/typing.nit:746,10--15
+                ../src/syntax/typing.nit:746,6
               ../src/syntax/typing.nit:746,20--29
                 ../src/syntax/typing.nit:746,20--23
                   ../src/syntax/typing.nit:746,20
                   identifier 'psig' ... ../src/syntax/typing.nit:746,20--23
+                  ../src/syntax/typing.nit:746,20
                 identifier 'arity' ... ../src/syntax/typing.nit:746,25--29
+                ../src/syntax/typing.nit:746,20
             ../src/syntax/typing.nit:747,4--752,9
               ../src/syntax/typing.nit:747,4--751,6
                 keyword 'if' ... ../src/syntax/typing.nit:747,4--5
@@ -4378,69 +5389,89 @@
                     ../src/syntax/typing.nit:747,7--10
                       ../src/syntax/typing.nit:747,7
                       identifier 'psig' ... ../src/syntax/typing.nit:747,7--10
+                      ../src/syntax/typing.nit:747,7
                     identifier 'arity' ... ../src/syntax/typing.nit:747,12--16
+                    ../src/syntax/typing.nit:747,7
                   ../src/syntax/typing.nit:747,21
                     literal value '1' ... ../src/syntax/typing.nit:747,21
-                ../src/syntax/typing.nit:748,5--85
-                  ../src/syntax/typing.nit:748,5--85
+                ../src/syntax/typing.nit:748,5--86
+                  ../src/syntax/typing.nit:748,5--86
                     ../src/syntax/typing.nit:748,5
                       ../src/syntax/typing.nit:748,5
                       identifier 'v' ... ../src/syntax/typing.nit:748,5
+                      ../src/syntax/typing.nit:748,5
                     identifier 'error' ... ../src/syntax/typing.nit:748,7--11
-                    ../src/syntax/typing.nit:748,13--16
-                      keyword 'self' ... ../src/syntax/typing.nit:748,13--16
-                    ../src/syntax/typing.nit:748,19--85
-                      ../src/syntax/typing.nit:748,19--36
-                        literal value '"Error: Expected {' ... ../src/syntax/typing.nit:748,19--36
-                      ../src/syntax/typing.nit:748,37--46
-                        ../src/syntax/typing.nit:748,37--40
+                    ../src/syntax/typing.nit:748,12--86
+                      '(' ... ../src/syntax/typing.nit:748,12
+                      ../src/syntax/typing.nit:748,13--16
+                        keyword 'self' ... ../src/syntax/typing.nit:748,13--16
+                      ../src/syntax/typing.nit:748,19--85
+                        ../src/syntax/typing.nit:748,19--36
+                          literal value '"Error: Expected {' ... ../src/syntax/typing.nit:748,19--36
+                        ../src/syntax/typing.nit:748,37--46
+                          ../src/syntax/typing.nit:748,37--40
+                            ../src/syntax/typing.nit:748,37
+                            identifier 'psig' ... ../src/syntax/typing.nit:748,37--40
+                            ../src/syntax/typing.nit:748,37
+                          identifier 'arity' ... ../src/syntax/typing.nit:748,42--46
                           ../src/syntax/typing.nit:748,37
-                          identifier 'psig' ... ../src/syntax/typing.nit:748,37--40
-                        identifier 'arity' ... ../src/syntax/typing.nit:748,42--46
-                      ../src/syntax/typing.nit:748,47--58
-                        literal value '} variable {' ... ../src/syntax/typing.nit:748,47--58
-                      ../src/syntax/typing.nit:748,59--62
-                        ../src/syntax/typing.nit:748,59
-                        identifier 'psig' ... ../src/syntax/typing.nit:748,59--62
-                      ../src/syntax/typing.nit:748,63--72
-                        literal value '}, found {' ... ../src/syntax/typing.nit:748,63--72
-                      ../src/syntax/typing.nit:748,73--82
-                        ../src/syntax/typing.nit:748,73--75
+                        ../src/syntax/typing.nit:748,47--58
+                          literal value '} variable {' ... ../src/syntax/typing.nit:748,47--58
+                        ../src/syntax/typing.nit:748,59--62
+                          ../src/syntax/typing.nit:748,59
+                          identifier 'psig' ... ../src/syntax/typing.nit:748,59--62
+                          ../src/syntax/typing.nit:748,59
+                        ../src/syntax/typing.nit:748,63--72
+                          literal value '}, found {' ... ../src/syntax/typing.nit:748,63--72
+                        ../src/syntax/typing.nit:748,73--82
+                          ../src/syntax/typing.nit:748,73--75
+                            ../src/syntax/typing.nit:748,73
+                            identifier 'vas' ... ../src/syntax/typing.nit:748,73--75
+                            ../src/syntax/typing.nit:748,73
+                          identifier 'length' ... ../src/syntax/typing.nit:748,77--82
                           ../src/syntax/typing.nit:748,73
-                          identifier 'vas' ... ../src/syntax/typing.nit:748,73--75
-                        identifier 'length' ... ../src/syntax/typing.nit:748,77--82
-                      ../src/syntax/typing.nit:748,83--85
-                        '}."' ... ../src/syntax/typing.nit:748,83--85
+                        ../src/syntax/typing.nit:748,83--85
+                          '}."' ... ../src/syntax/typing.nit:748,83--85
+                      ')' ... ../src/syntax/typing.nit:748,86
                 ../src/syntax/typing.nit:750,5--751,6
-                  ../src/syntax/typing.nit:750,5--86
+                  ../src/syntax/typing.nit:750,5--87
                     ../src/syntax/typing.nit:750,5
                       ../src/syntax/typing.nit:750,5
                       identifier 'v' ... ../src/syntax/typing.nit:750,5
+                      ../src/syntax/typing.nit:750,5
                     identifier 'error' ... ../src/syntax/typing.nit:750,7--11
-                    ../src/syntax/typing.nit:750,13--16
-                      keyword 'self' ... ../src/syntax/typing.nit:750,13--16
-                    ../src/syntax/typing.nit:750,19--86
-                      ../src/syntax/typing.nit:750,19--36
-                        literal value '"Error: Expected {' ... ../src/syntax/typing.nit:750,19--36
-                      ../src/syntax/typing.nit:750,37--46
-                        ../src/syntax/typing.nit:750,37--40
+                    ../src/syntax/typing.nit:750,12--87
+                      '(' ... ../src/syntax/typing.nit:750,12
+                      ../src/syntax/typing.nit:750,13--16
+                        keyword 'self' ... ../src/syntax/typing.nit:750,13--16
+                      ../src/syntax/typing.nit:750,19--86
+                        ../src/syntax/typing.nit:750,19--36
+                          literal value '"Error: Expected {' ... ../src/syntax/typing.nit:750,19--36
+                        ../src/syntax/typing.nit:750,37--46
+                          ../src/syntax/typing.nit:750,37--40
+                            ../src/syntax/typing.nit:750,37
+                            identifier 'psig' ... ../src/syntax/typing.nit:750,37--40
+                            ../src/syntax/typing.nit:750,37
+                          identifier 'arity' ... ../src/syntax/typing.nit:750,42--46
                           ../src/syntax/typing.nit:750,37
-                          identifier 'psig' ... ../src/syntax/typing.nit:750,37--40
-                        identifier 'arity' ... ../src/syntax/typing.nit:750,42--46
-                      ../src/syntax/typing.nit:750,47--59
-                        literal value '} variables {' ... ../src/syntax/typing.nit:750,47--59
-                      ../src/syntax/typing.nit:750,60--63
-                        ../src/syntax/typing.nit:750,60
-                        identifier 'psig' ... ../src/syntax/typing.nit:750,60--63
-                      ../src/syntax/typing.nit:750,64--73
-                        literal value '}, found {' ... ../src/syntax/typing.nit:750,64--73
-                      ../src/syntax/typing.nit:750,74--83
-                        ../src/syntax/typing.nit:750,74--76
+                        ../src/syntax/typing.nit:750,47--59
+                          literal value '} variables {' ... ../src/syntax/typing.nit:750,47--59
+                        ../src/syntax/typing.nit:750,60--63
+                          ../src/syntax/typing.nit:750,60
+                          identifier 'psig' ... ../src/syntax/typing.nit:750,60--63
+                          ../src/syntax/typing.nit:750,60
+                        ../src/syntax/typing.nit:750,64--73
+                          literal value '}, found {' ... ../src/syntax/typing.nit:750,64--73
+                        ../src/syntax/typing.nit:750,74--83
+                          ../src/syntax/typing.nit:750,74--76
+                            ../src/syntax/typing.nit:750,74
+                            identifier 'vas' ... ../src/syntax/typing.nit:750,74--76
+                            ../src/syntax/typing.nit:750,74
+                          identifier 'length' ... ../src/syntax/typing.nit:750,78--83
                           ../src/syntax/typing.nit:750,74
-                          identifier 'vas' ... ../src/syntax/typing.nit:750,74--76
-                        identifier 'length' ... ../src/syntax/typing.nit:750,78--83
-                      ../src/syntax/typing.nit:750,84--86
-                        '}."' ... ../src/syntax/typing.nit:750,84--86
+                        ../src/syntax/typing.nit:750,84--86
+                          '}."' ... ../src/syntax/typing.nit:750,84--86
+                      ')' ... ../src/syntax/typing.nit:750,87
                   keyword 'end' ... ../src/syntax/typing.nit:751,4--6
               ../src/syntax/typing.nit:752,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:752,4--9
@@ -4457,27 +5488,40 @@
                 ../src/syntax/typing.nit:756,16--18
                   ../src/syntax/typing.nit:756,16
                   identifier 'vas' ... ../src/syntax/typing.nit:756,16--18
+                  ../src/syntax/typing.nit:756,16
                 identifier 'length' ... ../src/syntax/typing.nit:756,20--25
+                ../src/syntax/typing.nit:756,16
               '[' ... ../src/syntax/typing.nit:756,26
             keyword 'do' ... ../src/syntax/typing.nit:756,28--29
             ../src/syntax/typing.nit:757,4--758,5
-              ../src/syntax/typing.nit:757,4--24
-                ../src/syntax/typing.nit:757,4--8
+              ../src/syntax/typing.nit:757,4--25
+                ../src/syntax/typing.nit:757,4--9
                   ../src/syntax/typing.nit:757,4--6
                     ../src/syntax/typing.nit:757,4
                     identifier 'vas' ... ../src/syntax/typing.nit:757,4--6
-                  ../src/syntax/typing.nit:757,8
+                    ../src/syntax/typing.nit:757,4
+                  ../src/syntax/typing.nit:757,7--9
+                    '[' ... ../src/syntax/typing.nit:757,7
                     ../src/syntax/typing.nit:757,8
-                    identifier 'i' ... ../src/syntax/typing.nit:757,8
+                      ../src/syntax/typing.nit:757,8
+                      identifier 'i' ... ../src/syntax/typing.nit:757,8
+                      ../src/syntax/typing.nit:757,8
+                    ']' ... ../src/syntax/typing.nit:757,9
                 identifier 'stype' ... ../src/syntax/typing.nit:757,11--15
+                ../src/syntax/typing.nit:757,19
                 '=' ... ../src/syntax/typing.nit:757,17
-                ../src/syntax/typing.nit:757,19--24
+                ../src/syntax/typing.nit:757,19--25
                   ../src/syntax/typing.nit:757,19--22
                     ../src/syntax/typing.nit:757,19
                     identifier 'psig' ... ../src/syntax/typing.nit:757,19--22
-                  ../src/syntax/typing.nit:757,24
+                    ../src/syntax/typing.nit:757,19
+                  ../src/syntax/typing.nit:757,23--25
+                    '[' ... ../src/syntax/typing.nit:757,23
                     ../src/syntax/typing.nit:757,24
-                    identifier 'i' ... ../src/syntax/typing.nit:757,24
+                      ../src/syntax/typing.nit:757,24
+                      identifier 'i' ... ../src/syntax/typing.nit:757,24
+                      ../src/syntax/typing.nit:757,24
+                    ']' ... ../src/syntax/typing.nit:757,25
               keyword 'end' ... ../src/syntax/typing.nit:758,3--5
           keyword 'end' ... ../src/syntax/typing.nit:759,2--4
       keyword 'end' ... ../src/syntax/typing.nit:760,1--3
@@ -4497,41 +5541,59 @@
           ../src/syntax/typing.nit:763,26
             identifier 'v' ... ../src/syntax/typing.nit:763,26
         ../src/syntax/typing.nit:766,3--781,4
-          ../src/syntax/typing.nit:766,3--22
+          ../src/syntax/typing.nit:766,3--23
             ../src/syntax/typing.nit:766,3
               ../src/syntax/typing.nit:766,3
               identifier 'v' ... ../src/syntax/typing.nit:766,3
+              ../src/syntax/typing.nit:766,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:766,5--15
-            ../src/syntax/typing.nit:766,17--22
-              ../src/syntax/typing.nit:766,17
-              identifier 'n_expr' ... ../src/syntax/typing.nit:766,17--22
-          ../src/syntax/typing.nit:767,3--42
+            ../src/syntax/typing.nit:766,16--23
+              '(' ... ../src/syntax/typing.nit:766,16
+              ../src/syntax/typing.nit:766,17--22
+                ../src/syntax/typing.nit:766,17
+                identifier 'n_expr' ... ../src/syntax/typing.nit:766,17--22
+                ../src/syntax/typing.nit:766,17
+              ')' ... ../src/syntax/typing.nit:766,23
+          ../src/syntax/typing.nit:767,3--43
             ../src/syntax/typing.nit:767,3
               ../src/syntax/typing.nit:767,3
               identifier 'v' ... ../src/syntax/typing.nit:767,3
+              ../src/syntax/typing.nit:767,3
             identifier 'check_conform_expr' ... ../src/syntax/typing.nit:767,5--22
-            ../src/syntax/typing.nit:767,24--29
-              ../src/syntax/typing.nit:767,24
-              identifier 'n_expr' ... ../src/syntax/typing.nit:767,24--29
-            ../src/syntax/typing.nit:767,32--42
-              ../src/syntax/typing.nit:767,32
+            ../src/syntax/typing.nit:767,23--43
+              '(' ... ../src/syntax/typing.nit:767,23
+              ../src/syntax/typing.nit:767,24--29
+                ../src/syntax/typing.nit:767,24
+                identifier 'n_expr' ... ../src/syntax/typing.nit:767,24--29
+                ../src/syntax/typing.nit:767,24
+              ../src/syntax/typing.nit:767,32--42
                 ../src/syntax/typing.nit:767,32
-                identifier 'v' ... ../src/syntax/typing.nit:767,32
-              identifier 'type_bool' ... ../src/syntax/typing.nit:767,34--42
-          ../src/syntax/typing.nit:768,3--27
+                  ../src/syntax/typing.nit:767,32
+                  identifier 'v' ... ../src/syntax/typing.nit:767,32
+                  ../src/syntax/typing.nit:767,32
+                identifier 'type_bool' ... ../src/syntax/typing.nit:767,34--42
+                ../src/syntax/typing.nit:767,32
+              ')' ... ../src/syntax/typing.nit:767,43
+          ../src/syntax/typing.nit:768,3--28
             ../src/syntax/typing.nit:768,3--8
               ../src/syntax/typing.nit:768,3
               identifier 'n_expr' ... ../src/syntax/typing.nit:768,3--8
+              ../src/syntax/typing.nit:768,3
             identifier 'warn_parentheses' ... ../src/syntax/typing.nit:768,10--25
-            ../src/syntax/typing.nit:768,27
+            ../src/syntax/typing.nit:768,26--28
+              '(' ... ../src/syntax/typing.nit:768,26
               ../src/syntax/typing.nit:768,27
-              identifier 'v' ... ../src/syntax/typing.nit:768,27
+                ../src/syntax/typing.nit:768,27
+                identifier 'v' ... ../src/syntax/typing.nit:768,27
+                ../src/syntax/typing.nit:768,27
+              ')' ... ../src/syntax/typing.nit:768,28
           ../src/syntax/typing.nit:771,3--776,5
             keyword 'if' ... ../src/syntax/typing.nit:771,3--4
             ../src/syntax/typing.nit:771,6--19
               ../src/syntax/typing.nit:771,6--11
                 ../src/syntax/typing.nit:771,6
                 identifier 'n_else' ... ../src/syntax/typing.nit:771,6--11
+                ../src/syntax/typing.nit:771,6
               ../src/syntax/typing.nit:771,16--19
                 keyword 'null' ... ../src/syntax/typing.nit:771,16--19
             ../src/syntax/typing.nit:772,4--775,28
@@ -4543,42 +5605,62 @@
                   ../src/syntax/typing.nit:772,23
                     ../src/syntax/typing.nit:772,23
                     identifier 'v' ... ../src/syntax/typing.nit:772,23
+                    ../src/syntax/typing.nit:772,23
                   identifier 'flow_ctx' ... ../src/syntax/typing.nit:772,25--32
-              ../src/syntax/typing.nit:773,4--33
+                  ../src/syntax/typing.nit:772,23
+              ../src/syntax/typing.nit:773,4--34
                 ../src/syntax/typing.nit:773,4
                   ../src/syntax/typing.nit:773,4
                   identifier 'v' ... ../src/syntax/typing.nit:773,4
+                  ../src/syntax/typing.nit:773,4
                 identifier 'use_if_false_flow_ctx' ... ../src/syntax/typing.nit:773,6--26
-                ../src/syntax/typing.nit:773,28--33
-                  ../src/syntax/typing.nit:773,28
-                  identifier 'n_expr' ... ../src/syntax/typing.nit:773,28--33
-              ../src/syntax/typing.nit:774,4--23
+                ../src/syntax/typing.nit:773,27--34
+                  '(' ... ../src/syntax/typing.nit:773,27
+                  ../src/syntax/typing.nit:773,28--33
+                    ../src/syntax/typing.nit:773,28
+                    identifier 'n_expr' ... ../src/syntax/typing.nit:773,28--33
+                    ../src/syntax/typing.nit:773,28
+                  ')' ... ../src/syntax/typing.nit:773,34
+              ../src/syntax/typing.nit:774,4--24
                 ../src/syntax/typing.nit:774,4
                   ../src/syntax/typing.nit:774,4
                   identifier 'v' ... ../src/syntax/typing.nit:774,4
+                  ../src/syntax/typing.nit:774,4
                 identifier 'enter_visit' ... ../src/syntax/typing.nit:774,6--16
-                ../src/syntax/typing.nit:774,18--23
-                  ../src/syntax/typing.nit:774,18
-                  identifier 'n_else' ... ../src/syntax/typing.nit:774,18--23
+                ../src/syntax/typing.nit:774,17--24
+                  '(' ... ../src/syntax/typing.nit:774,17
+                  ../src/syntax/typing.nit:774,18--23
+                    ../src/syntax/typing.nit:774,18
+                    identifier 'n_else' ... ../src/syntax/typing.nit:774,18--23
+                    ../src/syntax/typing.nit:774,18
+                  ')' ... ../src/syntax/typing.nit:774,24
               ../src/syntax/typing.nit:775,4--28
                 ../src/syntax/typing.nit:775,4
                   ../src/syntax/typing.nit:775,4
                   identifier 'v' ... ../src/syntax/typing.nit:775,4
+                  ../src/syntax/typing.nit:775,4
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:775,6--13
+                ../src/syntax/typing.nit:775,17
                 '=' ... ../src/syntax/typing.nit:775,15
                 ../src/syntax/typing.nit:775,17--28
                   ../src/syntax/typing.nit:775,17
                   identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:775,17--28
+                  ../src/syntax/typing.nit:775,17
             ../src/syntax/typing.nit:776,3--5
               keyword 'end' ... ../src/syntax/typing.nit:776,3--5
-          ../src/syntax/typing.nit:779,3--31
+          ../src/syntax/typing.nit:779,3--32
             ../src/syntax/typing.nit:779,3
               ../src/syntax/typing.nit:779,3
               identifier 'v' ... ../src/syntax/typing.nit:779,3
+              ../src/syntax/typing.nit:779,3
             identifier 'use_if_true_flow_ctx' ... ../src/syntax/typing.nit:779,5--24
-            ../src/syntax/typing.nit:779,26--31
-              ../src/syntax/typing.nit:779,26
-              identifier 'n_expr' ... ../src/syntax/typing.nit:779,26--31
+            ../src/syntax/typing.nit:779,25--32
+              '(' ... ../src/syntax/typing.nit:779,25
+              ../src/syntax/typing.nit:779,26--31
+                ../src/syntax/typing.nit:779,26
+                identifier 'n_expr' ... ../src/syntax/typing.nit:779,26--31
+                ../src/syntax/typing.nit:779,26
+              ')' ... ../src/syntax/typing.nit:779,32
           ../src/syntax/typing.nit:780,3--18
             ../src/syntax/typing.nit:780,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:780,3--11
@@ -4637,6 +5719,7 @@
           ../src/syntax/typing.nit:790,35--42
             ../src/syntax/typing.nit:790,35
             identifier 'variable' ... ../src/syntax/typing.nit:790,35--42
+            ../src/syntax/typing.nit:790,35
       ../src/syntax/typing.nit:792,2--797,4
         keyword 'redef' ... ../src/syntax/typing.nit:792,2--6
         ../src/syntax/typing.nit:792,12
@@ -4647,32 +5730,44 @@
           ../src/syntax/typing.nit:792,25
             identifier 'v' ... ../src/syntax/typing.nit:792,25
         ../src/syntax/typing.nit:794,3--797,4
-          ../src/syntax/typing.nit:794,3--40
+          ../src/syntax/typing.nit:794,3--41
             ../src/syntax/typing.nit:794,3--12
               ../src/syntax/typing.nit:794,3
                 ../src/syntax/typing.nit:794,3
                 identifier 'v' ... ../src/syntax/typing.nit:794,3
+                ../src/syntax/typing.nit:794,3
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:794,5--12
+              ../src/syntax/typing.nit:794,3
             identifier 'check_is_set' ... ../src/syntax/typing.nit:794,14--25
-            ../src/syntax/typing.nit:794,27--30
-              keyword 'self' ... ../src/syntax/typing.nit:794,27--30
-            ../src/syntax/typing.nit:794,33--40
-              ../src/syntax/typing.nit:794,33
-              identifier 'variable' ... ../src/syntax/typing.nit:794,33--40
-          ../src/syntax/typing.nit:795,3--36
+            ../src/syntax/typing.nit:794,26--41
+              '(' ... ../src/syntax/typing.nit:794,26
+              ../src/syntax/typing.nit:794,27--30
+                keyword 'self' ... ../src/syntax/typing.nit:794,27--30
+              ../src/syntax/typing.nit:794,33--40
+                ../src/syntax/typing.nit:794,33
+                identifier 'variable' ... ../src/syntax/typing.nit:794,33--40
+                ../src/syntax/typing.nit:794,33
+              ')' ... ../src/syntax/typing.nit:794,41
+          ../src/syntax/typing.nit:795,3--37
             ../src/syntax/typing.nit:795,12
             attribute '_stype' ... ../src/syntax/typing.nit:795,3--8
             '=' ... ../src/syntax/typing.nit:795,10
-            ../src/syntax/typing.nit:795,12--36
+            ../src/syntax/typing.nit:795,12--37
               ../src/syntax/typing.nit:795,12--21
                 ../src/syntax/typing.nit:795,12
                   ../src/syntax/typing.nit:795,12
                   identifier 'v' ... ../src/syntax/typing.nit:795,12
+                  ../src/syntax/typing.nit:795,12
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:795,14--21
+                ../src/syntax/typing.nit:795,12
               identifier 'stype' ... ../src/syntax/typing.nit:795,23--27
-              ../src/syntax/typing.nit:795,29--36
-                ../src/syntax/typing.nit:795,29
-                identifier 'variable' ... ../src/syntax/typing.nit:795,29--36
+              ../src/syntax/typing.nit:795,28--37
+                '(' ... ../src/syntax/typing.nit:795,28
+                ../src/syntax/typing.nit:795,29--36
+                  ../src/syntax/typing.nit:795,29
+                  identifier 'variable' ... ../src/syntax/typing.nit:795,29--36
+                  ../src/syntax/typing.nit:795,29
+                ')' ... ../src/syntax/typing.nit:795,37
           ../src/syntax/typing.nit:796,3--28
             ../src/syntax/typing.nit:796,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:796,3--11
@@ -4701,89 +5796,122 @@
           ../src/syntax/typing.nit:801,25
             identifier 'v' ... ../src/syntax/typing.nit:801,25
         ../src/syntax/typing.nit:803,3--814,4
-          ../src/syntax/typing.nit:803,3--24
+          ../src/syntax/typing.nit:803,3--25
             ../src/syntax/typing.nit:803,3
               ../src/syntax/typing.nit:803,3
               identifier 'v' ... ../src/syntax/typing.nit:803,3
+              ../src/syntax/typing.nit:803,3
             identifier 'mark_is_set' ... ../src/syntax/typing.nit:803,5--15
-            ../src/syntax/typing.nit:803,17--24
-              ../src/syntax/typing.nit:803,17
-              identifier 'variable' ... ../src/syntax/typing.nit:803,17--24
-          ../src/syntax/typing.nit:806,3--44
+            ../src/syntax/typing.nit:803,16--25
+              '(' ... ../src/syntax/typing.nit:803,16
+              ../src/syntax/typing.nit:803,17--24
+                ../src/syntax/typing.nit:803,17
+                identifier 'variable' ... ../src/syntax/typing.nit:803,17--24
+                ../src/syntax/typing.nit:803,17
+              ')' ... ../src/syntax/typing.nit:803,25
+          ../src/syntax/typing.nit:806,3--45
             keyword 'var' ... ../src/syntax/typing.nit:806,3--5
             identifier 'btype' ... ../src/syntax/typing.nit:806,7--11
             '=' ... ../src/syntax/typing.nit:806,13
-            ../src/syntax/typing.nit:806,15--44
+            ../src/syntax/typing.nit:806,15--45
               ../src/syntax/typing.nit:806,15--29
                 ../src/syntax/typing.nit:806,15
                   ../src/syntax/typing.nit:806,15
                   identifier 'v' ... ../src/syntax/typing.nit:806,15
+                  ../src/syntax/typing.nit:806,15
                 identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:806,17--29
+                ../src/syntax/typing.nit:806,15
               identifier 'stype' ... ../src/syntax/typing.nit:806,31--35
-              ../src/syntax/typing.nit:806,37--44
-                ../src/syntax/typing.nit:806,37
-                identifier 'variable' ... ../src/syntax/typing.nit:806,37--44
+              ../src/syntax/typing.nit:806,36--45
+                '(' ... ../src/syntax/typing.nit:806,36
+                ../src/syntax/typing.nit:806,37--44
+                  ../src/syntax/typing.nit:806,37
+                  identifier 'variable' ... ../src/syntax/typing.nit:806,37--44
+                  ../src/syntax/typing.nit:806,37
+                ')' ... ../src/syntax/typing.nit:806,45
           ../src/syntax/typing.nit:807,3--42
             keyword 'if' ... ../src/syntax/typing.nit:807,3--4
-            ../src/syntax/typing.nit:807,6--29
+            ../src/syntax/typing.nit:807,6--30
               keyword 'not' ... ../src/syntax/typing.nit:807,6--8
-              ../src/syntax/typing.nit:807,10--29
+              ../src/syntax/typing.nit:807,10--30
                 ../src/syntax/typing.nit:807,10
                   ../src/syntax/typing.nit:807,10
                   identifier 'v' ... ../src/syntax/typing.nit:807,10
+                  ../src/syntax/typing.nit:807,10
                 identifier 'check_expr' ... ../src/syntax/typing.nit:807,12--21
-                ../src/syntax/typing.nit:807,23--29
-                  ../src/syntax/typing.nit:807,23
-                  identifier 'n_value' ... ../src/syntax/typing.nit:807,23--29
+                ../src/syntax/typing.nit:807,22--30
+                  '(' ... ../src/syntax/typing.nit:807,22
+                  ../src/syntax/typing.nit:807,23--29
+                    ../src/syntax/typing.nit:807,23
+                    identifier 'n_value' ... ../src/syntax/typing.nit:807,23--29
+                    ../src/syntax/typing.nit:807,23
+                  ')' ... ../src/syntax/typing.nit:807,30
             ../src/syntax/typing.nit:807,37--42
               keyword 'return' ... ../src/syntax/typing.nit:807,37--42
           ../src/syntax/typing.nit:808,3--75
             keyword 'if' ... ../src/syntax/typing.nit:808,3--4
-            ../src/syntax/typing.nit:808,6--62
+            ../src/syntax/typing.nit:808,6--63
               ../src/syntax/typing.nit:808,6--18
                 ../src/syntax/typing.nit:808,6--10
                   ../src/syntax/typing.nit:808,6
                   identifier 'btype' ... ../src/syntax/typing.nit:808,6--10
+                  ../src/syntax/typing.nit:808,6
                 ../src/syntax/typing.nit:808,15--18
                   keyword 'null' ... ../src/syntax/typing.nit:808,15--18
-              ../src/syntax/typing.nit:808,24--62
+              ../src/syntax/typing.nit:808,24--63
                 keyword 'not' ... ../src/syntax/typing.nit:808,24--26
-                ../src/syntax/typing.nit:808,28--62
+                ../src/syntax/typing.nit:808,28--63
                   ../src/syntax/typing.nit:808,28
                     ../src/syntax/typing.nit:808,28
                     identifier 'v' ... ../src/syntax/typing.nit:808,28
+                    ../src/syntax/typing.nit:808,28
                   identifier 'check_conform_expr' ... ../src/syntax/typing.nit:808,30--47
-                  ../src/syntax/typing.nit:808,49--55
-                    ../src/syntax/typing.nit:808,49
-                    identifier 'n_value' ... ../src/syntax/typing.nit:808,49--55
-                  ../src/syntax/typing.nit:808,58--62
-                    ../src/syntax/typing.nit:808,58
-                    identifier 'btype' ... ../src/syntax/typing.nit:808,58--62
+                  ../src/syntax/typing.nit:808,48--63
+                    '(' ... ../src/syntax/typing.nit:808,48
+                    ../src/syntax/typing.nit:808,49--55
+                      ../src/syntax/typing.nit:808,49
+                      identifier 'n_value' ... ../src/syntax/typing.nit:808,49--55
+                      ../src/syntax/typing.nit:808,49
+                    ../src/syntax/typing.nit:808,58--62
+                      ../src/syntax/typing.nit:808,58
+                      identifier 'btype' ... ../src/syntax/typing.nit:808,58--62
+                      ../src/syntax/typing.nit:808,58
+                    ')' ... ../src/syntax/typing.nit:808,63
             ../src/syntax/typing.nit:808,70--75
               keyword 'return' ... ../src/syntax/typing.nit:808,70--75
-          ../src/syntax/typing.nit:811,3--64
+          ../src/syntax/typing.nit:811,3--65
             ../src/syntax/typing.nit:811,3
               ../src/syntax/typing.nit:811,3
               identifier 'v' ... ../src/syntax/typing.nit:811,3
+              ../src/syntax/typing.nit:811,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:811,5--12
+            ../src/syntax/typing.nit:811,16
             '=' ... ../src/syntax/typing.nit:811,14
-            ../src/syntax/typing.nit:811,16--64
+            ../src/syntax/typing.nit:811,16--65
               ../src/syntax/typing.nit:811,16--25
                 ../src/syntax/typing.nit:811,16
                   ../src/syntax/typing.nit:811,16
                   identifier 'v' ... ../src/syntax/typing.nit:811,16
+                  ../src/syntax/typing.nit:811,16
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:811,18--25
+                ../src/syntax/typing.nit:811,16
               identifier 'sub_with' ... ../src/syntax/typing.nit:811,27--34
-              ../src/syntax/typing.nit:811,36--39
-                keyword 'self' ... ../src/syntax/typing.nit:811,36--39
-              ../src/syntax/typing.nit:811,42--49
-                ../src/syntax/typing.nit:811,42
-                identifier 'variable' ... ../src/syntax/typing.nit:811,42--49
-              ../src/syntax/typing.nit:811,52--64
-                ../src/syntax/typing.nit:811,52--58
+              ../src/syntax/typing.nit:811,35--65
+                '(' ... ../src/syntax/typing.nit:811,35
+                ../src/syntax/typing.nit:811,36--39
+                  keyword 'self' ... ../src/syntax/typing.nit:811,36--39
+                ../src/syntax/typing.nit:811,42--49
+                  ../src/syntax/typing.nit:811,42
+                  identifier 'variable' ... ../src/syntax/typing.nit:811,42--49
+                  ../src/syntax/typing.nit:811,42
+                ../src/syntax/typing.nit:811,52--64
+                  ../src/syntax/typing.nit:811,52--58
+                    ../src/syntax/typing.nit:811,52
+                    identifier 'n_value' ... ../src/syntax/typing.nit:811,52--58
+                    ../src/syntax/typing.nit:811,52
+                  identifier 'stype' ... ../src/syntax/typing.nit:811,60--64
                   ../src/syntax/typing.nit:811,52
-                  identifier 'n_value' ... ../src/syntax/typing.nit:811,52--58
-                identifier 'stype' ... ../src/syntax/typing.nit:811,60--64
+                ')' ... ../src/syntax/typing.nit:811,65
           ../src/syntax/typing.nit:813,3--18
             ../src/syntax/typing.nit:813,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:813,3--11
@@ -4831,6 +5959,7 @@
               ../src/syntax/typing.nit:823,6--16
                 ../src/syntax/typing.nit:823,6
                 identifier 'type_lvalue' ... ../src/syntax/typing.nit:823,6--16
+                ../src/syntax/typing.nit:823,6
               ../src/syntax/typing.nit:823,21--24
                 keyword 'null' ... ../src/syntax/typing.nit:823,21--24
             ../src/syntax/typing.nit:824,4--14
@@ -4848,31 +5977,39 @@
               ../src/syntax/typing.nit:826,14--24
                 ../src/syntax/typing.nit:826,14
                 identifier 'n_assign_op' ... ../src/syntax/typing.nit:826,14--24
+                ../src/syntax/typing.nit:826,14
               identifier 'method_name' ... ../src/syntax/typing.nit:826,26--36
+              ../src/syntax/typing.nit:826,14
           ../src/syntax/typing.nit:827,3--830,5
             keyword 'if' ... ../src/syntax/typing.nit:827,3--4
             ../src/syntax/typing.nit:827,6--31
               ../src/syntax/typing.nit:827,6--16
                 ../src/syntax/typing.nit:827,6
                 identifier 'type_lvalue' ... ../src/syntax/typing.nit:827,6--16
+                ../src/syntax/typing.nit:827,6
               ../src/syntax/typing.nit:827,22--31
                 type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:827,22--31
             ../src/syntax/typing.nit:828,4--829,14
-              ../src/syntax/typing.nit:828,4--57
+              ../src/syntax/typing.nit:828,4--58
                 ../src/syntax/typing.nit:828,4
                   ../src/syntax/typing.nit:828,4
                   identifier 'v' ... ../src/syntax/typing.nit:828,4
+                  ../src/syntax/typing.nit:828,4
                 identifier 'error' ... ../src/syntax/typing.nit:828,6--10
-                ../src/syntax/typing.nit:828,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:828,12--15
-                ../src/syntax/typing.nit:828,18--57
-                  ../src/syntax/typing.nit:828,18--34
-                    literal value '"Error: Method '{' ... ../src/syntax/typing.nit:828,18--34
-                  ../src/syntax/typing.nit:828,35--38
-                    ../src/syntax/typing.nit:828,35
-                    identifier 'name' ... ../src/syntax/typing.nit:828,35--38
-                  ../src/syntax/typing.nit:828,39--57
-                    '}' call on 'null'."' ... ../src/syntax/typing.nit:828,39--57
+                ../src/syntax/typing.nit:828,11--58
+                  '(' ... ../src/syntax/typing.nit:828,11
+                  ../src/syntax/typing.nit:828,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:828,12--15
+                  ../src/syntax/typing.nit:828,18--57
+                    ../src/syntax/typing.nit:828,18--34
+                      literal value '"Error: Method '{' ... ../src/syntax/typing.nit:828,18--34
+                    ../src/syntax/typing.nit:828,35--38
+                      ../src/syntax/typing.nit:828,35
+                      identifier 'name' ... ../src/syntax/typing.nit:828,35--38
+                      ../src/syntax/typing.nit:828,35
+                    ../src/syntax/typing.nit:828,39--57
+                      '}' call on 'null'."' ... ../src/syntax/typing.nit:828,39--57
+                  ')' ... ../src/syntax/typing.nit:828,58
               ../src/syntax/typing.nit:829,4--14
                 keyword 'return' ... ../src/syntax/typing.nit:829,4--9
                 ../src/syntax/typing.nit:829,11--14
@@ -4887,89 +6024,120 @@
               ../src/syntax/typing.nit:831,12--22
                 ../src/syntax/typing.nit:831,12
                 identifier 'type_lvalue' ... ../src/syntax/typing.nit:831,12--22
+                ../src/syntax/typing.nit:831,12
               identifier 'local_class' ... ../src/syntax/typing.nit:831,24--34
+              ../src/syntax/typing.nit:831,12
           ../src/syntax/typing.nit:832,3--835,5
             keyword 'if' ... ../src/syntax/typing.nit:832,3--4
-            ../src/syntax/typing.nit:832,6--44
+            ../src/syntax/typing.nit:832,6--45
               keyword 'not' ... ../src/syntax/typing.nit:832,6--8
-              ../src/syntax/typing.nit:832,10--44
+              ../src/syntax/typing.nit:832,10--45
                 ../src/syntax/typing.nit:832,10--11
                   ../src/syntax/typing.nit:832,10
                   identifier 'lc' ... ../src/syntax/typing.nit:832,10--11
+                  ../src/syntax/typing.nit:832,10
                 identifier 'has_global_property_by_name' ... ../src/syntax/typing.nit:832,13--39
-                ../src/syntax/typing.nit:832,41--44
-                  ../src/syntax/typing.nit:832,41
-                  identifier 'name' ... ../src/syntax/typing.nit:832,41--44
+                ../src/syntax/typing.nit:832,40--45
+                  '(' ... ../src/syntax/typing.nit:832,40
+                  ../src/syntax/typing.nit:832,41--44
+                    ../src/syntax/typing.nit:832,41
+                    identifier 'name' ... ../src/syntax/typing.nit:832,41--44
+                    ../src/syntax/typing.nit:832,41
+                  ')' ... ../src/syntax/typing.nit:832,45
             ../src/syntax/typing.nit:833,4--834,14
-              ../src/syntax/typing.nit:833,4--74
+              ../src/syntax/typing.nit:833,4--75
                 ../src/syntax/typing.nit:833,4
                   ../src/syntax/typing.nit:833,4
                   identifier 'v' ... ../src/syntax/typing.nit:833,4
+                  ../src/syntax/typing.nit:833,4
                 identifier 'error' ... ../src/syntax/typing.nit:833,6--10
-                ../src/syntax/typing.nit:833,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:833,12--15
-                ../src/syntax/typing.nit:833,18--74
-                  ../src/syntax/typing.nit:833,18--34
-                    literal value '"Error: Method '{' ... ../src/syntax/typing.nit:833,18--34
-                  ../src/syntax/typing.nit:833,35--38
-                    ../src/syntax/typing.nit:833,35
-                    identifier 'name' ... ../src/syntax/typing.nit:833,35--38
-                  ../src/syntax/typing.nit:833,39--60
-                    literal value '}' doesn't exists in {' ... ../src/syntax/typing.nit:833,39--60
-                  ../src/syntax/typing.nit:833,61--71
-                    ../src/syntax/typing.nit:833,61
-                    identifier 'type_lvalue' ... ../src/syntax/typing.nit:833,61--71
-                  ../src/syntax/typing.nit:833,72--74
-                    '}."' ... ../src/syntax/typing.nit:833,72--74
+                ../src/syntax/typing.nit:833,11--75
+                  '(' ... ../src/syntax/typing.nit:833,11
+                  ../src/syntax/typing.nit:833,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:833,12--15
+                  ../src/syntax/typing.nit:833,18--74
+                    ../src/syntax/typing.nit:833,18--34
+                      literal value '"Error: Method '{' ... ../src/syntax/typing.nit:833,18--34
+                    ../src/syntax/typing.nit:833,35--38
+                      ../src/syntax/typing.nit:833,35
+                      identifier 'name' ... ../src/syntax/typing.nit:833,35--38
+                      ../src/syntax/typing.nit:833,35
+                    ../src/syntax/typing.nit:833,39--60
+                      literal value '}' doesn't exists in {' ... ../src/syntax/typing.nit:833,39--60
+                    ../src/syntax/typing.nit:833,61--71
+                      ../src/syntax/typing.nit:833,61
+                      identifier 'type_lvalue' ... ../src/syntax/typing.nit:833,61--71
+                      ../src/syntax/typing.nit:833,61
+                    ../src/syntax/typing.nit:833,72--74
+                      '}."' ... ../src/syntax/typing.nit:833,72--74
+                  ')' ... ../src/syntax/typing.nit:833,75
               ../src/syntax/typing.nit:834,4--14
                 keyword 'return' ... ../src/syntax/typing.nit:834,4--9
                 ../src/syntax/typing.nit:834,11--14
                   keyword 'null' ... ../src/syntax/typing.nit:834,11--14
             ../src/syntax/typing.nit:835,3--5
               keyword 'end' ... ../src/syntax/typing.nit:835,3--5
-          ../src/syntax/typing.nit:836,3--34
+          ../src/syntax/typing.nit:836,3--35
             keyword 'var' ... ../src/syntax/typing.nit:836,3--5
             identifier 'prop' ... ../src/syntax/typing.nit:836,7--10
             '=' ... ../src/syntax/typing.nit:836,12
-            ../src/syntax/typing.nit:836,14--34
+            ../src/syntax/typing.nit:836,14--35
               ../src/syntax/typing.nit:836,14--15
                 ../src/syntax/typing.nit:836,14
                 identifier 'lc' ... ../src/syntax/typing.nit:836,14--15
+                ../src/syntax/typing.nit:836,14
               identifier 'select_method' ... ../src/syntax/typing.nit:836,17--29
-              ../src/syntax/typing.nit:836,31--34
-                ../src/syntax/typing.nit:836,31
-                identifier 'name' ... ../src/syntax/typing.nit:836,31--34
-          ../src/syntax/typing.nit:837,3--57
+              ../src/syntax/typing.nit:836,30--35
+                '(' ... ../src/syntax/typing.nit:836,30
+                ../src/syntax/typing.nit:836,31--34
+                  ../src/syntax/typing.nit:836,31
+                  identifier 'name' ... ../src/syntax/typing.nit:836,31--34
+                  ../src/syntax/typing.nit:836,31
+                ')' ... ../src/syntax/typing.nit:836,35
+          ../src/syntax/typing.nit:837,3--58
             ../src/syntax/typing.nit:837,3--13
               ../src/syntax/typing.nit:837,3--6
                 ../src/syntax/typing.nit:837,3
                 identifier 'prop' ... ../src/syntax/typing.nit:837,3--6
+                ../src/syntax/typing.nit:837,3
               identifier 'global' ... ../src/syntax/typing.nit:837,8--13
+              ../src/syntax/typing.nit:837,3
             identifier 'check_visibility' ... ../src/syntax/typing.nit:837,15--30
-            ../src/syntax/typing.nit:837,32
+            ../src/syntax/typing.nit:837,31--58
+              '(' ... ../src/syntax/typing.nit:837,31
               ../src/syntax/typing.nit:837,32
-              identifier 'v' ... ../src/syntax/typing.nit:837,32
-            ../src/syntax/typing.nit:837,35--38
-              keyword 'self' ... ../src/syntax/typing.nit:837,35--38
-            ../src/syntax/typing.nit:837,41--50
-              ../src/syntax/typing.nit:837,41
+                ../src/syntax/typing.nit:837,32
+                identifier 'v' ... ../src/syntax/typing.nit:837,32
+                ../src/syntax/typing.nit:837,32
+              ../src/syntax/typing.nit:837,35--38
+                keyword 'self' ... ../src/syntax/typing.nit:837,35--38
+              ../src/syntax/typing.nit:837,41--50
                 ../src/syntax/typing.nit:837,41
-                identifier 'v' ... ../src/syntax/typing.nit:837,41
-              identifier 'mmmodule' ... ../src/syntax/typing.nit:837,43--50
-            ../src/syntax/typing.nit:837,53--57
-              keyword 'false' ... ../src/syntax/typing.nit:837,53--57
-          ../src/syntax/typing.nit:838,3--43
+                  ../src/syntax/typing.nit:837,41
+                  identifier 'v' ... ../src/syntax/typing.nit:837,41
+                  ../src/syntax/typing.nit:837,41
+                identifier 'mmmodule' ... ../src/syntax/typing.nit:837,43--50
+                ../src/syntax/typing.nit:837,41
+              ../src/syntax/typing.nit:837,53--57
+                keyword 'false' ... ../src/syntax/typing.nit:837,53--57
+              ')' ... ../src/syntax/typing.nit:837,58
+          ../src/syntax/typing.nit:838,3--44
             keyword 'var' ... ../src/syntax/typing.nit:838,3--5
             identifier 'psig' ... ../src/syntax/typing.nit:838,7--10
             '=' ... ../src/syntax/typing.nit:838,12
-            ../src/syntax/typing.nit:838,14--43
+            ../src/syntax/typing.nit:838,14--44
               ../src/syntax/typing.nit:838,14--17
                 ../src/syntax/typing.nit:838,14
                 identifier 'prop' ... ../src/syntax/typing.nit:838,14--17
+                ../src/syntax/typing.nit:838,14
               identifier 'signature_for' ... ../src/syntax/typing.nit:838,19--31
-              ../src/syntax/typing.nit:838,33--43
-                ../src/syntax/typing.nit:838,33
-                identifier 'type_lvalue' ... ../src/syntax/typing.nit:838,33--43
+              ../src/syntax/typing.nit:838,32--44
+                '(' ... ../src/syntax/typing.nit:838,32
+                ../src/syntax/typing.nit:838,33--43
+                  ../src/syntax/typing.nit:838,33
+                  identifier 'type_lvalue' ... ../src/syntax/typing.nit:838,33--43
+                  ../src/syntax/typing.nit:838,33
+                ')' ... ../src/syntax/typing.nit:838,44
           ../src/syntax/typing.nit:839,3--23
             ../src/syntax/typing.nit:839,20
             attribute '_assign_method' ... ../src/syntax/typing.nit:839,3--16
@@ -4977,26 +6145,37 @@
             ../src/syntax/typing.nit:839,20--23
               ../src/syntax/typing.nit:839,20
               identifier 'prop' ... ../src/syntax/typing.nit:839,20--23
+              ../src/syntax/typing.nit:839,20
           ../src/syntax/typing.nit:840,3--77
             keyword 'if' ... ../src/syntax/typing.nit:840,3--4
-            ../src/syntax/typing.nit:840,6--59
+            ../src/syntax/typing.nit:840,6--60
               keyword 'not' ... ../src/syntax/typing.nit:840,6--8
-              ../src/syntax/typing.nit:840,10--59
+              ../src/syntax/typing.nit:840,10--60
                 ../src/syntax/typing.nit:840,10
                   ../src/syntax/typing.nit:840,10
                   identifier 'v' ... ../src/syntax/typing.nit:840,10
+                  ../src/syntax/typing.nit:840,10
                 identifier 'check_conform_expr' ... ../src/syntax/typing.nit:840,12--29
-                ../src/syntax/typing.nit:840,31--37
-                  ../src/syntax/typing.nit:840,31
-                  identifier 'n_value' ... ../src/syntax/typing.nit:840,31--37
-                ../src/syntax/typing.nit:840,40--59
-                  ../src/syntax/typing.nit:840,40--45
-                    ../src/syntax/typing.nit:840,40--43
-                      ../src/syntax/typing.nit:840,40
-                      identifier 'psig' ... ../src/syntax/typing.nit:840,40--43
-                    ../src/syntax/typing.nit:840,45
-                      literal value '0' ... ../src/syntax/typing.nit:840,45
-                  identifier 'not_for_self' ... ../src/syntax/typing.nit:840,48--59
+                ../src/syntax/typing.nit:840,30--60
+                  '(' ... ../src/syntax/typing.nit:840,30
+                  ../src/syntax/typing.nit:840,31--37
+                    ../src/syntax/typing.nit:840,31
+                    identifier 'n_value' ... ../src/syntax/typing.nit:840,31--37
+                    ../src/syntax/typing.nit:840,31
+                  ../src/syntax/typing.nit:840,40--59
+                    ../src/syntax/typing.nit:840,40--46
+                      ../src/syntax/typing.nit:840,40--43
+                        ../src/syntax/typing.nit:840,40
+                        identifier 'psig' ... ../src/syntax/typing.nit:840,40--43
+                        ../src/syntax/typing.nit:840,40
+                      ../src/syntax/typing.nit:840,44--46
+                        '[' ... ../src/syntax/typing.nit:840,44
+                        ../src/syntax/typing.nit:840,45
+                          literal value '0' ... ../src/syntax/typing.nit:840,45
+                        ']' ... ../src/syntax/typing.nit:840,46
+                    identifier 'not_for_self' ... ../src/syntax/typing.nit:840,48--59
+                    ../src/syntax/typing.nit:840,40
+                  ')' ... ../src/syntax/typing.nit:840,60
             ../src/syntax/typing.nit:840,67--77
               keyword 'return' ... ../src/syntax/typing.nit:840,67--72
               ../src/syntax/typing.nit:840,74--77
@@ -5008,8 +6187,11 @@
                 ../src/syntax/typing.nit:841,10--13
                   ../src/syntax/typing.nit:841,10
                   identifier 'psig' ... ../src/syntax/typing.nit:841,10--13
+                  ../src/syntax/typing.nit:841,10
                 identifier 'return_type' ... ../src/syntax/typing.nit:841,15--25
+                ../src/syntax/typing.nit:841,10
               identifier 'not_for_self' ... ../src/syntax/typing.nit:841,27--38
+              ../src/syntax/typing.nit:841,10
           keyword 'end' ... ../src/syntax/typing.nit:842,2--4
       ../src/syntax/typing.nit:844,2--62
         keyword 'redef' ... ../src/syntax/typing.nit:844,2--6
@@ -5053,139 +6235,190 @@
           ../src/syntax/typing.nit:849,25
             identifier 'v' ... ../src/syntax/typing.nit:849,25
         ../src/syntax/typing.nit:851,3--866,4
-          ../src/syntax/typing.nit:851,3--40
+          ../src/syntax/typing.nit:851,3--41
             ../src/syntax/typing.nit:851,3--12
               ../src/syntax/typing.nit:851,3
                 ../src/syntax/typing.nit:851,3
                 identifier 'v' ... ../src/syntax/typing.nit:851,3
+                ../src/syntax/typing.nit:851,3
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:851,5--12
+              ../src/syntax/typing.nit:851,3
             identifier 'check_is_set' ... ../src/syntax/typing.nit:851,14--25
-            ../src/syntax/typing.nit:851,27--30
-              keyword 'self' ... ../src/syntax/typing.nit:851,27--30
-            ../src/syntax/typing.nit:851,33--40
-              ../src/syntax/typing.nit:851,33
-              identifier 'variable' ... ../src/syntax/typing.nit:851,33--40
-          ../src/syntax/typing.nit:852,3--24
+            ../src/syntax/typing.nit:851,26--41
+              '(' ... ../src/syntax/typing.nit:851,26
+              ../src/syntax/typing.nit:851,27--30
+                keyword 'self' ... ../src/syntax/typing.nit:851,27--30
+              ../src/syntax/typing.nit:851,33--40
+                ../src/syntax/typing.nit:851,33
+                identifier 'variable' ... ../src/syntax/typing.nit:851,33--40
+                ../src/syntax/typing.nit:851,33
+              ')' ... ../src/syntax/typing.nit:851,41
+          ../src/syntax/typing.nit:852,3--25
             ../src/syntax/typing.nit:852,3
               ../src/syntax/typing.nit:852,3
               identifier 'v' ... ../src/syntax/typing.nit:852,3
+              ../src/syntax/typing.nit:852,3
             identifier 'mark_is_set' ... ../src/syntax/typing.nit:852,5--15
-            ../src/syntax/typing.nit:852,17--24
-              ../src/syntax/typing.nit:852,17
-              identifier 'variable' ... ../src/syntax/typing.nit:852,17--24
-          ../src/syntax/typing.nit:853,3--35
+            ../src/syntax/typing.nit:852,16--25
+              '(' ... ../src/syntax/typing.nit:852,16
+              ../src/syntax/typing.nit:852,17--24
+                ../src/syntax/typing.nit:852,17
+                identifier 'variable' ... ../src/syntax/typing.nit:852,17--24
+                ../src/syntax/typing.nit:852,17
+              ')' ... ../src/syntax/typing.nit:852,25
+          ../src/syntax/typing.nit:853,3--36
             keyword 'var' ... ../src/syntax/typing.nit:853,3--5
             identifier 't' ... ../src/syntax/typing.nit:853,7
             '=' ... ../src/syntax/typing.nit:853,9
-            ../src/syntax/typing.nit:853,11--35
+            ../src/syntax/typing.nit:853,11--36
               ../src/syntax/typing.nit:853,11--20
                 ../src/syntax/typing.nit:853,11
                   ../src/syntax/typing.nit:853,11
                   identifier 'v' ... ../src/syntax/typing.nit:853,11
+                  ../src/syntax/typing.nit:853,11
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:853,13--20
+                ../src/syntax/typing.nit:853,11
               identifier 'stype' ... ../src/syntax/typing.nit:853,22--26
-              ../src/syntax/typing.nit:853,28--35
-                ../src/syntax/typing.nit:853,28
-                identifier 'variable' ... ../src/syntax/typing.nit:853,28--35
-          ../src/syntax/typing.nit:854,3--32
+              ../src/syntax/typing.nit:853,27--36
+                '(' ... ../src/syntax/typing.nit:853,27
+                ../src/syntax/typing.nit:853,28--35
+                  ../src/syntax/typing.nit:853,28
+                  identifier 'variable' ... ../src/syntax/typing.nit:853,28--35
+                  ../src/syntax/typing.nit:853,28
+                ')' ... ../src/syntax/typing.nit:853,36
+          ../src/syntax/typing.nit:854,3--33
             keyword 'var' ... ../src/syntax/typing.nit:854,3--5
             identifier 't2' ... ../src/syntax/typing.nit:854,7--8
             '=' ... ../src/syntax/typing.nit:854,10
-            ../src/syntax/typing.nit:854,12--32
+            ../src/syntax/typing.nit:854,12--33
               ../src/syntax/typing.nit:854,29
               identifier 'do_rvalue_typing' ... ../src/syntax/typing.nit:854,12--27
-              ../src/syntax/typing.nit:854,29
+              ../src/syntax/typing.nit:854,28--33
+                '(' ... ../src/syntax/typing.nit:854,28
                 ../src/syntax/typing.nit:854,29
-                identifier 'v' ... ../src/syntax/typing.nit:854,29
-              ../src/syntax/typing.nit:854,32
+                  ../src/syntax/typing.nit:854,29
+                  identifier 'v' ... ../src/syntax/typing.nit:854,29
+                  ../src/syntax/typing.nit:854,29
                 ../src/syntax/typing.nit:854,32
-                identifier 't' ... ../src/syntax/typing.nit:854,32
+                  ../src/syntax/typing.nit:854,32
+                  identifier 't' ... ../src/syntax/typing.nit:854,32
+                  ../src/syntax/typing.nit:854,32
+                ')' ... ../src/syntax/typing.nit:854,33
           ../src/syntax/typing.nit:855,3--27
             keyword 'if' ... ../src/syntax/typing.nit:855,3--4
             ../src/syntax/typing.nit:855,6--15
               ../src/syntax/typing.nit:855,6--7
                 ../src/syntax/typing.nit:855,6
                 identifier 't2' ... ../src/syntax/typing.nit:855,6--7
+                ../src/syntax/typing.nit:855,6
               ../src/syntax/typing.nit:855,12--15
                 keyword 'null' ... ../src/syntax/typing.nit:855,12--15
             ../src/syntax/typing.nit:855,22--27
               keyword 'return' ... ../src/syntax/typing.nit:855,22--27
-          ../src/syntax/typing.nit:858,3--44
+          ../src/syntax/typing.nit:858,3--45
             keyword 'var' ... ../src/syntax/typing.nit:858,3--5
             identifier 'btype' ... ../src/syntax/typing.nit:858,7--11
             '=' ... ../src/syntax/typing.nit:858,13
-            ../src/syntax/typing.nit:858,15--44
+            ../src/syntax/typing.nit:858,15--45
               ../src/syntax/typing.nit:858,15--29
                 ../src/syntax/typing.nit:858,15
                   ../src/syntax/typing.nit:858,15
                   identifier 'v' ... ../src/syntax/typing.nit:858,15
+                  ../src/syntax/typing.nit:858,15
                 identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:858,17--29
+                ../src/syntax/typing.nit:858,15
               identifier 'stype' ... ../src/syntax/typing.nit:858,31--35
-              ../src/syntax/typing.nit:858,37--44
-                ../src/syntax/typing.nit:858,37
-                identifier 'variable' ... ../src/syntax/typing.nit:858,37--44
+              ../src/syntax/typing.nit:858,36--45
+                '(' ... ../src/syntax/typing.nit:858,36
+                ../src/syntax/typing.nit:858,37--44
+                  ../src/syntax/typing.nit:858,37
+                  identifier 'variable' ... ../src/syntax/typing.nit:858,37--44
+                  ../src/syntax/typing.nit:858,37
+                ')' ... ../src/syntax/typing.nit:858,45
           ../src/syntax/typing.nit:859,3--42
             keyword 'if' ... ../src/syntax/typing.nit:859,3--4
-            ../src/syntax/typing.nit:859,6--29
+            ../src/syntax/typing.nit:859,6--30
               keyword 'not' ... ../src/syntax/typing.nit:859,6--8
-              ../src/syntax/typing.nit:859,10--29
+              ../src/syntax/typing.nit:859,10--30
                 ../src/syntax/typing.nit:859,10
                   ../src/syntax/typing.nit:859,10
                   identifier 'v' ... ../src/syntax/typing.nit:859,10
+                  ../src/syntax/typing.nit:859,10
                 identifier 'check_expr' ... ../src/syntax/typing.nit:859,12--21
-                ../src/syntax/typing.nit:859,23--29
-                  ../src/syntax/typing.nit:859,23
-                  identifier 'n_value' ... ../src/syntax/typing.nit:859,23--29
+                ../src/syntax/typing.nit:859,22--30
+                  '(' ... ../src/syntax/typing.nit:859,22
+                  ../src/syntax/typing.nit:859,23--29
+                    ../src/syntax/typing.nit:859,23
+                    identifier 'n_value' ... ../src/syntax/typing.nit:859,23--29
+                    ../src/syntax/typing.nit:859,23
+                  ')' ... ../src/syntax/typing.nit:859,30
             ../src/syntax/typing.nit:859,37--42
               keyword 'return' ... ../src/syntax/typing.nit:859,37--42
           ../src/syntax/typing.nit:860,3--74
             keyword 'if' ... ../src/syntax/typing.nit:860,3--4
-            ../src/syntax/typing.nit:860,6--61
+            ../src/syntax/typing.nit:860,6--62
               ../src/syntax/typing.nit:860,6--18
                 ../src/syntax/typing.nit:860,6--10
                   ../src/syntax/typing.nit:860,6
                   identifier 'btype' ... ../src/syntax/typing.nit:860,6--10
+                  ../src/syntax/typing.nit:860,6
                 ../src/syntax/typing.nit:860,15--18
                   keyword 'null' ... ../src/syntax/typing.nit:860,15--18
-              ../src/syntax/typing.nit:860,24--61
+              ../src/syntax/typing.nit:860,24--62
                 keyword 'not' ... ../src/syntax/typing.nit:860,24--26
-                ../src/syntax/typing.nit:860,28--61
+                ../src/syntax/typing.nit:860,28--62
                   ../src/syntax/typing.nit:860,28
                     ../src/syntax/typing.nit:860,28
                     identifier 'v' ... ../src/syntax/typing.nit:860,28
+                    ../src/syntax/typing.nit:860,28
                   identifier 'check_conform' ... ../src/syntax/typing.nit:860,30--42
-                  ../src/syntax/typing.nit:860,44--50
-                    ../src/syntax/typing.nit:860,44
-                    identifier 'n_value' ... ../src/syntax/typing.nit:860,44--50
-                  ../src/syntax/typing.nit:860,53--54
-                    ../src/syntax/typing.nit:860,53
-                    identifier 't2' ... ../src/syntax/typing.nit:860,53--54
-                  ../src/syntax/typing.nit:860,57--61
-                    ../src/syntax/typing.nit:860,57
-                    identifier 'btype' ... ../src/syntax/typing.nit:860,57--61
+                  ../src/syntax/typing.nit:860,43--62
+                    '(' ... ../src/syntax/typing.nit:860,43
+                    ../src/syntax/typing.nit:860,44--50
+                      ../src/syntax/typing.nit:860,44
+                      identifier 'n_value' ... ../src/syntax/typing.nit:860,44--50
+                      ../src/syntax/typing.nit:860,44
+                    ../src/syntax/typing.nit:860,53--54
+                      ../src/syntax/typing.nit:860,53
+                      identifier 't2' ... ../src/syntax/typing.nit:860,53--54
+                      ../src/syntax/typing.nit:860,53
+                    ../src/syntax/typing.nit:860,57--61
+                      ../src/syntax/typing.nit:860,57
+                      identifier 'btype' ... ../src/syntax/typing.nit:860,57--61
+                      ../src/syntax/typing.nit:860,57
+                    ')' ... ../src/syntax/typing.nit:860,62
             ../src/syntax/typing.nit:860,69--74
               keyword 'return' ... ../src/syntax/typing.nit:860,69--74
-          ../src/syntax/typing.nit:863,3--53
+          ../src/syntax/typing.nit:863,3--54
             ../src/syntax/typing.nit:863,3
               ../src/syntax/typing.nit:863,3
               identifier 'v' ... ../src/syntax/typing.nit:863,3
+              ../src/syntax/typing.nit:863,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:863,5--12
+            ../src/syntax/typing.nit:863,16
             '=' ... ../src/syntax/typing.nit:863,14
-            ../src/syntax/typing.nit:863,16--53
+            ../src/syntax/typing.nit:863,16--54
               ../src/syntax/typing.nit:863,16--25
                 ../src/syntax/typing.nit:863,16
                   ../src/syntax/typing.nit:863,16
                   identifier 'v' ... ../src/syntax/typing.nit:863,16
+                  ../src/syntax/typing.nit:863,16
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:863,18--25
+                ../src/syntax/typing.nit:863,16
               identifier 'sub_with' ... ../src/syntax/typing.nit:863,27--34
-              ../src/syntax/typing.nit:863,36--39
-                keyword 'self' ... ../src/syntax/typing.nit:863,36--39
-              ../src/syntax/typing.nit:863,42--49
-                ../src/syntax/typing.nit:863,42
-                identifier 'variable' ... ../src/syntax/typing.nit:863,42--49
-              ../src/syntax/typing.nit:863,52--53
-                ../src/syntax/typing.nit:863,52
-                identifier 't2' ... ../src/syntax/typing.nit:863,52--53
+              ../src/syntax/typing.nit:863,35--54
+                '(' ... ../src/syntax/typing.nit:863,35
+                ../src/syntax/typing.nit:863,36--39
+                  keyword 'self' ... ../src/syntax/typing.nit:863,36--39
+                ../src/syntax/typing.nit:863,42--49
+                  ../src/syntax/typing.nit:863,42
+                  identifier 'variable' ... ../src/syntax/typing.nit:863,42--49
+                  ../src/syntax/typing.nit:863,42
+                ../src/syntax/typing.nit:863,52--53
+                  ../src/syntax/typing.nit:863,52
+                  identifier 't2' ... ../src/syntax/typing.nit:863,52--53
+                  ../src/syntax/typing.nit:863,52
+                ')' ... ../src/syntax/typing.nit:863,54
           ../src/syntax/typing.nit:865,3--18
             ../src/syntax/typing.nit:865,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:865,3--11
@@ -5230,6 +6463,7 @@
               ../src/syntax/typing.nit:873,39--41
                 literal value '"+"' ... ../src/syntax/typing.nit:873,39--41
               identifier 'to_symbol' ... ../src/syntax/typing.nit:873,43--51
+              ../src/syntax/typing.nit:873,39
       keyword 'end' ... ../src/syntax/typing.nit:874,1--3
     ../src/syntax/typing.nit:875,1--877,3
       keyword 'redef' ... ../src/syntax/typing.nit:875,1--5
@@ -5252,6 +6486,7 @@
               ../src/syntax/typing.nit:876,39--41
                 literal value '"-"' ... ../src/syntax/typing.nit:876,39--41
               identifier 'to_symbol' ... ../src/syntax/typing.nit:876,43--51
+              ../src/syntax/typing.nit:876,39
       keyword 'end' ... ../src/syntax/typing.nit:877,1--3
     ../src/syntax/typing.nit:879,1--893,3
       keyword 'redef' ... ../src/syntax/typing.nit:879,1--5
@@ -5296,6 +6531,7 @@
           ../src/syntax/typing.nit:883,35--42
             ../src/syntax/typing.nit:883,35
             identifier 'variable' ... ../src/syntax/typing.nit:883,35--42
+            ../src/syntax/typing.nit:883,35
       ../src/syntax/typing.nit:885,2--890,4
         keyword 'redef' ... ../src/syntax/typing.nit:885,2--6
         ../src/syntax/typing.nit:885,12
@@ -5314,21 +6550,29 @@
               ../src/syntax/typing.nit:887,15
                 ../src/syntax/typing.nit:887,15
                 identifier 'v' ... ../src/syntax/typing.nit:887,15
+                ../src/syntax/typing.nit:887,15
               identifier 'self_var' ... ../src/syntax/typing.nit:887,17--24
-          ../src/syntax/typing.nit:888,3--36
+              ../src/syntax/typing.nit:887,15
+          ../src/syntax/typing.nit:888,3--37
             ../src/syntax/typing.nit:888,12
             attribute '_stype' ... ../src/syntax/typing.nit:888,3--8
             '=' ... ../src/syntax/typing.nit:888,10
-            ../src/syntax/typing.nit:888,12--36
+            ../src/syntax/typing.nit:888,12--37
               ../src/syntax/typing.nit:888,12--21
                 ../src/syntax/typing.nit:888,12
                   ../src/syntax/typing.nit:888,12
                   identifier 'v' ... ../src/syntax/typing.nit:888,12
+                  ../src/syntax/typing.nit:888,12
                 identifier 'flow_ctx' ... ../src/syntax/typing.nit:888,14--21
+                ../src/syntax/typing.nit:888,12
               identifier 'stype' ... ../src/syntax/typing.nit:888,23--27
-              ../src/syntax/typing.nit:888,29--36
-                ../src/syntax/typing.nit:888,29
-                identifier 'variable' ... ../src/syntax/typing.nit:888,29--36
+              ../src/syntax/typing.nit:888,28--37
+                '(' ... ../src/syntax/typing.nit:888,28
+                ../src/syntax/typing.nit:888,29--36
+                  ../src/syntax/typing.nit:888,29
+                  identifier 'variable' ... ../src/syntax/typing.nit:888,29--36
+                  ../src/syntax/typing.nit:888,29
+                ')' ... ../src/syntax/typing.nit:888,37
           ../src/syntax/typing.nit:889,3--18
             ../src/syntax/typing.nit:889,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:889,3--11
@@ -5390,44 +6634,68 @@
               ../src/syntax/typing.nit:902,22
                 ../src/syntax/typing.nit:902,22
                 identifier 'v' ... ../src/syntax/typing.nit:902,22
+                ../src/syntax/typing.nit:902,22
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:902,24--31
-          ../src/syntax/typing.nit:905,3--22
+              ../src/syntax/typing.nit:902,22
+          ../src/syntax/typing.nit:905,3--23
             ../src/syntax/typing.nit:905,3
               ../src/syntax/typing.nit:905,3
               identifier 'v' ... ../src/syntax/typing.nit:905,3
+              ../src/syntax/typing.nit:905,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:905,5--15
-            ../src/syntax/typing.nit:905,17--22
-              ../src/syntax/typing.nit:905,17
-              identifier 'n_expr' ... ../src/syntax/typing.nit:905,17--22
-          ../src/syntax/typing.nit:906,3--42
+            ../src/syntax/typing.nit:905,16--23
+              '(' ... ../src/syntax/typing.nit:905,16
+              ../src/syntax/typing.nit:905,17--22
+                ../src/syntax/typing.nit:905,17
+                identifier 'n_expr' ... ../src/syntax/typing.nit:905,17--22
+                ../src/syntax/typing.nit:905,17
+              ')' ... ../src/syntax/typing.nit:905,23
+          ../src/syntax/typing.nit:906,3--43
             ../src/syntax/typing.nit:906,3
               ../src/syntax/typing.nit:906,3
               identifier 'v' ... ../src/syntax/typing.nit:906,3
+              ../src/syntax/typing.nit:906,3
             identifier 'check_conform_expr' ... ../src/syntax/typing.nit:906,5--22
-            ../src/syntax/typing.nit:906,24--29
-              ../src/syntax/typing.nit:906,24
-              identifier 'n_expr' ... ../src/syntax/typing.nit:906,24--29
-            ../src/syntax/typing.nit:906,32--42
-              ../src/syntax/typing.nit:906,32
+            ../src/syntax/typing.nit:906,23--43
+              '(' ... ../src/syntax/typing.nit:906,23
+              ../src/syntax/typing.nit:906,24--29
+                ../src/syntax/typing.nit:906,24
+                identifier 'n_expr' ... ../src/syntax/typing.nit:906,24--29
+                ../src/syntax/typing.nit:906,24
+              ../src/syntax/typing.nit:906,32--42
+                ../src/syntax/typing.nit:906,32
+                  ../src/syntax/typing.nit:906,32
+                  identifier 'v' ... ../src/syntax/typing.nit:906,32
+                  ../src/syntax/typing.nit:906,32
+                identifier 'type_bool' ... ../src/syntax/typing.nit:906,34--42
                 ../src/syntax/typing.nit:906,32
-                identifier 'v' ... ../src/syntax/typing.nit:906,32
-              identifier 'type_bool' ... ../src/syntax/typing.nit:906,34--42
-          ../src/syntax/typing.nit:909,3--31
+              ')' ... ../src/syntax/typing.nit:906,43
+          ../src/syntax/typing.nit:909,3--32
             ../src/syntax/typing.nit:909,3
               ../src/syntax/typing.nit:909,3
               identifier 'v' ... ../src/syntax/typing.nit:909,3
+              ../src/syntax/typing.nit:909,3
             identifier 'use_if_true_flow_ctx' ... ../src/syntax/typing.nit:909,5--24
-            ../src/syntax/typing.nit:909,26--31
-              ../src/syntax/typing.nit:909,26
-              identifier 'n_expr' ... ../src/syntax/typing.nit:909,26--31
-          ../src/syntax/typing.nit:912,3--28
+            ../src/syntax/typing.nit:909,25--32
+              '(' ... ../src/syntax/typing.nit:909,25
+              ../src/syntax/typing.nit:909,26--31
+                ../src/syntax/typing.nit:909,26
+                identifier 'n_expr' ... ../src/syntax/typing.nit:909,26--31
+                ../src/syntax/typing.nit:909,26
+              ')' ... ../src/syntax/typing.nit:909,32
+          ../src/syntax/typing.nit:912,3--29
             ../src/syntax/typing.nit:912,3
               ../src/syntax/typing.nit:912,3
               identifier 'v' ... ../src/syntax/typing.nit:912,3
+              ../src/syntax/typing.nit:912,3
             identifier 'enter_visit_block' ... ../src/syntax/typing.nit:912,5--21
-            ../src/syntax/typing.nit:912,23--28
-              ../src/syntax/typing.nit:912,23
-              identifier 'n_then' ... ../src/syntax/typing.nit:912,23--28
+            ../src/syntax/typing.nit:912,22--29
+              '(' ... ../src/syntax/typing.nit:912,22
+              ../src/syntax/typing.nit:912,23--28
+                ../src/syntax/typing.nit:912,23
+                identifier 'n_then' ... ../src/syntax/typing.nit:912,23--28
+                ../src/syntax/typing.nit:912,23
+              ')' ... ../src/syntax/typing.nit:912,29
           ../src/syntax/typing.nit:915,3--32
             keyword 'var' ... ../src/syntax/typing.nit:915,3--5
             identifier 'then_flow_ctx' ... ../src/syntax/typing.nit:915,7--19
@@ -5436,79 +6704,114 @@
               ../src/syntax/typing.nit:915,23
                 ../src/syntax/typing.nit:915,23
                 identifier 'v' ... ../src/syntax/typing.nit:915,23
+                ../src/syntax/typing.nit:915,23
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:915,25--32
+              ../src/syntax/typing.nit:915,23
           ../src/syntax/typing.nit:918,3--27
             ../src/syntax/typing.nit:918,3
               ../src/syntax/typing.nit:918,3
               identifier 'v' ... ../src/syntax/typing.nit:918,3
+              ../src/syntax/typing.nit:918,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:918,5--12
+            ../src/syntax/typing.nit:918,16
             '=' ... ../src/syntax/typing.nit:918,14
             ../src/syntax/typing.nit:918,16--27
               ../src/syntax/typing.nit:918,16
               identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:918,16--27
-          ../src/syntax/typing.nit:919,3--32
+              ../src/syntax/typing.nit:918,16
+          ../src/syntax/typing.nit:919,3--33
             ../src/syntax/typing.nit:919,3
               ../src/syntax/typing.nit:919,3
               identifier 'v' ... ../src/syntax/typing.nit:919,3
+              ../src/syntax/typing.nit:919,3
             identifier 'use_if_false_flow_ctx' ... ../src/syntax/typing.nit:919,5--25
-            ../src/syntax/typing.nit:919,27--32
-              ../src/syntax/typing.nit:919,27
-              identifier 'n_expr' ... ../src/syntax/typing.nit:919,27--32
-          ../src/syntax/typing.nit:922,3--28
+            ../src/syntax/typing.nit:919,26--33
+              '(' ... ../src/syntax/typing.nit:919,26
+              ../src/syntax/typing.nit:919,27--32
+                ../src/syntax/typing.nit:919,27
+                identifier 'n_expr' ... ../src/syntax/typing.nit:919,27--32
+                ../src/syntax/typing.nit:919,27
+              ')' ... ../src/syntax/typing.nit:919,33
+          ../src/syntax/typing.nit:922,3--29
             ../src/syntax/typing.nit:922,3
               ../src/syntax/typing.nit:922,3
               identifier 'v' ... ../src/syntax/typing.nit:922,3
+              ../src/syntax/typing.nit:922,3
             identifier 'enter_visit_block' ... ../src/syntax/typing.nit:922,5--21
-            ../src/syntax/typing.nit:922,23--28
-              ../src/syntax/typing.nit:922,23
-              identifier 'n_else' ... ../src/syntax/typing.nit:922,23--28
-          ../src/syntax/typing.nit:925,3--74
+            ../src/syntax/typing.nit:922,22--29
+              '(' ... ../src/syntax/typing.nit:922,22
+              ../src/syntax/typing.nit:922,23--28
+                ../src/syntax/typing.nit:922,23
+                identifier 'n_else' ... ../src/syntax/typing.nit:922,23--28
+                ../src/syntax/typing.nit:922,23
+              ')' ... ../src/syntax/typing.nit:922,29
+          ../src/syntax/typing.nit:925,3--75
             ../src/syntax/typing.nit:925,3
               ../src/syntax/typing.nit:925,3
               identifier 'v' ... ../src/syntax/typing.nit:925,3
+              ../src/syntax/typing.nit:925,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:925,5--12
+            ../src/syntax/typing.nit:925,16
             '=' ... ../src/syntax/typing.nit:925,14
-            ../src/syntax/typing.nit:925,16--74
+            ../src/syntax/typing.nit:925,16--75
               ../src/syntax/typing.nit:925,16--30
                 ../src/syntax/typing.nit:925,16
                   ../src/syntax/typing.nit:925,16
                   identifier 'v' ... ../src/syntax/typing.nit:925,16
+                  ../src/syntax/typing.nit:925,16
                 identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:925,18--30
+                ../src/syntax/typing.nit:925,16
               identifier 'merge_reash' ... ../src/syntax/typing.nit:925,32--42
-              ../src/syntax/typing.nit:925,44--47
-                keyword 'self' ... ../src/syntax/typing.nit:925,44--47
-              ../src/syntax/typing.nit:925,50--62
-                ../src/syntax/typing.nit:925,50
-                identifier 'then_flow_ctx' ... ../src/syntax/typing.nit:925,50--62
-              ../src/syntax/typing.nit:925,65--74
-                ../src/syntax/typing.nit:925,65
+              ../src/syntax/typing.nit:925,43--75
+                '(' ... ../src/syntax/typing.nit:925,43
+                ../src/syntax/typing.nit:925,44--47
+                  keyword 'self' ... ../src/syntax/typing.nit:925,44--47
+                ../src/syntax/typing.nit:925,50--62
+                  ../src/syntax/typing.nit:925,50
+                  identifier 'then_flow_ctx' ... ../src/syntax/typing.nit:925,50--62
+                  ../src/syntax/typing.nit:925,50
+                ../src/syntax/typing.nit:925,65--74
                   ../src/syntax/typing.nit:925,65
-                  identifier 'v' ... ../src/syntax/typing.nit:925,65
-                identifier 'flow_ctx' ... ../src/syntax/typing.nit:925,67--74
-          ../src/syntax/typing.nit:927,3--61
+                    ../src/syntax/typing.nit:925,65
+                    identifier 'v' ... ../src/syntax/typing.nit:925,65
+                    ../src/syntax/typing.nit:925,65
+                  identifier 'flow_ctx' ... ../src/syntax/typing.nit:925,67--74
+                  ../src/syntax/typing.nit:925,65
+                ')' ... ../src/syntax/typing.nit:925,75
+          ../src/syntax/typing.nit:927,3--63
             keyword 'var' ... ../src/syntax/typing.nit:927,3--5
             identifier 'stype' ... ../src/syntax/typing.nit:927,7--11
             '=' ... ../src/syntax/typing.nit:927,13
-            ../src/syntax/typing.nit:927,15--61
+            ../src/syntax/typing.nit:927,15--63
               ../src/syntax/typing.nit:927,15
                 ../src/syntax/typing.nit:927,15
                 identifier 'v' ... ../src/syntax/typing.nit:927,15
+                ../src/syntax/typing.nit:927,15
               identifier 'check_conform_multiexpr' ... ../src/syntax/typing.nit:927,17--39
-              ../src/syntax/typing.nit:927,41--44
-                keyword 'null' ... ../src/syntax/typing.nit:927,41--44
-              ../src/syntax/typing.nit:927,48--61
-                ../src/syntax/typing.nit:927,48--53
-                  ../src/syntax/typing.nit:927,48
-                  identifier 'n_then' ... ../src/syntax/typing.nit:927,48--53
-                ../src/syntax/typing.nit:927,56--61
-                  ../src/syntax/typing.nit:927,56
-                  identifier 'n_else' ... ../src/syntax/typing.nit:927,56--61
+              ../src/syntax/typing.nit:927,40--63
+                '(' ... ../src/syntax/typing.nit:927,40
+                ../src/syntax/typing.nit:927,41--44
+                  keyword 'null' ... ../src/syntax/typing.nit:927,41--44
+                ../src/syntax/typing.nit:927,47--62
+                  ../src/syntax/typing.nit:927,47--62
+                    '[' ... ../src/syntax/typing.nit:927,47
+                    ../src/syntax/typing.nit:927,48--53
+                      ../src/syntax/typing.nit:927,48
+                      identifier 'n_then' ... ../src/syntax/typing.nit:927,48--53
+                      ../src/syntax/typing.nit:927,48
+                    ../src/syntax/typing.nit:927,56--61
+                      ../src/syntax/typing.nit:927,56
+                      identifier 'n_else' ... ../src/syntax/typing.nit:927,56--61
+                      ../src/syntax/typing.nit:927,56
+                    ']' ... ../src/syntax/typing.nit:927,62
+                ')' ... ../src/syntax/typing.nit:927,63
           ../src/syntax/typing.nit:928,3--30
             keyword 'if' ... ../src/syntax/typing.nit:928,3--4
             ../src/syntax/typing.nit:928,6--18
               ../src/syntax/typing.nit:928,6--10
                 ../src/syntax/typing.nit:928,6
                 identifier 'stype' ... ../src/syntax/typing.nit:928,6--10
+                ../src/syntax/typing.nit:928,6
               ../src/syntax/typing.nit:928,15--18
                 keyword 'null' ... ../src/syntax/typing.nit:928,15--18
             ../src/syntax/typing.nit:928,25--30
@@ -5520,6 +6823,7 @@
             ../src/syntax/typing.nit:930,12--16
               ../src/syntax/typing.nit:930,12
               identifier 'stype' ... ../src/syntax/typing.nit:930,12--16
+              ../src/syntax/typing.nit:930,12
           ../src/syntax/typing.nit:931,3--18
             ../src/syntax/typing.nit:931,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:931,3--11
@@ -5552,7 +6856,9 @@
               ../src/syntax/typing.nit:938,12
                 ../src/syntax/typing.nit:938,12
                 identifier 'v' ... ../src/syntax/typing.nit:938,12
+                ../src/syntax/typing.nit:938,12
               identifier 'type_bool' ... ../src/syntax/typing.nit:938,14--22
+              ../src/syntax/typing.nit:938,12
           ../src/syntax/typing.nit:939,3--18
             ../src/syntax/typing.nit:939,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:939,3--11
@@ -5585,7 +6891,9 @@
               ../src/syntax/typing.nit:946,22
                 ../src/syntax/typing.nit:946,22
                 identifier 'v' ... ../src/syntax/typing.nit:946,22
+                ../src/syntax/typing.nit:946,22
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:946,24--31
+              ../src/syntax/typing.nit:946,22
           ../src/syntax/typing.nit:947,3--25
             keyword 'var' ... ../src/syntax/typing.nit:947,3--5
             identifier 'stype' ... ../src/syntax/typing.nit:947,7--11
@@ -5594,7 +6902,9 @@
               ../src/syntax/typing.nit:947,15
                 ../src/syntax/typing.nit:947,15
                 identifier 'v' ... ../src/syntax/typing.nit:947,15
+                ../src/syntax/typing.nit:947,15
               identifier 'type_bool' ... ../src/syntax/typing.nit:947,17--25
+              ../src/syntax/typing.nit:947,15
           ../src/syntax/typing.nit:948,3--16
             ../src/syntax/typing.nit:948,12
             attribute '_stype' ... ../src/syntax/typing.nit:948,3--8
@@ -5602,30 +6912,46 @@
             ../src/syntax/typing.nit:948,12--16
               ../src/syntax/typing.nit:948,12
               identifier 'stype' ... ../src/syntax/typing.nit:948,12--16
-          ../src/syntax/typing.nit:951,3--22
+              ../src/syntax/typing.nit:948,12
+          ../src/syntax/typing.nit:951,3--23
             ../src/syntax/typing.nit:951,3
               ../src/syntax/typing.nit:951,3
               identifier 'v' ... ../src/syntax/typing.nit:951,3
+              ../src/syntax/typing.nit:951,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:951,5--15
-            ../src/syntax/typing.nit:951,17--22
-              ../src/syntax/typing.nit:951,17
-              identifier 'n_expr' ... ../src/syntax/typing.nit:951,17--22
-          ../src/syntax/typing.nit:954,3--32
+            ../src/syntax/typing.nit:951,16--23
+              '(' ... ../src/syntax/typing.nit:951,16
+              ../src/syntax/typing.nit:951,17--22
+                ../src/syntax/typing.nit:951,17
+                identifier 'n_expr' ... ../src/syntax/typing.nit:951,17--22
+                ../src/syntax/typing.nit:951,17
+              ')' ... ../src/syntax/typing.nit:951,23
+          ../src/syntax/typing.nit:954,3--33
             ../src/syntax/typing.nit:954,3
               ../src/syntax/typing.nit:954,3
               identifier 'v' ... ../src/syntax/typing.nit:954,3
+              ../src/syntax/typing.nit:954,3
             identifier 'use_if_false_flow_ctx' ... ../src/syntax/typing.nit:954,5--25
-            ../src/syntax/typing.nit:954,27--32
-              ../src/syntax/typing.nit:954,27
-              identifier 'n_expr' ... ../src/syntax/typing.nit:954,27--32
-          ../src/syntax/typing.nit:957,3--23
+            ../src/syntax/typing.nit:954,26--33
+              '(' ... ../src/syntax/typing.nit:954,26
+              ../src/syntax/typing.nit:954,27--32
+                ../src/syntax/typing.nit:954,27
+                identifier 'n_expr' ... ../src/syntax/typing.nit:954,27--32
+                ../src/syntax/typing.nit:954,27
+              ')' ... ../src/syntax/typing.nit:954,33
+          ../src/syntax/typing.nit:957,3--24
             ../src/syntax/typing.nit:957,3
               ../src/syntax/typing.nit:957,3
               identifier 'v' ... ../src/syntax/typing.nit:957,3
+              ../src/syntax/typing.nit:957,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:957,5--15
-            ../src/syntax/typing.nit:957,17--23
-              ../src/syntax/typing.nit:957,17
-              identifier 'n_expr2' ... ../src/syntax/typing.nit:957,17--23
+            ../src/syntax/typing.nit:957,16--24
+              '(' ... ../src/syntax/typing.nit:957,16
+              ../src/syntax/typing.nit:957,17--23
+                ../src/syntax/typing.nit:957,17
+                identifier 'n_expr2' ... ../src/syntax/typing.nit:957,17--23
+                ../src/syntax/typing.nit:957,17
+              ')' ... ../src/syntax/typing.nit:957,24
           ../src/syntax/typing.nit:958,3--962,5
             keyword 'if' ... ../src/syntax/typing.nit:958,3--4
             ../src/syntax/typing.nit:958,6--38
@@ -5633,7 +6959,9 @@
                 ../src/syntax/typing.nit:958,6--12
                   ../src/syntax/typing.nit:958,6
                   identifier 'n_expr2' ... ../src/syntax/typing.nit:958,6--12
+                  ../src/syntax/typing.nit:958,6
                 identifier 'if_false_flow_ctx' ... ../src/syntax/typing.nit:958,14--30
+                ../src/syntax/typing.nit:958,6
               ../src/syntax/typing.nit:958,35--38
                 keyword 'null' ... ../src/syntax/typing.nit:958,35--38
             ../src/syntax/typing.nit:959,4--49
@@ -5645,7 +6973,9 @@
                   ../src/syntax/typing.nit:959,25--31
                     ../src/syntax/typing.nit:959,25
                     identifier 'n_expr2' ... ../src/syntax/typing.nit:959,25--31
+                    ../src/syntax/typing.nit:959,25
                   identifier 'if_false_flow_ctx' ... ../src/syntax/typing.nit:959,33--49
+                  ../src/syntax/typing.nit:959,25
             ../src/syntax/typing.nit:961,4--962,5
               ../src/syntax/typing.nit:961,4--34
                 ../src/syntax/typing.nit:961,25
@@ -5655,39 +6985,56 @@
                   ../src/syntax/typing.nit:961,25
                     ../src/syntax/typing.nit:961,25
                     identifier 'v' ... ../src/syntax/typing.nit:961,25
+                    ../src/syntax/typing.nit:961,25
                   identifier 'flow_ctx' ... ../src/syntax/typing.nit:961,27--34
+                  ../src/syntax/typing.nit:961,25
               keyword 'end' ... ../src/syntax/typing.nit:962,3--5
           ../src/syntax/typing.nit:964,3--27
             ../src/syntax/typing.nit:964,3
               ../src/syntax/typing.nit:964,3
               identifier 'v' ... ../src/syntax/typing.nit:964,3
+              ../src/syntax/typing.nit:964,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:964,5--12
+            ../src/syntax/typing.nit:964,16
             '=' ... ../src/syntax/typing.nit:964,14
             ../src/syntax/typing.nit:964,16--27
               ../src/syntax/typing.nit:964,16
               identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:964,16--27
-          ../src/syntax/typing.nit:966,3--36
+              ../src/syntax/typing.nit:964,16
+          ../src/syntax/typing.nit:966,3--37
             ../src/syntax/typing.nit:966,3
               ../src/syntax/typing.nit:966,3
               identifier 'v' ... ../src/syntax/typing.nit:966,3
+              ../src/syntax/typing.nit:966,3
             identifier 'check_conform_expr' ... ../src/syntax/typing.nit:966,5--22
-            ../src/syntax/typing.nit:966,24--29
-              ../src/syntax/typing.nit:966,24
-              identifier 'n_expr' ... ../src/syntax/typing.nit:966,24--29
-            ../src/syntax/typing.nit:966,32--36
-              ../src/syntax/typing.nit:966,32
-              identifier 'stype' ... ../src/syntax/typing.nit:966,32--36
-          ../src/syntax/typing.nit:967,3--37
+            ../src/syntax/typing.nit:966,23--37
+              '(' ... ../src/syntax/typing.nit:966,23
+              ../src/syntax/typing.nit:966,24--29
+                ../src/syntax/typing.nit:966,24
+                identifier 'n_expr' ... ../src/syntax/typing.nit:966,24--29
+                ../src/syntax/typing.nit:966,24
+              ../src/syntax/typing.nit:966,32--36
+                ../src/syntax/typing.nit:966,32
+                identifier 'stype' ... ../src/syntax/typing.nit:966,32--36
+                ../src/syntax/typing.nit:966,32
+              ')' ... ../src/syntax/typing.nit:966,37
+          ../src/syntax/typing.nit:967,3--38
             ../src/syntax/typing.nit:967,3
               ../src/syntax/typing.nit:967,3
               identifier 'v' ... ../src/syntax/typing.nit:967,3
+              ../src/syntax/typing.nit:967,3
             identifier 'check_conform_expr' ... ../src/syntax/typing.nit:967,5--22
-            ../src/syntax/typing.nit:967,24--30
-              ../src/syntax/typing.nit:967,24
-              identifier 'n_expr2' ... ../src/syntax/typing.nit:967,24--30
-            ../src/syntax/typing.nit:967,33--37
-              ../src/syntax/typing.nit:967,33
-              identifier 'stype' ... ../src/syntax/typing.nit:967,33--37
+            ../src/syntax/typing.nit:967,23--38
+              '(' ... ../src/syntax/typing.nit:967,23
+              ../src/syntax/typing.nit:967,24--30
+                ../src/syntax/typing.nit:967,24
+                identifier 'n_expr2' ... ../src/syntax/typing.nit:967,24--30
+                ../src/syntax/typing.nit:967,24
+              ../src/syntax/typing.nit:967,33--37
+                ../src/syntax/typing.nit:967,33
+                identifier 'stype' ... ../src/syntax/typing.nit:967,33--37
+                ../src/syntax/typing.nit:967,33
+              ')' ... ../src/syntax/typing.nit:967,38
           ../src/syntax/typing.nit:968,3--16
             ../src/syntax/typing.nit:968,12
             attribute '_stype' ... ../src/syntax/typing.nit:968,3--8
@@ -5695,6 +7042,7 @@
             ../src/syntax/typing.nit:968,12--16
               ../src/syntax/typing.nit:968,12
               identifier 'stype' ... ../src/syntax/typing.nit:968,12--16
+              ../src/syntax/typing.nit:968,12
           ../src/syntax/typing.nit:969,3--18
             ../src/syntax/typing.nit:969,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:969,3--11
@@ -5727,7 +7075,9 @@
               ../src/syntax/typing.nit:976,22
                 ../src/syntax/typing.nit:976,22
                 identifier 'v' ... ../src/syntax/typing.nit:976,22
+                ../src/syntax/typing.nit:976,22
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:976,24--31
+              ../src/syntax/typing.nit:976,22
           ../src/syntax/typing.nit:977,3--25
             keyword 'var' ... ../src/syntax/typing.nit:977,3--5
             identifier 'stype' ... ../src/syntax/typing.nit:977,7--11
@@ -5736,31 +7086,48 @@
               ../src/syntax/typing.nit:977,15
                 ../src/syntax/typing.nit:977,15
                 identifier 'v' ... ../src/syntax/typing.nit:977,15
+                ../src/syntax/typing.nit:977,15
               identifier 'type_bool' ... ../src/syntax/typing.nit:977,17--25
-          ../src/syntax/typing.nit:980,3--22
+              ../src/syntax/typing.nit:977,15
+          ../src/syntax/typing.nit:980,3--23
             ../src/syntax/typing.nit:980,3
               ../src/syntax/typing.nit:980,3
               identifier 'v' ... ../src/syntax/typing.nit:980,3
+              ../src/syntax/typing.nit:980,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:980,5--15
-            ../src/syntax/typing.nit:980,17--22
-              ../src/syntax/typing.nit:980,17
-              identifier 'n_expr' ... ../src/syntax/typing.nit:980,17--22
-          ../src/syntax/typing.nit:983,3--31
+            ../src/syntax/typing.nit:980,16--23
+              '(' ... ../src/syntax/typing.nit:980,16
+              ../src/syntax/typing.nit:980,17--22
+                ../src/syntax/typing.nit:980,17
+                identifier 'n_expr' ... ../src/syntax/typing.nit:980,17--22
+                ../src/syntax/typing.nit:980,17
+              ')' ... ../src/syntax/typing.nit:980,23
+          ../src/syntax/typing.nit:983,3--32
             ../src/syntax/typing.nit:983,3
               ../src/syntax/typing.nit:983,3
               identifier 'v' ... ../src/syntax/typing.nit:983,3
+              ../src/syntax/typing.nit:983,3
             identifier 'use_if_true_flow_ctx' ... ../src/syntax/typing.nit:983,5--24
-            ../src/syntax/typing.nit:983,26--31
-              ../src/syntax/typing.nit:983,26
-              identifier 'n_expr' ... ../src/syntax/typing.nit:983,26--31
-          ../src/syntax/typing.nit:986,3--23
+            ../src/syntax/typing.nit:983,25--32
+              '(' ... ../src/syntax/typing.nit:983,25
+              ../src/syntax/typing.nit:983,26--31
+                ../src/syntax/typing.nit:983,26
+                identifier 'n_expr' ... ../src/syntax/typing.nit:983,26--31
+                ../src/syntax/typing.nit:983,26
+              ')' ... ../src/syntax/typing.nit:983,32
+          ../src/syntax/typing.nit:986,3--24
             ../src/syntax/typing.nit:986,3
               ../src/syntax/typing.nit:986,3
               identifier 'v' ... ../src/syntax/typing.nit:986,3
+              ../src/syntax/typing.nit:986,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:986,5--15
-            ../src/syntax/typing.nit:986,17--23
-              ../src/syntax/typing.nit:986,17
-              identifier 'n_expr2' ... ../src/syntax/typing.nit:986,17--23
+            ../src/syntax/typing.nit:986,16--24
+              '(' ... ../src/syntax/typing.nit:986,16
+              ../src/syntax/typing.nit:986,17--23
+                ../src/syntax/typing.nit:986,17
+                identifier 'n_expr2' ... ../src/syntax/typing.nit:986,17--23
+                ../src/syntax/typing.nit:986,17
+              ')' ... ../src/syntax/typing.nit:986,24
           ../src/syntax/typing.nit:987,3--991,5
             keyword 'if' ... ../src/syntax/typing.nit:987,3--4
             ../src/syntax/typing.nit:987,6--37
@@ -5768,7 +7135,9 @@
                 ../src/syntax/typing.nit:987,6--12
                   ../src/syntax/typing.nit:987,6
                   identifier 'n_expr2' ... ../src/syntax/typing.nit:987,6--12
+                  ../src/syntax/typing.nit:987,6
                 identifier 'if_true_flow_ctx' ... ../src/syntax/typing.nit:987,14--29
+                ../src/syntax/typing.nit:987,6
               ../src/syntax/typing.nit:987,34--37
                 keyword 'null' ... ../src/syntax/typing.nit:987,34--37
             ../src/syntax/typing.nit:988,4--47
@@ -5780,7 +7149,9 @@
                   ../src/syntax/typing.nit:988,24--30
                     ../src/syntax/typing.nit:988,24
                     identifier 'n_expr2' ... ../src/syntax/typing.nit:988,24--30
+                    ../src/syntax/typing.nit:988,24
                   identifier 'if_true_flow_ctx' ... ../src/syntax/typing.nit:988,32--47
+                  ../src/syntax/typing.nit:988,24
             ../src/syntax/typing.nit:990,4--991,5
               ../src/syntax/typing.nit:990,4--33
                 ../src/syntax/typing.nit:990,24
@@ -5790,39 +7161,56 @@
                   ../src/syntax/typing.nit:990,24
                     ../src/syntax/typing.nit:990,24
                     identifier 'v' ... ../src/syntax/typing.nit:990,24
+                    ../src/syntax/typing.nit:990,24
                   identifier 'flow_ctx' ... ../src/syntax/typing.nit:990,26--33
+                  ../src/syntax/typing.nit:990,24
               keyword 'end' ... ../src/syntax/typing.nit:991,3--5
           ../src/syntax/typing.nit:993,3--27
             ../src/syntax/typing.nit:993,3
               ../src/syntax/typing.nit:993,3
               identifier 'v' ... ../src/syntax/typing.nit:993,3
+              ../src/syntax/typing.nit:993,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:993,5--12
+            ../src/syntax/typing.nit:993,16
             '=' ... ../src/syntax/typing.nit:993,14
             ../src/syntax/typing.nit:993,16--27
               ../src/syntax/typing.nit:993,16
               identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:993,16--27
-          ../src/syntax/typing.nit:995,3--36
+              ../src/syntax/typing.nit:993,16
+          ../src/syntax/typing.nit:995,3--37
             ../src/syntax/typing.nit:995,3
               ../src/syntax/typing.nit:995,3
               identifier 'v' ... ../src/syntax/typing.nit:995,3
+              ../src/syntax/typing.nit:995,3
             identifier 'check_conform_expr' ... ../src/syntax/typing.nit:995,5--22
-            ../src/syntax/typing.nit:995,24--29
-              ../src/syntax/typing.nit:995,24
-              identifier 'n_expr' ... ../src/syntax/typing.nit:995,24--29
-            ../src/syntax/typing.nit:995,32--36
-              ../src/syntax/typing.nit:995,32
-              identifier 'stype' ... ../src/syntax/typing.nit:995,32--36
-          ../src/syntax/typing.nit:996,3--37
+            ../src/syntax/typing.nit:995,23--37
+              '(' ... ../src/syntax/typing.nit:995,23
+              ../src/syntax/typing.nit:995,24--29
+                ../src/syntax/typing.nit:995,24
+                identifier 'n_expr' ... ../src/syntax/typing.nit:995,24--29
+                ../src/syntax/typing.nit:995,24
+              ../src/syntax/typing.nit:995,32--36
+                ../src/syntax/typing.nit:995,32
+                identifier 'stype' ... ../src/syntax/typing.nit:995,32--36
+                ../src/syntax/typing.nit:995,32
+              ')' ... ../src/syntax/typing.nit:995,37
+          ../src/syntax/typing.nit:996,3--38
             ../src/syntax/typing.nit:996,3
               ../src/syntax/typing.nit:996,3
               identifier 'v' ... ../src/syntax/typing.nit:996,3
+              ../src/syntax/typing.nit:996,3
             identifier 'check_conform_expr' ... ../src/syntax/typing.nit:996,5--22
-            ../src/syntax/typing.nit:996,24--30
-              ../src/syntax/typing.nit:996,24
-              identifier 'n_expr2' ... ../src/syntax/typing.nit:996,24--30
-            ../src/syntax/typing.nit:996,33--37
-              ../src/syntax/typing.nit:996,33
-              identifier 'stype' ... ../src/syntax/typing.nit:996,33--37
+            ../src/syntax/typing.nit:996,23--38
+              '(' ... ../src/syntax/typing.nit:996,23
+              ../src/syntax/typing.nit:996,24--30
+                ../src/syntax/typing.nit:996,24
+                identifier 'n_expr2' ... ../src/syntax/typing.nit:996,24--30
+                ../src/syntax/typing.nit:996,24
+              ../src/syntax/typing.nit:996,33--37
+                ../src/syntax/typing.nit:996,33
+                identifier 'stype' ... ../src/syntax/typing.nit:996,33--37
+                ../src/syntax/typing.nit:996,33
+              ')' ... ../src/syntax/typing.nit:996,38
           ../src/syntax/typing.nit:997,3--16
             ../src/syntax/typing.nit:997,12
             attribute '_stype' ... ../src/syntax/typing.nit:997,3--8
@@ -5830,6 +7218,7 @@
             ../src/syntax/typing.nit:997,12--16
               ../src/syntax/typing.nit:997,12
               identifier 'stype' ... ../src/syntax/typing.nit:997,12--16
+              ../src/syntax/typing.nit:997,12
           ../src/syntax/typing.nit:998,3--18
             ../src/syntax/typing.nit:998,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:998,3--11
@@ -5854,19 +7243,26 @@
           ../src/syntax/typing.nit:1003,25
             identifier 'v' ... ../src/syntax/typing.nit:1003,25
         ../src/syntax/typing.nit:1005,3--1013,4
-          ../src/syntax/typing.nit:1005,3--42
+          ../src/syntax/typing.nit:1005,3--43
             ../src/syntax/typing.nit:1005,3
               ../src/syntax/typing.nit:1005,3
               identifier 'v' ... ../src/syntax/typing.nit:1005,3
+              ../src/syntax/typing.nit:1005,3
             identifier 'check_conform_expr' ... ../src/syntax/typing.nit:1005,5--22
-            ../src/syntax/typing.nit:1005,24--29
-              ../src/syntax/typing.nit:1005,24
-              identifier 'n_expr' ... ../src/syntax/typing.nit:1005,24--29
-            ../src/syntax/typing.nit:1005,32--42
-              ../src/syntax/typing.nit:1005,32
+            ../src/syntax/typing.nit:1005,23--43
+              '(' ... ../src/syntax/typing.nit:1005,23
+              ../src/syntax/typing.nit:1005,24--29
+                ../src/syntax/typing.nit:1005,24
+                identifier 'n_expr' ... ../src/syntax/typing.nit:1005,24--29
+                ../src/syntax/typing.nit:1005,24
+              ../src/syntax/typing.nit:1005,32--42
+                ../src/syntax/typing.nit:1005,32
+                  ../src/syntax/typing.nit:1005,32
+                  identifier 'v' ... ../src/syntax/typing.nit:1005,32
+                  ../src/syntax/typing.nit:1005,32
+                identifier 'type_bool' ... ../src/syntax/typing.nit:1005,34--42
                 ../src/syntax/typing.nit:1005,32
-                identifier 'v' ... ../src/syntax/typing.nit:1005,32
-              identifier 'type_bool' ... ../src/syntax/typing.nit:1005,34--42
+              ')' ... ../src/syntax/typing.nit:1005,43
           ../src/syntax/typing.nit:1008,3--47
             ../src/syntax/typing.nit:1008,24
             attribute '_if_false_flow_ctx' ... ../src/syntax/typing.nit:1008,3--20
@@ -5875,6 +7271,7 @@
               ../src/syntax/typing.nit:1008,24--29
                 ../src/syntax/typing.nit:1008,24
                 identifier 'n_expr' ... ../src/syntax/typing.nit:1008,24--29
+                ../src/syntax/typing.nit:1008,24
               attribute '_if_true_flow_ctx' ... ../src/syntax/typing.nit:1008,31--47
           ../src/syntax/typing.nit:1009,3--47
             ../src/syntax/typing.nit:1009,23
@@ -5884,6 +7281,7 @@
               ../src/syntax/typing.nit:1009,23--28
                 ../src/syntax/typing.nit:1009,23
                 identifier 'n_expr' ... ../src/syntax/typing.nit:1009,23--28
+                ../src/syntax/typing.nit:1009,23
               attribute '_if_false_flow_ctx' ... ../src/syntax/typing.nit:1009,30--47
           ../src/syntax/typing.nit:1011,3--22
             ../src/syntax/typing.nit:1011,12
@@ -5893,7 +7291,9 @@
               ../src/syntax/typing.nit:1011,12
                 ../src/syntax/typing.nit:1011,12
                 identifier 'v' ... ../src/syntax/typing.nit:1011,12
+                ../src/syntax/typing.nit:1011,12
               identifier 'type_bool' ... ../src/syntax/typing.nit:1011,14--22
+              ../src/syntax/typing.nit:1011,12
           ../src/syntax/typing.nit:1012,3--18
             ../src/syntax/typing.nit:1012,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1012,3--11
@@ -5926,23 +7326,35 @@
               ../src/syntax/typing.nit:1019,22
                 ../src/syntax/typing.nit:1019,22
                 identifier 'v' ... ../src/syntax/typing.nit:1019,22
+                ../src/syntax/typing.nit:1019,22
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:1019,24--31
-          ../src/syntax/typing.nit:1022,3--22
+              ../src/syntax/typing.nit:1019,22
+          ../src/syntax/typing.nit:1022,3--23
             ../src/syntax/typing.nit:1022,3
               ../src/syntax/typing.nit:1022,3
               identifier 'v' ... ../src/syntax/typing.nit:1022,3
+              ../src/syntax/typing.nit:1022,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:1022,5--15
-            ../src/syntax/typing.nit:1022,17--22
-              ../src/syntax/typing.nit:1022,17
-              identifier 'n_expr' ... ../src/syntax/typing.nit:1022,17--22
-          ../src/syntax/typing.nit:1023,3--21
+            ../src/syntax/typing.nit:1022,16--23
+              '(' ... ../src/syntax/typing.nit:1022,16
+              ../src/syntax/typing.nit:1022,17--22
+                ../src/syntax/typing.nit:1022,17
+                identifier 'n_expr' ... ../src/syntax/typing.nit:1022,17--22
+                ../src/syntax/typing.nit:1022,17
+              ')' ... ../src/syntax/typing.nit:1022,23
+          ../src/syntax/typing.nit:1023,3--22
             ../src/syntax/typing.nit:1023,3
               ../src/syntax/typing.nit:1023,3
               identifier 'v' ... ../src/syntax/typing.nit:1023,3
+              ../src/syntax/typing.nit:1023,3
             identifier 'check_expr' ... ../src/syntax/typing.nit:1023,5--14
-            ../src/syntax/typing.nit:1023,16--21
-              ../src/syntax/typing.nit:1023,16
-              identifier 'n_expr' ... ../src/syntax/typing.nit:1023,16--21
+            ../src/syntax/typing.nit:1023,15--22
+              '(' ... ../src/syntax/typing.nit:1023,15
+              ../src/syntax/typing.nit:1023,16--21
+                ../src/syntax/typing.nit:1023,16
+                identifier 'n_expr' ... ../src/syntax/typing.nit:1023,16--21
+                ../src/syntax/typing.nit:1023,16
+              ')' ... ../src/syntax/typing.nit:1023,22
           ../src/syntax/typing.nit:1026,3--22
             keyword 'var' ... ../src/syntax/typing.nit:1026,3--5
             identifier 't' ... ../src/syntax/typing.nit:1026,7
@@ -5951,7 +7363,9 @@
               ../src/syntax/typing.nit:1026,11--16
                 ../src/syntax/typing.nit:1026,11
                 identifier 'n_expr' ... ../src/syntax/typing.nit:1026,11--16
+                ../src/syntax/typing.nit:1026,11
               identifier 'stype' ... ../src/syntax/typing.nit:1026,18--22
+              ../src/syntax/typing.nit:1026,11
           ../src/syntax/typing.nit:1027,3--1031,5
             keyword 'if' ... ../src/syntax/typing.nit:1027,3--4
             ../src/syntax/typing.nit:1027,6--22
@@ -5960,28 +7374,38 @@
                 ../src/syntax/typing.nit:1027,10
                   ../src/syntax/typing.nit:1027,10
                   identifier 't' ... ../src/syntax/typing.nit:1027,10
+                  ../src/syntax/typing.nit:1027,10
                 identifier 'is_nullable' ... ../src/syntax/typing.nit:1027,12--22
-            ../src/syntax/typing.nit:1028,4--83
-              ../src/syntax/typing.nit:1028,4--83
+                ../src/syntax/typing.nit:1027,10
+            ../src/syntax/typing.nit:1028,4--84
+              ../src/syntax/typing.nit:1028,4--84
                 ../src/syntax/typing.nit:1028,4
                   ../src/syntax/typing.nit:1028,4
                   identifier 'v' ... ../src/syntax/typing.nit:1028,4
+                  ../src/syntax/typing.nit:1028,4
                 identifier 'warning' ... ../src/syntax/typing.nit:1028,6--12
-                ../src/syntax/typing.nit:1028,14--19
-                  ../src/syntax/typing.nit:1028,14
-                  identifier 'n_expr' ... ../src/syntax/typing.nit:1028,14--19
-                ../src/syntax/typing.nit:1028,22--83
-                  literal value '"Warning: left operand of a 'or else' is not a nullable type."' ... ../src/syntax/typing.nit:1028,22--83
+                ../src/syntax/typing.nit:1028,13--84
+                  '(' ... ../src/syntax/typing.nit:1028,13
+                  ../src/syntax/typing.nit:1028,14--19
+                    ../src/syntax/typing.nit:1028,14
+                    identifier 'n_expr' ... ../src/syntax/typing.nit:1028,14--19
+                    ../src/syntax/typing.nit:1028,14
+                  ../src/syntax/typing.nit:1028,22--83
+                    literal value '"Warning: left operand of a 'or else' is not a nullable type."' ... ../src/syntax/typing.nit:1028,22--83
+                  ')' ... ../src/syntax/typing.nit:1028,84
             ../src/syntax/typing.nit:1030,4--1031,5
               ../src/syntax/typing.nit:1030,4--19
                 ../src/syntax/typing.nit:1030,8
                 identifier 't' ... ../src/syntax/typing.nit:1030,4
+                ../src/syntax/typing.nit:1030,8
                 '=' ... ../src/syntax/typing.nit:1030,6
                 ../src/syntax/typing.nit:1030,8--19
                   ../src/syntax/typing.nit:1030,8
                     ../src/syntax/typing.nit:1030,8
                     identifier 't' ... ../src/syntax/typing.nit:1030,8
+                    ../src/syntax/typing.nit:1030,8
                   identifier 'as_notnull' ... ../src/syntax/typing.nit:1030,10--19
+                  ../src/syntax/typing.nit:1030,8
               keyword 'end' ... ../src/syntax/typing.nit:1031,3--5
           ../src/syntax/typing.nit:1034,3--36
             keyword 'var' ... ../src/syntax/typing.nit:1034,3--5
@@ -5991,82 +7415,116 @@
               ../src/syntax/typing.nit:1034,18--23
                 ../src/syntax/typing.nit:1034,18
                 identifier 'n_expr' ... ../src/syntax/typing.nit:1034,18--23
+                ../src/syntax/typing.nit:1034,18
               identifier 'its_variable' ... ../src/syntax/typing.nit:1034,25--36
+              ../src/syntax/typing.nit:1034,18
           ../src/syntax/typing.nit:1035,3--1037,5
             keyword 'if' ... ../src/syntax/typing.nit:1035,3--4
             ../src/syntax/typing.nit:1035,6--21
               ../src/syntax/typing.nit:1035,6--13
                 ../src/syntax/typing.nit:1035,6
                 identifier 'variable' ... ../src/syntax/typing.nit:1035,6--13
+                ../src/syntax/typing.nit:1035,6
               ../src/syntax/typing.nit:1035,18--21
                 keyword 'null' ... ../src/syntax/typing.nit:1035,18--21
-            ../src/syntax/typing.nit:1036,4--50
-              ../src/syntax/typing.nit:1036,4--50
+            ../src/syntax/typing.nit:1036,4--51
+              ../src/syntax/typing.nit:1036,4--51
                 ../src/syntax/typing.nit:1036,4--13
                   ../src/syntax/typing.nit:1036,4
                     ../src/syntax/typing.nit:1036,4
                     identifier 'v' ... ../src/syntax/typing.nit:1036,4
+                    ../src/syntax/typing.nit:1036,4
                   identifier 'flow_ctx' ... ../src/syntax/typing.nit:1036,6--13
+                  ../src/syntax/typing.nit:1036,4
                 identifier 'sub_with' ... ../src/syntax/typing.nit:1036,15--22
-                ../src/syntax/typing.nit:1036,24--27
-                  keyword 'self' ... ../src/syntax/typing.nit:1036,24--27
-                ../src/syntax/typing.nit:1036,30--37
-                  ../src/syntax/typing.nit:1036,30
-                  identifier 'variable' ... ../src/syntax/typing.nit:1036,30--37
-                ../src/syntax/typing.nit:1036,40--50
-                  ../src/syntax/typing.nit:1036,40
+                ../src/syntax/typing.nit:1036,23--51
+                  '(' ... ../src/syntax/typing.nit:1036,23
+                  ../src/syntax/typing.nit:1036,24--27
+                    keyword 'self' ... ../src/syntax/typing.nit:1036,24--27
+                  ../src/syntax/typing.nit:1036,30--37
+                    ../src/syntax/typing.nit:1036,30
+                    identifier 'variable' ... ../src/syntax/typing.nit:1036,30--37
+                    ../src/syntax/typing.nit:1036,30
+                  ../src/syntax/typing.nit:1036,40--50
                     ../src/syntax/typing.nit:1036,40
-                    identifier 'v' ... ../src/syntax/typing.nit:1036,40
-                  identifier 'type_none' ... ../src/syntax/typing.nit:1036,42--50
+                      ../src/syntax/typing.nit:1036,40
+                      identifier 'v' ... ../src/syntax/typing.nit:1036,40
+                      ../src/syntax/typing.nit:1036,40
+                    identifier 'type_none' ... ../src/syntax/typing.nit:1036,42--50
+                    ../src/syntax/typing.nit:1036,40
+                  ')' ... ../src/syntax/typing.nit:1036,51
             ../src/syntax/typing.nit:1037,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1037,3--5
-          ../src/syntax/typing.nit:1040,3--23
+          ../src/syntax/typing.nit:1040,3--24
             ../src/syntax/typing.nit:1040,3
               ../src/syntax/typing.nit:1040,3
               identifier 'v' ... ../src/syntax/typing.nit:1040,3
+              ../src/syntax/typing.nit:1040,3
             identifier 'enter_visit' ... ../src/syntax/typing.nit:1040,5--15
-            ../src/syntax/typing.nit:1040,17--23
-              ../src/syntax/typing.nit:1040,17
-              identifier 'n_expr2' ... ../src/syntax/typing.nit:1040,17--23
-          ../src/syntax/typing.nit:1041,3--21
+            ../src/syntax/typing.nit:1040,16--24
+              '(' ... ../src/syntax/typing.nit:1040,16
+              ../src/syntax/typing.nit:1040,17--23
+                ../src/syntax/typing.nit:1040,17
+                identifier 'n_expr2' ... ../src/syntax/typing.nit:1040,17--23
+                ../src/syntax/typing.nit:1040,17
+              ')' ... ../src/syntax/typing.nit:1040,24
+          ../src/syntax/typing.nit:1041,3--22
             ../src/syntax/typing.nit:1041,3
               ../src/syntax/typing.nit:1041,3
               identifier 'v' ... ../src/syntax/typing.nit:1041,3
+              ../src/syntax/typing.nit:1041,3
             identifier 'check_expr' ... ../src/syntax/typing.nit:1041,5--14
-            ../src/syntax/typing.nit:1041,16--21
-              ../src/syntax/typing.nit:1041,16
-              identifier 'n_expr' ... ../src/syntax/typing.nit:1041,16--21
+            ../src/syntax/typing.nit:1041,15--22
+              '(' ... ../src/syntax/typing.nit:1041,15
+              ../src/syntax/typing.nit:1041,16--21
+                ../src/syntax/typing.nit:1041,16
+                identifier 'n_expr' ... ../src/syntax/typing.nit:1041,16--21
+                ../src/syntax/typing.nit:1041,16
+              ')' ... ../src/syntax/typing.nit:1041,22
           ../src/syntax/typing.nit:1044,3--27
             ../src/syntax/typing.nit:1044,3
               ../src/syntax/typing.nit:1044,3
               identifier 'v' ... ../src/syntax/typing.nit:1044,3
+              ../src/syntax/typing.nit:1044,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:1044,5--12
+            ../src/syntax/typing.nit:1044,16
             '=' ... ../src/syntax/typing.nit:1044,14
             ../src/syntax/typing.nit:1044,16--27
               ../src/syntax/typing.nit:1044,16
               identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:1044,16--27
-          ../src/syntax/typing.nit:1047,3--51
+              ../src/syntax/typing.nit:1044,16
+          ../src/syntax/typing.nit:1047,3--53
             keyword 'var' ... ../src/syntax/typing.nit:1047,3--5
             identifier 'stype' ... ../src/syntax/typing.nit:1047,7--11
             '=' ... ../src/syntax/typing.nit:1047,13
-            ../src/syntax/typing.nit:1047,15--51
+            ../src/syntax/typing.nit:1047,15--53
               ../src/syntax/typing.nit:1047,15
                 ../src/syntax/typing.nit:1047,15
                 identifier 'v' ... ../src/syntax/typing.nit:1047,15
+                ../src/syntax/typing.nit:1047,15
               identifier 'check_conform_multiexpr' ... ../src/syntax/typing.nit:1047,17--39
-              ../src/syntax/typing.nit:1047,41
+              ../src/syntax/typing.nit:1047,40--53
+                '(' ... ../src/syntax/typing.nit:1047,40
                 ../src/syntax/typing.nit:1047,41
-                identifier 't' ... ../src/syntax/typing.nit:1047,41
-              ../src/syntax/typing.nit:1047,45--51
-                ../src/syntax/typing.nit:1047,45--51
-                  ../src/syntax/typing.nit:1047,45
-                  identifier 'n_expr2' ... ../src/syntax/typing.nit:1047,45--51
+                  ../src/syntax/typing.nit:1047,41
+                  identifier 't' ... ../src/syntax/typing.nit:1047,41
+                  ../src/syntax/typing.nit:1047,41
+                ../src/syntax/typing.nit:1047,44--52
+                  ../src/syntax/typing.nit:1047,44--52
+                    '[' ... ../src/syntax/typing.nit:1047,44
+                    ../src/syntax/typing.nit:1047,45--51
+                      ../src/syntax/typing.nit:1047,45
+                      identifier 'n_expr2' ... ../src/syntax/typing.nit:1047,45--51
+                      ../src/syntax/typing.nit:1047,45
+                    ']' ... ../src/syntax/typing.nit:1047,52
+                ')' ... ../src/syntax/typing.nit:1047,53
           ../src/syntax/typing.nit:1048,3--30
             keyword 'if' ... ../src/syntax/typing.nit:1048,3--4
             ../src/syntax/typing.nit:1048,6--18
               ../src/syntax/typing.nit:1048,6--10
                 ../src/syntax/typing.nit:1048,6
                 identifier 'stype' ... ../src/syntax/typing.nit:1048,6--10
+                ../src/syntax/typing.nit:1048,6
               ../src/syntax/typing.nit:1048,15--18
                 keyword 'null' ... ../src/syntax/typing.nit:1048,15--18
             ../src/syntax/typing.nit:1048,25--30
@@ -6078,6 +7536,7 @@
             ../src/syntax/typing.nit:1050,12--16
               ../src/syntax/typing.nit:1050,12
               identifier 'stype' ... ../src/syntax/typing.nit:1050,12--16
+              ../src/syntax/typing.nit:1050,12
           ../src/syntax/typing.nit:1051,3--18
             ../src/syntax/typing.nit:1051,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1051,3--11
@@ -6110,7 +7569,9 @@
               ../src/syntax/typing.nit:1058,12
                 ../src/syntax/typing.nit:1058,12
                 identifier 'v' ... ../src/syntax/typing.nit:1058,12
+                ../src/syntax/typing.nit:1058,12
               identifier 'type_int' ... ../src/syntax/typing.nit:1058,14--21
+              ../src/syntax/typing.nit:1058,12
           ../src/syntax/typing.nit:1059,3--18
             ../src/syntax/typing.nit:1059,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1059,3--11
@@ -6143,7 +7604,9 @@
               ../src/syntax/typing.nit:1066,12
                 ../src/syntax/typing.nit:1066,12
                 identifier 'v' ... ../src/syntax/typing.nit:1066,12
+                ../src/syntax/typing.nit:1066,12
               identifier 'type_float' ... ../src/syntax/typing.nit:1066,14--23
+              ../src/syntax/typing.nit:1066,12
           ../src/syntax/typing.nit:1067,3--18
             ../src/syntax/typing.nit:1067,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1067,3--11
@@ -6176,7 +7639,9 @@
               ../src/syntax/typing.nit:1074,12
                 ../src/syntax/typing.nit:1074,12
                 identifier 'v' ... ../src/syntax/typing.nit:1074,12
+                ../src/syntax/typing.nit:1074,12
               identifier 'type_char' ... ../src/syntax/typing.nit:1074,14--22
+              ../src/syntax/typing.nit:1074,12
           ../src/syntax/typing.nit:1075,3--18
             ../src/syntax/typing.nit:1075,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1075,3--11
@@ -6209,7 +7674,9 @@
               ../src/syntax/typing.nit:1082,12
                 ../src/syntax/typing.nit:1082,12
                 identifier 'v' ... ../src/syntax/typing.nit:1082,12
+                ../src/syntax/typing.nit:1082,12
               identifier 'type_string' ... ../src/syntax/typing.nit:1082,14--24
+              ../src/syntax/typing.nit:1082,12
           ../src/syntax/typing.nit:1083,3--18
             ../src/syntax/typing.nit:1083,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1083,3--11
@@ -6267,7 +7734,9 @@
               ../src/syntax/typing.nit:1092,15
                 ../src/syntax/typing.nit:1092,15
                 identifier 'v' ... ../src/syntax/typing.nit:1092,15
+                ../src/syntax/typing.nit:1092,15
               identifier 'type_object' ... ../src/syntax/typing.nit:1092,17--27
+              ../src/syntax/typing.nit:1092,15
           ../src/syntax/typing.nit:1093,3--27
             keyword 'var' ... ../src/syntax/typing.nit:1093,3--5
             identifier 'stype' ... ../src/syntax/typing.nit:1093,7--11
@@ -6276,7 +7745,9 @@
               ../src/syntax/typing.nit:1093,15
                 ../src/syntax/typing.nit:1093,15
                 identifier 'v' ... ../src/syntax/typing.nit:1093,15
+                ../src/syntax/typing.nit:1093,15
               identifier 'type_string' ... ../src/syntax/typing.nit:1093,17--27
+              ../src/syntax/typing.nit:1093,15
           ../src/syntax/typing.nit:1094,3--16
             ../src/syntax/typing.nit:1094,12
             attribute '_stype' ... ../src/syntax/typing.nit:1094,3--8
@@ -6284,36 +7755,49 @@
             ../src/syntax/typing.nit:1094,12--16
               ../src/syntax/typing.nit:1094,12
               identifier 'stype' ... ../src/syntax/typing.nit:1094,12--16
-          ../src/syntax/typing.nit:1095,3--51
+              ../src/syntax/typing.nit:1094,12
+          ../src/syntax/typing.nit:1095,3--52
             keyword 'for' ... ../src/syntax/typing.nit:1095,3--5
             identifier 'e' ... ../src/syntax/typing.nit:1095,7
             ../src/syntax/typing.nit:1095,12--18
               ../src/syntax/typing.nit:1095,12
               identifier 'n_exprs' ... ../src/syntax/typing.nit:1095,12--18
+              ../src/syntax/typing.nit:1095,12
             keyword 'do' ... ../src/syntax/typing.nit:1095,20--21
-            ../src/syntax/typing.nit:1095,23--51
+            ../src/syntax/typing.nit:1095,23--52
               ../src/syntax/typing.nit:1095,23
                 ../src/syntax/typing.nit:1095,23
                 identifier 'v' ... ../src/syntax/typing.nit:1095,23
+                ../src/syntax/typing.nit:1095,23
               identifier 'check_conform_expr' ... ../src/syntax/typing.nit:1095,25--42
-              ../src/syntax/typing.nit:1095,44
+              ../src/syntax/typing.nit:1095,43--52
+                '(' ... ../src/syntax/typing.nit:1095,43
                 ../src/syntax/typing.nit:1095,44
-                identifier 'e' ... ../src/syntax/typing.nit:1095,44
-              ../src/syntax/typing.nit:1095,47--51
-                ../src/syntax/typing.nit:1095,47
-                identifier 'otype' ... ../src/syntax/typing.nit:1095,47--51
-          ../src/syntax/typing.nit:1096,3--32
+                  ../src/syntax/typing.nit:1095,44
+                  identifier 'e' ... ../src/syntax/typing.nit:1095,44
+                  ../src/syntax/typing.nit:1095,44
+                ../src/syntax/typing.nit:1095,47--51
+                  ../src/syntax/typing.nit:1095,47
+                  identifier 'otype' ... ../src/syntax/typing.nit:1095,47--51
+                  ../src/syntax/typing.nit:1095,47
+                ')' ... ../src/syntax/typing.nit:1095,52
+          ../src/syntax/typing.nit:1096,3--33
             keyword 'var' ... ../src/syntax/typing.nit:1096,3--5
             identifier 'atype' ... ../src/syntax/typing.nit:1096,7--11
             '=' ... ../src/syntax/typing.nit:1096,13
-            ../src/syntax/typing.nit:1096,15--32
+            ../src/syntax/typing.nit:1096,15--33
               ../src/syntax/typing.nit:1096,15
                 ../src/syntax/typing.nit:1096,15
                 identifier 'v' ... ../src/syntax/typing.nit:1096,15
+                ../src/syntax/typing.nit:1096,15
               identifier 'type_array' ... ../src/syntax/typing.nit:1096,17--26
-              ../src/syntax/typing.nit:1096,28--32
-                ../src/syntax/typing.nit:1096,28
-                identifier 'stype' ... ../src/syntax/typing.nit:1096,28--32
+              ../src/syntax/typing.nit:1096,27--33
+                '(' ... ../src/syntax/typing.nit:1096,27
+                ../src/syntax/typing.nit:1096,28--32
+                  ../src/syntax/typing.nit:1096,28
+                  identifier 'stype' ... ../src/syntax/typing.nit:1096,28--32
+                  ../src/syntax/typing.nit:1096,28
+                ')' ... ../src/syntax/typing.nit:1096,33
           ../src/syntax/typing.nit:1097,3--16
             ../src/syntax/typing.nit:1097,12
             attribute '_atype' ... ../src/syntax/typing.nit:1097,3--8
@@ -6321,6 +7805,7 @@
             ../src/syntax/typing.nit:1097,12--16
               ../src/syntax/typing.nit:1097,12
               identifier 'atype' ... ../src/syntax/typing.nit:1097,12--16
+              ../src/syntax/typing.nit:1097,12
           ../src/syntax/typing.nit:1098,3--18
             ../src/syntax/typing.nit:1098,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1098,3--11
@@ -6353,7 +7838,9 @@
               ../src/syntax/typing.nit:1105,12
                 ../src/syntax/typing.nit:1105,12
                 identifier 'v' ... ../src/syntax/typing.nit:1105,12
+                ../src/syntax/typing.nit:1105,12
               identifier 'type_none' ... ../src/syntax/typing.nit:1105,14--22
+              ../src/syntax/typing.nit:1105,12
           ../src/syntax/typing.nit:1106,3--18
             ../src/syntax/typing.nit:1106,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1106,3--11
@@ -6378,37 +7865,51 @@
           ../src/syntax/typing.nit:1111,25
             identifier 'v' ... ../src/syntax/typing.nit:1111,25
         ../src/syntax/typing.nit:1113,3--1115,4
-          ../src/syntax/typing.nit:1113,3--53
+          ../src/syntax/typing.nit:1113,3--62
             keyword 'var' ... ../src/syntax/typing.nit:1113,3--5
             identifier 'stype' ... ../src/syntax/typing.nit:1113,7--11
             '=' ... ../src/syntax/typing.nit:1113,13
-            ../src/syntax/typing.nit:1113,15--53
+            ../src/syntax/typing.nit:1113,15--62
               ../src/syntax/typing.nit:1113,15
                 ../src/syntax/typing.nit:1113,15
                 identifier 'v' ... ../src/syntax/typing.nit:1113,15
+                ../src/syntax/typing.nit:1113,15
               identifier 'check_conform_multiexpr' ... ../src/syntax/typing.nit:1113,17--39
-              ../src/syntax/typing.nit:1113,41--44
-                keyword 'null' ... ../src/syntax/typing.nit:1113,41--44
-              ../src/syntax/typing.nit:1113,47--53
-                ../src/syntax/typing.nit:1113,47
-                identifier 'n_exprs' ... ../src/syntax/typing.nit:1113,47--53
-          ../src/syntax/typing.nit:1114,3--42
+              ../src/syntax/typing.nit:1113,40--62
+                '(' ... ../src/syntax/typing.nit:1113,40
+                ../src/syntax/typing.nit:1113,41--44
+                  keyword 'null' ... ../src/syntax/typing.nit:1113,41--44
+                ../src/syntax/typing.nit:1113,47--61
+                  ../src/syntax/typing.nit:1113,47--53
+                    ../src/syntax/typing.nit:1113,47
+                    identifier 'n_exprs' ... ../src/syntax/typing.nit:1113,47--53
+                    ../src/syntax/typing.nit:1113,47
+                  identifier 'n_exprs' ... ../src/syntax/typing.nit:1113,55--61
+                  ../src/syntax/typing.nit:1113,47
+                ')' ... ../src/syntax/typing.nit:1113,62
+          ../src/syntax/typing.nit:1114,3--43
             keyword 'if' ... ../src/syntax/typing.nit:1114,3--4
             ../src/syntax/typing.nit:1114,6--18
               ../src/syntax/typing.nit:1114,6--10
                 ../src/syntax/typing.nit:1114,6
                 identifier 'stype' ... ../src/syntax/typing.nit:1114,6--10
+                ../src/syntax/typing.nit:1114,6
               ../src/syntax/typing.nit:1114,15--18
                 keyword 'null' ... ../src/syntax/typing.nit:1114,15--18
-            ../src/syntax/typing.nit:1114,25--42
+            ../src/syntax/typing.nit:1114,25--43
               ../src/syntax/typing.nit:1114,35
               identifier 'do_typing' ... ../src/syntax/typing.nit:1114,25--33
-              ../src/syntax/typing.nit:1114,35
+              ../src/syntax/typing.nit:1114,34--43
+                '(' ... ../src/syntax/typing.nit:1114,34
                 ../src/syntax/typing.nit:1114,35
-                identifier 'v' ... ../src/syntax/typing.nit:1114,35
-              ../src/syntax/typing.nit:1114,38--42
-                ../src/syntax/typing.nit:1114,38
-                identifier 'stype' ... ../src/syntax/typing.nit:1114,38--42
+                  ../src/syntax/typing.nit:1114,35
+                  identifier 'v' ... ../src/syntax/typing.nit:1114,35
+                  ../src/syntax/typing.nit:1114,35
+                ../src/syntax/typing.nit:1114,38--42
+                  ../src/syntax/typing.nit:1114,38
+                  identifier 'stype' ... ../src/syntax/typing.nit:1114,38--42
+                  ../src/syntax/typing.nit:1114,38
+                ')' ... ../src/syntax/typing.nit:1114,43
           keyword 'end' ... ../src/syntax/typing.nit:1115,2--4
       ../src/syntax/typing.nit:1117,2--1121,4
         ../src/syntax/typing.nit:1117,2--8
@@ -6426,18 +7927,23 @@
             ../src/syntax/typing.nit:1117,56--61
               type identifier 'MMType' ... ../src/syntax/typing.nit:1117,56--61
         ../src/syntax/typing.nit:1119,3--1121,4
-          ../src/syntax/typing.nit:1119,3--36
+          ../src/syntax/typing.nit:1119,3--37
             ../src/syntax/typing.nit:1119,12
             attribute '_stype' ... ../src/syntax/typing.nit:1119,3--8
             '=' ... ../src/syntax/typing.nit:1119,10
-            ../src/syntax/typing.nit:1119,12--36
+            ../src/syntax/typing.nit:1119,12--37
               ../src/syntax/typing.nit:1119,12
                 ../src/syntax/typing.nit:1119,12
                 identifier 'v' ... ../src/syntax/typing.nit:1119,12
+                ../src/syntax/typing.nit:1119,12
               identifier 'type_array' ... ../src/syntax/typing.nit:1119,14--23
-              ../src/syntax/typing.nit:1119,25--36
-                ../src/syntax/typing.nit:1119,25
-                identifier 'element_type' ... ../src/syntax/typing.nit:1119,25--36
+              ../src/syntax/typing.nit:1119,24--37
+                '(' ... ../src/syntax/typing.nit:1119,24
+                ../src/syntax/typing.nit:1119,25--36
+                  ../src/syntax/typing.nit:1119,25
+                  identifier 'element_type' ... ../src/syntax/typing.nit:1119,25--36
+                  ../src/syntax/typing.nit:1119,25
+                ')' ... ../src/syntax/typing.nit:1119,37
           ../src/syntax/typing.nit:1120,3--18
             ../src/syntax/typing.nit:1120,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1120,3--11
@@ -6464,27 +7970,37 @@
         ../src/syntax/typing.nit:1127,3--1140,4
           ../src/syntax/typing.nit:1127,3--70
             keyword 'if' ... ../src/syntax/typing.nit:1127,3--4
-            ../src/syntax/typing.nit:1127,6--57
-              ../src/syntax/typing.nit:1127,6--28
+            ../src/syntax/typing.nit:1127,6--58
+              ../src/syntax/typing.nit:1127,6--29
                 keyword 'not' ... ../src/syntax/typing.nit:1127,6--8
-                ../src/syntax/typing.nit:1127,10--28
+                ../src/syntax/typing.nit:1127,10--29
                   ../src/syntax/typing.nit:1127,10
                     ../src/syntax/typing.nit:1127,10
                     identifier 'v' ... ../src/syntax/typing.nit:1127,10
+                    ../src/syntax/typing.nit:1127,10
                   identifier 'check_expr' ... ../src/syntax/typing.nit:1127,12--21
-                  ../src/syntax/typing.nit:1127,23--28
-                    ../src/syntax/typing.nit:1127,23
-                    identifier 'n_expr' ... ../src/syntax/typing.nit:1127,23--28
-              ../src/syntax/typing.nit:1127,34--57
+                  ../src/syntax/typing.nit:1127,22--29
+                    '(' ... ../src/syntax/typing.nit:1127,22
+                    ../src/syntax/typing.nit:1127,23--28
+                      ../src/syntax/typing.nit:1127,23
+                      identifier 'n_expr' ... ../src/syntax/typing.nit:1127,23--28
+                      ../src/syntax/typing.nit:1127,23
+                    ')' ... ../src/syntax/typing.nit:1127,29
+              ../src/syntax/typing.nit:1127,34--58
                 keyword 'not' ... ../src/syntax/typing.nit:1127,34--36
-                ../src/syntax/typing.nit:1127,38--57
+                ../src/syntax/typing.nit:1127,38--58
                   ../src/syntax/typing.nit:1127,38
                     ../src/syntax/typing.nit:1127,38
                     identifier 'v' ... ../src/syntax/typing.nit:1127,38
+                    ../src/syntax/typing.nit:1127,38
                   identifier 'check_expr' ... ../src/syntax/typing.nit:1127,40--49
-                  ../src/syntax/typing.nit:1127,51--57
-                    ../src/syntax/typing.nit:1127,51
-                    identifier 'n_expr2' ... ../src/syntax/typing.nit:1127,51--57
+                  ../src/syntax/typing.nit:1127,50--58
+                    '(' ... ../src/syntax/typing.nit:1127,50
+                    ../src/syntax/typing.nit:1127,51--57
+                      ../src/syntax/typing.nit:1127,51
+                      identifier 'n_expr2' ... ../src/syntax/typing.nit:1127,51--57
+                      ../src/syntax/typing.nit:1127,51
+                    ')' ... ../src/syntax/typing.nit:1127,58
             ../src/syntax/typing.nit:1127,65--70
               keyword 'return' ... ../src/syntax/typing.nit:1127,65--70
           ../src/syntax/typing.nit:1128,3--26
@@ -6495,7 +8011,9 @@
               ../src/syntax/typing.nit:1128,15--20
                 ../src/syntax/typing.nit:1128,15
                 identifier 'n_expr' ... ../src/syntax/typing.nit:1128,15--20
+                ../src/syntax/typing.nit:1128,15
               identifier 'stype' ... ../src/syntax/typing.nit:1128,22--26
+              ../src/syntax/typing.nit:1128,15
           ../src/syntax/typing.nit:1129,3--28
             keyword 'var' ... ../src/syntax/typing.nit:1129,3--5
             identifier 'ntype2' ... ../src/syntax/typing.nit:1129,7--12
@@ -6504,24 +8022,30 @@
               ../src/syntax/typing.nit:1129,16--22
                 ../src/syntax/typing.nit:1129,16
                 identifier 'n_expr2' ... ../src/syntax/typing.nit:1129,16--22
+                ../src/syntax/typing.nit:1129,16
               identifier 'stype' ... ../src/syntax/typing.nit:1129,24--28
+              ../src/syntax/typing.nit:1129,16
           ../src/syntax/typing.nit:1130,3--1135,5
             keyword 'if' ... ../src/syntax/typing.nit:1130,3--4
             ../src/syntax/typing.nit:1130,6--19
               ../src/syntax/typing.nit:1130,6--10
                 ../src/syntax/typing.nit:1130,6
                 identifier 'ntype' ... ../src/syntax/typing.nit:1130,6--10
+                ../src/syntax/typing.nit:1130,6
               ../src/syntax/typing.nit:1130,14--19
                 ../src/syntax/typing.nit:1130,14
                 identifier 'ntype2' ... ../src/syntax/typing.nit:1130,14--19
+                ../src/syntax/typing.nit:1130,14
             ../src/syntax/typing.nit:1131,4--17
               ../src/syntax/typing.nit:1131,4--17
                 ../src/syntax/typing.nit:1131,12
                 identifier 'ntype' ... ../src/syntax/typing.nit:1131,4--8
+                ../src/syntax/typing.nit:1131,12
                 '=' ... ../src/syntax/typing.nit:1131,10
                 ../src/syntax/typing.nit:1131,12--17
                   ../src/syntax/typing.nit:1131,12
                   identifier 'ntype2' ... ../src/syntax/typing.nit:1131,12--17
+                  ../src/syntax/typing.nit:1131,12
             ../src/syntax/typing.nit:1132,8--1135,5
               keyword 'if' ... ../src/syntax/typing.nit:1132,8--9
               ../src/syntax/typing.nit:1132,11--28
@@ -6530,30 +8054,38 @@
                   ../src/syntax/typing.nit:1132,15--20
                     ../src/syntax/typing.nit:1132,15
                     identifier 'ntype2' ... ../src/syntax/typing.nit:1132,15--20
+                    ../src/syntax/typing.nit:1132,15
                   ../src/syntax/typing.nit:1132,24--28
                     ../src/syntax/typing.nit:1132,24
                     identifier 'ntype' ... ../src/syntax/typing.nit:1132,24--28
+                    ../src/syntax/typing.nit:1132,24
               ../src/syntax/typing.nit:1133,4--1134,9
-                ../src/syntax/typing.nit:1133,4--66
+                ../src/syntax/typing.nit:1133,4--67
                   ../src/syntax/typing.nit:1133,4
                     ../src/syntax/typing.nit:1133,4
                     identifier 'v' ... ../src/syntax/typing.nit:1133,4
+                    ../src/syntax/typing.nit:1133,4
                   identifier 'error' ... ../src/syntax/typing.nit:1133,6--10
-                  ../src/syntax/typing.nit:1133,12--15
-                    keyword 'self' ... ../src/syntax/typing.nit:1133,12--15
-                  ../src/syntax/typing.nit:1133,18--66
-                    ../src/syntax/typing.nit:1133,18--31
-                      literal value '"Type error: {' ... ../src/syntax/typing.nit:1133,18--31
-                    ../src/syntax/typing.nit:1133,32--36
-                      ../src/syntax/typing.nit:1133,32
-                      identifier 'ntype' ... ../src/syntax/typing.nit:1133,32--36
-                    ../src/syntax/typing.nit:1133,37--57
-                      literal value '} incompatible with {' ... ../src/syntax/typing.nit:1133,37--57
-                    ../src/syntax/typing.nit:1133,58--63
-                      ../src/syntax/typing.nit:1133,58
-                      identifier 'ntype2' ... ../src/syntax/typing.nit:1133,58--63
-                    ../src/syntax/typing.nit:1133,64--66
-                      '}."' ... ../src/syntax/typing.nit:1133,64--66
+                  ../src/syntax/typing.nit:1133,11--67
+                    '(' ... ../src/syntax/typing.nit:1133,11
+                    ../src/syntax/typing.nit:1133,12--15
+                      keyword 'self' ... ../src/syntax/typing.nit:1133,12--15
+                    ../src/syntax/typing.nit:1133,18--66
+                      ../src/syntax/typing.nit:1133,18--31
+                        literal value '"Type error: {' ... ../src/syntax/typing.nit:1133,18--31
+                      ../src/syntax/typing.nit:1133,32--36
+                        ../src/syntax/typing.nit:1133,32
+                        identifier 'ntype' ... ../src/syntax/typing.nit:1133,32--36
+                        ../src/syntax/typing.nit:1133,32
+                      ../src/syntax/typing.nit:1133,37--57
+                        literal value '} incompatible with {' ... ../src/syntax/typing.nit:1133,37--57
+                      ../src/syntax/typing.nit:1133,58--63
+                        ../src/syntax/typing.nit:1133,58
+                        identifier 'ntype2' ... ../src/syntax/typing.nit:1133,58--63
+                        ../src/syntax/typing.nit:1133,58
+                      ../src/syntax/typing.nit:1133,64--66
+                        '}."' ... ../src/syntax/typing.nit:1133,64--66
+                    ')' ... ../src/syntax/typing.nit:1133,67
                 ../src/syntax/typing.nit:1134,4--9
                   keyword 'return' ... ../src/syntax/typing.nit:1134,4--9
               ../src/syntax/typing.nit:1135,3--5
@@ -6566,50 +8098,69 @@
               ../src/syntax/typing.nit:1136,15
                 ../src/syntax/typing.nit:1136,15
                 identifier 'v' ... ../src/syntax/typing.nit:1136,15
+                ../src/syntax/typing.nit:1136,15
               identifier 'type_discrete' ... ../src/syntax/typing.nit:1136,17--29
+              ../src/syntax/typing.nit:1136,15
           ../src/syntax/typing.nit:1137,3--100
             keyword 'if' ... ../src/syntax/typing.nit:1137,3--4
-            ../src/syntax/typing.nit:1137,6--87
-              ../src/syntax/typing.nit:1137,6--43
+            ../src/syntax/typing.nit:1137,6--88
+              ../src/syntax/typing.nit:1137,6--44
                 keyword 'not' ... ../src/syntax/typing.nit:1137,6--8
-                ../src/syntax/typing.nit:1137,10--43
+                ../src/syntax/typing.nit:1137,10--44
                   ../src/syntax/typing.nit:1137,10
                     ../src/syntax/typing.nit:1137,10
                     identifier 'v' ... ../src/syntax/typing.nit:1137,10
+                    ../src/syntax/typing.nit:1137,10
                   identifier 'check_conform_expr' ... ../src/syntax/typing.nit:1137,12--29
-                  ../src/syntax/typing.nit:1137,31--36
-                    ../src/syntax/typing.nit:1137,31
-                    identifier 'n_expr' ... ../src/syntax/typing.nit:1137,31--36
-                  ../src/syntax/typing.nit:1137,39--43
-                    ../src/syntax/typing.nit:1137,39
-                    identifier 'dtype' ... ../src/syntax/typing.nit:1137,39--43
-              ../src/syntax/typing.nit:1137,49--87
+                  ../src/syntax/typing.nit:1137,30--44
+                    '(' ... ../src/syntax/typing.nit:1137,30
+                    ../src/syntax/typing.nit:1137,31--36
+                      ../src/syntax/typing.nit:1137,31
+                      identifier 'n_expr' ... ../src/syntax/typing.nit:1137,31--36
+                      ../src/syntax/typing.nit:1137,31
+                    ../src/syntax/typing.nit:1137,39--43
+                      ../src/syntax/typing.nit:1137,39
+                      identifier 'dtype' ... ../src/syntax/typing.nit:1137,39--43
+                      ../src/syntax/typing.nit:1137,39
+                    ')' ... ../src/syntax/typing.nit:1137,44
+              ../src/syntax/typing.nit:1137,49--88
                 keyword 'not' ... ../src/syntax/typing.nit:1137,49--51
-                ../src/syntax/typing.nit:1137,53--87
+                ../src/syntax/typing.nit:1137,53--88
                   ../src/syntax/typing.nit:1137,53
                     ../src/syntax/typing.nit:1137,53
                     identifier 'v' ... ../src/syntax/typing.nit:1137,53
+                    ../src/syntax/typing.nit:1137,53
                   identifier 'check_conform_expr' ... ../src/syntax/typing.nit:1137,55--72
-                  ../src/syntax/typing.nit:1137,74--80
-                    ../src/syntax/typing.nit:1137,74
-                    identifier 'n_expr2' ... ../src/syntax/typing.nit:1137,74--80
-                  ../src/syntax/typing.nit:1137,83--87
-                    ../src/syntax/typing.nit:1137,83
-                    identifier 'dtype' ... ../src/syntax/typing.nit:1137,83--87
+                  ../src/syntax/typing.nit:1137,73--88
+                    '(' ... ../src/syntax/typing.nit:1137,73
+                    ../src/syntax/typing.nit:1137,74--80
+                      ../src/syntax/typing.nit:1137,74
+                      identifier 'n_expr2' ... ../src/syntax/typing.nit:1137,74--80
+                      ../src/syntax/typing.nit:1137,74
+                    ../src/syntax/typing.nit:1137,83--87
+                      ../src/syntax/typing.nit:1137,83
+                      identifier 'dtype' ... ../src/syntax/typing.nit:1137,83--87
+                      ../src/syntax/typing.nit:1137,83
+                    ')' ... ../src/syntax/typing.nit:1137,88
             ../src/syntax/typing.nit:1137,95--100
               keyword 'return' ... ../src/syntax/typing.nit:1137,95--100
-          ../src/syntax/typing.nit:1138,3--29
+          ../src/syntax/typing.nit:1138,3--30
             ../src/syntax/typing.nit:1138,12
             attribute '_stype' ... ../src/syntax/typing.nit:1138,3--8
             '=' ... ../src/syntax/typing.nit:1138,10
-            ../src/syntax/typing.nit:1138,12--29
+            ../src/syntax/typing.nit:1138,12--30
               ../src/syntax/typing.nit:1138,12
                 ../src/syntax/typing.nit:1138,12
                 identifier 'v' ... ../src/syntax/typing.nit:1138,12
+                ../src/syntax/typing.nit:1138,12
               identifier 'type_range' ... ../src/syntax/typing.nit:1138,14--23
-              ../src/syntax/typing.nit:1138,25--29
-                ../src/syntax/typing.nit:1138,25
-                identifier 'ntype' ... ../src/syntax/typing.nit:1138,25--29
+              ../src/syntax/typing.nit:1138,24--30
+                '(' ... ../src/syntax/typing.nit:1138,24
+                ../src/syntax/typing.nit:1138,25--29
+                  ../src/syntax/typing.nit:1138,25
+                  identifier 'ntype' ... ../src/syntax/typing.nit:1138,25--29
+                  ../src/syntax/typing.nit:1138,25
+                ')' ... ../src/syntax/typing.nit:1138,30
           ../src/syntax/typing.nit:1139,3--18
             ../src/syntax/typing.nit:1139,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1139,3--11
@@ -6647,7 +8198,9 @@
             ../src/syntax/typing.nit:1145,44--49
               ../src/syntax/typing.nit:1145,44
               identifier 'n_args' ... ../src/syntax/typing.nit:1145,44--49
+              ../src/syntax/typing.nit:1145,44
             identifier 'to_a' ... ../src/syntax/typing.nit:1145,51--54
+            ../src/syntax/typing.nit:1145,44
       ../src/syntax/typing.nit:1146,2--1200,4
         keyword 'redef' ... ../src/syntax/typing.nit:1146,2--6
         ../src/syntax/typing.nit:1146,12
@@ -6672,9 +8225,13 @@
                   ../src/syntax/typing.nit:1148,39
                     ../src/syntax/typing.nit:1148,39
                     identifier 'v' ... ../src/syntax/typing.nit:1148,39
+                    ../src/syntax/typing.nit:1148,39
                   identifier 'local_property' ... ../src/syntax/typing.nit:1148,41--54
+                  ../src/syntax/typing.nit:1148,39
                 identifier 'prhe' ... ../src/syntax/typing.nit:1148,56--59
+                ../src/syntax/typing.nit:1148,39
               identifier 'direct_greaters' ... ../src/syntax/typing.nit:1148,61--75
+              ../src/syntax/typing.nit:1148,39
           ../src/syntax/typing.nit:1149,3--1178,5
             keyword 'if' ... ../src/syntax/typing.nit:1149,3--4
             ../src/syntax/typing.nit:1149,6--23
@@ -6683,15 +8240,20 @@
                 ../src/syntax/typing.nit:1149,10--14
                   ../src/syntax/typing.nit:1149,10
                   identifier 'precs' ... ../src/syntax/typing.nit:1149,10--14
+                  ../src/syntax/typing.nit:1149,10
                 identifier 'is_empty' ... ../src/syntax/typing.nit:1149,16--23
+                ../src/syntax/typing.nit:1149,10
             ../src/syntax/typing.nit:1150,4--37
               ../src/syntax/typing.nit:1150,4--37
                 ../src/syntax/typing.nit:1150,4--19
                   ../src/syntax/typing.nit:1150,4
                     ../src/syntax/typing.nit:1150,4
                     identifier 'v' ... ../src/syntax/typing.nit:1150,4
+                    ../src/syntax/typing.nit:1150,4
                   identifier 'local_property' ... ../src/syntax/typing.nit:1150,6--19
+                  ../src/syntax/typing.nit:1150,4
                 identifier 'need_super' ... ../src/syntax/typing.nit:1150,21--30
+                ../src/syntax/typing.nit:1150,34
                 '=' ... ../src/syntax/typing.nit:1150,32
                 ../src/syntax/typing.nit:1150,34--37
                   keyword 'true' ... ../src/syntax/typing.nit:1150,34--37
@@ -6703,34 +8265,47 @@
                     ../src/syntax/typing.nit:1151,11
                       ../src/syntax/typing.nit:1151,11
                       identifier 'v' ... ../src/syntax/typing.nit:1151,11
+                      ../src/syntax/typing.nit:1151,11
                     identifier 'local_property' ... ../src/syntax/typing.nit:1151,13--26
+                    ../src/syntax/typing.nit:1151,11
                   identifier 'global' ... ../src/syntax/typing.nit:1151,28--33
+                  ../src/syntax/typing.nit:1151,11
                 identifier 'is_init' ... ../src/syntax/typing.nit:1151,35--41
+                ../src/syntax/typing.nit:1151,11
               ../src/syntax/typing.nit:1152,4--1174,6
-                ../src/syntax/typing.nit:1152,4--75
+                ../src/syntax/typing.nit:1152,4--76
                   keyword 'var' ... ../src/syntax/typing.nit:1152,4--6
                   identifier 'base_precs' ... ../src/syntax/typing.nit:1152,8--17
                   '=' ... ../src/syntax/typing.nit:1152,19
-                  ../src/syntax/typing.nit:1152,21--75
+                  ../src/syntax/typing.nit:1152,21--76
                     ../src/syntax/typing.nit:1152,21--33
                       ../src/syntax/typing.nit:1152,21
                         ../src/syntax/typing.nit:1152,21
                         identifier 'v' ... ../src/syntax/typing.nit:1152,21
+                        ../src/syntax/typing.nit:1152,21
                       identifier 'local_class' ... ../src/syntax/typing.nit:1152,23--33
+                      ../src/syntax/typing.nit:1152,21
                     identifier 'super_methods_named' ... ../src/syntax/typing.nit:1152,35--53
-                    ../src/syntax/typing.nit:1152,55--75
-                      ../src/syntax/typing.nit:1152,55--70
-                        ../src/syntax/typing.nit:1152,55
+                    ../src/syntax/typing.nit:1152,54--76
+                      '(' ... ../src/syntax/typing.nit:1152,54
+                      ../src/syntax/typing.nit:1152,55--75
+                        ../src/syntax/typing.nit:1152,55--70
                           ../src/syntax/typing.nit:1152,55
-                          identifier 'v' ... ../src/syntax/typing.nit:1152,55
-                        identifier 'local_property' ... ../src/syntax/typing.nit:1152,57--70
-                      identifier 'name' ... ../src/syntax/typing.nit:1152,72--75
+                            ../src/syntax/typing.nit:1152,55
+                            identifier 'v' ... ../src/syntax/typing.nit:1152,55
+                            ../src/syntax/typing.nit:1152,55
+                          identifier 'local_property' ... ../src/syntax/typing.nit:1152,57--70
+                          ../src/syntax/typing.nit:1152,55
+                        identifier 'name' ... ../src/syntax/typing.nit:1152,72--75
+                        ../src/syntax/typing.nit:1152,55
+                      ')' ... ../src/syntax/typing.nit:1152,76
                 ../src/syntax/typing.nit:1153,4--1159,6
                   keyword 'for' ... ../src/syntax/typing.nit:1153,4--6
                   identifier 'p' ... ../src/syntax/typing.nit:1153,8
                   ../src/syntax/typing.nit:1153,13--22
                     ../src/syntax/typing.nit:1153,13
                     identifier 'base_precs' ... ../src/syntax/typing.nit:1153,13--22
+                    ../src/syntax/typing.nit:1153,13
                   keyword 'do' ... ../src/syntax/typing.nit:1153,24--25
                   ../src/syntax/typing.nit:1154,5--1159,6
                     ../src/syntax/typing.nit:1154,5--1158,7
@@ -6742,48 +8317,69 @@
                             ../src/syntax/typing.nit:1154,12
                               ../src/syntax/typing.nit:1154,12
                               identifier 'p' ... ../src/syntax/typing.nit:1154,12
+                              ../src/syntax/typing.nit:1154,12
                             identifier 'global' ... ../src/syntax/typing.nit:1154,14--19
+                            ../src/syntax/typing.nit:1154,12
                           identifier 'is_init' ... ../src/syntax/typing.nit:1154,21--27
-                      ../src/syntax/typing.nit:1155,6--70
-                        ../src/syntax/typing.nit:1155,6--70
+                          ../src/syntax/typing.nit:1154,12
+                      ../src/syntax/typing.nit:1155,6--71
+                        ../src/syntax/typing.nit:1155,6--71
                           ../src/syntax/typing.nit:1155,6
                             ../src/syntax/typing.nit:1155,6
                             identifier 'v' ... ../src/syntax/typing.nit:1155,6
+                            ../src/syntax/typing.nit:1155,6
                           identifier 'error' ... ../src/syntax/typing.nit:1155,8--12
-                          ../src/syntax/typing.nit:1155,14--17
-                            keyword 'self' ... ../src/syntax/typing.nit:1155,14--17
-                          ../src/syntax/typing.nit:1155,20--70
-                            ../src/syntax/typing.nit:1155,20--28
-                              literal value '"Error: {' ... ../src/syntax/typing.nit:1155,20--28
-                            ../src/syntax/typing.nit:1155,29--41
-                              ../src/syntax/typing.nit:1155,29
+                          ../src/syntax/typing.nit:1155,13--71
+                            '(' ... ../src/syntax/typing.nit:1155,13
+                            ../src/syntax/typing.nit:1155,14--17
+                              keyword 'self' ... ../src/syntax/typing.nit:1155,14--17
+                            ../src/syntax/typing.nit:1155,20--70
+                              ../src/syntax/typing.nit:1155,20--28
+                                literal value '"Error: {' ... ../src/syntax/typing.nit:1155,20--28
+                              ../src/syntax/typing.nit:1155,29--41
                                 ../src/syntax/typing.nit:1155,29
-                                identifier 'p' ... ../src/syntax/typing.nit:1155,29
-                              identifier 'local_class' ... ../src/syntax/typing.nit:1155,31--41
-                            ../src/syntax/typing.nit:1155,42--45
-                              literal value '}::{' ... ../src/syntax/typing.nit:1155,42--45
-                            ../src/syntax/typing.nit:1155,46
+                                  ../src/syntax/typing.nit:1155,29
+                                  identifier 'p' ... ../src/syntax/typing.nit:1155,29
+                                  ../src/syntax/typing.nit:1155,29
+                                identifier 'local_class' ... ../src/syntax/typing.nit:1155,31--41
+                                ../src/syntax/typing.nit:1155,29
+                              ../src/syntax/typing.nit:1155,42--45
+                                literal value '}::{' ... ../src/syntax/typing.nit:1155,42--45
                               ../src/syntax/typing.nit:1155,46
-                              identifier 'p' ... ../src/syntax/typing.nit:1155,46
-                            ../src/syntax/typing.nit:1155,47--70
-                              '} is not a constructor."' ... ../src/syntax/typing.nit:1155,47--70
+                                ../src/syntax/typing.nit:1155,46
+                                identifier 'p' ... ../src/syntax/typing.nit:1155,46
+                                ../src/syntax/typing.nit:1155,46
+                              ../src/syntax/typing.nit:1155,47--70
+                                '} is not a constructor."' ... ../src/syntax/typing.nit:1155,47--70
+                            ')' ... ../src/syntax/typing.nit:1155,71
                       ../src/syntax/typing.nit:1157,6--1158,7
-                        ../src/syntax/typing.nit:1157,6--37
+                        ../src/syntax/typing.nit:1157,6--39
                           ../src/syntax/typing.nit:1157,6--10
                             ../src/syntax/typing.nit:1157,6
                             identifier 'precs' ... ../src/syntax/typing.nit:1157,6--10
+                            ../src/syntax/typing.nit:1157,6
                           identifier 'add' ... ../src/syntax/typing.nit:1157,12--14
-                          ../src/syntax/typing.nit:1157,16--37
-                            ../src/syntax/typing.nit:1157,16--28
-                              ../src/syntax/typing.nit:1157,16
+                          ../src/syntax/typing.nit:1157,15--39
+                            '(' ... ../src/syntax/typing.nit:1157,15
+                            ../src/syntax/typing.nit:1157,16--38
+                              ../src/syntax/typing.nit:1157,16--28
                                 ../src/syntax/typing.nit:1157,16
-                                identifier 'v' ... ../src/syntax/typing.nit:1157,16
-                              identifier 'local_class' ... ../src/syntax/typing.nit:1157,18--28
-                            ../src/syntax/typing.nit:1157,30--37
-                              ../src/syntax/typing.nit:1157,30
-                                ../src/syntax/typing.nit:1157,30
-                                identifier 'p' ... ../src/syntax/typing.nit:1157,30
-                              identifier 'global' ... ../src/syntax/typing.nit:1157,32--37
+                                  ../src/syntax/typing.nit:1157,16
+                                  identifier 'v' ... ../src/syntax/typing.nit:1157,16
+                                  ../src/syntax/typing.nit:1157,16
+                                identifier 'local_class' ... ../src/syntax/typing.nit:1157,18--28
+                                ../src/syntax/typing.nit:1157,16
+                              ../src/syntax/typing.nit:1157,29--38
+                                '[' ... ../src/syntax/typing.nit:1157,29
+                                ../src/syntax/typing.nit:1157,30--37
+                                  ../src/syntax/typing.nit:1157,30
+                                    ../src/syntax/typing.nit:1157,30
+                                    identifier 'p' ... ../src/syntax/typing.nit:1157,30
+                                    ../src/syntax/typing.nit:1157,30
+                                  identifier 'global' ... ../src/syntax/typing.nit:1157,32--37
+                                  ../src/syntax/typing.nit:1157,30
+                                ']' ... ../src/syntax/typing.nit:1157,38
+                            ')' ... ../src/syntax/typing.nit:1157,39
                         keyword 'end' ... ../src/syntax/typing.nit:1158,5--7
                     keyword 'end' ... ../src/syntax/typing.nit:1159,4--6
                 ../src/syntax/typing.nit:1160,4--1166,6
@@ -6792,27 +8388,36 @@
                     ../src/syntax/typing.nit:1160,7--11
                       ../src/syntax/typing.nit:1160,7
                       identifier 'precs' ... ../src/syntax/typing.nit:1160,7--11
+                      ../src/syntax/typing.nit:1160,7
                     identifier 'is_empty' ... ../src/syntax/typing.nit:1160,13--20
+                    ../src/syntax/typing.nit:1160,7
                   ../src/syntax/typing.nit:1161,5--1162,10
-                    ../src/syntax/typing.nit:1161,5--87
+                    ../src/syntax/typing.nit:1161,5--88
                       ../src/syntax/typing.nit:1161,5
                         ../src/syntax/typing.nit:1161,5
                         identifier 'v' ... ../src/syntax/typing.nit:1161,5
+                        ../src/syntax/typing.nit:1161,5
                       identifier 'error' ... ../src/syntax/typing.nit:1161,7--11
-                      ../src/syntax/typing.nit:1161,13--16
-                        keyword 'self' ... ../src/syntax/typing.nit:1161,13--16
-                      ../src/syntax/typing.nit:1161,19--87
-                        ../src/syntax/typing.nit:1161,19--47
-                          literal value '"Error: No contructor named {' ... ../src/syntax/typing.nit:1161,19--47
-                        ../src/syntax/typing.nit:1161,48--68
-                          ../src/syntax/typing.nit:1161,48--63
-                            ../src/syntax/typing.nit:1161,48
+                      ../src/syntax/typing.nit:1161,12--88
+                        '(' ... ../src/syntax/typing.nit:1161,12
+                        ../src/syntax/typing.nit:1161,13--16
+                          keyword 'self' ... ../src/syntax/typing.nit:1161,13--16
+                        ../src/syntax/typing.nit:1161,19--87
+                          ../src/syntax/typing.nit:1161,19--47
+                            literal value '"Error: No contructor named {' ... ../src/syntax/typing.nit:1161,19--47
+                          ../src/syntax/typing.nit:1161,48--68
+                            ../src/syntax/typing.nit:1161,48--63
+                              ../src/syntax/typing.nit:1161,48
+                                ../src/syntax/typing.nit:1161,48
+                                identifier 'v' ... ../src/syntax/typing.nit:1161,48
+                                ../src/syntax/typing.nit:1161,48
+                              identifier 'local_property' ... ../src/syntax/typing.nit:1161,50--63
                               ../src/syntax/typing.nit:1161,48
-                              identifier 'v' ... ../src/syntax/typing.nit:1161,48
-                            identifier 'local_property' ... ../src/syntax/typing.nit:1161,50--63
-                          identifier 'name' ... ../src/syntax/typing.nit:1161,65--68
-                        ../src/syntax/typing.nit:1161,69--87
-                          '} in superclasses."' ... ../src/syntax/typing.nit:1161,69--87
+                            identifier 'name' ... ../src/syntax/typing.nit:1161,65--68
+                            ../src/syntax/typing.nit:1161,48
+                          ../src/syntax/typing.nit:1161,69--87
+                            '} in superclasses."' ... ../src/syntax/typing.nit:1161,69--87
+                        ')' ... ../src/syntax/typing.nit:1161,88
                     ../src/syntax/typing.nit:1162,5--10
                       keyword 'return' ... ../src/syntax/typing.nit:1162,5--10
                   ../src/syntax/typing.nit:1163,9--1166,6
@@ -6822,38 +8427,51 @@
                         ../src/syntax/typing.nit:1163,12--16
                           ../src/syntax/typing.nit:1163,12
                           identifier 'precs' ... ../src/syntax/typing.nit:1163,12--16
+                          ../src/syntax/typing.nit:1163,12
                         identifier 'length' ... ../src/syntax/typing.nit:1163,18--23
+                        ../src/syntax/typing.nit:1163,12
                       ../src/syntax/typing.nit:1163,27
                         literal value '1' ... ../src/syntax/typing.nit:1163,27
                     ../src/syntax/typing.nit:1164,5--1165,10
-                      ../src/syntax/typing.nit:1164,5--117
+                      ../src/syntax/typing.nit:1164,5--118
                         ../src/syntax/typing.nit:1164,5
                           ../src/syntax/typing.nit:1164,5
                           identifier 'v' ... ../src/syntax/typing.nit:1164,5
+                          ../src/syntax/typing.nit:1164,5
                         identifier 'error' ... ../src/syntax/typing.nit:1164,7--11
-                        ../src/syntax/typing.nit:1164,13--16
-                          keyword 'self' ... ../src/syntax/typing.nit:1164,13--16
-                        ../src/syntax/typing.nit:1164,19--117
-                          ../src/syntax/typing.nit:1164,19--57
-                            literal value '"Error: Conflicting contructors named {' ... ../src/syntax/typing.nit:1164,19--57
-                          ../src/syntax/typing.nit:1164,58--78
-                            ../src/syntax/typing.nit:1164,58--73
-                              ../src/syntax/typing.nit:1164,58
+                        ../src/syntax/typing.nit:1164,12--118
+                          '(' ... ../src/syntax/typing.nit:1164,12
+                          ../src/syntax/typing.nit:1164,13--16
+                            keyword 'self' ... ../src/syntax/typing.nit:1164,13--16
+                          ../src/syntax/typing.nit:1164,19--117
+                            ../src/syntax/typing.nit:1164,19--57
+                              literal value '"Error: Conflicting contructors named {' ... ../src/syntax/typing.nit:1164,19--57
+                            ../src/syntax/typing.nit:1164,58--78
+                              ../src/syntax/typing.nit:1164,58--73
                                 ../src/syntax/typing.nit:1164,58
-                                identifier 'v' ... ../src/syntax/typing.nit:1164,58
-                              identifier 'local_property' ... ../src/syntax/typing.nit:1164,60--73
-                            identifier 'name' ... ../src/syntax/typing.nit:1164,75--78
-                          ../src/syntax/typing.nit:1164,79--98
-                            literal value '} in superclasses: {' ... ../src/syntax/typing.nit:1164,79--98
-                          ../src/syntax/typing.nit:1164,99--113
-                            ../src/syntax/typing.nit:1164,99--103
-                              ../src/syntax/typing.nit:1164,99
-                              identifier 'precs' ... ../src/syntax/typing.nit:1164,99--103
-                            identifier 'join' ... ../src/syntax/typing.nit:1164,105--108
-                            ../src/syntax/typing.nit:1164,110--113
-                              literal value '", "' ... ../src/syntax/typing.nit:1164,110--113
-                          ../src/syntax/typing.nit:1164,115--117
-                            '}."' ... ../src/syntax/typing.nit:1164,115--117
+                                  ../src/syntax/typing.nit:1164,58
+                                  identifier 'v' ... ../src/syntax/typing.nit:1164,58
+                                  ../src/syntax/typing.nit:1164,58
+                                identifier 'local_property' ... ../src/syntax/typing.nit:1164,60--73
+                                ../src/syntax/typing.nit:1164,58
+                              identifier 'name' ... ../src/syntax/typing.nit:1164,75--78
+                              ../src/syntax/typing.nit:1164,58
+                            ../src/syntax/typing.nit:1164,79--98
+                              literal value '} in superclasses: {' ... ../src/syntax/typing.nit:1164,79--98
+                            ../src/syntax/typing.nit:1164,99--114
+                              ../src/syntax/typing.nit:1164,99--103
+                                ../src/syntax/typing.nit:1164,99
+                                identifier 'precs' ... ../src/syntax/typing.nit:1164,99--103
+                                ../src/syntax/typing.nit:1164,99
+                              identifier 'join' ... ../src/syntax/typing.nit:1164,105--108
+                              ../src/syntax/typing.nit:1164,109--114
+                                '(' ... ../src/syntax/typing.nit:1164,109
+                                ../src/syntax/typing.nit:1164,110--113
+                                  literal value '", "' ... ../src/syntax/typing.nit:1164,110--113
+                                ')' ... ../src/syntax/typing.nit:1164,114
+                            ../src/syntax/typing.nit:1164,115--117
+                              '}."' ... ../src/syntax/typing.nit:1164,115--117
+                          ')' ... ../src/syntax/typing.nit:1164,118
                       ../src/syntax/typing.nit:1165,5--10
                         keyword 'return' ... ../src/syntax/typing.nit:1165,5--10
                     ../src/syntax/typing.nit:1166,4--6
@@ -6866,13 +8484,16 @@
                     ../src/syntax/typing.nit:1167,12--21
                       ../src/syntax/typing.nit:1167,12
                       identifier 'base_precs' ... ../src/syntax/typing.nit:1167,12--21
+                      ../src/syntax/typing.nit:1167,12
                     identifier 'first' ... ../src/syntax/typing.nit:1167,23--27
+                    ../src/syntax/typing.nit:1167,12
                 ../src/syntax/typing.nit:1168,4--24
                   keyword 'assert' ... ../src/syntax/typing.nit:1168,4--9
                   ../src/syntax/typing.nit:1168,11--24
                     ../src/syntax/typing.nit:1168,11
                       ../src/syntax/typing.nit:1168,11
                       identifier 'p' ... ../src/syntax/typing.nit:1168,11
+                      ../src/syntax/typing.nit:1168,11
                     ../src/syntax/typing.nit:1168,17--24
                       type identifier 'MMMethod' ... ../src/syntax/typing.nit:1168,17--24
                 ../src/syntax/typing.nit:1169,4--26
@@ -6882,91 +8503,124 @@
                   ../src/syntax/typing.nit:1169,26
                     ../src/syntax/typing.nit:1169,26
                     identifier 'p' ... ../src/syntax/typing.nit:1169,26
-                ../src/syntax/typing.nit:1170,4--32
+                    ../src/syntax/typing.nit:1169,26
+                ../src/syntax/typing.nit:1170,4--33
                   ../src/syntax/typing.nit:1170,29
                   identifier 'register_super_init_call' ... ../src/syntax/typing.nit:1170,4--27
-                  ../src/syntax/typing.nit:1170,29
+                  ../src/syntax/typing.nit:1170,28--33
+                    '(' ... ../src/syntax/typing.nit:1170,28
                     ../src/syntax/typing.nit:1170,29
-                    identifier 'v' ... ../src/syntax/typing.nit:1170,29
-                  ../src/syntax/typing.nit:1170,32
+                      ../src/syntax/typing.nit:1170,29
+                      identifier 'v' ... ../src/syntax/typing.nit:1170,29
+                      ../src/syntax/typing.nit:1170,29
                     ../src/syntax/typing.nit:1170,32
-                    identifier 'p' ... ../src/syntax/typing.nit:1170,32
+                      ../src/syntax/typing.nit:1170,32
+                      identifier 'p' ... ../src/syntax/typing.nit:1170,32
+                      ../src/syntax/typing.nit:1170,32
+                    ')' ... ../src/syntax/typing.nit:1170,33
                 ../src/syntax/typing.nit:1171,4--1174,6
                   keyword 'if' ... ../src/syntax/typing.nit:1171,4--5
-                  ../src/syntax/typing.nit:1171,7--23
-                    ../src/syntax/typing.nit:1171,7--19
-                      ../src/syntax/typing.nit:1171,7--12
+                  ../src/syntax/typing.nit:1171,7--31
+                    ../src/syntax/typing.nit:1171,7--27
+                      ../src/syntax/typing.nit:1171,7--20
+                        ../src/syntax/typing.nit:1171,7--12
+                          ../src/syntax/typing.nit:1171,7
+                          identifier 'n_args' ... ../src/syntax/typing.nit:1171,7--12
+                          ../src/syntax/typing.nit:1171,7
+                        identifier 'n_exprs' ... ../src/syntax/typing.nit:1171,14--20
                         ../src/syntax/typing.nit:1171,7
-                        identifier 'n_args' ... ../src/syntax/typing.nit:1171,7--12
-                      identifier 'length' ... ../src/syntax/typing.nit:1171,14--19
-                    ../src/syntax/typing.nit:1171,23
-                      literal value '0' ... ../src/syntax/typing.nit:1171,23
-                  ../src/syntax/typing.nit:1172,5--1173,65
-                    ../src/syntax/typing.nit:1172,5--75
+                      identifier 'length' ... ../src/syntax/typing.nit:1171,22--27
+                      ../src/syntax/typing.nit:1171,7
+                    ../src/syntax/typing.nit:1171,31
+                      literal value '0' ... ../src/syntax/typing.nit:1171,31
+                  ../src/syntax/typing.nit:1172,5--1173,66
+                    ../src/syntax/typing.nit:1172,5--76
                       keyword 'var' ... ../src/syntax/typing.nit:1172,5--7
                       identifier 'signature' ... ../src/syntax/typing.nit:1172,9--17
                       '=' ... ../src/syntax/typing.nit:1172,19
-                      ../src/syntax/typing.nit:1172,21--75
+                      ../src/syntax/typing.nit:1172,21--76
                         ../src/syntax/typing.nit:1172,35
                         identifier 'get_signature' ... ../src/syntax/typing.nit:1172,21--33
-                        ../src/syntax/typing.nit:1172,35
+                        ../src/syntax/typing.nit:1172,34--76
+                          '(' ... ../src/syntax/typing.nit:1172,34
                           ../src/syntax/typing.nit:1172,35
-                          identifier 'v' ... ../src/syntax/typing.nit:1172,35
-                        ../src/syntax/typing.nit:1172,38--66
-                          ../src/syntax/typing.nit:1172,38--53
-                            ../src/syntax/typing.nit:1172,38--47
-                              ../src/syntax/typing.nit:1172,38
+                            ../src/syntax/typing.nit:1172,35
+                            identifier 'v' ... ../src/syntax/typing.nit:1172,35
+                            ../src/syntax/typing.nit:1172,35
+                          ../src/syntax/typing.nit:1172,38--66
+                            ../src/syntax/typing.nit:1172,38--53
+                              ../src/syntax/typing.nit:1172,38--47
                                 ../src/syntax/typing.nit:1172,38
-                                identifier 'v' ... ../src/syntax/typing.nit:1172,38
-                              identifier 'self_var' ... ../src/syntax/typing.nit:1172,40--47
-                            identifier 'stype' ... ../src/syntax/typing.nit:1172,49--53
-                          keyword 'as' ... ../src/syntax/typing.nit:1172,55--56
-                          '(' ... ../src/syntax/typing.nit:1172,57
-                          keyword 'not' ... ../src/syntax/typing.nit:1172,58--60
-                          keyword 'null' ... ../src/syntax/typing.nit:1172,62--65
-                          ')' ... ../src/syntax/typing.nit:1172,66
-                        ../src/syntax/typing.nit:1172,69
+                                  ../src/syntax/typing.nit:1172,38
+                                  identifier 'v' ... ../src/syntax/typing.nit:1172,38
+                                  ../src/syntax/typing.nit:1172,38
+                                identifier 'self_var' ... ../src/syntax/typing.nit:1172,40--47
+                                ../src/syntax/typing.nit:1172,38
+                              identifier 'stype' ... ../src/syntax/typing.nit:1172,49--53
+                              ../src/syntax/typing.nit:1172,38
+                            keyword 'as' ... ../src/syntax/typing.nit:1172,55--56
+                            '(' ... ../src/syntax/typing.nit:1172,57
+                            keyword 'not' ... ../src/syntax/typing.nit:1172,58--60
+                            keyword 'null' ... ../src/syntax/typing.nit:1172,62--65
+                            ')' ... ../src/syntax/typing.nit:1172,66
                           ../src/syntax/typing.nit:1172,69
-                          identifier 'p' ... ../src/syntax/typing.nit:1172,69
-                        ../src/syntax/typing.nit:1172,72--75
-                          keyword 'true' ... ../src/syntax/typing.nit:1172,72--75
-                    ../src/syntax/typing.nit:1173,5--65
+                            ../src/syntax/typing.nit:1172,69
+                            identifier 'p' ... ../src/syntax/typing.nit:1172,69
+                            ../src/syntax/typing.nit:1172,69
+                          ../src/syntax/typing.nit:1172,72--75
+                            keyword 'true' ... ../src/syntax/typing.nit:1172,72--75
+                          ')' ... ../src/syntax/typing.nit:1172,76
+                    ../src/syntax/typing.nit:1173,5--66
                       ../src/syntax/typing.nit:1173,23
                       identifier 'process_signature' ... ../src/syntax/typing.nit:1173,5--21
-                      ../src/syntax/typing.nit:1173,23
+                      ../src/syntax/typing.nit:1173,22--66
+                        '(' ... ../src/syntax/typing.nit:1173,22
                         ../src/syntax/typing.nit:1173,23
-                        identifier 'v' ... ../src/syntax/typing.nit:1173,23
-                      ../src/syntax/typing.nit:1173,26--34
-                        ../src/syntax/typing.nit:1173,26
-                        identifier 'signature' ... ../src/syntax/typing.nit:1173,26--34
-                      ../src/syntax/typing.nit:1173,37--42
-                        ../src/syntax/typing.nit:1173,37
+                          ../src/syntax/typing.nit:1173,23
+                          identifier 'v' ... ../src/syntax/typing.nit:1173,23
+                          ../src/syntax/typing.nit:1173,23
+                        ../src/syntax/typing.nit:1173,26--34
+                          ../src/syntax/typing.nit:1173,26
+                          identifier 'signature' ... ../src/syntax/typing.nit:1173,26--34
+                          ../src/syntax/typing.nit:1173,26
+                        ../src/syntax/typing.nit:1173,37--42
                           ../src/syntax/typing.nit:1173,37
-                          identifier 'p' ... ../src/syntax/typing.nit:1173,37
-                        identifier 'name' ... ../src/syntax/typing.nit:1173,39--42
-                      ../src/syntax/typing.nit:1173,45--65
-                        ../src/syntax/typing.nit:1173,45
-                        identifier 'compute_raw_arguments' ... ../src/syntax/typing.nit:1173,45--65
+                            ../src/syntax/typing.nit:1173,37
+                            identifier 'p' ... ../src/syntax/typing.nit:1173,37
+                            ../src/syntax/typing.nit:1173,37
+                          identifier 'name' ... ../src/syntax/typing.nit:1173,39--42
+                          ../src/syntax/typing.nit:1173,37
+                        ../src/syntax/typing.nit:1173,45--65
+                          ../src/syntax/typing.nit:1173,45
+                          identifier 'compute_raw_arguments' ... ../src/syntax/typing.nit:1173,45--65
+                          ../src/syntax/typing.nit:1173,45
+                        ')' ... ../src/syntax/typing.nit:1173,66
                   ../src/syntax/typing.nit:1174,4--6
                     keyword 'end' ... ../src/syntax/typing.nit:1174,4--6
               ../src/syntax/typing.nit:1176,4--1178,5
-                ../src/syntax/typing.nit:1176,4--73
+                ../src/syntax/typing.nit:1176,4--74
                   ../src/syntax/typing.nit:1176,4
                     ../src/syntax/typing.nit:1176,4
                     identifier 'v' ... ../src/syntax/typing.nit:1176,4
+                    ../src/syntax/typing.nit:1176,4
                   identifier 'error' ... ../src/syntax/typing.nit:1176,6--10
-                  ../src/syntax/typing.nit:1176,12--15
-                    keyword 'self' ... ../src/syntax/typing.nit:1176,12--15
-                  ../src/syntax/typing.nit:1176,18--73
-                    ../src/syntax/typing.nit:1176,18--54
-                      literal value '"Error: No super method to call for {' ... ../src/syntax/typing.nit:1176,18--54
-                    ../src/syntax/typing.nit:1176,55--70
-                      ../src/syntax/typing.nit:1176,55
+                  ../src/syntax/typing.nit:1176,11--74
+                    '(' ... ../src/syntax/typing.nit:1176,11
+                    ../src/syntax/typing.nit:1176,12--15
+                      keyword 'self' ... ../src/syntax/typing.nit:1176,12--15
+                    ../src/syntax/typing.nit:1176,18--73
+                      ../src/syntax/typing.nit:1176,18--54
+                        literal value '"Error: No super method to call for {' ... ../src/syntax/typing.nit:1176,18--54
+                      ../src/syntax/typing.nit:1176,55--70
                         ../src/syntax/typing.nit:1176,55
-                        identifier 'v' ... ../src/syntax/typing.nit:1176,55
-                      identifier 'local_property' ... ../src/syntax/typing.nit:1176,57--70
-                    ../src/syntax/typing.nit:1176,71--73
-                      '}."' ... ../src/syntax/typing.nit:1176,71--73
+                          ../src/syntax/typing.nit:1176,55
+                          identifier 'v' ... ../src/syntax/typing.nit:1176,55
+                          ../src/syntax/typing.nit:1176,55
+                        identifier 'local_property' ... ../src/syntax/typing.nit:1176,57--70
+                        ../src/syntax/typing.nit:1176,55
+                      ../src/syntax/typing.nit:1176,71--73
+                        '}."' ... ../src/syntax/typing.nit:1176,71--73
+                    ')' ... ../src/syntax/typing.nit:1176,74
                 ../src/syntax/typing.nit:1177,4--9
                   keyword 'return' ... ../src/syntax/typing.nit:1177,4--9
                 keyword 'end' ... ../src/syntax/typing.nit:1178,3--5
@@ -6974,27 +8628,36 @@
             keyword 'if' ... ../src/syntax/typing.nit:1180,3--4
             ../src/syntax/typing.nit:1180,6--81
               ../src/syntax/typing.nit:1180,6--73
-                ../src/syntax/typing.nit:1180,6--60
+                ../src/syntax/typing.nit:1180,6--61
                   ../src/syntax/typing.nit:1180,6--16
                     ../src/syntax/typing.nit:1180,6--10
                       ../src/syntax/typing.nit:1180,6
                       identifier 'precs' ... ../src/syntax/typing.nit:1180,6--10
+                      ../src/syntax/typing.nit:1180,6
                     identifier 'first' ... ../src/syntax/typing.nit:1180,12--16
+                    ../src/syntax/typing.nit:1180,6
                   identifier 'signature_for' ... ../src/syntax/typing.nit:1180,18--30
-                  ../src/syntax/typing.nit:1180,32--60
-                    ../src/syntax/typing.nit:1180,32--47
-                      ../src/syntax/typing.nit:1180,32--41
-                        ../src/syntax/typing.nit:1180,32
+                  ../src/syntax/typing.nit:1180,31--61
+                    '(' ... ../src/syntax/typing.nit:1180,31
+                    ../src/syntax/typing.nit:1180,32--60
+                      ../src/syntax/typing.nit:1180,32--47
+                        ../src/syntax/typing.nit:1180,32--41
+                          ../src/syntax/typing.nit:1180,32
+                            ../src/syntax/typing.nit:1180,32
+                            identifier 'v' ... ../src/syntax/typing.nit:1180,32
+                            ../src/syntax/typing.nit:1180,32
+                          identifier 'self_var' ... ../src/syntax/typing.nit:1180,34--41
                           ../src/syntax/typing.nit:1180,32
-                          identifier 'v' ... ../src/syntax/typing.nit:1180,32
-                        identifier 'self_var' ... ../src/syntax/typing.nit:1180,34--41
-                      identifier 'stype' ... ../src/syntax/typing.nit:1180,43--47
-                    keyword 'as' ... ../src/syntax/typing.nit:1180,49--50
-                    '(' ... ../src/syntax/typing.nit:1180,51
-                    keyword 'not' ... ../src/syntax/typing.nit:1180,52--54
-                    keyword 'null' ... ../src/syntax/typing.nit:1180,56--59
-                    ')' ... ../src/syntax/typing.nit:1180,60
+                        identifier 'stype' ... ../src/syntax/typing.nit:1180,43--47
+                        ../src/syntax/typing.nit:1180,32
+                      keyword 'as' ... ../src/syntax/typing.nit:1180,49--50
+                      '(' ... ../src/syntax/typing.nit:1180,51
+                      keyword 'not' ... ../src/syntax/typing.nit:1180,52--54
+                      keyword 'null' ... ../src/syntax/typing.nit:1180,56--59
+                      ')' ... ../src/syntax/typing.nit:1180,60
+                    ')' ... ../src/syntax/typing.nit:1180,61
                 identifier 'return_type' ... ../src/syntax/typing.nit:1180,63--73
+                ../src/syntax/typing.nit:1180,6
               ../src/syntax/typing.nit:1180,78--81
                 keyword 'null' ... ../src/syntax/typing.nit:1180,78--81
             ../src/syntax/typing.nit:1181,4--1194,17
@@ -7008,6 +8671,7 @@
                     type identifier 'Array' ... ../src/syntax/typing.nit:1181,21--25
                     ../src/syntax/typing.nit:1181,27--32
                       type identifier 'MMType' ... ../src/syntax/typing.nit:1181,27--32
+                  ../src/syntax/typing.nit:1181,17
               ../src/syntax/typing.nit:1182,4--36
                 keyword 'var' ... ../src/syntax/typing.nit:1182,4--6
                 identifier 'stype' ... ../src/syntax/typing.nit:1182,8--12
@@ -7023,6 +8687,7 @@
                 ../src/syntax/typing.nit:1183,16--20
                   ../src/syntax/typing.nit:1183,16
                   identifier 'precs' ... ../src/syntax/typing.nit:1183,16--20
+                  ../src/syntax/typing.nit:1183,16
                 keyword 'do' ... ../src/syntax/typing.nit:1183,22--23
                 ../src/syntax/typing.nit:1184,5--1190,6
                   ../src/syntax/typing.nit:1184,5--28
@@ -7031,58 +8696,84 @@
                       ../src/syntax/typing.nit:1184,12--15
                         ../src/syntax/typing.nit:1184,12
                         identifier 'prop' ... ../src/syntax/typing.nit:1184,12--15
+                        ../src/syntax/typing.nit:1184,12
                       ../src/syntax/typing.nit:1184,21--28
                         type identifier 'MMMethod' ... ../src/syntax/typing.nit:1184,21--28
-                  ../src/syntax/typing.nit:1185,5--137
+                  ../src/syntax/typing.nit:1185,5--138
                     keyword 'var' ... ../src/syntax/typing.nit:1185,5--7
                     identifier 't' ... ../src/syntax/typing.nit:1185,9
                     '=' ... ../src/syntax/typing.nit:1185,11
-                    ../src/syntax/typing.nit:1185,13--137
-                      ../src/syntax/typing.nit:1185,13--95
+                    ../src/syntax/typing.nit:1185,13--138
+                      ../src/syntax/typing.nit:1185,13--96
                         ../src/syntax/typing.nit:1185,13--73
-                          ../src/syntax/typing.nit:1185,13--60
+                          ../src/syntax/typing.nit:1185,13--61
                             ../src/syntax/typing.nit:1185,13--16
                               ../src/syntax/typing.nit:1185,13
                               identifier 'prop' ... ../src/syntax/typing.nit:1185,13--16
+                              ../src/syntax/typing.nit:1185,13
                             identifier 'signature_for' ... ../src/syntax/typing.nit:1185,18--30
-                            ../src/syntax/typing.nit:1185,32--60
-                              ../src/syntax/typing.nit:1185,32--47
-                                ../src/syntax/typing.nit:1185,32--41
-                                  ../src/syntax/typing.nit:1185,32
+                            ../src/syntax/typing.nit:1185,31--61
+                              '(' ... ../src/syntax/typing.nit:1185,31
+                              ../src/syntax/typing.nit:1185,32--60
+                                ../src/syntax/typing.nit:1185,32--47
+                                  ../src/syntax/typing.nit:1185,32--41
+                                    ../src/syntax/typing.nit:1185,32
+                                      ../src/syntax/typing.nit:1185,32
+                                      identifier 'v' ... ../src/syntax/typing.nit:1185,32
+                                      ../src/syntax/typing.nit:1185,32
+                                    identifier 'self_var' ... ../src/syntax/typing.nit:1185,34--41
                                     ../src/syntax/typing.nit:1185,32
-                                    identifier 'v' ... ../src/syntax/typing.nit:1185,32
-                                  identifier 'self_var' ... ../src/syntax/typing.nit:1185,34--41
-                                identifier 'stype' ... ../src/syntax/typing.nit:1185,43--47
-                              keyword 'as' ... ../src/syntax/typing.nit:1185,49--50
-                              '(' ... ../src/syntax/typing.nit:1185,51
-                              keyword 'not' ... ../src/syntax/typing.nit:1185,52--54
-                              keyword 'null' ... ../src/syntax/typing.nit:1185,56--59
-                              ')' ... ../src/syntax/typing.nit:1185,60
+                                  identifier 'stype' ... ../src/syntax/typing.nit:1185,43--47
+                                  ../src/syntax/typing.nit:1185,32
+                                keyword 'as' ... ../src/syntax/typing.nit:1185,49--50
+                                '(' ... ../src/syntax/typing.nit:1185,51
+                                keyword 'not' ... ../src/syntax/typing.nit:1185,52--54
+                                keyword 'null' ... ../src/syntax/typing.nit:1185,56--59
+                                ')' ... ../src/syntax/typing.nit:1185,60
+                              ')' ... ../src/syntax/typing.nit:1185,61
                           identifier 'return_type' ... ../src/syntax/typing.nit:1185,63--73
+                          ../src/syntax/typing.nit:1185,13
                         identifier 'for_module' ... ../src/syntax/typing.nit:1185,75--84
-                        ../src/syntax/typing.nit:1185,86--95
-                          ../src/syntax/typing.nit:1185,86
+                        ../src/syntax/typing.nit:1185,85--96
+                          '(' ... ../src/syntax/typing.nit:1185,85
+                          ../src/syntax/typing.nit:1185,86--95
+                            ../src/syntax/typing.nit:1185,86
+                              ../src/syntax/typing.nit:1185,86
+                              identifier 'v' ... ../src/syntax/typing.nit:1185,86
+                              ../src/syntax/typing.nit:1185,86
+                            identifier 'mmmodule' ... ../src/syntax/typing.nit:1185,88--95
                             ../src/syntax/typing.nit:1185,86
-                            identifier 'v' ... ../src/syntax/typing.nit:1185,86
-                          identifier 'mmmodule' ... ../src/syntax/typing.nit:1185,88--95
+                          ')' ... ../src/syntax/typing.nit:1185,96
                       identifier 'adapt_to' ... ../src/syntax/typing.nit:1185,98--105
-                      ../src/syntax/typing.nit:1185,107--137
-                        ../src/syntax/typing.nit:1185,107--132
-                          ../src/syntax/typing.nit:1185,107--122
-                            ../src/syntax/typing.nit:1185,107
+                      ../src/syntax/typing.nit:1185,106--138
+                        '(' ... ../src/syntax/typing.nit:1185,106
+                        ../src/syntax/typing.nit:1185,107--137
+                          ../src/syntax/typing.nit:1185,107--132
+                            ../src/syntax/typing.nit:1185,107--122
+                              ../src/syntax/typing.nit:1185,107
+                                ../src/syntax/typing.nit:1185,107
+                                identifier 'v' ... ../src/syntax/typing.nit:1185,107
+                                ../src/syntax/typing.nit:1185,107
+                              identifier 'local_property' ... ../src/syntax/typing.nit:1185,109--122
                               ../src/syntax/typing.nit:1185,107
-                              identifier 'v' ... ../src/syntax/typing.nit:1185,107
-                            identifier 'local_property' ... ../src/syntax/typing.nit:1185,109--122
-                          identifier 'signature' ... ../src/syntax/typing.nit:1185,124--132
-                        identifier 'recv' ... ../src/syntax/typing.nit:1185,134--137
-                  ../src/syntax/typing.nit:1186,5--16
+                            identifier 'signature' ... ../src/syntax/typing.nit:1185,124--132
+                            ../src/syntax/typing.nit:1185,107
+                          identifier 'recv' ... ../src/syntax/typing.nit:1185,134--137
+                          ../src/syntax/typing.nit:1185,107
+                        ')' ... ../src/syntax/typing.nit:1185,138
+                  ../src/syntax/typing.nit:1186,5--17
                     ../src/syntax/typing.nit:1186,5--10
                       ../src/syntax/typing.nit:1186,5
                       identifier 'stypes' ... ../src/syntax/typing.nit:1186,5--10
+                      ../src/syntax/typing.nit:1186,5
                     identifier 'add' ... ../src/syntax/typing.nit:1186,12--14
-                    ../src/syntax/typing.nit:1186,16
+                    ../src/syntax/typing.nit:1186,15--17
+                      '(' ... ../src/syntax/typing.nit:1186,15
                       ../src/syntax/typing.nit:1186,16
-                      identifier 't' ... ../src/syntax/typing.nit:1186,16
+                        ../src/syntax/typing.nit:1186,16
+                        identifier 't' ... ../src/syntax/typing.nit:1186,16
+                        ../src/syntax/typing.nit:1186,16
+                      ')' ... ../src/syntax/typing.nit:1186,17
                   ../src/syntax/typing.nit:1187,5--1189,7
                     keyword 'if' ... ../src/syntax/typing.nit:1187,5--6
                     ../src/syntax/typing.nit:1187,8--33
@@ -7090,23 +8781,28 @@
                         ../src/syntax/typing.nit:1187,8--12
                           ../src/syntax/typing.nit:1187,8
                           identifier 'stype' ... ../src/syntax/typing.nit:1187,8--12
+                          ../src/syntax/typing.nit:1187,8
                         ../src/syntax/typing.nit:1187,17--20
                           keyword 'null' ... ../src/syntax/typing.nit:1187,17--20
                       ../src/syntax/typing.nit:1187,25--33
                         ../src/syntax/typing.nit:1187,25--29
                           ../src/syntax/typing.nit:1187,25
                           identifier 'stype' ... ../src/syntax/typing.nit:1187,25--29
+                          ../src/syntax/typing.nit:1187,25
                         ../src/syntax/typing.nit:1187,33
                           ../src/syntax/typing.nit:1187,33
                           identifier 't' ... ../src/syntax/typing.nit:1187,33
+                          ../src/syntax/typing.nit:1187,33
                     ../src/syntax/typing.nit:1188,6--14
                       ../src/syntax/typing.nit:1188,6--14
                         ../src/syntax/typing.nit:1188,14
                         identifier 'stype' ... ../src/syntax/typing.nit:1188,6--10
+                        ../src/syntax/typing.nit:1188,14
                         '=' ... ../src/syntax/typing.nit:1188,12
                         ../src/syntax/typing.nit:1188,14
                           ../src/syntax/typing.nit:1188,14
                           identifier 't' ... ../src/syntax/typing.nit:1188,14
+                          ../src/syntax/typing.nit:1188,14
                     ../src/syntax/typing.nit:1189,5--7
                       keyword 'end' ... ../src/syntax/typing.nit:1189,5--7
                   keyword 'end' ... ../src/syntax/typing.nit:1190,4--6
@@ -7116,27 +8812,34 @@
                 ../src/syntax/typing.nit:1191,13--18
                   ../src/syntax/typing.nit:1191,13
                   identifier 'stypes' ... ../src/syntax/typing.nit:1191,13--18
+                  ../src/syntax/typing.nit:1191,13
                 keyword 'do' ... ../src/syntax/typing.nit:1191,20--21
                 ../src/syntax/typing.nit:1192,5--1193,6
-                  ../src/syntax/typing.nit:1192,5--47
+                  ../src/syntax/typing.nit:1192,5--48
                     ../src/syntax/typing.nit:1192,5
                       ../src/syntax/typing.nit:1192,5
                       identifier 'v' ... ../src/syntax/typing.nit:1192,5
+                      ../src/syntax/typing.nit:1192,5
                     identifier 'check_conform' ... ../src/syntax/typing.nit:1192,7--19
-                    ../src/syntax/typing.nit:1192,21--24
-                      keyword 'self' ... ../src/syntax/typing.nit:1192,21--24
-                    ../src/syntax/typing.nit:1192,27
+                    ../src/syntax/typing.nit:1192,20--48
+                      '(' ... ../src/syntax/typing.nit:1192,20
+                      ../src/syntax/typing.nit:1192,21--24
+                        keyword 'self' ... ../src/syntax/typing.nit:1192,21--24
                       ../src/syntax/typing.nit:1192,27
-                      identifier 't' ... ../src/syntax/typing.nit:1192,27
-                    ../src/syntax/typing.nit:1192,30--47
-                      ../src/syntax/typing.nit:1192,30--34
-                        ../src/syntax/typing.nit:1192,30
-                        identifier 'stype' ... ../src/syntax/typing.nit:1192,30--34
-                      keyword 'as' ... ../src/syntax/typing.nit:1192,36--37
-                      '(' ... ../src/syntax/typing.nit:1192,38
-                      keyword 'not' ... ../src/syntax/typing.nit:1192,39--41
-                      keyword 'null' ... ../src/syntax/typing.nit:1192,43--46
-                      ')' ... ../src/syntax/typing.nit:1192,47
+                        ../src/syntax/typing.nit:1192,27
+                        identifier 't' ... ../src/syntax/typing.nit:1192,27
+                        ../src/syntax/typing.nit:1192,27
+                      ../src/syntax/typing.nit:1192,30--47
+                        ../src/syntax/typing.nit:1192,30--34
+                          ../src/syntax/typing.nit:1192,30
+                          identifier 'stype' ... ../src/syntax/typing.nit:1192,30--34
+                          ../src/syntax/typing.nit:1192,30
+                        keyword 'as' ... ../src/syntax/typing.nit:1192,36--37
+                        '(' ... ../src/syntax/typing.nit:1192,38
+                        keyword 'not' ... ../src/syntax/typing.nit:1192,39--41
+                        keyword 'null' ... ../src/syntax/typing.nit:1192,43--46
+                        ')' ... ../src/syntax/typing.nit:1192,47
+                      ')' ... ../src/syntax/typing.nit:1192,48
                   keyword 'end' ... ../src/syntax/typing.nit:1193,4--6
               ../src/syntax/typing.nit:1194,4--17
                 ../src/syntax/typing.nit:1194,13
@@ -7145,6 +8848,7 @@
                 ../src/syntax/typing.nit:1194,13--17
                   ../src/syntax/typing.nit:1194,13
                   identifier 'stype' ... ../src/syntax/typing.nit:1194,13--17
+                  ../src/syntax/typing.nit:1194,13
             ../src/syntax/typing.nit:1195,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1195,3--5
           ../src/syntax/typing.nit:1196,3--26
@@ -7155,13 +8859,16 @@
               ../src/syntax/typing.nit:1196,11
                 ../src/syntax/typing.nit:1196,11
                 identifier 'v' ... ../src/syntax/typing.nit:1196,11
+                ../src/syntax/typing.nit:1196,11
               identifier 'local_property' ... ../src/syntax/typing.nit:1196,13--26
+              ../src/syntax/typing.nit:1196,11
           ../src/syntax/typing.nit:1197,3--26
             keyword 'assert' ... ../src/syntax/typing.nit:1197,3--8
             ../src/syntax/typing.nit:1197,10--26
               ../src/syntax/typing.nit:1197,10
                 ../src/syntax/typing.nit:1197,10
                 identifier 'p' ... ../src/syntax/typing.nit:1197,10
+                ../src/syntax/typing.nit:1197,10
               ../src/syntax/typing.nit:1197,16--26
                 type identifier 'MMSrcMethod' ... ../src/syntax/typing.nit:1197,16--26
           ../src/syntax/typing.nit:1198,3--11
@@ -7171,6 +8878,7 @@
             ../src/syntax/typing.nit:1198,11
               ../src/syntax/typing.nit:1198,11
               identifier 'p' ... ../src/syntax/typing.nit:1198,11
+              ../src/syntax/typing.nit:1198,11
           ../src/syntax/typing.nit:1199,3--18
             ../src/syntax/typing.nit:1199,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1199,3--11
@@ -7224,6 +8932,7 @@
               ../src/syntax/typing.nit:1209,27--30
                 keyword 'self' ... ../src/syntax/typing.nit:1209,27--30
               identifier 'target_class_name' ... ../src/syntax/typing.nit:1209,32--48
+              ../src/syntax/typing.nit:1209,27
           ../src/syntax/typing.nit:1210,3--50
             keyword 'var' ... ../src/syntax/typing.nit:1210,3--5
             identifier 'target_method_name' ... ../src/syntax/typing.nit:1210,7--24
@@ -7232,6 +8941,7 @@
               ../src/syntax/typing.nit:1210,28--31
                 keyword 'self' ... ../src/syntax/typing.nit:1210,28--31
               identifier 'target_method_name' ... ../src/syntax/typing.nit:1210,33--50
+              ../src/syntax/typing.nit:1210,28
           ../src/syntax/typing.nit:1212,3--33
             keyword 'var' ... ../src/syntax/typing.nit:1212,3--5
             identifier 'target_class' ... ../src/syntax/typing.nit:1212,7--18
@@ -7248,213 +8958,288 @@
               ../src/syntax/typing.nit:1217,6--22
                 ../src/syntax/typing.nit:1217,6
                 identifier 'target_class_name' ... ../src/syntax/typing.nit:1217,6--22
+                ../src/syntax/typing.nit:1217,6
               ../src/syntax/typing.nit:1217,27--30
                 keyword 'null' ... ../src/syntax/typing.nit:1217,27--30
             ../src/syntax/typing.nit:1218,4--46
               ../src/syntax/typing.nit:1218,4--46
                 ../src/syntax/typing.nit:1218,19
                 identifier 'target_class' ... ../src/syntax/typing.nit:1218,4--15
+                ../src/syntax/typing.nit:1218,19
                 '=' ... ../src/syntax/typing.nit:1218,17
                 ../src/syntax/typing.nit:1218,19--46
                   ../src/syntax/typing.nit:1218,19--34
                     ../src/syntax/typing.nit:1218,19
                       ../src/syntax/typing.nit:1218,19
                       identifier 'v' ... ../src/syntax/typing.nit:1218,19
+                      ../src/syntax/typing.nit:1218,19
                     identifier 'local_property' ... ../src/syntax/typing.nit:1218,21--34
+                    ../src/syntax/typing.nit:1218,19
                   identifier 'local_class' ... ../src/syntax/typing.nit:1218,36--46
+                  ../src/syntax/typing.nit:1218,19
             ../src/syntax/typing.nit:1220,4--1227,5
               ../src/syntax/typing.nit:1220,4--1226,6
                 keyword 'if' ... ../src/syntax/typing.nit:1220,4--5
-                ../src/syntax/typing.nit:1220,7--73
+                ../src/syntax/typing.nit:1220,7--75
                   ../src/syntax/typing.nit:1220,7--31
                     ../src/syntax/typing.nit:1220,7--22
                       ../src/syntax/typing.nit:1220,7
                         ../src/syntax/typing.nit:1220,7
                         identifier 'v' ... ../src/syntax/typing.nit:1220,7
+                        ../src/syntax/typing.nit:1220,7
                       identifier 'local_property' ... ../src/syntax/typing.nit:1220,9--22
+                      ../src/syntax/typing.nit:1220,7
                     identifier 'mmmodule' ... ../src/syntax/typing.nit:1220,24--31
+                    ../src/syntax/typing.nit:1220,7
                   identifier 'has_global_class_named' ... ../src/syntax/typing.nit:1220,33--54
-                  ../src/syntax/typing.nit:1220,57--73
-                    ../src/syntax/typing.nit:1220,57
-                    identifier 'target_class_name' ... ../src/syntax/typing.nit:1220,57--73
-                ../src/syntax/typing.nit:1221,5--1222,58
-                  ../src/syntax/typing.nit:1221,5--86
+                  ../src/syntax/typing.nit:1220,55--75
+                    '(' ... ../src/syntax/typing.nit:1220,55
+                    ../src/syntax/typing.nit:1220,57--73
+                      ../src/syntax/typing.nit:1220,57
+                      identifier 'target_class_name' ... ../src/syntax/typing.nit:1220,57--73
+                      ../src/syntax/typing.nit:1220,57
+                    ')' ... ../src/syntax/typing.nit:1220,75
+                ../src/syntax/typing.nit:1221,5--1222,60
+                  ../src/syntax/typing.nit:1221,5--88
                     keyword 'var' ... ../src/syntax/typing.nit:1221,5--7
                     identifier 'global_class' ... ../src/syntax/typing.nit:1221,9--20
                     '=' ... ../src/syntax/typing.nit:1221,22
-                    ../src/syntax/typing.nit:1221,24--86
+                    ../src/syntax/typing.nit:1221,24--88
                       ../src/syntax/typing.nit:1221,24--48
                         ../src/syntax/typing.nit:1221,24--39
                           ../src/syntax/typing.nit:1221,24
                             ../src/syntax/typing.nit:1221,24
                             identifier 'v' ... ../src/syntax/typing.nit:1221,24
+                            ../src/syntax/typing.nit:1221,24
                           identifier 'local_property' ... ../src/syntax/typing.nit:1221,26--39
+                          ../src/syntax/typing.nit:1221,24
                         identifier 'mmmodule' ... ../src/syntax/typing.nit:1221,41--48
+                        ../src/syntax/typing.nit:1221,24
                       identifier 'global_class_named' ... ../src/syntax/typing.nit:1221,50--67
-                      ../src/syntax/typing.nit:1221,70--86
-                        ../src/syntax/typing.nit:1221,70
-                        identifier 'target_class_name' ... ../src/syntax/typing.nit:1221,70--86
-                  ../src/syntax/typing.nit:1222,5--58
+                      ../src/syntax/typing.nit:1221,68--88
+                        '(' ... ../src/syntax/typing.nit:1221,68
+                        ../src/syntax/typing.nit:1221,70--86
+                          ../src/syntax/typing.nit:1221,70
+                          identifier 'target_class_name' ... ../src/syntax/typing.nit:1221,70--86
+                          ../src/syntax/typing.nit:1221,70
+                        ')' ... ../src/syntax/typing.nit:1221,88
+                  ../src/syntax/typing.nit:1222,5--60
                     ../src/syntax/typing.nit:1222,20
                     identifier 'target_class' ... ../src/syntax/typing.nit:1222,5--16
+                    ../src/syntax/typing.nit:1222,20
                     '=' ... ../src/syntax/typing.nit:1222,18
-                    ../src/syntax/typing.nit:1222,20--58
+                    ../src/syntax/typing.nit:1222,20--60
                       ../src/syntax/typing.nit:1222,20--44
                         ../src/syntax/typing.nit:1222,20--35
                           ../src/syntax/typing.nit:1222,20
                             ../src/syntax/typing.nit:1222,20
                             identifier 'v' ... ../src/syntax/typing.nit:1222,20
+                            ../src/syntax/typing.nit:1222,20
                           identifier 'local_property' ... ../src/syntax/typing.nit:1222,22--35
+                          ../src/syntax/typing.nit:1222,20
                         identifier 'mmmodule' ... ../src/syntax/typing.nit:1222,37--44
-                      ../src/syntax/typing.nit:1222,47--58
-                        ../src/syntax/typing.nit:1222,47
-                        identifier 'global_class' ... ../src/syntax/typing.nit:1222,47--58
+                        ../src/syntax/typing.nit:1222,20
+                      ../src/syntax/typing.nit:1222,45--60
+                        '[' ... ../src/syntax/typing.nit:1222,45
+                        ../src/syntax/typing.nit:1222,47--58
+                          ../src/syntax/typing.nit:1222,47
+                          identifier 'global_class' ... ../src/syntax/typing.nit:1222,47--58
+                          ../src/syntax/typing.nit:1222,47
+                        ']' ... ../src/syntax/typing.nit:1222,60
                 ../src/syntax/typing.nit:1224,5--1226,6
-                  ../src/syntax/typing.nit:1224,5--70
+                  ../src/syntax/typing.nit:1224,5--72
                     ../src/syntax/typing.nit:1224,5
                       ../src/syntax/typing.nit:1224,5
                       identifier 'v' ... ../src/syntax/typing.nit:1224,5
+                      ../src/syntax/typing.nit:1224,5
                     identifier 'error' ... ../src/syntax/typing.nit:1224,7--11
-                    ../src/syntax/typing.nit:1224,14--17
-                      keyword 'self' ... ../src/syntax/typing.nit:1224,14--17
-                    ../src/syntax/typing.nit:1224,20--70
-                      ../src/syntax/typing.nit:1224,20--34
-                        literal value '"Error: class {' ... ../src/syntax/typing.nit:1224,20--34
-                      ../src/syntax/typing.nit:1224,35--56
-                        ../src/syntax/typing.nit:1224,35--51
+                    ../src/syntax/typing.nit:1224,12--72
+                      '(' ... ../src/syntax/typing.nit:1224,12
+                      ../src/syntax/typing.nit:1224,14--17
+                        keyword 'self' ... ../src/syntax/typing.nit:1224,14--17
+                      ../src/syntax/typing.nit:1224,20--70
+                        ../src/syntax/typing.nit:1224,20--34
+                          literal value '"Error: class {' ... ../src/syntax/typing.nit:1224,20--34
+                        ../src/syntax/typing.nit:1224,35--56
+                          ../src/syntax/typing.nit:1224,35--51
+                            ../src/syntax/typing.nit:1224,35
+                            identifier 'target_class_name' ... ../src/syntax/typing.nit:1224,35--51
+                            ../src/syntax/typing.nit:1224,35
+                          identifier 'to_s' ... ../src/syntax/typing.nit:1224,53--56
                           ../src/syntax/typing.nit:1224,35
-                          identifier 'target_class_name' ... ../src/syntax/typing.nit:1224,35--51
-                        identifier 'to_s' ... ../src/syntax/typing.nit:1224,53--56
-                      ../src/syntax/typing.nit:1224,57--70
-                        '}, not found."' ... ../src/syntax/typing.nit:1224,57--70
+                        ../src/syntax/typing.nit:1224,57--70
+                          '}, not found."' ... ../src/syntax/typing.nit:1224,57--70
+                      ')' ... ../src/syntax/typing.nit:1224,72
                   ../src/syntax/typing.nit:1225,5--10
                     keyword 'return' ... ../src/syntax/typing.nit:1225,5--10
                   keyword 'end' ... ../src/syntax/typing.nit:1226,4--6
               keyword 'end' ... ../src/syntax/typing.nit:1227,3--5
           ../src/syntax/typing.nit:1229,3--1243,5
             keyword 'if' ... ../src/syntax/typing.nit:1229,3--4
-            ../src/syntax/typing.nit:1229,6--65
+            ../src/syntax/typing.nit:1229,6--67
               ../src/syntax/typing.nit:1229,6--17
                 ../src/syntax/typing.nit:1229,6
                 identifier 'target_class' ... ../src/syntax/typing.nit:1229,6--17
+                ../src/syntax/typing.nit:1229,6
               identifier 'has_global_property_by_name' ... ../src/syntax/typing.nit:1229,19--45
-              ../src/syntax/typing.nit:1229,48--65
-                ../src/syntax/typing.nit:1229,48
-                identifier 'target_method_name' ... ../src/syntax/typing.nit:1229,48--65
+              ../src/syntax/typing.nit:1229,46--67
+                '(' ... ../src/syntax/typing.nit:1229,46
+                ../src/syntax/typing.nit:1229,48--65
+                  ../src/syntax/typing.nit:1229,48
+                  identifier 'target_method_name' ... ../src/syntax/typing.nit:1229,48--65
+                  ../src/syntax/typing.nit:1229,48
+                ')' ... ../src/syntax/typing.nit:1229,67
             ../src/syntax/typing.nit:1230,4--1239,6
-              ../src/syntax/typing.nit:1230,4--78
+              ../src/syntax/typing.nit:1230,4--80
                 keyword 'var' ... ../src/syntax/typing.nit:1230,4--6
                 identifier 'global_property' ... ../src/syntax/typing.nit:1230,8--22
                 '=' ... ../src/syntax/typing.nit:1230,24
-                ../src/syntax/typing.nit:1230,26--78
+                ../src/syntax/typing.nit:1230,26--80
                   ../src/syntax/typing.nit:1230,26--37
                     ../src/syntax/typing.nit:1230,26
                     identifier 'target_class' ... ../src/syntax/typing.nit:1230,26--37
+                    ../src/syntax/typing.nit:1230,26
                   identifier 'get_property_by_name' ... ../src/syntax/typing.nit:1230,39--58
-                  ../src/syntax/typing.nit:1230,61--78
-                    ../src/syntax/typing.nit:1230,61
-                    identifier 'target_method_name' ... ../src/syntax/typing.nit:1230,61--78
-              ../src/syntax/typing.nit:1232,4--53
+                  ../src/syntax/typing.nit:1230,59--80
+                    '(' ... ../src/syntax/typing.nit:1230,59
+                    ../src/syntax/typing.nit:1230,61--78
+                      ../src/syntax/typing.nit:1230,61
+                      identifier 'target_method_name' ... ../src/syntax/typing.nit:1230,61--78
+                      ../src/syntax/typing.nit:1230,61
+                    ')' ... ../src/syntax/typing.nit:1230,80
+              ../src/syntax/typing.nit:1232,4--54
                 keyword 'var' ... ../src/syntax/typing.nit:1232,4--6
                 identifier 'target_property' ... ../src/syntax/typing.nit:1232,8--22
                 '=' ... ../src/syntax/typing.nit:1232,24
-                ../src/syntax/typing.nit:1232,26--53
+                ../src/syntax/typing.nit:1232,26--54
                   ../src/syntax/typing.nit:1232,26--37
                     ../src/syntax/typing.nit:1232,26
                     identifier 'target_class' ... ../src/syntax/typing.nit:1232,26--37
-                  ../src/syntax/typing.nit:1232,39--53
-                    ../src/syntax/typing.nit:1232,39
-                    identifier 'global_property' ... ../src/syntax/typing.nit:1232,39--53
+                    ../src/syntax/typing.nit:1232,26
+                  ../src/syntax/typing.nit:1232,38--54
+                    '[' ... ../src/syntax/typing.nit:1232,38
+                    ../src/syntax/typing.nit:1232,39--53
+                      ../src/syntax/typing.nit:1232,39
+                      identifier 'global_property' ... ../src/syntax/typing.nit:1232,39--53
+                      ../src/syntax/typing.nit:1232,39
+                    ']' ... ../src/syntax/typing.nit:1232,54
               ../src/syntax/typing.nit:1234,4--1239,6
                 keyword 'if' ... ../src/syntax/typing.nit:1234,4--5
                 ../src/syntax/typing.nit:1234,7--34
                   ../src/syntax/typing.nit:1234,7--21
                     ../src/syntax/typing.nit:1234,7
                     identifier 'target_property' ... ../src/syntax/typing.nit:1234,7--21
+                    ../src/syntax/typing.nit:1234,7
                   ../src/syntax/typing.nit:1234,27--34
                     type identifier 'MMMethod' ... ../src/syntax/typing.nit:1234,27--34
                 ../src/syntax/typing.nit:1235,5--35
                   ../src/syntax/typing.nit:1235,5--35
                     ../src/syntax/typing.nit:1235,21
                     identifier 'target_method' ... ../src/syntax/typing.nit:1235,5--17
+                    ../src/syntax/typing.nit:1235,21
                     '=' ... ../src/syntax/typing.nit:1235,19
                     ../src/syntax/typing.nit:1235,21--35
                       ../src/syntax/typing.nit:1235,21
                       identifier 'target_property' ... ../src/syntax/typing.nit:1235,21--35
+                      ../src/syntax/typing.nit:1235,21
                 ../src/syntax/typing.nit:1237,5--1239,6
-                  ../src/syntax/typing.nit:1237,5--79
+                  ../src/syntax/typing.nit:1237,5--81
                     ../src/syntax/typing.nit:1237,5
                       ../src/syntax/typing.nit:1237,5
                       identifier 'v' ... ../src/syntax/typing.nit:1237,5
+                      ../src/syntax/typing.nit:1237,5
                     identifier 'error' ... ../src/syntax/typing.nit:1237,7--11
-                    ../src/syntax/typing.nit:1237,14--17
-                      keyword 'self' ... ../src/syntax/typing.nit:1237,14--17
-                    ../src/syntax/typing.nit:1237,20--79
-                      ../src/syntax/typing.nit:1237,20--37
-                        literal value '"Error: property {' ... ../src/syntax/typing.nit:1237,20--37
-                      ../src/syntax/typing.nit:1237,38--60
-                        ../src/syntax/typing.nit:1237,38--55
+                    ../src/syntax/typing.nit:1237,12--81
+                      '(' ... ../src/syntax/typing.nit:1237,12
+                      ../src/syntax/typing.nit:1237,14--17
+                        keyword 'self' ... ../src/syntax/typing.nit:1237,14--17
+                      ../src/syntax/typing.nit:1237,20--79
+                        ../src/syntax/typing.nit:1237,20--37
+                          literal value '"Error: property {' ... ../src/syntax/typing.nit:1237,20--37
+                        ../src/syntax/typing.nit:1237,38--60
+                          ../src/syntax/typing.nit:1237,38--55
+                            ../src/syntax/typing.nit:1237,38
+                            identifier 'target_method_name' ... ../src/syntax/typing.nit:1237,38--55
+                            ../src/syntax/typing.nit:1237,38
+                          identifier 'to_s' ... ../src/syntax/typing.nit:1237,57--60
                           ../src/syntax/typing.nit:1237,38
-                          identifier 'target_method_name' ... ../src/syntax/typing.nit:1237,38--55
-                        identifier 'to_s' ... ../src/syntax/typing.nit:1237,57--60
-                      ../src/syntax/typing.nit:1237,61--79
-                        '} is not a method."' ... ../src/syntax/typing.nit:1237,61--79
+                        ../src/syntax/typing.nit:1237,61--79
+                          '} is not a method."' ... ../src/syntax/typing.nit:1237,61--79
+                      ')' ... ../src/syntax/typing.nit:1237,81
                   ../src/syntax/typing.nit:1238,5--10
                     keyword 'return' ... ../src/syntax/typing.nit:1238,5--10
                   keyword 'end' ... ../src/syntax/typing.nit:1239,4--6
             ../src/syntax/typing.nit:1241,4--1243,5
-              ../src/syntax/typing.nit:1241,4--88
+              ../src/syntax/typing.nit:1241,4--90
                 ../src/syntax/typing.nit:1241,4
                   ../src/syntax/typing.nit:1241,4
                   identifier 'v' ... ../src/syntax/typing.nit:1241,4
+                  ../src/syntax/typing.nit:1241,4
                 identifier 'error' ... ../src/syntax/typing.nit:1241,6--10
-                ../src/syntax/typing.nit:1241,13--16
-                  keyword 'self' ... ../src/syntax/typing.nit:1241,13--16
-                ../src/syntax/typing.nit:1241,19--88
-                  ../src/syntax/typing.nit:1241,19--36
-                    literal value '"Error: property {' ... ../src/syntax/typing.nit:1241,19--36
-                  ../src/syntax/typing.nit:1241,37--59
-                    ../src/syntax/typing.nit:1241,37--54
+                ../src/syntax/typing.nit:1241,11--90
+                  '(' ... ../src/syntax/typing.nit:1241,11
+                  ../src/syntax/typing.nit:1241,13--16
+                    keyword 'self' ... ../src/syntax/typing.nit:1241,13--16
+                  ../src/syntax/typing.nit:1241,19--88
+                    ../src/syntax/typing.nit:1241,19--36
+                      literal value '"Error: property {' ... ../src/syntax/typing.nit:1241,19--36
+                    ../src/syntax/typing.nit:1241,37--59
+                      ../src/syntax/typing.nit:1241,37--54
+                        ../src/syntax/typing.nit:1241,37
+                        identifier 'target_method_name' ... ../src/syntax/typing.nit:1241,37--54
+                        ../src/syntax/typing.nit:1241,37
+                      identifier 'to_s' ... ../src/syntax/typing.nit:1241,56--59
                       ../src/syntax/typing.nit:1241,37
-                      identifier 'target_method_name' ... ../src/syntax/typing.nit:1241,37--54
-                    identifier 'to_s' ... ../src/syntax/typing.nit:1241,56--59
-                  ../src/syntax/typing.nit:1241,60--88
-                    '} not found in target class."' ... ../src/syntax/typing.nit:1241,60--88
+                    ../src/syntax/typing.nit:1241,60--88
+                      '} not found in target class."' ... ../src/syntax/typing.nit:1241,60--88
+                  ')' ... ../src/syntax/typing.nit:1241,90
               ../src/syntax/typing.nit:1242,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:1242,4--9
               keyword 'end' ... ../src/syntax/typing.nit:1243,3--5
-          ../src/syntax/typing.nit:1245,3--73
+          ../src/syntax/typing.nit:1245,3--75
             keyword 'var' ... ../src/syntax/typing.nit:1245,3--5
             identifier 'explicit_import' ... ../src/syntax/typing.nit:1245,7--21
             '=' ... ../src/syntax/typing.nit:1245,23
-            ../src/syntax/typing.nit:1245,25--73
+            ../src/syntax/typing.nit:1245,25--75
               keyword 'new' ... ../src/syntax/typing.nit:1245,25--27
               ../src/syntax/typing.nit:1245,29--44
                 type identifier 'MMExplicitImport' ... ../src/syntax/typing.nit:1245,29--44
-              ../src/syntax/typing.nit:1245,47--58
-                ../src/syntax/typing.nit:1245,47
-                identifier 'target_class' ... ../src/syntax/typing.nit:1245,47--58
-              ../src/syntax/typing.nit:1245,61--73
-                ../src/syntax/typing.nit:1245,61
-                identifier 'target_method' ... ../src/syntax/typing.nit:1245,61--73
-          ../src/syntax/typing.nit:1246,3--72
+              ../src/syntax/typing.nit:1245,45--75
+                '(' ... ../src/syntax/typing.nit:1245,45
+                ../src/syntax/typing.nit:1245,47--58
+                  ../src/syntax/typing.nit:1245,47
+                  identifier 'target_class' ... ../src/syntax/typing.nit:1245,47--58
+                  ../src/syntax/typing.nit:1245,47
+                ../src/syntax/typing.nit:1245,61--73
+                  ../src/syntax/typing.nit:1245,61
+                  identifier 'target_method' ... ../src/syntax/typing.nit:1245,61--73
+                  ../src/syntax/typing.nit:1245,61
+                ')' ... ../src/syntax/typing.nit:1245,75
+          ../src/syntax/typing.nit:1246,3--74
             ../src/syntax/typing.nit:1246,3--51
               ../src/syntax/typing.nit:1246,3--34
                 ../src/syntax/typing.nit:1246,3--18
                   ../src/syntax/typing.nit:1246,3
                     ../src/syntax/typing.nit:1246,3
                     identifier 'v' ... ../src/syntax/typing.nit:1246,3
+                    ../src/syntax/typing.nit:1246,3
                   identifier 'local_property' ... ../src/syntax/typing.nit:1246,5--18
+                  ../src/syntax/typing.nit:1246,3
                 keyword 'as' ... ../src/syntax/typing.nit:1246,20--21
                 '(' ... ../src/syntax/typing.nit:1246,22
                 ../src/syntax/typing.nit:1246,23--33
                   type identifier 'MMSrcMethod' ... ../src/syntax/typing.nit:1246,23--33
                 ')' ... ../src/syntax/typing.nit:1246,34
               identifier 'explicit_imports' ... ../src/syntax/typing.nit:1246,36--51
+              ../src/syntax/typing.nit:1246,3
             identifier 'add' ... ../src/syntax/typing.nit:1246,53--55
-            ../src/syntax/typing.nit:1246,58--72
-              ../src/syntax/typing.nit:1246,58
-              identifier 'explicit_import' ... ../src/syntax/typing.nit:1246,58--72
+            ../src/syntax/typing.nit:1246,56--74
+              '(' ... ../src/syntax/typing.nit:1246,56
+              ../src/syntax/typing.nit:1246,58--72
+                ../src/syntax/typing.nit:1246,58
+                identifier 'explicit_import' ... ../src/syntax/typing.nit:1246,58--72
+                ../src/syntax/typing.nit:1246,58
+              ')' ... ../src/syntax/typing.nit:1246,74
           keyword 'end' ... ../src/syntax/typing.nit:1247,2--4
       keyword 'end' ... ../src/syntax/typing.nit:1248,1--3
     ../src/syntax/typing.nit:1250,1--1253,3
@@ -7488,7 +9273,9 @@
               ../src/syntax/typing.nit:1252,41--48
                 ../src/syntax/typing.nit:1252,41
                 identifier 'n_methid' ... ../src/syntax/typing.nit:1252,41--48
+                ../src/syntax/typing.nit:1252,41
               identifier 'name' ... ../src/syntax/typing.nit:1252,50--53
+              ../src/syntax/typing.nit:1252,41
             keyword 'as' ... ../src/syntax/typing.nit:1252,55--56
             '(' ... ../src/syntax/typing.nit:1252,57
             keyword 'not' ... ../src/syntax/typing.nit:1252,58--60
@@ -7525,9 +9312,13 @@
                   ../src/syntax/typing.nit:1258,39
                     ../src/syntax/typing.nit:1258,39
                     identifier 'v' ... ../src/syntax/typing.nit:1258,39
+                    ../src/syntax/typing.nit:1258,39
                   identifier 'local_property' ... ../src/syntax/typing.nit:1258,41--54
+                  ../src/syntax/typing.nit:1258,39
                 identifier 'prhe' ... ../src/syntax/typing.nit:1258,56--59
+                ../src/syntax/typing.nit:1258,39
               identifier 'direct_greaters' ... ../src/syntax/typing.nit:1258,61--75
+              ../src/syntax/typing.nit:1258,39
           ../src/syntax/typing.nit:1259,3--1264,5
             keyword 'if' ... ../src/syntax/typing.nit:1259,3--4
             ../src/syntax/typing.nit:1259,6--23
@@ -7536,36 +9327,47 @@
                 ../src/syntax/typing.nit:1259,10--14
                   ../src/syntax/typing.nit:1259,10
                   identifier 'precs' ... ../src/syntax/typing.nit:1259,10--14
+                  ../src/syntax/typing.nit:1259,10
                 identifier 'is_empty' ... ../src/syntax/typing.nit:1259,16--23
+                ../src/syntax/typing.nit:1259,10
             ../src/syntax/typing.nit:1260,4--37
               ../src/syntax/typing.nit:1260,4--37
                 ../src/syntax/typing.nit:1260,4--19
                   ../src/syntax/typing.nit:1260,4
                     ../src/syntax/typing.nit:1260,4
                     identifier 'v' ... ../src/syntax/typing.nit:1260,4
+                    ../src/syntax/typing.nit:1260,4
                   identifier 'local_property' ... ../src/syntax/typing.nit:1260,6--19
+                  ../src/syntax/typing.nit:1260,4
                 identifier 'need_super' ... ../src/syntax/typing.nit:1260,21--30
+                ../src/syntax/typing.nit:1260,34
                 '=' ... ../src/syntax/typing.nit:1260,32
                 ../src/syntax/typing.nit:1260,34--37
                   keyword 'true' ... ../src/syntax/typing.nit:1260,34--37
             ../src/syntax/typing.nit:1262,4--1264,5
-              ../src/syntax/typing.nit:1262,4--73
+              ../src/syntax/typing.nit:1262,4--74
                 ../src/syntax/typing.nit:1262,4
                   ../src/syntax/typing.nit:1262,4
                   identifier 'v' ... ../src/syntax/typing.nit:1262,4
+                  ../src/syntax/typing.nit:1262,4
                 identifier 'error' ... ../src/syntax/typing.nit:1262,6--10
-                ../src/syntax/typing.nit:1262,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:1262,12--15
-                ../src/syntax/typing.nit:1262,18--73
-                  ../src/syntax/typing.nit:1262,18--54
-                    literal value '"Error: No super method to call for {' ... ../src/syntax/typing.nit:1262,18--54
-                  ../src/syntax/typing.nit:1262,55--70
-                    ../src/syntax/typing.nit:1262,55
+                ../src/syntax/typing.nit:1262,11--74
+                  '(' ... ../src/syntax/typing.nit:1262,11
+                  ../src/syntax/typing.nit:1262,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:1262,12--15
+                  ../src/syntax/typing.nit:1262,18--73
+                    ../src/syntax/typing.nit:1262,18--54
+                      literal value '"Error: No super method to call for {' ... ../src/syntax/typing.nit:1262,18--54
+                    ../src/syntax/typing.nit:1262,55--70
+                      ../src/syntax/typing.nit:1262,55
+                        ../src/syntax/typing.nit:1262,55
+                        identifier 'v' ... ../src/syntax/typing.nit:1262,55
+                        ../src/syntax/typing.nit:1262,55
+                      identifier 'local_property' ... ../src/syntax/typing.nit:1262,57--70
                       ../src/syntax/typing.nit:1262,55
-                      identifier 'v' ... ../src/syntax/typing.nit:1262,55
-                    identifier 'local_property' ... ../src/syntax/typing.nit:1262,57--70
-                  ../src/syntax/typing.nit:1262,71--73
-                    '}."' ... ../src/syntax/typing.nit:1262,71--73
+                    ../src/syntax/typing.nit:1262,71--73
+                      '}."' ... ../src/syntax/typing.nit:1262,71--73
+                  ')' ... ../src/syntax/typing.nit:1262,74
               ../src/syntax/typing.nit:1263,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:1263,4--9
               keyword 'end' ... ../src/syntax/typing.nit:1264,3--5
@@ -7590,7 +9392,9 @@
             ../src/syntax/typing.nit:1269,40--48
               ../src/syntax/typing.nit:1269,40
               identifier 'n_classid' ... ../src/syntax/typing.nit:1269,40--48
+              ../src/syntax/typing.nit:1269,40
             identifier 'to_symbol' ... ../src/syntax/typing.nit:1269,50--58
+            ../src/syntax/typing.nit:1269,40
       ../src/syntax/typing.nit:1270,2--66
         keyword 'redef' ... ../src/syntax/typing.nit:1270,2--6
         ../src/syntax/typing.nit:1270,12
@@ -7605,7 +9409,9 @@
               ../src/syntax/typing.nit:1270,41--48
                 ../src/syntax/typing.nit:1270,41
                 identifier 'n_methid' ... ../src/syntax/typing.nit:1270,41--48
+                ../src/syntax/typing.nit:1270,41
               identifier 'name' ... ../src/syntax/typing.nit:1270,50--53
+              ../src/syntax/typing.nit:1270,41
             keyword 'as' ... ../src/syntax/typing.nit:1270,55--56
             '(' ... ../src/syntax/typing.nit:1270,57
             keyword 'not' ... ../src/syntax/typing.nit:1270,58--60
@@ -7631,7 +9437,9 @@
             ../src/syntax/typing.nit:1274,40--48
               ../src/syntax/typing.nit:1274,40
               identifier 'n_classid' ... ../src/syntax/typing.nit:1274,40--48
+              ../src/syntax/typing.nit:1274,40
             identifier 'to_symbol' ... ../src/syntax/typing.nit:1274,50--58
+            ../src/syntax/typing.nit:1274,40
       ../src/syntax/typing.nit:1275,2--56
         keyword 'redef' ... ../src/syntax/typing.nit:1275,2--6
         ../src/syntax/typing.nit:1275,12
@@ -7645,6 +9453,7 @@
             ../src/syntax/typing.nit:1275,41--46
               literal value '"init"' ... ../src/syntax/typing.nit:1275,41--46
             identifier 'to_symbol' ... ../src/syntax/typing.nit:1275,48--56
+            ../src/syntax/typing.nit:1275,41
       keyword 'end' ... ../src/syntax/typing.nit:1276,1--3
     ../src/syntax/typing.nit:1278,1--1294,3
       keyword 'redef' ... ../src/syntax/typing.nit:1278,1--5
@@ -7684,35 +9493,46 @@
               ../src/syntax/typing.nit:1284,6--14
                 ../src/syntax/typing.nit:1284,6
                 identifier 'from_type' ... ../src/syntax/typing.nit:1284,6--14
+                ../src/syntax/typing.nit:1284,6
               ../src/syntax/typing.nit:1284,19--25
                 ../src/syntax/typing.nit:1284,19
                 identifier 'to_type' ... ../src/syntax/typing.nit:1284,19--25
-            ../src/syntax/typing.nit:1286,4--64
-              ../src/syntax/typing.nit:1286,4--64
+                ../src/syntax/typing.nit:1284,19
+            ../src/syntax/typing.nit:1286,4--66
+              ../src/syntax/typing.nit:1286,4--66
                 ../src/syntax/typing.nit:1286,4
                   ../src/syntax/typing.nit:1286,4
                   identifier 'v' ... ../src/syntax/typing.nit:1286,4
+                  ../src/syntax/typing.nit:1286,4
                 identifier 'error' ... ../src/syntax/typing.nit:1286,6--10
-                ../src/syntax/typing.nit:1286,13--16
-                  keyword 'self' ... ../src/syntax/typing.nit:1286,13--16
-                ../src/syntax/typing.nit:1286,19--64
-                  literal value '"Attepting to cast from and to the same type."' ... ../src/syntax/typing.nit:1286,19--64
+                ../src/syntax/typing.nit:1286,11--66
+                  '(' ... ../src/syntax/typing.nit:1286,11
+                  ../src/syntax/typing.nit:1286,13--16
+                    keyword 'self' ... ../src/syntax/typing.nit:1286,13--16
+                  ../src/syntax/typing.nit:1286,19--64
+                    literal value '"Attepting to cast from and to the same type."' ... ../src/syntax/typing.nit:1286,19--64
+                  ')' ... ../src/syntax/typing.nit:1286,66
             ../src/syntax/typing.nit:1287,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1287,3--5
-          ../src/syntax/typing.nit:1289,3--51
+          ../src/syntax/typing.nit:1289,3--53
             keyword 'var' ... ../src/syntax/typing.nit:1289,3--5
             identifier 'cast' ... ../src/syntax/typing.nit:1289,7--10
             '=' ... ../src/syntax/typing.nit:1289,12
-            ../src/syntax/typing.nit:1289,14--51
+            ../src/syntax/typing.nit:1289,14--53
               keyword 'new' ... ../src/syntax/typing.nit:1289,14--16
               ../src/syntax/typing.nit:1289,18--31
                 type identifier 'MMImportedCast' ... ../src/syntax/typing.nit:1289,18--31
-              ../src/syntax/typing.nit:1289,34--42
-                ../src/syntax/typing.nit:1289,34
-                identifier 'from_type' ... ../src/syntax/typing.nit:1289,34--42
-              ../src/syntax/typing.nit:1289,45--51
-                ../src/syntax/typing.nit:1289,45
-                identifier 'to_type' ... ../src/syntax/typing.nit:1289,45--51
+              ../src/syntax/typing.nit:1289,32--53
+                '(' ... ../src/syntax/typing.nit:1289,32
+                ../src/syntax/typing.nit:1289,34--42
+                  ../src/syntax/typing.nit:1289,34
+                  identifier 'from_type' ... ../src/syntax/typing.nit:1289,34--42
+                  ../src/syntax/typing.nit:1289,34
+                ../src/syntax/typing.nit:1289,45--51
+                  ../src/syntax/typing.nit:1289,45
+                  identifier 'to_type' ... ../src/syntax/typing.nit:1289,45--51
+                  ../src/syntax/typing.nit:1289,45
+                ')' ... ../src/syntax/typing.nit:1289,53
           ../src/syntax/typing.nit:1290,3--26
             keyword 'var' ... ../src/syntax/typing.nit:1290,3--5
             identifier 'm' ... ../src/syntax/typing.nit:1290,7
@@ -7721,25 +9541,34 @@
               ../src/syntax/typing.nit:1290,11
                 ../src/syntax/typing.nit:1290,11
                 identifier 'v' ... ../src/syntax/typing.nit:1290,11
+                ../src/syntax/typing.nit:1290,11
               identifier 'local_property' ... ../src/syntax/typing.nit:1290,13--26
+              ../src/syntax/typing.nit:1290,11
           ../src/syntax/typing.nit:1291,3--23
             keyword 'assert' ... ../src/syntax/typing.nit:1291,3--8
             ../src/syntax/typing.nit:1291,10--23
               ../src/syntax/typing.nit:1291,10
                 ../src/syntax/typing.nit:1291,10
                 identifier 'm' ... ../src/syntax/typing.nit:1291,10
+                ../src/syntax/typing.nit:1291,10
               ../src/syntax/typing.nit:1291,16--23
                 type identifier 'MMMethod' ... ../src/syntax/typing.nit:1291,16--23
-          ../src/syntax/typing.nit:1292,3--28
+          ../src/syntax/typing.nit:1292,3--30
             ../src/syntax/typing.nit:1292,3--18
               ../src/syntax/typing.nit:1292,3
                 ../src/syntax/typing.nit:1292,3
                 identifier 'm' ... ../src/syntax/typing.nit:1292,3
+                ../src/syntax/typing.nit:1292,3
               identifier 'explicit_casts' ... ../src/syntax/typing.nit:1292,5--18
+              ../src/syntax/typing.nit:1292,3
             identifier 'add' ... ../src/syntax/typing.nit:1292,20--22
-            ../src/syntax/typing.nit:1292,25--28
-              ../src/syntax/typing.nit:1292,25
-              identifier 'cast' ... ../src/syntax/typing.nit:1292,25--28
+            ../src/syntax/typing.nit:1292,23--30
+              '(' ... ../src/syntax/typing.nit:1292,23
+              ../src/syntax/typing.nit:1292,25--28
+                ../src/syntax/typing.nit:1292,25
+                identifier 'cast' ... ../src/syntax/typing.nit:1292,25--28
+                ../src/syntax/typing.nit:1292,25
+              ')' ... ../src/syntax/typing.nit:1292,30
           keyword 'end' ... ../src/syntax/typing.nit:1293,2--4
       keyword 'end' ... ../src/syntax/typing.nit:1294,1--3
     ../src/syntax/typing.nit:1296,1--1299,3
@@ -7761,7 +9590,9 @@
             ../src/syntax/typing.nit:1297,32--42
               ../src/syntax/typing.nit:1297,32
               identifier 'n_from_type' ... ../src/syntax/typing.nit:1297,32--42
+              ../src/syntax/typing.nit:1297,32
             identifier 'stype' ... ../src/syntax/typing.nit:1297,44--48
+            ../src/syntax/typing.nit:1297,32
       ../src/syntax/typing.nit:1298,2--44
         keyword 'redef' ... ../src/syntax/typing.nit:1298,2--6
         ../src/syntax/typing.nit:1298,12
@@ -7775,7 +9606,9 @@
             ../src/syntax/typing.nit:1298,30--38
               ../src/syntax/typing.nit:1298,30
               identifier 'n_to_type' ... ../src/syntax/typing.nit:1298,30--38
+              ../src/syntax/typing.nit:1298,30
             identifier 'stype' ... ../src/syntax/typing.nit:1298,40--44
+            ../src/syntax/typing.nit:1298,30
       keyword 'end' ... ../src/syntax/typing.nit:1299,1--3
     ../src/syntax/typing.nit:1301,1--1304,3
       keyword 'redef' ... ../src/syntax/typing.nit:1301,1--5
@@ -7796,7 +9629,9 @@
             ../src/syntax/typing.nit:1302,32--37
               ../src/syntax/typing.nit:1302,32
               identifier 'n_type' ... ../src/syntax/typing.nit:1302,32--37
+              ../src/syntax/typing.nit:1302,32
             identifier 'stype' ... ../src/syntax/typing.nit:1302,39--43
+            ../src/syntax/typing.nit:1302,32
       ../src/syntax/typing.nit:1303,2--53
         keyword 'redef' ... ../src/syntax/typing.nit:1303,2--6
         ../src/syntax/typing.nit:1303,12
@@ -7811,8 +9646,11 @@
               ../src/syntax/typing.nit:1303,30--35
                 ../src/syntax/typing.nit:1303,30
                 identifier 'n_type' ... ../src/syntax/typing.nit:1303,30--35
+                ../src/syntax/typing.nit:1303,30
               identifier 'stype' ... ../src/syntax/typing.nit:1303,37--41
+              ../src/syntax/typing.nit:1303,30
             identifier 'as_nullable' ... ../src/syntax/typing.nit:1303,43--53
+            ../src/syntax/typing.nit:1303,30
       keyword 'end' ... ../src/syntax/typing.nit:1304,1--3
     ../src/syntax/typing.nit:1306,1--1318,3
       keyword 'redef' ... ../src/syntax/typing.nit:1306,1--5
@@ -7836,20 +9674,25 @@
               ../src/syntax/typing.nit:1309,11--16
                 ../src/syntax/typing.nit:1309,11
                 identifier 'n_type' ... ../src/syntax/typing.nit:1309,11--16
+                ../src/syntax/typing.nit:1309,11
               identifier 'stype' ... ../src/syntax/typing.nit:1309,18--22
+              ../src/syntax/typing.nit:1309,11
           ../src/syntax/typing.nit:1310,3--1315,5
             keyword 'if' ... ../src/syntax/typing.nit:1310,3--4
             ../src/syntax/typing.nit:1310,6--18
               ../src/syntax/typing.nit:1310,6
                 ../src/syntax/typing.nit:1310,6
                 identifier 't' ... ../src/syntax/typing.nit:1310,6
+                ../src/syntax/typing.nit:1310,6
               identifier 'is_nullable' ... ../src/syntax/typing.nit:1310,8--18
+              ../src/syntax/typing.nit:1310,6
             ../src/syntax/typing.nit:1312,4--11
               ../src/syntax/typing.nit:1312,4--11
                 keyword 'return' ... ../src/syntax/typing.nit:1312,4--9
                 ../src/syntax/typing.nit:1312,11
                   ../src/syntax/typing.nit:1312,11
                   identifier 't' ... ../src/syntax/typing.nit:1312,11
+                  ../src/syntax/typing.nit:1312,11
             ../src/syntax/typing.nit:1314,4--1315,5
               ../src/syntax/typing.nit:1314,4--23
                 keyword 'return' ... ../src/syntax/typing.nit:1314,4--9
@@ -7857,7 +9700,9 @@
                   ../src/syntax/typing.nit:1314,11
                     ../src/syntax/typing.nit:1314,11
                     identifier 't' ... ../src/syntax/typing.nit:1314,11
+                    ../src/syntax/typing.nit:1314,11
                   identifier 'as_nullable' ... ../src/syntax/typing.nit:1314,13--23
+                  ../src/syntax/typing.nit:1314,11
               keyword 'end' ... ../src/syntax/typing.nit:1315,3--5
           keyword 'end' ... ../src/syntax/typing.nit:1316,2--4
       ../src/syntax/typing.nit:1317,2--52
@@ -7874,8 +9719,11 @@
               ../src/syntax/typing.nit:1317,30--35
                 ../src/syntax/typing.nit:1317,30
                 identifier 'n_type' ... ../src/syntax/typing.nit:1317,30--35
+                ../src/syntax/typing.nit:1317,30
               identifier 'stype' ... ../src/syntax/typing.nit:1317,37--41
+              ../src/syntax/typing.nit:1317,30
             identifier 'as_notnull' ... ../src/syntax/typing.nit:1317,43--52
+            ../src/syntax/typing.nit:1317,30
       keyword 'end' ... ../src/syntax/typing.nit:1318,1--3
     ../src/syntax/typing.nit:1320,1--1351,3
       keyword 'redef' ... ../src/syntax/typing.nit:1320,1--5
@@ -7950,16 +9798,21 @@
         ../src/syntax/typing.nit:1330,3--1350,4
           ../src/syntax/typing.nit:1330,3--41
             keyword 'if' ... ../src/syntax/typing.nit:1330,3--4
-            ../src/syntax/typing.nit:1330,6--28
+            ../src/syntax/typing.nit:1330,6--29
               keyword 'not' ... ../src/syntax/typing.nit:1330,6--8
-              ../src/syntax/typing.nit:1330,10--28
+              ../src/syntax/typing.nit:1330,10--29
                 ../src/syntax/typing.nit:1330,10
                   ../src/syntax/typing.nit:1330,10
                   identifier 'v' ... ../src/syntax/typing.nit:1330,10
+                  ../src/syntax/typing.nit:1330,10
                 identifier 'check_expr' ... ../src/syntax/typing.nit:1330,12--21
-                ../src/syntax/typing.nit:1330,23--28
-                  ../src/syntax/typing.nit:1330,23
-                  identifier 'n_expr' ... ../src/syntax/typing.nit:1330,23--28
+                ../src/syntax/typing.nit:1330,22--29
+                  '(' ... ../src/syntax/typing.nit:1330,22
+                  ../src/syntax/typing.nit:1330,23--28
+                    ../src/syntax/typing.nit:1330,23
+                    identifier 'n_expr' ... ../src/syntax/typing.nit:1330,23--28
+                    ../src/syntax/typing.nit:1330,23
+                  ')' ... ../src/syntax/typing.nit:1330,29
             ../src/syntax/typing.nit:1330,36--41
               keyword 'return' ... ../src/syntax/typing.nit:1330,36--41
           ../src/syntax/typing.nit:1331,3--30
@@ -7970,7 +9823,9 @@
               ../src/syntax/typing.nit:1331,19--24
                 ../src/syntax/typing.nit:1331,19
                 identifier 'n_expr' ... ../src/syntax/typing.nit:1331,19--24
+                ../src/syntax/typing.nit:1331,19
               identifier 'stype' ... ../src/syntax/typing.nit:1331,26--30
+              ../src/syntax/typing.nit:1331,19
           ../src/syntax/typing.nit:1332,3--27
             keyword 'var' ... ../src/syntax/typing.nit:1332,3--5
             identifier 'name' ... ../src/syntax/typing.nit:1332,7--10
@@ -7979,31 +9834,39 @@
               ../src/syntax/typing.nit:1332,14--17
                 ../src/syntax/typing.nit:1332,14
                 identifier 'n_id' ... ../src/syntax/typing.nit:1332,14--17
+                ../src/syntax/typing.nit:1332,14
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1332,19--27
+              ../src/syntax/typing.nit:1332,14
           ../src/syntax/typing.nit:1333,3--1336,5
             keyword 'if' ... ../src/syntax/typing.nit:1333,3--4
             ../src/syntax/typing.nit:1333,6--29
               ../src/syntax/typing.nit:1333,6--14
                 ../src/syntax/typing.nit:1333,6
                 identifier 'type_recv' ... ../src/syntax/typing.nit:1333,6--14
+                ../src/syntax/typing.nit:1333,6
               ../src/syntax/typing.nit:1333,20--29
                 type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1333,20--29
             ../src/syntax/typing.nit:1334,4--1335,9
-              ../src/syntax/typing.nit:1334,4--62
+              ../src/syntax/typing.nit:1334,4--63
                 ../src/syntax/typing.nit:1334,4
                   ../src/syntax/typing.nit:1334,4
                   identifier 'v' ... ../src/syntax/typing.nit:1334,4
+                  ../src/syntax/typing.nit:1334,4
                 identifier 'error' ... ../src/syntax/typing.nit:1334,6--10
-                ../src/syntax/typing.nit:1334,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:1334,12--15
-                ../src/syntax/typing.nit:1334,18--62
-                  ../src/syntax/typing.nit:1334,18--37
-                    literal value '"Error: Attribute '{' ... ../src/syntax/typing.nit:1334,18--37
-                  ../src/syntax/typing.nit:1334,38--41
-                    ../src/syntax/typing.nit:1334,38
-                    identifier 'name' ... ../src/syntax/typing.nit:1334,38--41
-                  ../src/syntax/typing.nit:1334,42--62
-                    '}' access on 'null'."' ... ../src/syntax/typing.nit:1334,42--62
+                ../src/syntax/typing.nit:1334,11--63
+                  '(' ... ../src/syntax/typing.nit:1334,11
+                  ../src/syntax/typing.nit:1334,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:1334,12--15
+                  ../src/syntax/typing.nit:1334,18--62
+                    ../src/syntax/typing.nit:1334,18--37
+                      literal value '"Error: Attribute '{' ... ../src/syntax/typing.nit:1334,18--37
+                    ../src/syntax/typing.nit:1334,38--41
+                      ../src/syntax/typing.nit:1334,38
+                      identifier 'name' ... ../src/syntax/typing.nit:1334,38--41
+                      ../src/syntax/typing.nit:1334,38
+                    ../src/syntax/typing.nit:1334,42--62
+                      '}' access on 'null'."' ... ../src/syntax/typing.nit:1334,42--62
+                  ')' ... ../src/syntax/typing.nit:1334,63
               ../src/syntax/typing.nit:1335,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:1335,4--9
             ../src/syntax/typing.nit:1336,3--5
@@ -8016,111 +9879,149 @@
               ../src/syntax/typing.nit:1337,12--20
                 ../src/syntax/typing.nit:1337,12
                 identifier 'type_recv' ... ../src/syntax/typing.nit:1337,12--20
+                ../src/syntax/typing.nit:1337,12
               identifier 'local_class' ... ../src/syntax/typing.nit:1337,22--32
+              ../src/syntax/typing.nit:1337,12
           ../src/syntax/typing.nit:1338,3--1341,5
             keyword 'if' ... ../src/syntax/typing.nit:1338,3--4
-            ../src/syntax/typing.nit:1338,6--44
+            ../src/syntax/typing.nit:1338,6--45
               keyword 'not' ... ../src/syntax/typing.nit:1338,6--8
-              ../src/syntax/typing.nit:1338,10--44
+              ../src/syntax/typing.nit:1338,10--45
                 ../src/syntax/typing.nit:1338,10--11
                   ../src/syntax/typing.nit:1338,10
                   identifier 'lc' ... ../src/syntax/typing.nit:1338,10--11
+                  ../src/syntax/typing.nit:1338,10
                 identifier 'has_global_property_by_name' ... ../src/syntax/typing.nit:1338,13--39
-                ../src/syntax/typing.nit:1338,41--44
-                  ../src/syntax/typing.nit:1338,41
-                  identifier 'name' ... ../src/syntax/typing.nit:1338,41--44
+                ../src/syntax/typing.nit:1338,40--45
+                  '(' ... ../src/syntax/typing.nit:1338,40
+                  ../src/syntax/typing.nit:1338,41--44
+                    ../src/syntax/typing.nit:1338,41
+                    identifier 'name' ... ../src/syntax/typing.nit:1338,41--44
+                    ../src/syntax/typing.nit:1338,41
+                  ')' ... ../src/syntax/typing.nit:1338,45
             ../src/syntax/typing.nit:1339,4--1340,9
-              ../src/syntax/typing.nit:1339,4--73
+              ../src/syntax/typing.nit:1339,4--74
                 ../src/syntax/typing.nit:1339,4
                   ../src/syntax/typing.nit:1339,4
                   identifier 'v' ... ../src/syntax/typing.nit:1339,4
+                  ../src/syntax/typing.nit:1339,4
                 identifier 'error' ... ../src/syntax/typing.nit:1339,6--10
-                ../src/syntax/typing.nit:1339,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:1339,12--15
-                ../src/syntax/typing.nit:1339,18--73
-                  ../src/syntax/typing.nit:1339,18--36
-                    literal value '"Error: Attribute {' ... ../src/syntax/typing.nit:1339,18--36
-                  ../src/syntax/typing.nit:1339,37--40
-                    ../src/syntax/typing.nit:1339,37
-                    identifier 'name' ... ../src/syntax/typing.nit:1339,37--40
-                  ../src/syntax/typing.nit:1339,41--61
-                    literal value '} doesn't exists in {' ... ../src/syntax/typing.nit:1339,41--61
-                  ../src/syntax/typing.nit:1339,62--70
-                    ../src/syntax/typing.nit:1339,62
-                    identifier 'type_recv' ... ../src/syntax/typing.nit:1339,62--70
-                  ../src/syntax/typing.nit:1339,71--73
-                    '}."' ... ../src/syntax/typing.nit:1339,71--73
+                ../src/syntax/typing.nit:1339,11--74
+                  '(' ... ../src/syntax/typing.nit:1339,11
+                  ../src/syntax/typing.nit:1339,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:1339,12--15
+                  ../src/syntax/typing.nit:1339,18--73
+                    ../src/syntax/typing.nit:1339,18--36
+                      literal value '"Error: Attribute {' ... ../src/syntax/typing.nit:1339,18--36
+                    ../src/syntax/typing.nit:1339,37--40
+                      ../src/syntax/typing.nit:1339,37
+                      identifier 'name' ... ../src/syntax/typing.nit:1339,37--40
+                      ../src/syntax/typing.nit:1339,37
+                    ../src/syntax/typing.nit:1339,41--61
+                      literal value '} doesn't exists in {' ... ../src/syntax/typing.nit:1339,41--61
+                    ../src/syntax/typing.nit:1339,62--70
+                      ../src/syntax/typing.nit:1339,62
+                      identifier 'type_recv' ... ../src/syntax/typing.nit:1339,62--70
+                      ../src/syntax/typing.nit:1339,62
+                    ../src/syntax/typing.nit:1339,71--73
+                      '}."' ... ../src/syntax/typing.nit:1339,71--73
+                  ')' ... ../src/syntax/typing.nit:1339,74
               ../src/syntax/typing.nit:1340,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:1340,4--9
             ../src/syntax/typing.nit:1341,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1341,3--5
-          ../src/syntax/typing.nit:1342,3--37
+          ../src/syntax/typing.nit:1342,3--38
             keyword 'var' ... ../src/syntax/typing.nit:1342,3--5
             identifier 'prop' ... ../src/syntax/typing.nit:1342,7--10
             '=' ... ../src/syntax/typing.nit:1342,12
-            ../src/syntax/typing.nit:1342,14--37
+            ../src/syntax/typing.nit:1342,14--38
               ../src/syntax/typing.nit:1342,14--15
                 ../src/syntax/typing.nit:1342,14
                 identifier 'lc' ... ../src/syntax/typing.nit:1342,14--15
+                ../src/syntax/typing.nit:1342,14
               identifier 'select_attribute' ... ../src/syntax/typing.nit:1342,17--32
-              ../src/syntax/typing.nit:1342,34--37
-                ../src/syntax/typing.nit:1342,34
-                identifier 'name' ... ../src/syntax/typing.nit:1342,34--37
+              ../src/syntax/typing.nit:1342,33--38
+                '(' ... ../src/syntax/typing.nit:1342,33
+                ../src/syntax/typing.nit:1342,34--37
+                  ../src/syntax/typing.nit:1342,34
+                  identifier 'name' ... ../src/syntax/typing.nit:1342,34--37
+                  ../src/syntax/typing.nit:1342,34
+                ')' ... ../src/syntax/typing.nit:1342,38
           ../src/syntax/typing.nit:1343,3--1345,5
             keyword 'if' ... ../src/syntax/typing.nit:1343,3--4
             ../src/syntax/typing.nit:1343,6--68
-              ../src/syntax/typing.nit:1343,6--63
+              ../src/syntax/typing.nit:1343,6--64
                 ../src/syntax/typing.nit:1343,6--15
                   ../src/syntax/typing.nit:1343,6
                     ../src/syntax/typing.nit:1343,6
                     identifier 'v' ... ../src/syntax/typing.nit:1343,6
+                    ../src/syntax/typing.nit:1343,6
                   identifier 'mmmodule' ... ../src/syntax/typing.nit:1343,8--15
+                  ../src/syntax/typing.nit:1343,6
                 identifier 'visibility_for' ... ../src/syntax/typing.nit:1343,17--30
-                ../src/syntax/typing.nit:1343,32--63
-                  ../src/syntax/typing.nit:1343,32--54
-                    ../src/syntax/typing.nit:1343,32--42
-                      ../src/syntax/typing.nit:1343,32--35
+                ../src/syntax/typing.nit:1343,31--64
+                  '(' ... ../src/syntax/typing.nit:1343,31
+                  ../src/syntax/typing.nit:1343,32--63
+                    ../src/syntax/typing.nit:1343,32--54
+                      ../src/syntax/typing.nit:1343,32--42
+                        ../src/syntax/typing.nit:1343,32--35
+                          ../src/syntax/typing.nit:1343,32
+                          identifier 'prop' ... ../src/syntax/typing.nit:1343,32--35
+                          ../src/syntax/typing.nit:1343,32
+                        identifier 'global' ... ../src/syntax/typing.nit:1343,37--42
                         ../src/syntax/typing.nit:1343,32
-                        identifier 'prop' ... ../src/syntax/typing.nit:1343,32--35
-                      identifier 'global' ... ../src/syntax/typing.nit:1343,37--42
-                    identifier 'local_class' ... ../src/syntax/typing.nit:1343,44--54
-                  identifier 'mmmodule' ... ../src/syntax/typing.nit:1343,56--63
+                      identifier 'local_class' ... ../src/syntax/typing.nit:1343,44--54
+                      ../src/syntax/typing.nit:1343,32
+                    identifier 'mmmodule' ... ../src/syntax/typing.nit:1343,56--63
+                    ../src/syntax/typing.nit:1343,32
+                  ')' ... ../src/syntax/typing.nit:1343,64
               ../src/syntax/typing.nit:1343,68
                 literal value '3' ... ../src/syntax/typing.nit:1343,68
-            ../src/syntax/typing.nit:1344,4--111
-              ../src/syntax/typing.nit:1344,4--111
+            ../src/syntax/typing.nit:1344,4--112
+              ../src/syntax/typing.nit:1344,4--112
                 ../src/syntax/typing.nit:1344,4
                   ../src/syntax/typing.nit:1344,4
                   identifier 'v' ... ../src/syntax/typing.nit:1344,4
+                  ../src/syntax/typing.nit:1344,4
                 identifier 'error' ... ../src/syntax/typing.nit:1344,6--10
-                ../src/syntax/typing.nit:1344,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:1344,12--15
-                ../src/syntax/typing.nit:1344,18--111
-                  ../src/syntax/typing.nit:1344,18--36
-                    literal value '"Error: Attribute {' ... ../src/syntax/typing.nit:1344,18--36
-                  ../src/syntax/typing.nit:1344,37--40
-                    ../src/syntax/typing.nit:1344,37
-                    identifier 'name' ... ../src/syntax/typing.nit:1344,37--40
-                  ../src/syntax/typing.nit:1344,41--48
-                    literal value '} from {' ... ../src/syntax/typing.nit:1344,41--48
-                  ../src/syntax/typing.nit:1344,49--80
-                    ../src/syntax/typing.nit:1344,49--71
-                      ../src/syntax/typing.nit:1344,49--59
-                        ../src/syntax/typing.nit:1344,49--52
+                ../src/syntax/typing.nit:1344,11--112
+                  '(' ... ../src/syntax/typing.nit:1344,11
+                  ../src/syntax/typing.nit:1344,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:1344,12--15
+                  ../src/syntax/typing.nit:1344,18--111
+                    ../src/syntax/typing.nit:1344,18--36
+                      literal value '"Error: Attribute {' ... ../src/syntax/typing.nit:1344,18--36
+                    ../src/syntax/typing.nit:1344,37--40
+                      ../src/syntax/typing.nit:1344,37
+                      identifier 'name' ... ../src/syntax/typing.nit:1344,37--40
+                      ../src/syntax/typing.nit:1344,37
+                    ../src/syntax/typing.nit:1344,41--48
+                      literal value '} from {' ... ../src/syntax/typing.nit:1344,41--48
+                    ../src/syntax/typing.nit:1344,49--80
+                      ../src/syntax/typing.nit:1344,49--71
+                        ../src/syntax/typing.nit:1344,49--59
+                          ../src/syntax/typing.nit:1344,49--52
+                            ../src/syntax/typing.nit:1344,49
+                            identifier 'prop' ... ../src/syntax/typing.nit:1344,49--52
+                            ../src/syntax/typing.nit:1344,49
+                          identifier 'global' ... ../src/syntax/typing.nit:1344,54--59
                           ../src/syntax/typing.nit:1344,49
-                          identifier 'prop' ... ../src/syntax/typing.nit:1344,49--52
-                        identifier 'global' ... ../src/syntax/typing.nit:1344,54--59
-                      identifier 'local_class' ... ../src/syntax/typing.nit:1344,61--71
-                    identifier 'mmmodule' ... ../src/syntax/typing.nit:1344,73--80
-                  ../src/syntax/typing.nit:1344,81--99
-                    literal value '} is invisible in {' ... ../src/syntax/typing.nit:1344,81--99
-                  ../src/syntax/typing.nit:1344,100--109
-                    ../src/syntax/typing.nit:1344,100
+                        identifier 'local_class' ... ../src/syntax/typing.nit:1344,61--71
+                        ../src/syntax/typing.nit:1344,49
+                      identifier 'mmmodule' ... ../src/syntax/typing.nit:1344,73--80
+                      ../src/syntax/typing.nit:1344,49
+                    ../src/syntax/typing.nit:1344,81--99
+                      literal value '} is invisible in {' ... ../src/syntax/typing.nit:1344,81--99
+                    ../src/syntax/typing.nit:1344,100--109
                       ../src/syntax/typing.nit:1344,100
-                      identifier 'v' ... ../src/syntax/typing.nit:1344,100
-                    identifier 'mmmodule' ... ../src/syntax/typing.nit:1344,102--109
-                  ../src/syntax/typing.nit:1344,110--111
-                    '}"' ... ../src/syntax/typing.nit:1344,110--111
+                        ../src/syntax/typing.nit:1344,100
+                        identifier 'v' ... ../src/syntax/typing.nit:1344,100
+                        ../src/syntax/typing.nit:1344,100
+                      identifier 'mmmodule' ... ../src/syntax/typing.nit:1344,102--109
+                      ../src/syntax/typing.nit:1344,100
+                    ../src/syntax/typing.nit:1344,110--111
+                      '}"' ... ../src/syntax/typing.nit:1344,110--111
+                  ')' ... ../src/syntax/typing.nit:1344,112
             ../src/syntax/typing.nit:1345,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1345,3--5
           ../src/syntax/typing.nit:1346,3--14
@@ -8130,20 +10031,27 @@
             ../src/syntax/typing.nit:1346,11--14
               ../src/syntax/typing.nit:1346,11
               identifier 'prop' ... ../src/syntax/typing.nit:1346,11--14
+              ../src/syntax/typing.nit:1346,11
           ../src/syntax/typing.nit:1347,3--52
             keyword 'var' ... ../src/syntax/typing.nit:1347,3--5
             identifier 'at' ... ../src/syntax/typing.nit:1347,7--8
             '=' ... ../src/syntax/typing.nit:1347,10
             ../src/syntax/typing.nit:1347,12--52
-              ../src/syntax/typing.nit:1347,12--39
+              ../src/syntax/typing.nit:1347,12--40
                 ../src/syntax/typing.nit:1347,12--15
                   ../src/syntax/typing.nit:1347,12
                   identifier 'prop' ... ../src/syntax/typing.nit:1347,12--15
+                  ../src/syntax/typing.nit:1347,12
                 identifier 'signature_for' ... ../src/syntax/typing.nit:1347,17--29
-                ../src/syntax/typing.nit:1347,31--39
-                  ../src/syntax/typing.nit:1347,31
-                  identifier 'type_recv' ... ../src/syntax/typing.nit:1347,31--39
+                ../src/syntax/typing.nit:1347,30--40
+                  '(' ... ../src/syntax/typing.nit:1347,30
+                  ../src/syntax/typing.nit:1347,31--39
+                    ../src/syntax/typing.nit:1347,31
+                    identifier 'type_recv' ... ../src/syntax/typing.nit:1347,31--39
+                    ../src/syntax/typing.nit:1347,31
+                  ')' ... ../src/syntax/typing.nit:1347,40
               identifier 'return_type' ... ../src/syntax/typing.nit:1347,42--52
+              ../src/syntax/typing.nit:1347,12
           ../src/syntax/typing.nit:1348,3--49
             keyword 'if' ... ../src/syntax/typing.nit:1348,3--4
             ../src/syntax/typing.nit:1348,6--23
@@ -8152,16 +10060,21 @@
                 ../src/syntax/typing.nit:1348,10--15
                   ../src/syntax/typing.nit:1348,10
                   identifier 'n_expr' ... ../src/syntax/typing.nit:1348,10--15
+                  ../src/syntax/typing.nit:1348,10
                 identifier 'is_self' ... ../src/syntax/typing.nit:1348,17--23
+                ../src/syntax/typing.nit:1348,10
             ../src/syntax/typing.nit:1348,30--49
               ../src/syntax/typing.nit:1348,35
               identifier 'at' ... ../src/syntax/typing.nit:1348,30--31
+              ../src/syntax/typing.nit:1348,35
               '=' ... ../src/syntax/typing.nit:1348,33
               ../src/syntax/typing.nit:1348,35--49
                 ../src/syntax/typing.nit:1348,35--36
                   ../src/syntax/typing.nit:1348,35
                   identifier 'at' ... ../src/syntax/typing.nit:1348,35--36
+                  ../src/syntax/typing.nit:1348,35
                 identifier 'not_for_self' ... ../src/syntax/typing.nit:1348,38--49
+                ../src/syntax/typing.nit:1348,35
           ../src/syntax/typing.nit:1349,3--17
             ../src/syntax/typing.nit:1349,16
             attribute '_attr_type' ... ../src/syntax/typing.nit:1349,3--12
@@ -8169,6 +10082,7 @@
             ../src/syntax/typing.nit:1349,16--17
               ../src/syntax/typing.nit:1349,16
               identifier 'at' ... ../src/syntax/typing.nit:1349,16--17
+              ../src/syntax/typing.nit:1349,16
           keyword 'end' ... ../src/syntax/typing.nit:1350,2--4
       keyword 'end' ... ../src/syntax/typing.nit:1351,1--3
     ../src/syntax/typing.nit:1353,1--1361,3
@@ -8187,12 +10101,16 @@
           ../src/syntax/typing.nit:1354,25
             identifier 'v' ... ../src/syntax/typing.nit:1354,25
         ../src/syntax/typing.nit:1356,3--1360,4
-          ../src/syntax/typing.nit:1356,3--13
+          ../src/syntax/typing.nit:1356,3--14
             ../src/syntax/typing.nit:1356,13
             identifier 'do_typing' ... ../src/syntax/typing.nit:1356,3--11
-            ../src/syntax/typing.nit:1356,13
+            ../src/syntax/typing.nit:1356,12--14
+              '(' ... ../src/syntax/typing.nit:1356,12
               ../src/syntax/typing.nit:1356,13
-              identifier 'v' ... ../src/syntax/typing.nit:1356,13
+                ../src/syntax/typing.nit:1356,13
+                identifier 'v' ... ../src/syntax/typing.nit:1356,13
+                ../src/syntax/typing.nit:1356,13
+              ')' ... ../src/syntax/typing.nit:1356,14
           ../src/syntax/typing.nit:1357,3--30
             keyword 'if' ... ../src/syntax/typing.nit:1357,3--4
             ../src/syntax/typing.nit:1357,6--18
@@ -8210,6 +10128,7 @@
             ../src/syntax/typing.nit:1358,12--20
               ../src/syntax/typing.nit:1358,12
               identifier 'attr_type' ... ../src/syntax/typing.nit:1358,12--20
+              ../src/syntax/typing.nit:1358,12
           ../src/syntax/typing.nit:1359,3--18
             ../src/syntax/typing.nit:1359,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1359,3--11
@@ -8234,12 +10153,16 @@
           ../src/syntax/typing.nit:1364,25
             identifier 'v' ... ../src/syntax/typing.nit:1364,25
         ../src/syntax/typing.nit:1366,3--1370,4
-          ../src/syntax/typing.nit:1366,3--13
+          ../src/syntax/typing.nit:1366,3--14
             ../src/syntax/typing.nit:1366,13
             identifier 'do_typing' ... ../src/syntax/typing.nit:1366,3--11
-            ../src/syntax/typing.nit:1366,13
+            ../src/syntax/typing.nit:1366,12--14
+              '(' ... ../src/syntax/typing.nit:1366,12
               ../src/syntax/typing.nit:1366,13
-              identifier 'v' ... ../src/syntax/typing.nit:1366,13
+                ../src/syntax/typing.nit:1366,13
+                identifier 'v' ... ../src/syntax/typing.nit:1366,13
+                ../src/syntax/typing.nit:1366,13
+              ')' ... ../src/syntax/typing.nit:1366,14
           ../src/syntax/typing.nit:1367,3--30
             keyword 'if' ... ../src/syntax/typing.nit:1367,3--4
             ../src/syntax/typing.nit:1367,6--18
@@ -8252,19 +10175,25 @@
               keyword 'return' ... ../src/syntax/typing.nit:1367,25--30
           ../src/syntax/typing.nit:1368,3--61
             keyword 'if' ... ../src/syntax/typing.nit:1368,3--4
-            ../src/syntax/typing.nit:1368,6--48
+            ../src/syntax/typing.nit:1368,6--49
               keyword 'not' ... ../src/syntax/typing.nit:1368,6--8
-              ../src/syntax/typing.nit:1368,10--48
+              ../src/syntax/typing.nit:1368,10--49
                 ../src/syntax/typing.nit:1368,10
                   ../src/syntax/typing.nit:1368,10
                   identifier 'v' ... ../src/syntax/typing.nit:1368,10
+                  ../src/syntax/typing.nit:1368,10
                 identifier 'check_conform_expr' ... ../src/syntax/typing.nit:1368,12--29
-                ../src/syntax/typing.nit:1368,31--37
-                  ../src/syntax/typing.nit:1368,31
-                  identifier 'n_value' ... ../src/syntax/typing.nit:1368,31--37
-                ../src/syntax/typing.nit:1368,40--48
-                  ../src/syntax/typing.nit:1368,40
-                  identifier 'attr_type' ... ../src/syntax/typing.nit:1368,40--48
+                ../src/syntax/typing.nit:1368,30--49
+                  '(' ... ../src/syntax/typing.nit:1368,30
+                  ../src/syntax/typing.nit:1368,31--37
+                    ../src/syntax/typing.nit:1368,31
+                    identifier 'n_value' ... ../src/syntax/typing.nit:1368,31--37
+                    ../src/syntax/typing.nit:1368,31
+                  ../src/syntax/typing.nit:1368,40--48
+                    ../src/syntax/typing.nit:1368,40
+                    identifier 'attr_type' ... ../src/syntax/typing.nit:1368,40--48
+                    ../src/syntax/typing.nit:1368,40
+                  ')' ... ../src/syntax/typing.nit:1368,49
             ../src/syntax/typing.nit:1368,56--61
               keyword 'return' ... ../src/syntax/typing.nit:1368,56--61
           ../src/syntax/typing.nit:1369,3--18
@@ -8291,12 +10220,16 @@
           ../src/syntax/typing.nit:1374,25
             identifier 'v' ... ../src/syntax/typing.nit:1374,25
         ../src/syntax/typing.nit:1376,3--1382,4
-          ../src/syntax/typing.nit:1376,3--13
+          ../src/syntax/typing.nit:1376,3--14
             ../src/syntax/typing.nit:1376,13
             identifier 'do_typing' ... ../src/syntax/typing.nit:1376,3--11
-            ../src/syntax/typing.nit:1376,13
+            ../src/syntax/typing.nit:1376,12--14
+              '(' ... ../src/syntax/typing.nit:1376,12
               ../src/syntax/typing.nit:1376,13
-              identifier 'v' ... ../src/syntax/typing.nit:1376,13
+                ../src/syntax/typing.nit:1376,13
+                identifier 'v' ... ../src/syntax/typing.nit:1376,13
+                ../src/syntax/typing.nit:1376,13
+              ')' ... ../src/syntax/typing.nit:1376,14
           ../src/syntax/typing.nit:1377,3--30
             keyword 'if' ... ../src/syntax/typing.nit:1377,3--4
             ../src/syntax/typing.nit:1377,6--18
@@ -8307,44 +10240,57 @@
                 keyword 'null' ... ../src/syntax/typing.nit:1377,15--18
             ../src/syntax/typing.nit:1377,25--30
               keyword 'return' ... ../src/syntax/typing.nit:1377,25--30
-          ../src/syntax/typing.nit:1378,3--39
+          ../src/syntax/typing.nit:1378,3--40
             keyword 'var' ... ../src/syntax/typing.nit:1378,3--5
             identifier 't' ... ../src/syntax/typing.nit:1378,7
             '=' ... ../src/syntax/typing.nit:1378,9
-            ../src/syntax/typing.nit:1378,11--39
+            ../src/syntax/typing.nit:1378,11--40
               ../src/syntax/typing.nit:1378,28
               identifier 'do_rvalue_typing' ... ../src/syntax/typing.nit:1378,11--26
-              ../src/syntax/typing.nit:1378,28
+              ../src/syntax/typing.nit:1378,27--40
+                '(' ... ../src/syntax/typing.nit:1378,27
                 ../src/syntax/typing.nit:1378,28
-                identifier 'v' ... ../src/syntax/typing.nit:1378,28
-              ../src/syntax/typing.nit:1378,31--39
-                ../src/syntax/typing.nit:1378,31
-                identifier 'attr_type' ... ../src/syntax/typing.nit:1378,31--39
+                  ../src/syntax/typing.nit:1378,28
+                  identifier 'v' ... ../src/syntax/typing.nit:1378,28
+                  ../src/syntax/typing.nit:1378,28
+                ../src/syntax/typing.nit:1378,31--39
+                  ../src/syntax/typing.nit:1378,31
+                  identifier 'attr_type' ... ../src/syntax/typing.nit:1378,31--39
+                  ../src/syntax/typing.nit:1378,31
+                ')' ... ../src/syntax/typing.nit:1378,40
           ../src/syntax/typing.nit:1379,3--26
             keyword 'if' ... ../src/syntax/typing.nit:1379,3--4
             ../src/syntax/typing.nit:1379,6--14
               ../src/syntax/typing.nit:1379,6
                 ../src/syntax/typing.nit:1379,6
                 identifier 't' ... ../src/syntax/typing.nit:1379,6
+                ../src/syntax/typing.nit:1379,6
               ../src/syntax/typing.nit:1379,11--14
                 keyword 'null' ... ../src/syntax/typing.nit:1379,11--14
             ../src/syntax/typing.nit:1379,21--26
               keyword 'return' ... ../src/syntax/typing.nit:1379,21--26
-          ../src/syntax/typing.nit:1380,3--40
+          ../src/syntax/typing.nit:1380,3--41
             ../src/syntax/typing.nit:1380,3
               ../src/syntax/typing.nit:1380,3
               identifier 'v' ... ../src/syntax/typing.nit:1380,3
+              ../src/syntax/typing.nit:1380,3
             identifier 'check_conform' ... ../src/syntax/typing.nit:1380,5--17
-            ../src/syntax/typing.nit:1380,19--22
-              keyword 'self' ... ../src/syntax/typing.nit:1380,19--22
-            ../src/syntax/typing.nit:1380,25
+            ../src/syntax/typing.nit:1380,18--41
+              '(' ... ../src/syntax/typing.nit:1380,18
+              ../src/syntax/typing.nit:1380,19--22
+                keyword 'self' ... ../src/syntax/typing.nit:1380,19--22
               ../src/syntax/typing.nit:1380,25
-              identifier 't' ... ../src/syntax/typing.nit:1380,25
-            ../src/syntax/typing.nit:1380,28--40
-              ../src/syntax/typing.nit:1380,28--34
+                ../src/syntax/typing.nit:1380,25
+                identifier 't' ... ../src/syntax/typing.nit:1380,25
+                ../src/syntax/typing.nit:1380,25
+              ../src/syntax/typing.nit:1380,28--40
+                ../src/syntax/typing.nit:1380,28--34
+                  ../src/syntax/typing.nit:1380,28
+                  identifier 'n_value' ... ../src/syntax/typing.nit:1380,28--34
+                  ../src/syntax/typing.nit:1380,28
+                identifier 'stype' ... ../src/syntax/typing.nit:1380,36--40
                 ../src/syntax/typing.nit:1380,28
-                identifier 'n_value' ... ../src/syntax/typing.nit:1380,28--34
-              identifier 'stype' ... ../src/syntax/typing.nit:1380,36--40
+              ')' ... ../src/syntax/typing.nit:1380,41
           ../src/syntax/typing.nit:1381,3--18
             ../src/syntax/typing.nit:1381,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1381,3--11
@@ -8369,12 +10315,16 @@
           ../src/syntax/typing.nit:1386,25
             identifier 'v' ... ../src/syntax/typing.nit:1386,25
         ../src/syntax/typing.nit:1388,3--1395,4
-          ../src/syntax/typing.nit:1388,3--13
+          ../src/syntax/typing.nit:1388,3--14
             ../src/syntax/typing.nit:1388,13
             identifier 'do_typing' ... ../src/syntax/typing.nit:1388,3--11
-            ../src/syntax/typing.nit:1388,13
+            ../src/syntax/typing.nit:1388,12--14
+              '(' ... ../src/syntax/typing.nit:1388,12
               ../src/syntax/typing.nit:1388,13
-              identifier 'v' ... ../src/syntax/typing.nit:1388,13
+                ../src/syntax/typing.nit:1388,13
+                identifier 'v' ... ../src/syntax/typing.nit:1388,13
+                ../src/syntax/typing.nit:1388,13
+              ')' ... ../src/syntax/typing.nit:1388,14
           ../src/syntax/typing.nit:1389,3--30
             keyword 'if' ... ../src/syntax/typing.nit:1389,3--4
             ../src/syntax/typing.nit:1389,6--18
@@ -8391,17 +10341,23 @@
               ../src/syntax/typing.nit:1390,6--14
                 ../src/syntax/typing.nit:1390,6
                 identifier 'attr_type' ... ../src/syntax/typing.nit:1390,6--14
+                ../src/syntax/typing.nit:1390,6
               identifier 'is_nullable' ... ../src/syntax/typing.nit:1390,16--26
-            ../src/syntax/typing.nit:1391,4--56
-              ../src/syntax/typing.nit:1391,4--56
+              ../src/syntax/typing.nit:1390,6
+            ../src/syntax/typing.nit:1391,4--57
+              ../src/syntax/typing.nit:1391,4--57
                 ../src/syntax/typing.nit:1391,4
                   ../src/syntax/typing.nit:1391,4
                   identifier 'v' ... ../src/syntax/typing.nit:1391,4
+                  ../src/syntax/typing.nit:1391,4
                 identifier 'error' ... ../src/syntax/typing.nit:1391,6--10
-                ../src/syntax/typing.nit:1391,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:1391,12--15
-                ../src/syntax/typing.nit:1391,18--56
-                  literal value '"Error: isset on a nullable attribute."' ... ../src/syntax/typing.nit:1391,18--56
+                ../src/syntax/typing.nit:1391,11--57
+                  '(' ... ../src/syntax/typing.nit:1391,11
+                  ../src/syntax/typing.nit:1391,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:1391,12--15
+                  ../src/syntax/typing.nit:1391,18--56
+                    literal value '"Error: isset on a nullable attribute."' ... ../src/syntax/typing.nit:1391,18--56
+                  ')' ... ../src/syntax/typing.nit:1391,57
             ../src/syntax/typing.nit:1392,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1392,3--5
           ../src/syntax/typing.nit:1393,3--22
@@ -8412,7 +10368,9 @@
               ../src/syntax/typing.nit:1393,12
                 ../src/syntax/typing.nit:1393,12
                 identifier 'v' ... ../src/syntax/typing.nit:1393,12
+                ../src/syntax/typing.nit:1393,12
               identifier 'type_bool' ... ../src/syntax/typing.nit:1393,14--22
+              ../src/syntax/typing.nit:1393,12
           ../src/syntax/typing.nit:1394,3--18
             ../src/syntax/typing.nit:1394,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1394,3--11
@@ -8483,6 +10441,7 @@
               ../src/syntax/typing.nit:1407,6--8
                 ../src/syntax/typing.nit:1407,6
                 identifier 'res' ... ../src/syntax/typing.nit:1407,6--8
+                ../src/syntax/typing.nit:1407,6
               ../src/syntax/typing.nit:1407,13--16
                 keyword 'null' ... ../src/syntax/typing.nit:1407,13--16
             ../src/syntax/typing.nit:1408,4--13
@@ -8491,25 +10450,30 @@
                 ../src/syntax/typing.nit:1408,11--13
                   ../src/syntax/typing.nit:1408,11
                   identifier 'res' ... ../src/syntax/typing.nit:1408,11--13
+                  ../src/syntax/typing.nit:1408,11
             ../src/syntax/typing.nit:1410,4--1414,5
               ../src/syntax/typing.nit:1410,4--30
                 ../src/syntax/typing.nit:1410,10
                 identifier 'res' ... ../src/syntax/typing.nit:1410,4--6
+                ../src/syntax/typing.nit:1410,10
                 '=' ... ../src/syntax/typing.nit:1410,8
                 ../src/syntax/typing.nit:1410,10--30
                   ../src/syntax/typing.nit:1410,10
                   identifier 'compute_raw_arguments' ... ../src/syntax/typing.nit:1410,10--30
+                  ../src/syntax/typing.nit:1410,10
               ../src/syntax/typing.nit:1411,4--44
                 keyword 'if' ... ../src/syntax/typing.nit:1411,4--5
                 ../src/syntax/typing.nit:1411,7--17
                   ../src/syntax/typing.nit:1411,7--9
                     ../src/syntax/typing.nit:1411,7
                     identifier 'res' ... ../src/syntax/typing.nit:1411,7--9
+                    ../src/syntax/typing.nit:1411,7
                   ../src/syntax/typing.nit:1411,14--17
                     keyword 'null' ... ../src/syntax/typing.nit:1411,14--17
                 ../src/syntax/typing.nit:1411,24--44
                   ../src/syntax/typing.nit:1411,40
                   identifier 'res' ... ../src/syntax/typing.nit:1411,24--26
+                  ../src/syntax/typing.nit:1411,40
                   '=' ... ../src/syntax/typing.nit:1411,28
                   ../src/syntax/typing.nit:1411,30--44
                     keyword 'new' ... ../src/syntax/typing.nit:1411,30--32
@@ -8517,6 +10481,7 @@
                       type identifier 'Array' ... ../src/syntax/typing.nit:1411,34--38
                       ../src/syntax/typing.nit:1411,40--44
                         type identifier 'AExpr' ... ../src/syntax/typing.nit:1411,40--44
+                    ../src/syntax/typing.nit:1411,30
               ../src/syntax/typing.nit:1412,4--29
                 ../src/syntax/typing.nit:1412,27
                 attribute '_raw_arguments_cache' ... ../src/syntax/typing.nit:1412,4--23
@@ -8524,11 +10489,13 @@
                 ../src/syntax/typing.nit:1412,27--29
                   ../src/syntax/typing.nit:1412,27
                   identifier 'res' ... ../src/syntax/typing.nit:1412,27--29
+                  ../src/syntax/typing.nit:1412,27
               ../src/syntax/typing.nit:1413,4--13
                 keyword 'return' ... ../src/syntax/typing.nit:1413,4--9
                 ../src/syntax/typing.nit:1413,11--13
                   ../src/syntax/typing.nit:1413,11
                   identifier 'res' ... ../src/syntax/typing.nit:1413,11--13
+                  ../src/syntax/typing.nit:1413,11
               keyword 'end' ... ../src/syntax/typing.nit:1414,3--5
           keyword 'end' ... ../src/syntax/typing.nit:1415,2--4
       ../src/syntax/typing.nit:1417,2--55
@@ -8558,13 +10525,15 @@
             ../src/syntax/typing.nit:1421,9
             identifier 'print' ... ../src/syntax/typing.nit:1421,3--7
             ../src/syntax/typing.nit:1421,9--45
-              ../src/syntax/typing.nit:1421,9--10
-                literal value '"{' ... ../src/syntax/typing.nit:1421,9--10
-              ../src/syntax/typing.nit:1421,11--18
-                ../src/syntax/typing.nit:1421,11
-                identifier 'location' ... ../src/syntax/typing.nit:1421,11--18
-              ../src/syntax/typing.nit:1421,19--45
-                '} no compute_raw_arguments"' ... ../src/syntax/typing.nit:1421,19--45
+              ../src/syntax/typing.nit:1421,9--45
+                ../src/syntax/typing.nit:1421,9--10
+                  literal value '"{' ... ../src/syntax/typing.nit:1421,9--10
+                ../src/syntax/typing.nit:1421,11--18
+                  ../src/syntax/typing.nit:1421,11
+                  identifier 'location' ... ../src/syntax/typing.nit:1421,11--18
+                  ../src/syntax/typing.nit:1421,11
+                ../src/syntax/typing.nit:1421,19--45
+                  '} no compute_raw_arguments"' ... ../src/syntax/typing.nit:1421,19--45
           ../src/syntax/typing.nit:1422,3--13
             keyword 'return' ... ../src/syntax/typing.nit:1422,3--8
             ../src/syntax/typing.nit:1422,10--13
@@ -8610,7 +10579,9 @@
               ../src/syntax/typing.nit:1428,20--23
                 ../src/syntax/typing.nit:1428,20
                 identifier 'psig' ... ../src/syntax/typing.nit:1428,20--23
+                ../src/syntax/typing.nit:1428,20
               identifier 'vararg_rank' ... ../src/syntax/typing.nit:1428,25--35
+              ../src/syntax/typing.nit:1428,20
           ../src/syntax/typing.nit:1429,3--28
             keyword 'var' ... ../src/syntax/typing.nit:1429,3--5
             identifier 'par_arity' ... ../src/syntax/typing.nit:1429,7--15
@@ -8619,7 +10590,9 @@
               ../src/syntax/typing.nit:1429,19--22
                 ../src/syntax/typing.nit:1429,19
                 identifier 'psig' ... ../src/syntax/typing.nit:1429,19--22
+                ../src/syntax/typing.nit:1429,19
               identifier 'arity' ... ../src/syntax/typing.nit:1429,24--28
+              ../src/syntax/typing.nit:1429,19
           ../src/syntax/typing.nit:1430,3--20
             keyword 'var' ... ../src/syntax/typing.nit:1430,3--5
             identifier 'raw_arity' ... ../src/syntax/typing.nit:1430,7--15
@@ -8631,23 +10604,28 @@
               ../src/syntax/typing.nit:1431,6--13
                 ../src/syntax/typing.nit:1431,6
                 identifier 'raw_args' ... ../src/syntax/typing.nit:1431,6--13
+                ../src/syntax/typing.nit:1431,6
               ../src/syntax/typing.nit:1431,18--21
                 keyword 'null' ... ../src/syntax/typing.nit:1431,18--21
             ../src/syntax/typing.nit:1431,28--40
               ../src/syntax/typing.nit:1431,40
               identifier 'raw_arity' ... ../src/syntax/typing.nit:1431,28--36
+              ../src/syntax/typing.nit:1431,40
               '=' ... ../src/syntax/typing.nit:1431,38
               ../src/syntax/typing.nit:1431,40
                 literal value '0' ... ../src/syntax/typing.nit:1431,40
             ../src/syntax/typing.nit:1431,47--73
               ../src/syntax/typing.nit:1431,59
               identifier 'raw_arity' ... ../src/syntax/typing.nit:1431,47--55
+              ../src/syntax/typing.nit:1431,59
               '=' ... ../src/syntax/typing.nit:1431,57
               ../src/syntax/typing.nit:1431,59--73
                 ../src/syntax/typing.nit:1431,59--66
                   ../src/syntax/typing.nit:1431,59
                   identifier 'raw_args' ... ../src/syntax/typing.nit:1431,59--66
+                  ../src/syntax/typing.nit:1431,59
                 identifier 'length' ... ../src/syntax/typing.nit:1431,68--73
+                ../src/syntax/typing.nit:1431,59
           ../src/syntax/typing.nit:1432,3--1435,5
             keyword 'if' ... ../src/syntax/typing.nit:1432,3--4
             ../src/syntax/typing.nit:1432,6--75
@@ -8655,9 +10633,11 @@
                 ../src/syntax/typing.nit:1432,6--14
                   ../src/syntax/typing.nit:1432,6
                   identifier 'par_arity' ... ../src/syntax/typing.nit:1432,6--14
+                  ../src/syntax/typing.nit:1432,6
                 ../src/syntax/typing.nit:1432,18--26
                   ../src/syntax/typing.nit:1432,18
                   identifier 'raw_arity' ... ../src/syntax/typing.nit:1432,18--26
+                  ../src/syntax/typing.nit:1432,18
               ../src/syntax/typing.nit:1432,31--75
                 '(' ... ../src/syntax/typing.nit:1432,31
                 ../src/syntax/typing.nit:1432,32--74
@@ -8665,39 +10645,48 @@
                     ../src/syntax/typing.nit:1432,32--40
                       ../src/syntax/typing.nit:1432,32
                       identifier 'par_arity' ... ../src/syntax/typing.nit:1432,32--40
+                      ../src/syntax/typing.nit:1432,32
                     ../src/syntax/typing.nit:1432,45--53
                       ../src/syntax/typing.nit:1432,45
                       identifier 'raw_arity' ... ../src/syntax/typing.nit:1432,45--53
+                      ../src/syntax/typing.nit:1432,45
                   ../src/syntax/typing.nit:1432,59--74
                     ../src/syntax/typing.nit:1432,59--68
                       ../src/syntax/typing.nit:1432,59
                       identifier 'par_vararg' ... ../src/syntax/typing.nit:1432,59--68
+                      ../src/syntax/typing.nit:1432,59
                     ../src/syntax/typing.nit:1432,73--74
                       operator '-' ... ../src/syntax/typing.nit:1432,73
                       ../src/syntax/typing.nit:1432,74
                         literal value '1' ... ../src/syntax/typing.nit:1432,74
                 ')' ... ../src/syntax/typing.nit:1432,75
             ../src/syntax/typing.nit:1433,4--1434,15
-              ../src/syntax/typing.nit:1433,4--70
+              ../src/syntax/typing.nit:1433,4--71
                 ../src/syntax/typing.nit:1433,4
                   ../src/syntax/typing.nit:1433,4
                   identifier 'v' ... ../src/syntax/typing.nit:1433,4
+                  ../src/syntax/typing.nit:1433,4
                 identifier 'error' ... ../src/syntax/typing.nit:1433,6--10
-                ../src/syntax/typing.nit:1433,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:1433,12--15
-                ../src/syntax/typing.nit:1433,18--70
-                  ../src/syntax/typing.nit:1433,18--56
-                    literal value '"Error: arity mismatch; prototype is '{' ... ../src/syntax/typing.nit:1433,18--56
-                  ../src/syntax/typing.nit:1433,57--60
-                    ../src/syntax/typing.nit:1433,57
-                    identifier 'name' ... ../src/syntax/typing.nit:1433,57--60
-                  ../src/syntax/typing.nit:1433,61--62
-                    literal value '}{' ... ../src/syntax/typing.nit:1433,61--62
-                  ../src/syntax/typing.nit:1433,63--66
-                    ../src/syntax/typing.nit:1433,63
-                    identifier 'psig' ... ../src/syntax/typing.nit:1433,63--66
-                  ../src/syntax/typing.nit:1433,67--70
-                    '}'."' ... ../src/syntax/typing.nit:1433,67--70
+                ../src/syntax/typing.nit:1433,11--71
+                  '(' ... ../src/syntax/typing.nit:1433,11
+                  ../src/syntax/typing.nit:1433,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:1433,12--15
+                  ../src/syntax/typing.nit:1433,18--70
+                    ../src/syntax/typing.nit:1433,18--56
+                      literal value '"Error: arity mismatch; prototype is '{' ... ../src/syntax/typing.nit:1433,18--56
+                    ../src/syntax/typing.nit:1433,57--60
+                      ../src/syntax/typing.nit:1433,57
+                      identifier 'name' ... ../src/syntax/typing.nit:1433,57--60
+                      ../src/syntax/typing.nit:1433,57
+                    ../src/syntax/typing.nit:1433,61--62
+                      literal value '}{' ... ../src/syntax/typing.nit:1433,61--62
+                    ../src/syntax/typing.nit:1433,63--66
+                      ../src/syntax/typing.nit:1433,63
+                      identifier 'psig' ... ../src/syntax/typing.nit:1433,63--66
+                      ../src/syntax/typing.nit:1433,63
+                    ../src/syntax/typing.nit:1433,67--70
+                      '}'."' ... ../src/syntax/typing.nit:1433,67--70
+                  ')' ... ../src/syntax/typing.nit:1433,71
               ../src/syntax/typing.nit:1434,4--15
                 keyword 'return' ... ../src/syntax/typing.nit:1434,4--9
                 ../src/syntax/typing.nit:1434,11--15
@@ -8720,6 +10709,7 @@
               ../src/syntax/typing.nit:1437,22--30
                 ../src/syntax/typing.nit:1437,22
                 identifier 'par_arity' ... ../src/syntax/typing.nit:1437,22--30
+                ../src/syntax/typing.nit:1437,22
               '[' ... ../src/syntax/typing.nit:1437,31
             keyword 'do' ... ../src/syntax/typing.nit:1437,33--34
             ../src/syntax/typing.nit:1438,4--1451,5
@@ -8728,26 +10718,33 @@
                 identifier 'a' ... ../src/syntax/typing.nit:1438,8
                 ../src/syntax/typing.nit:1438,11--15
                   type identifier 'AExpr' ... ../src/syntax/typing.nit:1438,11--15
-              ../src/syntax/typing.nit:1439,4--30
+              ../src/syntax/typing.nit:1439,4--31
                 keyword 'var' ... ../src/syntax/typing.nit:1439,4--6
                 identifier 'par_type' ... ../src/syntax/typing.nit:1439,8--15
                 '=' ... ../src/syntax/typing.nit:1439,17
-                ../src/syntax/typing.nit:1439,19--30
+                ../src/syntax/typing.nit:1439,19--31
                   ../src/syntax/typing.nit:1439,19--22
                     ../src/syntax/typing.nit:1439,19
                     identifier 'psig' ... ../src/syntax/typing.nit:1439,19--22
-                  ../src/syntax/typing.nit:1439,24--30
-                    ../src/syntax/typing.nit:1439,24
-                    identifier 'par_idx' ... ../src/syntax/typing.nit:1439,24--30
+                    ../src/syntax/typing.nit:1439,19
+                  ../src/syntax/typing.nit:1439,23--31
+                    '[' ... ../src/syntax/typing.nit:1439,23
+                    ../src/syntax/typing.nit:1439,24--30
+                      ../src/syntax/typing.nit:1439,24
+                      identifier 'par_idx' ... ../src/syntax/typing.nit:1439,24--30
+                      ../src/syntax/typing.nit:1439,24
+                    ']' ... ../src/syntax/typing.nit:1439,31
               ../src/syntax/typing.nit:1440,4--1450,6
                 keyword 'if' ... ../src/syntax/typing.nit:1440,4--5
                 ../src/syntax/typing.nit:1440,7--27
                   ../src/syntax/typing.nit:1440,7--13
                     ../src/syntax/typing.nit:1440,7
                     identifier 'par_idx' ... ../src/syntax/typing.nit:1440,7--13
+                    ../src/syntax/typing.nit:1440,7
                   ../src/syntax/typing.nit:1440,18--27
                     ../src/syntax/typing.nit:1440,18
                     identifier 'par_vararg' ... ../src/syntax/typing.nit:1440,18--27
+                    ../src/syntax/typing.nit:1440,18
                 ../src/syntax/typing.nit:1441,5--1445,7
                   ../src/syntax/typing.nit:1441,5--1445,7
                     keyword 'for' ... ../src/syntax/typing.nit:1441,5--7
@@ -8762,77 +10759,107 @@
                           ../src/syntax/typing.nit:1441,19--27
                             ../src/syntax/typing.nit:1441,19
                             identifier 'raw_arity' ... ../src/syntax/typing.nit:1441,19--27
+                            ../src/syntax/typing.nit:1441,19
                           ../src/syntax/typing.nit:1441,29--37
                             ../src/syntax/typing.nit:1441,29
                             identifier 'par_arity' ... ../src/syntax/typing.nit:1441,29--37
+                            ../src/syntax/typing.nit:1441,29
                         ')' ... ../src/syntax/typing.nit:1441,38
                       ']' ... ../src/syntax/typing.nit:1441,39
                     keyword 'do' ... ../src/syntax/typing.nit:1441,41--42
                     ../src/syntax/typing.nit:1442,6--1445,7
-                      ../src/syntax/typing.nit:1442,6--25
+                      ../src/syntax/typing.nit:1442,6--26
                         ../src/syntax/typing.nit:1442,10
                         identifier 'a' ... ../src/syntax/typing.nit:1442,6
+                        ../src/syntax/typing.nit:1442,10
                         '=' ... ../src/syntax/typing.nit:1442,8
-                        ../src/syntax/typing.nit:1442,10--25
+                        ../src/syntax/typing.nit:1442,10--26
                           ../src/syntax/typing.nit:1442,10--17
                             ../src/syntax/typing.nit:1442,10
                             identifier 'raw_args' ... ../src/syntax/typing.nit:1442,10--17
-                          ../src/syntax/typing.nit:1442,19--25
-                            ../src/syntax/typing.nit:1442,19
-                            identifier 'arg_idx' ... ../src/syntax/typing.nit:1442,19--25
-                      ../src/syntax/typing.nit:1443,6--37
+                            ../src/syntax/typing.nit:1442,10
+                          ../src/syntax/typing.nit:1442,18--26
+                            '[' ... ../src/syntax/typing.nit:1442,18
+                            ../src/syntax/typing.nit:1442,19--25
+                              ../src/syntax/typing.nit:1442,19
+                              identifier 'arg_idx' ... ../src/syntax/typing.nit:1442,19--25
+                              ../src/syntax/typing.nit:1442,19
+                            ']' ... ../src/syntax/typing.nit:1442,26
+                      ../src/syntax/typing.nit:1443,6--38
                         ../src/syntax/typing.nit:1443,6
                           ../src/syntax/typing.nit:1443,6
                           identifier 'v' ... ../src/syntax/typing.nit:1443,6
+                          ../src/syntax/typing.nit:1443,6
                         identifier 'check_conform_expr' ... ../src/syntax/typing.nit:1443,8--25
-                        ../src/syntax/typing.nit:1443,27
+                        ../src/syntax/typing.nit:1443,26--38
+                          '(' ... ../src/syntax/typing.nit:1443,26
                           ../src/syntax/typing.nit:1443,27
-                          identifier 'a' ... ../src/syntax/typing.nit:1443,27
-                        ../src/syntax/typing.nit:1443,30--37
-                          ../src/syntax/typing.nit:1443,30
-                          identifier 'par_type' ... ../src/syntax/typing.nit:1443,30--37
+                            ../src/syntax/typing.nit:1443,27
+                            identifier 'a' ... ../src/syntax/typing.nit:1443,27
+                            ../src/syntax/typing.nit:1443,27
+                          ../src/syntax/typing.nit:1443,30--37
+                            ../src/syntax/typing.nit:1443,30
+                            identifier 'par_type' ... ../src/syntax/typing.nit:1443,30--37
+                            ../src/syntax/typing.nit:1443,30
+                          ')' ... ../src/syntax/typing.nit:1443,38
                       ../src/syntax/typing.nit:1444,6--26
                         ../src/syntax/typing.nit:1444,16
                         identifier 'arg_idx' ... ../src/syntax/typing.nit:1444,6--12
+                        ../src/syntax/typing.nit:1444,16
                         '=' ... ../src/syntax/typing.nit:1444,14
                         ../src/syntax/typing.nit:1444,16--26
                           ../src/syntax/typing.nit:1444,16--22
                             ../src/syntax/typing.nit:1444,16
                             identifier 'arg_idx' ... ../src/syntax/typing.nit:1444,16--22
+                            ../src/syntax/typing.nit:1444,16
                           ../src/syntax/typing.nit:1444,26
                             literal value '1' ... ../src/syntax/typing.nit:1444,26
                       keyword 'end' ... ../src/syntax/typing.nit:1445,5--7
                 ../src/syntax/typing.nit:1447,5--1450,6
-                  ../src/syntax/typing.nit:1447,5--24
+                  ../src/syntax/typing.nit:1447,5--25
                     ../src/syntax/typing.nit:1447,9
                     identifier 'a' ... ../src/syntax/typing.nit:1447,5
+                    ../src/syntax/typing.nit:1447,9
                     '=' ... ../src/syntax/typing.nit:1447,7
-                    ../src/syntax/typing.nit:1447,9--24
+                    ../src/syntax/typing.nit:1447,9--25
                       ../src/syntax/typing.nit:1447,9--16
                         ../src/syntax/typing.nit:1447,9
                         identifier 'raw_args' ... ../src/syntax/typing.nit:1447,9--16
-                      ../src/syntax/typing.nit:1447,18--24
-                        ../src/syntax/typing.nit:1447,18
-                        identifier 'arg_idx' ... ../src/syntax/typing.nit:1447,18--24
-                  ../src/syntax/typing.nit:1448,5--36
+                        ../src/syntax/typing.nit:1447,9
+                      ../src/syntax/typing.nit:1447,17--25
+                        '[' ... ../src/syntax/typing.nit:1447,17
+                        ../src/syntax/typing.nit:1447,18--24
+                          ../src/syntax/typing.nit:1447,18
+                          identifier 'arg_idx' ... ../src/syntax/typing.nit:1447,18--24
+                          ../src/syntax/typing.nit:1447,18
+                        ']' ... ../src/syntax/typing.nit:1447,25
+                  ../src/syntax/typing.nit:1448,5--37
                     ../src/syntax/typing.nit:1448,5
                       ../src/syntax/typing.nit:1448,5
                       identifier 'v' ... ../src/syntax/typing.nit:1448,5
+                      ../src/syntax/typing.nit:1448,5
                     identifier 'check_conform_expr' ... ../src/syntax/typing.nit:1448,7--24
-                    ../src/syntax/typing.nit:1448,26
+                    ../src/syntax/typing.nit:1448,25--37
+                      '(' ... ../src/syntax/typing.nit:1448,25
                       ../src/syntax/typing.nit:1448,26
-                      identifier 'a' ... ../src/syntax/typing.nit:1448,26
-                    ../src/syntax/typing.nit:1448,29--36
-                      ../src/syntax/typing.nit:1448,29
-                      identifier 'par_type' ... ../src/syntax/typing.nit:1448,29--36
+                        ../src/syntax/typing.nit:1448,26
+                        identifier 'a' ... ../src/syntax/typing.nit:1448,26
+                        ../src/syntax/typing.nit:1448,26
+                      ../src/syntax/typing.nit:1448,29--36
+                        ../src/syntax/typing.nit:1448,29
+                        identifier 'par_type' ... ../src/syntax/typing.nit:1448,29--36
+                        ../src/syntax/typing.nit:1448,29
+                      ')' ... ../src/syntax/typing.nit:1448,37
                   ../src/syntax/typing.nit:1449,5--25
                     ../src/syntax/typing.nit:1449,15
                     identifier 'arg_idx' ... ../src/syntax/typing.nit:1449,5--11
+                    ../src/syntax/typing.nit:1449,15
                     '=' ... ../src/syntax/typing.nit:1449,13
                     ../src/syntax/typing.nit:1449,15--25
                       ../src/syntax/typing.nit:1449,15--21
                         ../src/syntax/typing.nit:1449,15
                         identifier 'arg_idx' ... ../src/syntax/typing.nit:1449,15--21
+                        ../src/syntax/typing.nit:1449,15
                       ../src/syntax/typing.nit:1449,25
                         literal value '1' ... ../src/syntax/typing.nit:1449,25
                   keyword 'end' ... ../src/syntax/typing.nit:1450,4--6
@@ -8883,7 +10910,9 @@
               ../src/syntax/typing.nit:1458,11--14
                 ../src/syntax/typing.nit:1458,11
                 identifier 'psig' ... ../src/syntax/typing.nit:1458,11--14
+                ../src/syntax/typing.nit:1458,11
               identifier 'return_type' ... ../src/syntax/typing.nit:1458,16--26
+              ../src/syntax/typing.nit:1458,11
           ../src/syntax/typing.nit:1459,3--24
             keyword 'var' ... ../src/syntax/typing.nit:1459,3--5
             identifier 'cs' ... ../src/syntax/typing.nit:1459,7--8
@@ -8892,7 +10921,9 @@
               ../src/syntax/typing.nit:1459,12--15
                 ../src/syntax/typing.nit:1459,12
                 identifier 'psig' ... ../src/syntax/typing.nit:1459,12--15
+                ../src/syntax/typing.nit:1459,12
               identifier 'closures' ... ../src/syntax/typing.nit:1459,17--24
+              ../src/syntax/typing.nit:1459,12
           ../src/syntax/typing.nit:1460,3--19
             keyword 'var' ... ../src/syntax/typing.nit:1460,3--5
             identifier 'min_arity' ... ../src/syntax/typing.nit:1460,7--15
@@ -8905,6 +10936,7 @@
             ../src/syntax/typing.nit:1461,12--13
               ../src/syntax/typing.nit:1461,12
               identifier 'cs' ... ../src/syntax/typing.nit:1461,12--13
+              ../src/syntax/typing.nit:1461,12
             keyword 'do' ... ../src/syntax/typing.nit:1461,15--16
             ../src/syntax/typing.nit:1462,4--1463,5
               ../src/syntax/typing.nit:1462,4--43
@@ -8915,10 +10947,13 @@
                     ../src/syntax/typing.nit:1462,11
                       ../src/syntax/typing.nit:1462,11
                       identifier 'c' ... ../src/syntax/typing.nit:1462,11
+                      ../src/syntax/typing.nit:1462,11
                     identifier 'is_optional' ... ../src/syntax/typing.nit:1462,13--23
+                    ../src/syntax/typing.nit:1462,11
                 ../src/syntax/typing.nit:1462,30--43
                   ../src/syntax/typing.nit:1462,40
                   identifier 'min_arity' ... ../src/syntax/typing.nit:1462,30--38
+                  ../src/syntax/typing.nit:1462,40
                   ../src/syntax/typing.nit:1462,40--41
                     operator '+=' ... ../src/syntax/typing.nit:1462,40--41
                   ../src/syntax/typing.nit:1462,43
@@ -8936,17 +10971,21 @@
               ../src/syntax/typing.nit:1465,6--7
                 ../src/syntax/typing.nit:1465,6
                 identifier 'cd' ... ../src/syntax/typing.nit:1465,6--7
+                ../src/syntax/typing.nit:1465,6
               ../src/syntax/typing.nit:1465,12--15
                 keyword 'null' ... ../src/syntax/typing.nit:1465,12--15
             ../src/syntax/typing.nit:1465,22--38
               ../src/syntax/typing.nit:1465,30
               identifier 'arity' ... ../src/syntax/typing.nit:1465,22--26
+              ../src/syntax/typing.nit:1465,30
               '=' ... ../src/syntax/typing.nit:1465,28
               ../src/syntax/typing.nit:1465,30--38
                 ../src/syntax/typing.nit:1465,30--31
                   ../src/syntax/typing.nit:1465,30
                   identifier 'cd' ... ../src/syntax/typing.nit:1465,30--31
+                  ../src/syntax/typing.nit:1465,30
                 identifier 'length' ... ../src/syntax/typing.nit:1465,33--38
+                ../src/syntax/typing.nit:1465,30
           ../src/syntax/typing.nit:1466,3--1507,5
             keyword 'if' ... ../src/syntax/typing.nit:1466,3--4
             ../src/syntax/typing.nit:1466,6--18
@@ -8954,7 +10993,9 @@
                 ../src/syntax/typing.nit:1466,6--7
                   ../src/syntax/typing.nit:1466,6
                   identifier 'cs' ... ../src/syntax/typing.nit:1466,6--7
+                  ../src/syntax/typing.nit:1466,6
                 identifier 'length' ... ../src/syntax/typing.nit:1466,9--14
+                ../src/syntax/typing.nit:1466,6
               ../src/syntax/typing.nit:1466,18
                 literal value '0' ... ../src/syntax/typing.nit:1466,18
             ../src/syntax/typing.nit:1467,4--1504,6
@@ -8965,37 +11006,46 @@
                     ../src/syntax/typing.nit:1467,7--11
                       ../src/syntax/typing.nit:1467,7
                       identifier 'arity' ... ../src/syntax/typing.nit:1467,7--11
+                      ../src/syntax/typing.nit:1467,7
                     ../src/syntax/typing.nit:1467,16
                       literal value '0' ... ../src/syntax/typing.nit:1467,16
                   ../src/syntax/typing.nit:1467,22--34
                     ../src/syntax/typing.nit:1467,22--30
                       ../src/syntax/typing.nit:1467,22
                       identifier 'min_arity' ... ../src/syntax/typing.nit:1467,22--30
+                      ../src/syntax/typing.nit:1467,22
                     ../src/syntax/typing.nit:1467,34
                       literal value '0' ... ../src/syntax/typing.nit:1467,34
-                ../src/syntax/typing.nit:1468,5--62
-                  ../src/syntax/typing.nit:1468,5--62
+                ../src/syntax/typing.nit:1468,5--63
+                  ../src/syntax/typing.nit:1468,5--63
                     ../src/syntax/typing.nit:1468,5
                       ../src/syntax/typing.nit:1468,5
                       identifier 'v' ... ../src/syntax/typing.nit:1468,5
+                      ../src/syntax/typing.nit:1468,5
                     identifier 'error' ... ../src/syntax/typing.nit:1468,7--11
-                    ../src/syntax/typing.nit:1468,13--16
-                      keyword 'self' ... ../src/syntax/typing.nit:1468,13--16
-                    ../src/syntax/typing.nit:1468,19--62
-                      ../src/syntax/typing.nit:1468,19--27
-                        literal value '"Error: {' ... ../src/syntax/typing.nit:1468,19--27
-                      ../src/syntax/typing.nit:1468,28--31
-                        ../src/syntax/typing.nit:1468,28
-                        identifier 'name' ... ../src/syntax/typing.nit:1468,28--31
-                      ../src/syntax/typing.nit:1468,32--43
-                        literal value '} requires {' ... ../src/syntax/typing.nit:1468,32--43
-                      ../src/syntax/typing.nit:1468,44--52
-                        ../src/syntax/typing.nit:1468,44--45
+                    ../src/syntax/typing.nit:1468,12--63
+                      '(' ... ../src/syntax/typing.nit:1468,12
+                      ../src/syntax/typing.nit:1468,13--16
+                        keyword 'self' ... ../src/syntax/typing.nit:1468,13--16
+                      ../src/syntax/typing.nit:1468,19--62
+                        ../src/syntax/typing.nit:1468,19--27
+                          literal value '"Error: {' ... ../src/syntax/typing.nit:1468,19--27
+                        ../src/syntax/typing.nit:1468,28--31
+                          ../src/syntax/typing.nit:1468,28
+                          identifier 'name' ... ../src/syntax/typing.nit:1468,28--31
+                          ../src/syntax/typing.nit:1468,28
+                        ../src/syntax/typing.nit:1468,32--43
+                          literal value '} requires {' ... ../src/syntax/typing.nit:1468,32--43
+                        ../src/syntax/typing.nit:1468,44--52
+                          ../src/syntax/typing.nit:1468,44--45
+                            ../src/syntax/typing.nit:1468,44
+                            identifier 'cs' ... ../src/syntax/typing.nit:1468,44--45
+                            ../src/syntax/typing.nit:1468,44
+                          identifier 'length' ... ../src/syntax/typing.nit:1468,47--52
                           ../src/syntax/typing.nit:1468,44
-                          identifier 'cs' ... ../src/syntax/typing.nit:1468,44--45
-                        identifier 'length' ... ../src/syntax/typing.nit:1468,47--52
-                      ../src/syntax/typing.nit:1468,53--62
-                        '} blocks."' ... ../src/syntax/typing.nit:1468,53--62
+                        ../src/syntax/typing.nit:1468,53--62
+                          '} blocks."' ... ../src/syntax/typing.nit:1468,53--62
+                      ')' ... ../src/syntax/typing.nit:1468,63
                 ../src/syntax/typing.nit:1469,9--1504,6
                   keyword 'if' ... ../src/syntax/typing.nit:1469,9--10
                   ../src/syntax/typing.nit:1469,12--49
@@ -9003,48 +11053,62 @@
                       ../src/syntax/typing.nit:1469,12--16
                         ../src/syntax/typing.nit:1469,12
                         identifier 'arity' ... ../src/syntax/typing.nit:1469,12--16
+                        ../src/syntax/typing.nit:1469,12
                       ../src/syntax/typing.nit:1469,20--28
                         ../src/syntax/typing.nit:1469,20--21
                           ../src/syntax/typing.nit:1469,20
                           identifier 'cs' ... ../src/syntax/typing.nit:1469,20--21
+                          ../src/syntax/typing.nit:1469,20
                         identifier 'length' ... ../src/syntax/typing.nit:1469,23--28
+                        ../src/syntax/typing.nit:1469,20
                     ../src/syntax/typing.nit:1469,33--49
                       ../src/syntax/typing.nit:1469,33--37
                         ../src/syntax/typing.nit:1469,33
                         identifier 'arity' ... ../src/syntax/typing.nit:1469,33--37
+                        ../src/syntax/typing.nit:1469,33
                       ../src/syntax/typing.nit:1469,41--49
                         ../src/syntax/typing.nit:1469,41
                         identifier 'min_arity' ... ../src/syntax/typing.nit:1469,41--49
-                  ../src/syntax/typing.nit:1470,5--81
-                    ../src/syntax/typing.nit:1470,5--81
+                        ../src/syntax/typing.nit:1469,41
+                  ../src/syntax/typing.nit:1470,5--82
+                    ../src/syntax/typing.nit:1470,5--82
                       ../src/syntax/typing.nit:1470,5
                         ../src/syntax/typing.nit:1470,5
                         identifier 'v' ... ../src/syntax/typing.nit:1470,5
+                        ../src/syntax/typing.nit:1470,5
                       identifier 'error' ... ../src/syntax/typing.nit:1470,7--11
-                      ../src/syntax/typing.nit:1470,13--16
-                        keyword 'self' ... ../src/syntax/typing.nit:1470,13--16
-                      ../src/syntax/typing.nit:1470,19--81
-                        ../src/syntax/typing.nit:1470,19--27
-                          literal value '"Error: {' ... ../src/syntax/typing.nit:1470,19--27
-                        ../src/syntax/typing.nit:1470,28--31
-                          ../src/syntax/typing.nit:1470,28
-                          identifier 'name' ... ../src/syntax/typing.nit:1470,28--31
-                        ../src/syntax/typing.nit:1470,32--43
-                          literal value '} requires {' ... ../src/syntax/typing.nit:1470,32--43
-                        ../src/syntax/typing.nit:1470,44--52
-                          ../src/syntax/typing.nit:1470,44--45
+                      ../src/syntax/typing.nit:1470,12--82
+                        '(' ... ../src/syntax/typing.nit:1470,12
+                        ../src/syntax/typing.nit:1470,13--16
+                          keyword 'self' ... ../src/syntax/typing.nit:1470,13--16
+                        ../src/syntax/typing.nit:1470,19--81
+                          ../src/syntax/typing.nit:1470,19--27
+                            literal value '"Error: {' ... ../src/syntax/typing.nit:1470,19--27
+                          ../src/syntax/typing.nit:1470,28--31
+                            ../src/syntax/typing.nit:1470,28
+                            identifier 'name' ... ../src/syntax/typing.nit:1470,28--31
+                            ../src/syntax/typing.nit:1470,28
+                          ../src/syntax/typing.nit:1470,32--43
+                            literal value '} requires {' ... ../src/syntax/typing.nit:1470,32--43
+                          ../src/syntax/typing.nit:1470,44--52
+                            ../src/syntax/typing.nit:1470,44--45
+                              ../src/syntax/typing.nit:1470,44
+                              identifier 'cs' ... ../src/syntax/typing.nit:1470,44--45
+                              ../src/syntax/typing.nit:1470,44
+                            identifier 'length' ... ../src/syntax/typing.nit:1470,47--52
                             ../src/syntax/typing.nit:1470,44
-                            identifier 'cs' ... ../src/syntax/typing.nit:1470,44--45
-                          identifier 'length' ... ../src/syntax/typing.nit:1470,47--52
-                        ../src/syntax/typing.nit:1470,53--63
-                          literal value '} blocks, {' ... ../src/syntax/typing.nit:1470,53--63
-                        ../src/syntax/typing.nit:1470,64--72
-                          ../src/syntax/typing.nit:1470,64--65
+                          ../src/syntax/typing.nit:1470,53--63
+                            literal value '} blocks, {' ... ../src/syntax/typing.nit:1470,53--63
+                          ../src/syntax/typing.nit:1470,64--72
+                            ../src/syntax/typing.nit:1470,64--65
+                              ../src/syntax/typing.nit:1470,64
+                              identifier 'cd' ... ../src/syntax/typing.nit:1470,64--65
+                              ../src/syntax/typing.nit:1470,64
+                            identifier 'length' ... ../src/syntax/typing.nit:1470,67--72
                             ../src/syntax/typing.nit:1470,64
-                            identifier 'cd' ... ../src/syntax/typing.nit:1470,64--65
-                          identifier 'length' ... ../src/syntax/typing.nit:1470,67--72
-                        ../src/syntax/typing.nit:1470,73--81
-                          '} found."' ... ../src/syntax/typing.nit:1470,73--81
+                          ../src/syntax/typing.nit:1470,73--81
+                            '} found."' ... ../src/syntax/typing.nit:1470,73--81
+                        ')' ... ../src/syntax/typing.nit:1470,82
                   ../src/syntax/typing.nit:1473,5--1504,6
                     ../src/syntax/typing.nit:1473,5--53
                       keyword 'var' ... ../src/syntax/typing.nit:1473,5--7
@@ -9063,11 +11127,13 @@
                         ../src/syntax/typing.nit:1474,8
                           ../src/syntax/typing.nit:1474,8
                           identifier 't' ... ../src/syntax/typing.nit:1474,8
+                          ../src/syntax/typing.nit:1474,8
                         ../src/syntax/typing.nit:1474,13--16
                           keyword 'null' ... ../src/syntax/typing.nit:1474,13--16
                       ../src/syntax/typing.nit:1474,23--55
                         ../src/syntax/typing.nit:1474,46
                         identifier 'break_list' ... ../src/syntax/typing.nit:1474,23--32
+                        ../src/syntax/typing.nit:1474,46
                         '=' ... ../src/syntax/typing.nit:1474,34
                         ../src/syntax/typing.nit:1474,36--55
                           keyword 'new' ... ../src/syntax/typing.nit:1474,36--38
@@ -9075,6 +11141,7 @@
                             type identifier 'Array' ... ../src/syntax/typing.nit:1474,40--44
                             ../src/syntax/typing.nit:1474,46--55
                               type identifier 'ABreakExpr' ... ../src/syntax/typing.nit:1474,46--55
+                          ../src/syntax/typing.nit:1474,36
                     ../src/syntax/typing.nit:1477,5--65
                       keyword 'var' ... ../src/syntax/typing.nit:1477,5--7
                       identifier 'n_label' ... ../src/syntax/typing.nit:1477,9--15
@@ -9085,21 +11152,28 @@
                           ../src/syntax/typing.nit:1477,22--26
                             ../src/syntax/typing.nit:1477,22
                             identifier 'arity' ... ../src/syntax/typing.nit:1477,22--26
+                            ../src/syntax/typing.nit:1477,22
                           ../src/syntax/typing.nit:1477,30
                             literal value '0' ... ../src/syntax/typing.nit:1477,30
                         keyword 'then' ... ../src/syntax/typing.nit:1477,32--35
                         ../src/syntax/typing.nit:1477,37--55
-                          ../src/syntax/typing.nit:1477,37--46
+                          ../src/syntax/typing.nit:1477,37--47
                             ../src/syntax/typing.nit:1477,37--38
                               ../src/syntax/typing.nit:1477,37
                               identifier 'cd' ... ../src/syntax/typing.nit:1477,37--38
-                            ../src/syntax/typing.nit:1477,40--46
-                              ../src/syntax/typing.nit:1477,40--44
-                                ../src/syntax/typing.nit:1477,40
-                                identifier 'arity' ... ../src/syntax/typing.nit:1477,40--44
-                              ../src/syntax/typing.nit:1477,46
-                                literal value '1' ... ../src/syntax/typing.nit:1477,46
+                              ../src/syntax/typing.nit:1477,37
+                            ../src/syntax/typing.nit:1477,39--47
+                              '[' ... ../src/syntax/typing.nit:1477,39
+                              ../src/syntax/typing.nit:1477,40--46
+                                ../src/syntax/typing.nit:1477,40--44
+                                  ../src/syntax/typing.nit:1477,40
+                                  identifier 'arity' ... ../src/syntax/typing.nit:1477,40--44
+                                  ../src/syntax/typing.nit:1477,40
+                                ../src/syntax/typing.nit:1477,46
+                                  literal value '1' ... ../src/syntax/typing.nit:1477,46
+                              ']' ... ../src/syntax/typing.nit:1477,47
                           identifier 'n_label' ... ../src/syntax/typing.nit:1477,49--55
+                          ../src/syntax/typing.nit:1477,37
                         keyword 'else' ... ../src/syntax/typing.nit:1477,57--60
                         ../src/syntax/typing.nit:1477,62--65
                           keyword 'null' ... ../src/syntax/typing.nit:1477,62--65
@@ -9113,20 +11187,26 @@
                         ../src/syntax/typing.nit:1480,18--22
                           ../src/syntax/typing.nit:1480,18
                           identifier 'arity' ... ../src/syntax/typing.nit:1480,18--22
+                          ../src/syntax/typing.nit:1480,18
                         '[' ... ../src/syntax/typing.nit:1480,23
                       keyword 'do' ... ../src/syntax/typing.nit:1480,25--26
                       ../src/syntax/typing.nit:1481,6--1498,7
-                        ../src/syntax/typing.nit:1481,6--19
+                        ../src/syntax/typing.nit:1481,6--20
                           keyword 'var' ... ../src/syntax/typing.nit:1481,6--8
                           identifier 'cdi' ... ../src/syntax/typing.nit:1481,10--12
                           '=' ... ../src/syntax/typing.nit:1481,14
-                          ../src/syntax/typing.nit:1481,16--19
+                          ../src/syntax/typing.nit:1481,16--20
                             ../src/syntax/typing.nit:1481,16--17
                               ../src/syntax/typing.nit:1481,16
                               identifier 'cd' ... ../src/syntax/typing.nit:1481,16--17
-                            ../src/syntax/typing.nit:1481,19
+                              ../src/syntax/typing.nit:1481,16
+                            ../src/syntax/typing.nit:1481,18--20
+                              '[' ... ../src/syntax/typing.nit:1481,18
                               ../src/syntax/typing.nit:1481,19
-                              identifier 'i' ... ../src/syntax/typing.nit:1481,19
+                                ../src/syntax/typing.nit:1481,19
+                                identifier 'i' ... ../src/syntax/typing.nit:1481,19
+                                ../src/syntax/typing.nit:1481,19
+                              ']' ... ../src/syntax/typing.nit:1481,20
                         ../src/syntax/typing.nit:1482,6--33
                           keyword 'var' ... ../src/syntax/typing.nit:1482,6--8
                           identifier 'cni' ... ../src/syntax/typing.nit:1482,10--12
@@ -9136,77 +11216,108 @@
                               ../src/syntax/typing.nit:1482,16--18
                                 ../src/syntax/typing.nit:1482,16
                                 identifier 'cdi' ... ../src/syntax/typing.nit:1482,16--18
+                                ../src/syntax/typing.nit:1482,16
                               identifier 'n_id' ... ../src/syntax/typing.nit:1482,20--23
+                              ../src/syntax/typing.nit:1482,16
                             identifier 'to_symbol' ... ../src/syntax/typing.nit:1482,25--33
-                        ../src/syntax/typing.nit:1483,6--37
+                            ../src/syntax/typing.nit:1482,16
+                        ../src/syntax/typing.nit:1483,6--38
                           keyword 'var' ... ../src/syntax/typing.nit:1483,6--8
                           identifier 'csi' ... ../src/syntax/typing.nit:1483,10--12
                           '=' ... ../src/syntax/typing.nit:1483,14
-                          ../src/syntax/typing.nit:1483,16--37
+                          ../src/syntax/typing.nit:1483,16--38
                             ../src/syntax/typing.nit:1483,16--19
                               ../src/syntax/typing.nit:1483,16
                               identifier 'psig' ... ../src/syntax/typing.nit:1483,16--19
+                              ../src/syntax/typing.nit:1483,16
                             identifier 'closure_named' ... ../src/syntax/typing.nit:1483,21--33
-                            ../src/syntax/typing.nit:1483,35--37
-                              ../src/syntax/typing.nit:1483,35
-                              identifier 'cni' ... ../src/syntax/typing.nit:1483,35--37
+                            ../src/syntax/typing.nit:1483,34--38
+                              '(' ... ../src/syntax/typing.nit:1483,34
+                              ../src/syntax/typing.nit:1483,35--37
+                                ../src/syntax/typing.nit:1483,35
+                                identifier 'cni' ... ../src/syntax/typing.nit:1483,35--37
+                                ../src/syntax/typing.nit:1483,35
+                              ')' ... ../src/syntax/typing.nit:1483,38
                         ../src/syntax/typing.nit:1484,6--1497,8
                           keyword 'if' ... ../src/syntax/typing.nit:1484,6--7
                           ../src/syntax/typing.nit:1484,9--19
                             ../src/syntax/typing.nit:1484,9--11
                               ../src/syntax/typing.nit:1484,9
                               identifier 'csi' ... ../src/syntax/typing.nit:1484,9--11
+                              ../src/syntax/typing.nit:1484,9
                             ../src/syntax/typing.nit:1484,16--19
                               keyword 'null' ... ../src/syntax/typing.nit:1484,16--19
                           ../src/syntax/typing.nit:1485,7--1488,21
-                            ../src/syntax/typing.nit:1485,7--57
+                            ../src/syntax/typing.nit:1485,7--58
                               keyword 'var' ... ../src/syntax/typing.nit:1485,7--9
                               identifier 'esc' ... ../src/syntax/typing.nit:1485,11--13
                               '=' ... ../src/syntax/typing.nit:1485,15
-                              ../src/syntax/typing.nit:1485,17--57
+                              ../src/syntax/typing.nit:1485,17--58
                                 keyword 'new' ... ../src/syntax/typing.nit:1485,17--19
                                 ../src/syntax/typing.nit:1485,21--36
                                   type identifier 'EscapableClosure' ... ../src/syntax/typing.nit:1485,21--36
-                                ../src/syntax/typing.nit:1485,38--40
-                                  ../src/syntax/typing.nit:1485,38
-                                  identifier 'cdi' ... ../src/syntax/typing.nit:1485,38--40
-                                ../src/syntax/typing.nit:1485,43--45
-                                  ../src/syntax/typing.nit:1485,43
-                                  identifier 'csi' ... ../src/syntax/typing.nit:1485,43--45
-                                ../src/syntax/typing.nit:1485,48--57
-                                  ../src/syntax/typing.nit:1485,48
-                                  identifier 'break_list' ... ../src/syntax/typing.nit:1485,48--57
-                            ../src/syntax/typing.nit:1486,7--45
+                                ../src/syntax/typing.nit:1485,37--58
+                                  '(' ... ../src/syntax/typing.nit:1485,37
+                                  ../src/syntax/typing.nit:1485,38--40
+                                    ../src/syntax/typing.nit:1485,38
+                                    identifier 'cdi' ... ../src/syntax/typing.nit:1485,38--40
+                                    ../src/syntax/typing.nit:1485,38
+                                  ../src/syntax/typing.nit:1485,43--45
+                                    ../src/syntax/typing.nit:1485,43
+                                    identifier 'csi' ... ../src/syntax/typing.nit:1485,43--45
+                                    ../src/syntax/typing.nit:1485,43
+                                  ../src/syntax/typing.nit:1485,48--57
+                                    ../src/syntax/typing.nit:1485,48
+                                    identifier 'break_list' ... ../src/syntax/typing.nit:1485,48--57
+                                    ../src/syntax/typing.nit:1485,48
+                                  ')' ... ../src/syntax/typing.nit:1485,58
+                            ../src/syntax/typing.nit:1486,7--46
                               ../src/syntax/typing.nit:1486,7--17
                                 ../src/syntax/typing.nit:1486,7
                                   ../src/syntax/typing.nit:1486,7
                                   identifier 'v' ... ../src/syntax/typing.nit:1486,7
+                                  ../src/syntax/typing.nit:1486,7
                                 identifier 'scope_ctx' ... ../src/syntax/typing.nit:1486,9--17
+                                ../src/syntax/typing.nit:1486,7
                               identifier 'push_escapable' ... ../src/syntax/typing.nit:1486,19--32
-                              ../src/syntax/typing.nit:1486,34--36
-                                ../src/syntax/typing.nit:1486,34
-                                identifier 'esc' ... ../src/syntax/typing.nit:1486,34--36
-                              ../src/syntax/typing.nit:1486,39--45
-                                ../src/syntax/typing.nit:1486,39
-                                identifier 'n_label' ... ../src/syntax/typing.nit:1486,39--45
-                            ../src/syntax/typing.nit:1487,7--31
+                              ../src/syntax/typing.nit:1486,33--46
+                                '(' ... ../src/syntax/typing.nit:1486,33
+                                ../src/syntax/typing.nit:1486,34--36
+                                  ../src/syntax/typing.nit:1486,34
+                                  identifier 'esc' ... ../src/syntax/typing.nit:1486,34--36
+                                  ../src/syntax/typing.nit:1486,34
+                                ../src/syntax/typing.nit:1486,39--45
+                                  ../src/syntax/typing.nit:1486,39
+                                  identifier 'n_label' ... ../src/syntax/typing.nit:1486,39--45
+                                  ../src/syntax/typing.nit:1486,39
+                                ')' ... ../src/syntax/typing.nit:1486,46
+                            ../src/syntax/typing.nit:1487,7--32
                               ../src/syntax/typing.nit:1487,7--9
                                 ../src/syntax/typing.nit:1487,7
                                 identifier 'cdi' ... ../src/syntax/typing.nit:1487,7--9
+                                ../src/syntax/typing.nit:1487,7
                               identifier 'accept_typing2' ... ../src/syntax/typing.nit:1487,11--24
-                              ../src/syntax/typing.nit:1487,26
+                              ../src/syntax/typing.nit:1487,25--32
+                                '(' ... ../src/syntax/typing.nit:1487,25
                                 ../src/syntax/typing.nit:1487,26
-                                identifier 'v' ... ../src/syntax/typing.nit:1487,26
-                              ../src/syntax/typing.nit:1487,29--31
-                                ../src/syntax/typing.nit:1487,29
-                                identifier 'esc' ... ../src/syntax/typing.nit:1487,29--31
+                                  ../src/syntax/typing.nit:1487,26
+                                  identifier 'v' ... ../src/syntax/typing.nit:1487,26
+                                  ../src/syntax/typing.nit:1487,26
+                                ../src/syntax/typing.nit:1487,29--31
+                                  ../src/syntax/typing.nit:1487,29
+                                  identifier 'esc' ... ../src/syntax/typing.nit:1487,29--31
+                                  ../src/syntax/typing.nit:1487,29
+                                ')' ... ../src/syntax/typing.nit:1487,32
                             ../src/syntax/typing.nit:1488,7--21
                               ../src/syntax/typing.nit:1488,7--17
                                 ../src/syntax/typing.nit:1488,7
                                   ../src/syntax/typing.nit:1488,7
                                   identifier 'v' ... ../src/syntax/typing.nit:1488,7
+                                  ../src/syntax/typing.nit:1488,7
                                 identifier 'scope_ctx' ... ../src/syntax/typing.nit:1488,9--17
+                                ../src/syntax/typing.nit:1488,7
                               identifier 'pop' ... ../src/syntax/typing.nit:1488,19--21
+                              ../src/syntax/typing.nit:1488,7
                           ../src/syntax/typing.nit:1489,11--1497,8
                             keyword 'if' ... ../src/syntax/typing.nit:1489,11--12
                             ../src/syntax/typing.nit:1489,14--27
@@ -9214,42 +11325,55 @@
                                 ../src/syntax/typing.nit:1489,14--15
                                   ../src/syntax/typing.nit:1489,14
                                   identifier 'cs' ... ../src/syntax/typing.nit:1489,14--15
+                                  ../src/syntax/typing.nit:1489,14
                                 identifier 'length' ... ../src/syntax/typing.nit:1489,17--22
+                                ../src/syntax/typing.nit:1489,14
                               ../src/syntax/typing.nit:1489,27
                                 literal value '1' ... ../src/syntax/typing.nit:1489,27
-                            ../src/syntax/typing.nit:1490,7--103
-                              ../src/syntax/typing.nit:1490,7--103
+                            ../src/syntax/typing.nit:1490,7--104
+                              ../src/syntax/typing.nit:1490,7--104
                                 ../src/syntax/typing.nit:1490,7
                                   ../src/syntax/typing.nit:1490,7
                                   identifier 'v' ... ../src/syntax/typing.nit:1490,7
+                                  ../src/syntax/typing.nit:1490,7
                                 identifier 'error' ... ../src/syntax/typing.nit:1490,9--13
-                                ../src/syntax/typing.nit:1490,15--22
-                                  ../src/syntax/typing.nit:1490,15--17
+                                ../src/syntax/typing.nit:1490,14--104
+                                  '(' ... ../src/syntax/typing.nit:1490,14
+                                  ../src/syntax/typing.nit:1490,15--22
+                                    ../src/syntax/typing.nit:1490,15--17
+                                      ../src/syntax/typing.nit:1490,15
+                                      identifier 'cdi' ... ../src/syntax/typing.nit:1490,15--17
+                                      ../src/syntax/typing.nit:1490,15
+                                    identifier 'n_id' ... ../src/syntax/typing.nit:1490,19--22
                                     ../src/syntax/typing.nit:1490,15
-                                    identifier 'cdi' ... ../src/syntax/typing.nit:1490,15--17
-                                  identifier 'n_id' ... ../src/syntax/typing.nit:1490,19--22
-                                ../src/syntax/typing.nit:1490,25--103
-                                  ../src/syntax/typing.nit:1490,25--52
-                                    literal value '"Error: no closure named '!{' ... ../src/syntax/typing.nit:1490,25--52
-                                  ../src/syntax/typing.nit:1490,53--55
-                                    ../src/syntax/typing.nit:1490,53
-                                    identifier 'cni' ... ../src/syntax/typing.nit:1490,53--55
-                                  ../src/syntax/typing.nit:1490,56--62
-                                    literal value '}' in {' ... ../src/syntax/typing.nit:1490,56--62
-                                  ../src/syntax/typing.nit:1490,63--66
-                                    ../src/syntax/typing.nit:1490,63
-                                    identifier 'name' ... ../src/syntax/typing.nit:1490,63--66
-                                  ../src/syntax/typing.nit:1490,67--87
-                                    literal value '}; only closure is !{' ... ../src/syntax/typing.nit:1490,67--87
-                                  ../src/syntax/typing.nit:1490,88--100
-                                    ../src/syntax/typing.nit:1490,88--95
-                                      ../src/syntax/typing.nit:1490,88--89
+                                  ../src/syntax/typing.nit:1490,25--103
+                                    ../src/syntax/typing.nit:1490,25--52
+                                      literal value '"Error: no closure named '!{' ... ../src/syntax/typing.nit:1490,25--52
+                                    ../src/syntax/typing.nit:1490,53--55
+                                      ../src/syntax/typing.nit:1490,53
+                                      identifier 'cni' ... ../src/syntax/typing.nit:1490,53--55
+                                      ../src/syntax/typing.nit:1490,53
+                                    ../src/syntax/typing.nit:1490,56--62
+                                      literal value '}' in {' ... ../src/syntax/typing.nit:1490,56--62
+                                    ../src/syntax/typing.nit:1490,63--66
+                                      ../src/syntax/typing.nit:1490,63
+                                      identifier 'name' ... ../src/syntax/typing.nit:1490,63--66
+                                      ../src/syntax/typing.nit:1490,63
+                                    ../src/syntax/typing.nit:1490,67--87
+                                      literal value '}; only closure is !{' ... ../src/syntax/typing.nit:1490,67--87
+                                    ../src/syntax/typing.nit:1490,88--100
+                                      ../src/syntax/typing.nit:1490,88--95
+                                        ../src/syntax/typing.nit:1490,88--89
+                                          ../src/syntax/typing.nit:1490,88
+                                          identifier 'cs' ... ../src/syntax/typing.nit:1490,88--89
+                                          ../src/syntax/typing.nit:1490,88
+                                        identifier 'first' ... ../src/syntax/typing.nit:1490,91--95
                                         ../src/syntax/typing.nit:1490,88
-                                        identifier 'cs' ... ../src/syntax/typing.nit:1490,88--89
-                                      identifier 'first' ... ../src/syntax/typing.nit:1490,91--95
-                                    identifier 'name' ... ../src/syntax/typing.nit:1490,97--100
-                                  ../src/syntax/typing.nit:1490,101--103
-                                    '}."' ... ../src/syntax/typing.nit:1490,101--103
+                                      identifier 'name' ... ../src/syntax/typing.nit:1490,97--100
+                                      ../src/syntax/typing.nit:1490,88
+                                    ../src/syntax/typing.nit:1490,101--103
+                                      '}."' ... ../src/syntax/typing.nit:1490,101--103
+                                  ')' ... ../src/syntax/typing.nit:1490,104
                             ../src/syntax/typing.nit:1492,7--1497,8
                               ../src/syntax/typing.nit:1492,7--30
                                 keyword 'var' ... ../src/syntax/typing.nit:1492,7--9
@@ -9261,62 +11385,82 @@
                                     type identifier 'Array' ... ../src/syntax/typing.nit:1492,19--23
                                     ../src/syntax/typing.nit:1492,25--30
                                       type identifier 'String' ... ../src/syntax/typing.nit:1492,25--30
+                                  ../src/syntax/typing.nit:1492,15
                               ../src/syntax/typing.nit:1493,7--1495,9
                                 keyword 'for' ... ../src/syntax/typing.nit:1493,7--9
                                 identifier 'c' ... ../src/syntax/typing.nit:1493,11
                                 ../src/syntax/typing.nit:1493,16--17
                                   ../src/syntax/typing.nit:1493,16
                                   identifier 'cs' ... ../src/syntax/typing.nit:1493,16--17
+                                  ../src/syntax/typing.nit:1493,16
                                 keyword 'do' ... ../src/syntax/typing.nit:1493,19--20
                                 ../src/syntax/typing.nit:1494,8--1495,9
-                                  ../src/syntax/typing.nit:1494,8--24
+                                  ../src/syntax/typing.nit:1494,8--25
                                     ../src/syntax/typing.nit:1494,8
                                       ../src/syntax/typing.nit:1494,8
                                       identifier 'a' ... ../src/syntax/typing.nit:1494,8
+                                      ../src/syntax/typing.nit:1494,8
                                     identifier 'add' ... ../src/syntax/typing.nit:1494,10--12
-                                    ../src/syntax/typing.nit:1494,14--24
-                                      ../src/syntax/typing.nit:1494,14--16
-                                        literal value '"!{' ... ../src/syntax/typing.nit:1494,14--16
-                                      ../src/syntax/typing.nit:1494,17--22
-                                        ../src/syntax/typing.nit:1494,17
+                                    ../src/syntax/typing.nit:1494,13--25
+                                      '(' ... ../src/syntax/typing.nit:1494,13
+                                      ../src/syntax/typing.nit:1494,14--24
+                                        ../src/syntax/typing.nit:1494,14--16
+                                          literal value '"!{' ... ../src/syntax/typing.nit:1494,14--16
+                                        ../src/syntax/typing.nit:1494,17--22
                                           ../src/syntax/typing.nit:1494,17
-                                          identifier 'c' ... ../src/syntax/typing.nit:1494,17
-                                        identifier 'name' ... ../src/syntax/typing.nit:1494,19--22
-                                      ../src/syntax/typing.nit:1494,23--24
-                                        '}"' ... ../src/syntax/typing.nit:1494,23--24
+                                            ../src/syntax/typing.nit:1494,17
+                                            identifier 'c' ... ../src/syntax/typing.nit:1494,17
+                                            ../src/syntax/typing.nit:1494,17
+                                          identifier 'name' ... ../src/syntax/typing.nit:1494,19--22
+                                          ../src/syntax/typing.nit:1494,17
+                                        ../src/syntax/typing.nit:1494,23--24
+                                          '}"' ... ../src/syntax/typing.nit:1494,23--24
+                                      ')' ... ../src/syntax/typing.nit:1494,25
                                   keyword 'end' ... ../src/syntax/typing.nit:1495,7--9
-                              ../src/syntax/typing.nit:1496,7--102
+                              ../src/syntax/typing.nit:1496,7--103
                                 ../src/syntax/typing.nit:1496,7
                                   ../src/syntax/typing.nit:1496,7
                                   identifier 'v' ... ../src/syntax/typing.nit:1496,7
+                                  ../src/syntax/typing.nit:1496,7
                                 identifier 'error' ... ../src/syntax/typing.nit:1496,9--13
-                                ../src/syntax/typing.nit:1496,15--22
-                                  ../src/syntax/typing.nit:1496,15--17
+                                ../src/syntax/typing.nit:1496,14--103
+                                  '(' ... ../src/syntax/typing.nit:1496,14
+                                  ../src/syntax/typing.nit:1496,15--22
+                                    ../src/syntax/typing.nit:1496,15--17
+                                      ../src/syntax/typing.nit:1496,15
+                                      identifier 'cdi' ... ../src/syntax/typing.nit:1496,15--17
+                                      ../src/syntax/typing.nit:1496,15
+                                    identifier 'n_id' ... ../src/syntax/typing.nit:1496,19--22
                                     ../src/syntax/typing.nit:1496,15
-                                    identifier 'cdi' ... ../src/syntax/typing.nit:1496,15--17
-                                  identifier 'n_id' ... ../src/syntax/typing.nit:1496,19--22
-                                ../src/syntax/typing.nit:1496,25--102
-                                  ../src/syntax/typing.nit:1496,25--52
-                                    literal value '"Error: no closure named '!{' ... ../src/syntax/typing.nit:1496,25--52
-                                  ../src/syntax/typing.nit:1496,53--55
-                                    ../src/syntax/typing.nit:1496,53
-                                    identifier 'cni' ... ../src/syntax/typing.nit:1496,53--55
-                                  ../src/syntax/typing.nit:1496,56--62
-                                    literal value '}' in {' ... ../src/syntax/typing.nit:1496,56--62
-                                  ../src/syntax/typing.nit:1496,63--66
-                                    ../src/syntax/typing.nit:1496,63
-                                    identifier 'name' ... ../src/syntax/typing.nit:1496,63--66
-                                  ../src/syntax/typing.nit:1496,67--88
-                                    literal value '}; only closures are {' ... ../src/syntax/typing.nit:1496,67--88
-                                  ../src/syntax/typing.nit:1496,89--98
-                                    ../src/syntax/typing.nit:1496,89
+                                  ../src/syntax/typing.nit:1496,25--102
+                                    ../src/syntax/typing.nit:1496,25--52
+                                      literal value '"Error: no closure named '!{' ... ../src/syntax/typing.nit:1496,25--52
+                                    ../src/syntax/typing.nit:1496,53--55
+                                      ../src/syntax/typing.nit:1496,53
+                                      identifier 'cni' ... ../src/syntax/typing.nit:1496,53--55
+                                      ../src/syntax/typing.nit:1496,53
+                                    ../src/syntax/typing.nit:1496,56--62
+                                      literal value '}' in {' ... ../src/syntax/typing.nit:1496,56--62
+                                    ../src/syntax/typing.nit:1496,63--66
+                                      ../src/syntax/typing.nit:1496,63
+                                      identifier 'name' ... ../src/syntax/typing.nit:1496,63--66
+                                      ../src/syntax/typing.nit:1496,63
+                                    ../src/syntax/typing.nit:1496,67--88
+                                      literal value '}; only closures are {' ... ../src/syntax/typing.nit:1496,67--88
+                                    ../src/syntax/typing.nit:1496,89--99
                                       ../src/syntax/typing.nit:1496,89
-                                      identifier 'a' ... ../src/syntax/typing.nit:1496,89
-                                    identifier 'join' ... ../src/syntax/typing.nit:1496,91--94
-                                    ../src/syntax/typing.nit:1496,96--98
-                                      literal value '","' ... ../src/syntax/typing.nit:1496,96--98
-                                  ../src/syntax/typing.nit:1496,100--102
-                                    '}."' ... ../src/syntax/typing.nit:1496,100--102
+                                        ../src/syntax/typing.nit:1496,89
+                                        identifier 'a' ... ../src/syntax/typing.nit:1496,89
+                                        ../src/syntax/typing.nit:1496,89
+                                      identifier 'join' ... ../src/syntax/typing.nit:1496,91--94
+                                      ../src/syntax/typing.nit:1496,95--99
+                                        '(' ... ../src/syntax/typing.nit:1496,95
+                                        ../src/syntax/typing.nit:1496,96--98
+                                          literal value '","' ... ../src/syntax/typing.nit:1496,96--98
+                                        ')' ... ../src/syntax/typing.nit:1496,99
+                                    ../src/syntax/typing.nit:1496,100--102
+                                      '}."' ... ../src/syntax/typing.nit:1496,100--102
+                                  ')' ... ../src/syntax/typing.nit:1496,103
                               keyword 'end' ... ../src/syntax/typing.nit:1497,6--8
                         keyword 'end' ... ../src/syntax/typing.nit:1498,5--7
                     ../src/syntax/typing.nit:1501,5--1503,7
@@ -9325,24 +11469,32 @@
                         ../src/syntax/typing.nit:1501,8--17
                           ../src/syntax/typing.nit:1501,8
                           identifier 'break_list' ... ../src/syntax/typing.nit:1501,8--17
+                          ../src/syntax/typing.nit:1501,8
                         ../src/syntax/typing.nit:1501,22--25
                           keyword 'null' ... ../src/syntax/typing.nit:1501,22--25
-                      ../src/syntax/typing.nit:1502,6--48
-                        ../src/syntax/typing.nit:1502,6--48
+                      ../src/syntax/typing.nit:1502,6--49
+                        ../src/syntax/typing.nit:1502,6--49
                           ../src/syntax/typing.nit:1502,10
                           identifier 't' ... ../src/syntax/typing.nit:1502,6
+                          ../src/syntax/typing.nit:1502,10
                           '=' ... ../src/syntax/typing.nit:1502,8
-                          ../src/syntax/typing.nit:1502,10--48
+                          ../src/syntax/typing.nit:1502,10--49
                             ../src/syntax/typing.nit:1502,10
                               ../src/syntax/typing.nit:1502,10
                               identifier 'v' ... ../src/syntax/typing.nit:1502,10
+                              ../src/syntax/typing.nit:1502,10
                             identifier 'check_conform_multiexpr' ... ../src/syntax/typing.nit:1502,12--34
-                            ../src/syntax/typing.nit:1502,36
+                            ../src/syntax/typing.nit:1502,35--49
+                              '(' ... ../src/syntax/typing.nit:1502,35
                               ../src/syntax/typing.nit:1502,36
-                              identifier 't' ... ../src/syntax/typing.nit:1502,36
-                            ../src/syntax/typing.nit:1502,39--48
-                              ../src/syntax/typing.nit:1502,39
-                              identifier 'break_list' ... ../src/syntax/typing.nit:1502,39--48
+                                ../src/syntax/typing.nit:1502,36
+                                identifier 't' ... ../src/syntax/typing.nit:1502,36
+                                ../src/syntax/typing.nit:1502,36
+                              ../src/syntax/typing.nit:1502,39--48
+                                ../src/syntax/typing.nit:1502,39
+                                identifier 'break_list' ... ../src/syntax/typing.nit:1502,39--48
+                                ../src/syntax/typing.nit:1502,39
+                              ')' ... ../src/syntax/typing.nit:1502,49
                       ../src/syntax/typing.nit:1503,5--7
                         keyword 'end' ... ../src/syntax/typing.nit:1503,5--7
                     keyword 'end' ... ../src/syntax/typing.nit:1504,4--6
@@ -9352,24 +11504,30 @@
                 ../src/syntax/typing.nit:1505,11--15
                   ../src/syntax/typing.nit:1505,11
                   identifier 'arity' ... ../src/syntax/typing.nit:1505,11--15
+                  ../src/syntax/typing.nit:1505,11
                 ../src/syntax/typing.nit:1505,20
                   literal value '0' ... ../src/syntax/typing.nit:1505,20
-              ../src/syntax/typing.nit:1506,4--57
-                ../src/syntax/typing.nit:1506,4--57
+              ../src/syntax/typing.nit:1506,4--58
+                ../src/syntax/typing.nit:1506,4--58
                   ../src/syntax/typing.nit:1506,4
                     ../src/syntax/typing.nit:1506,4
                     identifier 'v' ... ../src/syntax/typing.nit:1506,4
+                    ../src/syntax/typing.nit:1506,4
                   identifier 'error' ... ../src/syntax/typing.nit:1506,6--10
-                  ../src/syntax/typing.nit:1506,12--15
-                    keyword 'self' ... ../src/syntax/typing.nit:1506,12--15
-                  ../src/syntax/typing.nit:1506,18--57
-                    ../src/syntax/typing.nit:1506,18--26
-                      literal value '"Error: {' ... ../src/syntax/typing.nit:1506,18--26
-                    ../src/syntax/typing.nit:1506,27--30
-                      ../src/syntax/typing.nit:1506,27
-                      identifier 'name' ... ../src/syntax/typing.nit:1506,27--30
-                    ../src/syntax/typing.nit:1506,31--57
-                      '} does not require blocks."' ... ../src/syntax/typing.nit:1506,31--57
+                  ../src/syntax/typing.nit:1506,11--58
+                    '(' ... ../src/syntax/typing.nit:1506,11
+                    ../src/syntax/typing.nit:1506,12--15
+                      keyword 'self' ... ../src/syntax/typing.nit:1506,12--15
+                    ../src/syntax/typing.nit:1506,18--57
+                      ../src/syntax/typing.nit:1506,18--26
+                        literal value '"Error: {' ... ../src/syntax/typing.nit:1506,18--26
+                      ../src/syntax/typing.nit:1506,27--30
+                        ../src/syntax/typing.nit:1506,27
+                        identifier 'name' ... ../src/syntax/typing.nit:1506,27--30
+                        ../src/syntax/typing.nit:1506,27
+                      ../src/syntax/typing.nit:1506,31--57
+                        '} does not require blocks."' ... ../src/syntax/typing.nit:1506,31--57
+                    ')' ... ../src/syntax/typing.nit:1506,58
               ../src/syntax/typing.nit:1507,3--5
                 keyword 'end' ... ../src/syntax/typing.nit:1507,3--5
           ../src/syntax/typing.nit:1508,3--10
@@ -9377,6 +11535,7 @@
             ../src/syntax/typing.nit:1508,10
               ../src/syntax/typing.nit:1508,10
               identifier 't' ... ../src/syntax/typing.nit:1508,10
+              ../src/syntax/typing.nit:1508,10
           keyword 'end' ... ../src/syntax/typing.nit:1509,2--4
       keyword 'end' ... ../src/syntax/typing.nit:1510,1--3
     ../src/syntax/typing.nit:1512,1--1579,3
@@ -9430,98 +11589,129 @@
               ../src/syntax/typing.nit:1514,181--191
                 type identifier 'AClosureDef' ... ../src/syntax/typing.nit:1514,181--191
         ../src/syntax/typing.nit:1516,3--1525,4
-          ../src/syntax/typing.nit:1516,3--62
+          ../src/syntax/typing.nit:1516,3--63
             keyword 'var' ... ../src/syntax/typing.nit:1516,3--5
             identifier 'prop' ... ../src/syntax/typing.nit:1516,7--10
             '=' ... ../src/syntax/typing.nit:1516,12
-            ../src/syntax/typing.nit:1516,14--62
+            ../src/syntax/typing.nit:1516,14--63
               ../src/syntax/typing.nit:1516,27
               identifier 'get_property' ... ../src/syntax/typing.nit:1516,14--25
-              ../src/syntax/typing.nit:1516,27
+              ../src/syntax/typing.nit:1516,26--63
+                '(' ... ../src/syntax/typing.nit:1516,26
                 ../src/syntax/typing.nit:1516,27
-                identifier 'v' ... ../src/syntax/typing.nit:1516,27
-              ../src/syntax/typing.nit:1516,30--38
-                ../src/syntax/typing.nit:1516,30
-                identifier 'type_recv' ... ../src/syntax/typing.nit:1516,30--38
-              ../src/syntax/typing.nit:1516,41--56
-                ../src/syntax/typing.nit:1516,41
-                identifier 'is_implicit_self' ... ../src/syntax/typing.nit:1516,41--56
-              ../src/syntax/typing.nit:1516,59--62
-                ../src/syntax/typing.nit:1516,59
-                identifier 'name' ... ../src/syntax/typing.nit:1516,59--62
+                  ../src/syntax/typing.nit:1516,27
+                  identifier 'v' ... ../src/syntax/typing.nit:1516,27
+                  ../src/syntax/typing.nit:1516,27
+                ../src/syntax/typing.nit:1516,30--38
+                  ../src/syntax/typing.nit:1516,30
+                  identifier 'type_recv' ... ../src/syntax/typing.nit:1516,30--38
+                  ../src/syntax/typing.nit:1516,30
+                ../src/syntax/typing.nit:1516,41--56
+                  ../src/syntax/typing.nit:1516,41
+                  identifier 'is_implicit_self' ... ../src/syntax/typing.nit:1516,41--56
+                  ../src/syntax/typing.nit:1516,41
+                ../src/syntax/typing.nit:1516,59--62
+                  ../src/syntax/typing.nit:1516,59
+                  identifier 'name' ... ../src/syntax/typing.nit:1516,59--62
+                  ../src/syntax/typing.nit:1516,59
+                ')' ... ../src/syntax/typing.nit:1516,63
           ../src/syntax/typing.nit:1517,3--29
             keyword 'if' ... ../src/syntax/typing.nit:1517,3--4
             ../src/syntax/typing.nit:1517,6--17
               ../src/syntax/typing.nit:1517,6--9
                 ../src/syntax/typing.nit:1517,6
                 identifier 'prop' ... ../src/syntax/typing.nit:1517,6--9
+                ../src/syntax/typing.nit:1517,6
               ../src/syntax/typing.nit:1517,14--17
                 keyword 'null' ... ../src/syntax/typing.nit:1517,14--17
             ../src/syntax/typing.nit:1517,24--29
               keyword 'return' ... ../src/syntax/typing.nit:1517,24--29
-          ../src/syntax/typing.nit:1518,3--58
+          ../src/syntax/typing.nit:1518,3--59
             keyword 'var' ... ../src/syntax/typing.nit:1518,3--5
             identifier 'sig' ... ../src/syntax/typing.nit:1518,7--9
             '=' ... ../src/syntax/typing.nit:1518,11
-            ../src/syntax/typing.nit:1518,13--58
+            ../src/syntax/typing.nit:1518,13--59
               ../src/syntax/typing.nit:1518,27
               identifier 'get_signature' ... ../src/syntax/typing.nit:1518,13--25
-              ../src/syntax/typing.nit:1518,27
+              ../src/syntax/typing.nit:1518,26--59
+                '(' ... ../src/syntax/typing.nit:1518,26
                 ../src/syntax/typing.nit:1518,27
-                identifier 'v' ... ../src/syntax/typing.nit:1518,27
-              ../src/syntax/typing.nit:1518,30--38
-                ../src/syntax/typing.nit:1518,30
-                identifier 'type_recv' ... ../src/syntax/typing.nit:1518,30--38
-              ../src/syntax/typing.nit:1518,41--44
-                ../src/syntax/typing.nit:1518,41
-                identifier 'prop' ... ../src/syntax/typing.nit:1518,41--44
-              ../src/syntax/typing.nit:1518,47--58
-                ../src/syntax/typing.nit:1518,47
-                identifier 'recv_is_self' ... ../src/syntax/typing.nit:1518,47--58
+                  ../src/syntax/typing.nit:1518,27
+                  identifier 'v' ... ../src/syntax/typing.nit:1518,27
+                  ../src/syntax/typing.nit:1518,27
+                ../src/syntax/typing.nit:1518,30--38
+                  ../src/syntax/typing.nit:1518,30
+                  identifier 'type_recv' ... ../src/syntax/typing.nit:1518,30--38
+                  ../src/syntax/typing.nit:1518,30
+                ../src/syntax/typing.nit:1518,41--44
+                  ../src/syntax/typing.nit:1518,41
+                  identifier 'prop' ... ../src/syntax/typing.nit:1518,41--44
+                  ../src/syntax/typing.nit:1518,41
+                ../src/syntax/typing.nit:1518,47--58
+                  ../src/syntax/typing.nit:1518,47
+                  identifier 'recv_is_self' ... ../src/syntax/typing.nit:1518,47--58
+                  ../src/syntax/typing.nit:1518,47
+                ')' ... ../src/syntax/typing.nit:1518,59
           ../src/syntax/typing.nit:1519,3--67
             keyword 'if' ... ../src/syntax/typing.nit:1519,3--4
-            ../src/syntax/typing.nit:1519,6--54
+            ../src/syntax/typing.nit:1519,6--55
               keyword 'not' ... ../src/syntax/typing.nit:1519,6--8
-              ../src/syntax/typing.nit:1519,10--54
+              ../src/syntax/typing.nit:1519,10--55
                 ../src/syntax/typing.nit:1519,28
                 identifier 'process_signature' ... ../src/syntax/typing.nit:1519,10--26
-                ../src/syntax/typing.nit:1519,28
+                ../src/syntax/typing.nit:1519,27--55
+                  '(' ... ../src/syntax/typing.nit:1519,27
                   ../src/syntax/typing.nit:1519,28
-                  identifier 'v' ... ../src/syntax/typing.nit:1519,28
-                ../src/syntax/typing.nit:1519,31--33
-                  ../src/syntax/typing.nit:1519,31
-                  identifier 'sig' ... ../src/syntax/typing.nit:1519,31--33
-                ../src/syntax/typing.nit:1519,36--44
-                  ../src/syntax/typing.nit:1519,36--39
+                    ../src/syntax/typing.nit:1519,28
+                    identifier 'v' ... ../src/syntax/typing.nit:1519,28
+                    ../src/syntax/typing.nit:1519,28
+                  ../src/syntax/typing.nit:1519,31--33
+                    ../src/syntax/typing.nit:1519,31
+                    identifier 'sig' ... ../src/syntax/typing.nit:1519,31--33
+                    ../src/syntax/typing.nit:1519,31
+                  ../src/syntax/typing.nit:1519,36--44
+                    ../src/syntax/typing.nit:1519,36--39
+                      ../src/syntax/typing.nit:1519,36
+                      identifier 'prop' ... ../src/syntax/typing.nit:1519,36--39
+                      ../src/syntax/typing.nit:1519,36
+                    identifier 'name' ... ../src/syntax/typing.nit:1519,41--44
                     ../src/syntax/typing.nit:1519,36
-                    identifier 'prop' ... ../src/syntax/typing.nit:1519,36--39
-                  identifier 'name' ... ../src/syntax/typing.nit:1519,41--44
-                ../src/syntax/typing.nit:1519,47--54
-                  ../src/syntax/typing.nit:1519,47
-                  identifier 'raw_args' ... ../src/syntax/typing.nit:1519,47--54
+                  ../src/syntax/typing.nit:1519,47--54
+                    ../src/syntax/typing.nit:1519,47
+                    identifier 'raw_args' ... ../src/syntax/typing.nit:1519,47--54
+                    ../src/syntax/typing.nit:1519,47
+                  ')' ... ../src/syntax/typing.nit:1519,55
             ../src/syntax/typing.nit:1519,62--67
               keyword 'return' ... ../src/syntax/typing.nit:1519,62--67
-          ../src/syntax/typing.nit:1520,3--62
+          ../src/syntax/typing.nit:1520,3--63
             keyword 'var' ... ../src/syntax/typing.nit:1520,3--5
             identifier 'rtype' ... ../src/syntax/typing.nit:1520,7--11
             '=' ... ../src/syntax/typing.nit:1520,13
-            ../src/syntax/typing.nit:1520,15--62
+            ../src/syntax/typing.nit:1520,15--63
               ../src/syntax/typing.nit:1520,32
               identifier 'process_closures' ... ../src/syntax/typing.nit:1520,15--30
-              ../src/syntax/typing.nit:1520,32
+              ../src/syntax/typing.nit:1520,31--63
+                '(' ... ../src/syntax/typing.nit:1520,31
                 ../src/syntax/typing.nit:1520,32
-                identifier 'v' ... ../src/syntax/typing.nit:1520,32
-              ../src/syntax/typing.nit:1520,35--37
-                ../src/syntax/typing.nit:1520,35
-                identifier 'sig' ... ../src/syntax/typing.nit:1520,35--37
-              ../src/syntax/typing.nit:1520,40--48
-                ../src/syntax/typing.nit:1520,40--43
+                  ../src/syntax/typing.nit:1520,32
+                  identifier 'v' ... ../src/syntax/typing.nit:1520,32
+                  ../src/syntax/typing.nit:1520,32
+                ../src/syntax/typing.nit:1520,35--37
+                  ../src/syntax/typing.nit:1520,35
+                  identifier 'sig' ... ../src/syntax/typing.nit:1520,35--37
+                  ../src/syntax/typing.nit:1520,35
+                ../src/syntax/typing.nit:1520,40--48
+                  ../src/syntax/typing.nit:1520,40--43
+                    ../src/syntax/typing.nit:1520,40
+                    identifier 'prop' ... ../src/syntax/typing.nit:1520,40--43
+                    ../src/syntax/typing.nit:1520,40
+                  identifier 'name' ... ../src/syntax/typing.nit:1520,45--48
                   ../src/syntax/typing.nit:1520,40
-                  identifier 'prop' ... ../src/syntax/typing.nit:1520,40--43
-                identifier 'name' ... ../src/syntax/typing.nit:1520,45--48
-              ../src/syntax/typing.nit:1520,51--62
-                ../src/syntax/typing.nit:1520,51
-                identifier 'closure_defs' ... ../src/syntax/typing.nit:1520,51--62
+                ../src/syntax/typing.nit:1520,51--62
+                  ../src/syntax/typing.nit:1520,51
+                  identifier 'closure_defs' ... ../src/syntax/typing.nit:1520,51--62
+                  ../src/syntax/typing.nit:1520,51
+                ')' ... ../src/syntax/typing.nit:1520,63
           ../src/syntax/typing.nit:1521,3--58
             keyword 'if' ... ../src/syntax/typing.nit:1521,3--4
             ../src/syntax/typing.nit:1521,6--46
@@ -9529,6 +11719,7 @@
                 ../src/syntax/typing.nit:1521,6--10
                   ../src/syntax/typing.nit:1521,6
                   identifier 'rtype' ... ../src/syntax/typing.nit:1521,6--10
+                  ../src/syntax/typing.nit:1521,6
                 ../src/syntax/typing.nit:1521,15--18
                   keyword 'null' ... ../src/syntax/typing.nit:1521,15--18
               ../src/syntax/typing.nit:1521,24--46
@@ -9536,7 +11727,9 @@
                   ../src/syntax/typing.nit:1521,24--26
                     ../src/syntax/typing.nit:1521,24
                     identifier 'sig' ... ../src/syntax/typing.nit:1521,24--26
+                    ../src/syntax/typing.nit:1521,24
                   identifier 'return_type' ... ../src/syntax/typing.nit:1521,28--38
+                  ../src/syntax/typing.nit:1521,24
                 ../src/syntax/typing.nit:1521,43--46
                   keyword 'null' ... ../src/syntax/typing.nit:1521,43--46
             ../src/syntax/typing.nit:1521,53--58
@@ -9548,6 +11741,7 @@
             ../src/syntax/typing.nit:1522,11--14
               ../src/syntax/typing.nit:1522,11
               identifier 'prop' ... ../src/syntax/typing.nit:1522,11--14
+              ../src/syntax/typing.nit:1522,11
           ../src/syntax/typing.nit:1523,3--23
             ../src/syntax/typing.nit:1523,21
             attribute '_prop_signature' ... ../src/syntax/typing.nit:1523,3--17
@@ -9555,6 +11749,7 @@
             ../src/syntax/typing.nit:1523,21--23
               ../src/syntax/typing.nit:1523,21
               identifier 'sig' ... ../src/syntax/typing.nit:1523,21--23
+              ../src/syntax/typing.nit:1523,21
           ../src/syntax/typing.nit:1524,3--22
             ../src/syntax/typing.nit:1524,18
             attribute '_return_type' ... ../src/syntax/typing.nit:1524,3--14
@@ -9562,6 +11757,7 @@
             ../src/syntax/typing.nit:1524,18--22
               ../src/syntax/typing.nit:1524,18
               identifier 'rtype' ... ../src/syntax/typing.nit:1524,18--22
+              ../src/syntax/typing.nit:1524,18
           keyword 'end' ... ../src/syntax/typing.nit:1525,2--4
       ../src/syntax/typing.nit:1527,2--1562,4
         ../src/syntax/typing.nit:1527,2--8
@@ -9596,6 +11792,7 @@
               ../src/syntax/typing.nit:1529,6--14
                 ../src/syntax/typing.nit:1529,6
                 identifier 'type_recv' ... ../src/syntax/typing.nit:1529,6--14
+                ../src/syntax/typing.nit:1529,6
               ../src/syntax/typing.nit:1529,20--29
                 type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1529,20--29
             ../src/syntax/typing.nit:1530,4--1536,6
@@ -9606,6 +11803,7 @@
                     ../src/syntax/typing.nit:1530,7--10
                       ../src/syntax/typing.nit:1530,7
                       identifier 'name' ... ../src/syntax/typing.nit:1530,7--10
+                      ../src/syntax/typing.nit:1530,7
                     ../src/syntax/typing.nit:1530,15--35
                       '(' ... ../src/syntax/typing.nit:1530,15
                       ../src/syntax/typing.nit:1530,16--34
@@ -9614,11 +11812,13 @@
                           ../src/syntax/typing.nit:1530,21--24
                             literal value '"=="' ... ../src/syntax/typing.nit:1530,21--24
                           identifier 'to_symbol' ... ../src/syntax/typing.nit:1530,26--34
+                          ../src/syntax/typing.nit:1530,21
                       ')' ... ../src/syntax/typing.nit:1530,35
                   ../src/syntax/typing.nit:1530,40--68
                     ../src/syntax/typing.nit:1530,40--43
                       ../src/syntax/typing.nit:1530,40
                       identifier 'name' ... ../src/syntax/typing.nit:1530,40--43
+                      ../src/syntax/typing.nit:1530,40
                     ../src/syntax/typing.nit:1530,48--68
                       '(' ... ../src/syntax/typing.nit:1530,48
                       ../src/syntax/typing.nit:1530,49--67
@@ -9627,35 +11827,45 @@
                           ../src/syntax/typing.nit:1530,54--57
                             literal value '"!="' ... ../src/syntax/typing.nit:1530,54--57
                           identifier 'to_symbol' ... ../src/syntax/typing.nit:1530,59--67
+                          ../src/syntax/typing.nit:1530,54
                       ')' ... ../src/syntax/typing.nit:1530,68
                 ../src/syntax/typing.nit:1532,5--41
                   ../src/syntax/typing.nit:1532,5--41
                     ../src/syntax/typing.nit:1532,17
                     identifier 'type_recv' ... ../src/syntax/typing.nit:1532,5--13
+                    ../src/syntax/typing.nit:1532,17
                     '=' ... ../src/syntax/typing.nit:1532,15
                     ../src/syntax/typing.nit:1532,17--41
                       ../src/syntax/typing.nit:1532,17--29
                         ../src/syntax/typing.nit:1532,17
                           ../src/syntax/typing.nit:1532,17
                           identifier 'v' ... ../src/syntax/typing.nit:1532,17
+                          ../src/syntax/typing.nit:1532,17
                         identifier 'type_object' ... ../src/syntax/typing.nit:1532,19--29
+                        ../src/syntax/typing.nit:1532,17
                       identifier 'as_nullable' ... ../src/syntax/typing.nit:1532,31--41
+                      ../src/syntax/typing.nit:1532,17
                 ../src/syntax/typing.nit:1534,5--1536,6
-                  ../src/syntax/typing.nit:1534,5--58
+                  ../src/syntax/typing.nit:1534,5--59
                     ../src/syntax/typing.nit:1534,5
                       ../src/syntax/typing.nit:1534,5
                       identifier 'v' ... ../src/syntax/typing.nit:1534,5
+                      ../src/syntax/typing.nit:1534,5
                     identifier 'error' ... ../src/syntax/typing.nit:1534,7--11
-                    ../src/syntax/typing.nit:1534,13--16
-                      keyword 'self' ... ../src/syntax/typing.nit:1534,13--16
-                    ../src/syntax/typing.nit:1534,19--58
-                      ../src/syntax/typing.nit:1534,19--35
-                        literal value '"Error: Method '{' ... ../src/syntax/typing.nit:1534,19--35
-                      ../src/syntax/typing.nit:1534,36--39
-                        ../src/syntax/typing.nit:1534,36
-                        identifier 'name' ... ../src/syntax/typing.nit:1534,36--39
-                      ../src/syntax/typing.nit:1534,40--58
-                        '}' call on 'null'."' ... ../src/syntax/typing.nit:1534,40--58
+                    ../src/syntax/typing.nit:1534,12--59
+                      '(' ... ../src/syntax/typing.nit:1534,12
+                      ../src/syntax/typing.nit:1534,13--16
+                        keyword 'self' ... ../src/syntax/typing.nit:1534,13--16
+                      ../src/syntax/typing.nit:1534,19--58
+                        ../src/syntax/typing.nit:1534,19--35
+                          literal value '"Error: Method '{' ... ../src/syntax/typing.nit:1534,19--35
+                        ../src/syntax/typing.nit:1534,36--39
+                          ../src/syntax/typing.nit:1534,36
+                          identifier 'name' ... ../src/syntax/typing.nit:1534,36--39
+                          ../src/syntax/typing.nit:1534,36
+                        ../src/syntax/typing.nit:1534,40--58
+                          '}' call on 'null'."' ... ../src/syntax/typing.nit:1534,40--58
+                      ')' ... ../src/syntax/typing.nit:1534,59
                   ../src/syntax/typing.nit:1535,5--15
                     keyword 'return' ... ../src/syntax/typing.nit:1535,5--10
                     ../src/syntax/typing.nit:1535,12--15
@@ -9671,7 +11881,9 @@
               ../src/syntax/typing.nit:1538,12--20
                 ../src/syntax/typing.nit:1538,12
                 identifier 'type_recv' ... ../src/syntax/typing.nit:1538,12--20
+                ../src/syntax/typing.nit:1538,12
               identifier 'local_class' ... ../src/syntax/typing.nit:1538,22--32
+              ../src/syntax/typing.nit:1538,12
           ../src/syntax/typing.nit:1539,3--36
             keyword 'var' ... ../src/syntax/typing.nit:1539,3--5
             identifier 'prop' ... ../src/syntax/typing.nit:1539,7--10
@@ -9681,28 +11893,39 @@
             '=' ... ../src/syntax/typing.nit:1539,31
             ../src/syntax/typing.nit:1539,33--36
               keyword 'null' ... ../src/syntax/typing.nit:1539,33--36
-          ../src/syntax/typing.nit:1540,3--75
+          ../src/syntax/typing.nit:1540,3--76
             keyword 'if' ... ../src/syntax/typing.nit:1540,3--4
-            ../src/syntax/typing.nit:1540,6--40
+            ../src/syntax/typing.nit:1540,6--41
               ../src/syntax/typing.nit:1540,6--7
                 ../src/syntax/typing.nit:1540,6
                 identifier 'lc' ... ../src/syntax/typing.nit:1540,6--7
+                ../src/syntax/typing.nit:1540,6
               identifier 'has_global_property_by_name' ... ../src/syntax/typing.nit:1540,9--35
-              ../src/syntax/typing.nit:1540,37--40
-                ../src/syntax/typing.nit:1540,37
-                identifier 'name' ... ../src/syntax/typing.nit:1540,37--40
-            ../src/syntax/typing.nit:1540,48--75
+              ../src/syntax/typing.nit:1540,36--41
+                '(' ... ../src/syntax/typing.nit:1540,36
+                ../src/syntax/typing.nit:1540,37--40
+                  ../src/syntax/typing.nit:1540,37
+                  identifier 'name' ... ../src/syntax/typing.nit:1540,37--40
+                  ../src/syntax/typing.nit:1540,37
+                ')' ... ../src/syntax/typing.nit:1540,41
+            ../src/syntax/typing.nit:1540,48--76
               ../src/syntax/typing.nit:1540,55
               identifier 'prop' ... ../src/syntax/typing.nit:1540,48--51
+              ../src/syntax/typing.nit:1540,55
               '=' ... ../src/syntax/typing.nit:1540,53
-              ../src/syntax/typing.nit:1540,55--75
+              ../src/syntax/typing.nit:1540,55--76
                 ../src/syntax/typing.nit:1540,55--56
                   ../src/syntax/typing.nit:1540,55
                   identifier 'lc' ... ../src/syntax/typing.nit:1540,55--56
+                  ../src/syntax/typing.nit:1540,55
                 identifier 'select_method' ... ../src/syntax/typing.nit:1540,58--70
-                ../src/syntax/typing.nit:1540,72--75
-                  ../src/syntax/typing.nit:1540,72
-                  identifier 'name' ... ../src/syntax/typing.nit:1540,72--75
+                ../src/syntax/typing.nit:1540,71--76
+                  '(' ... ../src/syntax/typing.nit:1540,71
+                  ../src/syntax/typing.nit:1540,72--75
+                    ../src/syntax/typing.nit:1540,72
+                    identifier 'name' ... ../src/syntax/typing.nit:1540,72--75
+                    ../src/syntax/typing.nit:1540,72
+                  ')' ... ../src/syntax/typing.nit:1540,76
           ../src/syntax/typing.nit:1541,3--1552,5
             keyword 'if' ... ../src/syntax/typing.nit:1541,3--4
             ../src/syntax/typing.nit:1541,6--53
@@ -9710,6 +11933,7 @@
                 ../src/syntax/typing.nit:1541,6--9
                   ../src/syntax/typing.nit:1541,6
                   identifier 'prop' ... ../src/syntax/typing.nit:1541,6--9
+                  ../src/syntax/typing.nit:1541,6
                 ../src/syntax/typing.nit:1541,14--17
                   keyword 'null' ... ../src/syntax/typing.nit:1541,14--17
               ../src/syntax/typing.nit:1541,23--53
@@ -9718,22 +11942,31 @@
                     ../src/syntax/typing.nit:1541,23
                       ../src/syntax/typing.nit:1541,23
                       identifier 'v' ... ../src/syntax/typing.nit:1541,23
+                      ../src/syntax/typing.nit:1541,23
                     identifier 'local_property' ... ../src/syntax/typing.nit:1541,25--38
+                    ../src/syntax/typing.nit:1541,23
                   identifier 'global' ... ../src/syntax/typing.nit:1541,40--45
+                  ../src/syntax/typing.nit:1541,23
                 identifier 'is_init' ... ../src/syntax/typing.nit:1541,47--53
+                ../src/syntax/typing.nit:1541,23
             ../src/syntax/typing.nit:1542,4--1550,6
-              ../src/syntax/typing.nit:1542,4--42
+              ../src/syntax/typing.nit:1542,4--43
                 keyword 'var' ... ../src/syntax/typing.nit:1542,4--6
                 identifier 'props' ... ../src/syntax/typing.nit:1542,8--12
                 '=' ... ../src/syntax/typing.nit:1542,14
-                ../src/syntax/typing.nit:1542,16--42
+                ../src/syntax/typing.nit:1542,16--43
                   ../src/syntax/typing.nit:1542,16--17
                     ../src/syntax/typing.nit:1542,16
                     identifier 'lc' ... ../src/syntax/typing.nit:1542,16--17
+                    ../src/syntax/typing.nit:1542,16
                   identifier 'super_methods_named' ... ../src/syntax/typing.nit:1542,19--37
-                  ../src/syntax/typing.nit:1542,39--42
-                    ../src/syntax/typing.nit:1542,39
-                    identifier 'name' ... ../src/syntax/typing.nit:1542,39--42
+                  ../src/syntax/typing.nit:1542,38--43
+                    '(' ... ../src/syntax/typing.nit:1542,38
+                    ../src/syntax/typing.nit:1542,39--42
+                      ../src/syntax/typing.nit:1542,39
+                      identifier 'name' ... ../src/syntax/typing.nit:1542,39--42
+                      ../src/syntax/typing.nit:1542,39
+                    ')' ... ../src/syntax/typing.nit:1542,43
               ../src/syntax/typing.nit:1543,4--1550,6
                 keyword 'if' ... ../src/syntax/typing.nit:1543,4--5
                 ../src/syntax/typing.nit:1543,7--22
@@ -9741,34 +11974,45 @@
                     ../src/syntax/typing.nit:1543,7--11
                       ../src/syntax/typing.nit:1543,7
                       identifier 'props' ... ../src/syntax/typing.nit:1543,7--11
+                      ../src/syntax/typing.nit:1543,7
                     identifier 'length' ... ../src/syntax/typing.nit:1543,13--18
+                    ../src/syntax/typing.nit:1543,7
                   ../src/syntax/typing.nit:1543,22
                     literal value '1' ... ../src/syntax/typing.nit:1543,22
                 ../src/syntax/typing.nit:1544,5--1545,15
-                  ../src/syntax/typing.nit:1544,5--106
+                  ../src/syntax/typing.nit:1544,5--107
                     ../src/syntax/typing.nit:1544,5
                       ../src/syntax/typing.nit:1544,5
                       identifier 'v' ... ../src/syntax/typing.nit:1544,5
+                      ../src/syntax/typing.nit:1544,5
                     identifier 'error' ... ../src/syntax/typing.nit:1544,7--11
-                    ../src/syntax/typing.nit:1544,13--16
-                      keyword 'self' ... ../src/syntax/typing.nit:1544,13--16
-                    ../src/syntax/typing.nit:1544,19--106
-                      ../src/syntax/typing.nit:1544,19--49
-                        literal value '"Error: Ambigous method name '{' ... ../src/syntax/typing.nit:1544,19--49
-                      ../src/syntax/typing.nit:1544,50--53
-                        ../src/syntax/typing.nit:1544,50
-                        identifier 'name' ... ../src/syntax/typing.nit:1544,50--53
-                      ../src/syntax/typing.nit:1544,54--61
-                        literal value '}' for {' ... ../src/syntax/typing.nit:1544,54--61
-                      ../src/syntax/typing.nit:1544,62--76
-                        ../src/syntax/typing.nit:1544,62--66
-                          ../src/syntax/typing.nit:1544,62
-                          identifier 'props' ... ../src/syntax/typing.nit:1544,62--66
-                        identifier 'join' ... ../src/syntax/typing.nit:1544,68--71
-                        ../src/syntax/typing.nit:1544,73--76
-                          literal value '", "' ... ../src/syntax/typing.nit:1544,73--76
-                      ../src/syntax/typing.nit:1544,78--106
-                        '}. Use explicit designation."' ... ../src/syntax/typing.nit:1544,78--106
+                    ../src/syntax/typing.nit:1544,12--107
+                      '(' ... ../src/syntax/typing.nit:1544,12
+                      ../src/syntax/typing.nit:1544,13--16
+                        keyword 'self' ... ../src/syntax/typing.nit:1544,13--16
+                      ../src/syntax/typing.nit:1544,19--106
+                        ../src/syntax/typing.nit:1544,19--49
+                          literal value '"Error: Ambigous method name '{' ... ../src/syntax/typing.nit:1544,19--49
+                        ../src/syntax/typing.nit:1544,50--53
+                          ../src/syntax/typing.nit:1544,50
+                          identifier 'name' ... ../src/syntax/typing.nit:1544,50--53
+                          ../src/syntax/typing.nit:1544,50
+                        ../src/syntax/typing.nit:1544,54--61
+                          literal value '}' for {' ... ../src/syntax/typing.nit:1544,54--61
+                        ../src/syntax/typing.nit:1544,62--77
+                          ../src/syntax/typing.nit:1544,62--66
+                            ../src/syntax/typing.nit:1544,62
+                            identifier 'props' ... ../src/syntax/typing.nit:1544,62--66
+                            ../src/syntax/typing.nit:1544,62
+                          identifier 'join' ... ../src/syntax/typing.nit:1544,68--71
+                          ../src/syntax/typing.nit:1544,72--77
+                            '(' ... ../src/syntax/typing.nit:1544,72
+                            ../src/syntax/typing.nit:1544,73--76
+                              literal value '", "' ... ../src/syntax/typing.nit:1544,73--76
+                            ')' ... ../src/syntax/typing.nit:1544,77
+                        ../src/syntax/typing.nit:1544,78--106
+                          '}. Use explicit designation."' ... ../src/syntax/typing.nit:1544,78--106
+                      ')' ... ../src/syntax/typing.nit:1544,107
                   ../src/syntax/typing.nit:1545,5--15
                     keyword 'return' ... ../src/syntax/typing.nit:1545,5--10
                     ../src/syntax/typing.nit:1545,12--15
@@ -9780,40 +12024,52 @@
                       ../src/syntax/typing.nit:1546,12--16
                         ../src/syntax/typing.nit:1546,12
                         identifier 'props' ... ../src/syntax/typing.nit:1546,12--16
+                        ../src/syntax/typing.nit:1546,12
                       identifier 'length' ... ../src/syntax/typing.nit:1546,18--23
+                      ../src/syntax/typing.nit:1546,12
                     ../src/syntax/typing.nit:1546,28
                       literal value '1' ... ../src/syntax/typing.nit:1546,28
                   ../src/syntax/typing.nit:1547,5--1549,12
-                    ../src/syntax/typing.nit:1547,5--33
+                    ../src/syntax/typing.nit:1547,5--34
                       keyword 'var' ... ../src/syntax/typing.nit:1547,5--7
                       identifier 'p' ... ../src/syntax/typing.nit:1547,9
                       '=' ... ../src/syntax/typing.nit:1547,11
-                      ../src/syntax/typing.nit:1547,13--33
+                      ../src/syntax/typing.nit:1547,13--34
                         ../src/syntax/typing.nit:1547,13--14
                           ../src/syntax/typing.nit:1547,13
                           identifier 'lc' ... ../src/syntax/typing.nit:1547,13--14
-                        ../src/syntax/typing.nit:1547,16--33
-                          ../src/syntax/typing.nit:1547,16--26
-                            ../src/syntax/typing.nit:1547,16--20
+                          ../src/syntax/typing.nit:1547,13
+                        ../src/syntax/typing.nit:1547,15--34
+                          '[' ... ../src/syntax/typing.nit:1547,15
+                          ../src/syntax/typing.nit:1547,16--33
+                            ../src/syntax/typing.nit:1547,16--26
+                              ../src/syntax/typing.nit:1547,16--20
+                                ../src/syntax/typing.nit:1547,16
+                                identifier 'props' ... ../src/syntax/typing.nit:1547,16--20
+                                ../src/syntax/typing.nit:1547,16
+                              identifier 'first' ... ../src/syntax/typing.nit:1547,22--26
                               ../src/syntax/typing.nit:1547,16
-                              identifier 'props' ... ../src/syntax/typing.nit:1547,16--20
-                            identifier 'first' ... ../src/syntax/typing.nit:1547,22--26
-                          identifier 'global' ... ../src/syntax/typing.nit:1547,28--33
+                            identifier 'global' ... ../src/syntax/typing.nit:1547,28--33
+                            ../src/syntax/typing.nit:1547,16
+                          ']' ... ../src/syntax/typing.nit:1547,34
                     ../src/syntax/typing.nit:1548,5--25
                       keyword 'assert' ... ../src/syntax/typing.nit:1548,5--10
                       ../src/syntax/typing.nit:1548,12--25
                         ../src/syntax/typing.nit:1548,12
                           ../src/syntax/typing.nit:1548,12
                           identifier 'p' ... ../src/syntax/typing.nit:1548,12
+                          ../src/syntax/typing.nit:1548,12
                         ../src/syntax/typing.nit:1548,18--25
                           type identifier 'MMMethod' ... ../src/syntax/typing.nit:1548,18--25
                     ../src/syntax/typing.nit:1549,5--12
                       ../src/syntax/typing.nit:1549,12
                       identifier 'prop' ... ../src/syntax/typing.nit:1549,5--8
+                      ../src/syntax/typing.nit:1549,12
                       '=' ... ../src/syntax/typing.nit:1549,10
                       ../src/syntax/typing.nit:1549,12
                         ../src/syntax/typing.nit:1549,12
                         identifier 'p' ... ../src/syntax/typing.nit:1549,12
+                        ../src/syntax/typing.nit:1549,12
                   ../src/syntax/typing.nit:1550,4--6
                     keyword 'end' ... ../src/syntax/typing.nit:1550,4--6
             ../src/syntax/typing.nit:1552,3--5
@@ -9824,6 +12080,7 @@
               ../src/syntax/typing.nit:1553,6--9
                 ../src/syntax/typing.nit:1553,6
                 identifier 'prop' ... ../src/syntax/typing.nit:1553,6--9
+                ../src/syntax/typing.nit:1553,6
               ../src/syntax/typing.nit:1553,14--17
                 keyword 'null' ... ../src/syntax/typing.nit:1553,14--17
             ../src/syntax/typing.nit:1554,4--1559,14
@@ -9832,48 +12089,61 @@
                 ../src/syntax/typing.nit:1554,7--22
                   ../src/syntax/typing.nit:1554,7
                   identifier 'is_implicit_self' ... ../src/syntax/typing.nit:1554,7--22
-                ../src/syntax/typing.nit:1555,5--78
-                  ../src/syntax/typing.nit:1555,5--78
+                  ../src/syntax/typing.nit:1554,7
+                ../src/syntax/typing.nit:1555,5--79
+                  ../src/syntax/typing.nit:1555,5--79
                     ../src/syntax/typing.nit:1555,5
                       ../src/syntax/typing.nit:1555,5
                       identifier 'v' ... ../src/syntax/typing.nit:1555,5
+                      ../src/syntax/typing.nit:1555,5
                     identifier 'error' ... ../src/syntax/typing.nit:1555,7--11
-                    ../src/syntax/typing.nit:1555,13--16
-                      keyword 'self' ... ../src/syntax/typing.nit:1555,13--16
-                    ../src/syntax/typing.nit:1555,19--78
-                      ../src/syntax/typing.nit:1555,19--47
-                        literal value '"Error: Method or variable '{' ... ../src/syntax/typing.nit:1555,19--47
-                      ../src/syntax/typing.nit:1555,48--51
-                        ../src/syntax/typing.nit:1555,48
-                        identifier 'name' ... ../src/syntax/typing.nit:1555,48--51
-                      ../src/syntax/typing.nit:1555,52--66
-                        literal value '}' unknown in {' ... ../src/syntax/typing.nit:1555,52--66
-                      ../src/syntax/typing.nit:1555,67--75
-                        ../src/syntax/typing.nit:1555,67
-                        identifier 'type_recv' ... ../src/syntax/typing.nit:1555,67--75
-                      ../src/syntax/typing.nit:1555,76--78
-                        '}."' ... ../src/syntax/typing.nit:1555,76--78
+                    ../src/syntax/typing.nit:1555,12--79
+                      '(' ... ../src/syntax/typing.nit:1555,12
+                      ../src/syntax/typing.nit:1555,13--16
+                        keyword 'self' ... ../src/syntax/typing.nit:1555,13--16
+                      ../src/syntax/typing.nit:1555,19--78
+                        ../src/syntax/typing.nit:1555,19--47
+                          literal value '"Error: Method or variable '{' ... ../src/syntax/typing.nit:1555,19--47
+                        ../src/syntax/typing.nit:1555,48--51
+                          ../src/syntax/typing.nit:1555,48
+                          identifier 'name' ... ../src/syntax/typing.nit:1555,48--51
+                          ../src/syntax/typing.nit:1555,48
+                        ../src/syntax/typing.nit:1555,52--66
+                          literal value '}' unknown in {' ... ../src/syntax/typing.nit:1555,52--66
+                        ../src/syntax/typing.nit:1555,67--75
+                          ../src/syntax/typing.nit:1555,67
+                          identifier 'type_recv' ... ../src/syntax/typing.nit:1555,67--75
+                          ../src/syntax/typing.nit:1555,67
+                        ../src/syntax/typing.nit:1555,76--78
+                          '}."' ... ../src/syntax/typing.nit:1555,76--78
+                      ')' ... ../src/syntax/typing.nit:1555,79
                 ../src/syntax/typing.nit:1557,5--1558,6
-                  ../src/syntax/typing.nit:1557,5--73
+                  ../src/syntax/typing.nit:1557,5--74
                     ../src/syntax/typing.nit:1557,5
                       ../src/syntax/typing.nit:1557,5
                       identifier 'v' ... ../src/syntax/typing.nit:1557,5
+                      ../src/syntax/typing.nit:1557,5
                     identifier 'error' ... ../src/syntax/typing.nit:1557,7--11
-                    ../src/syntax/typing.nit:1557,13--16
-                      keyword 'self' ... ../src/syntax/typing.nit:1557,13--16
-                    ../src/syntax/typing.nit:1557,19--73
-                      ../src/syntax/typing.nit:1557,19--35
-                        literal value '"Error: Method '{' ... ../src/syntax/typing.nit:1557,19--35
-                      ../src/syntax/typing.nit:1557,36--39
-                        ../src/syntax/typing.nit:1557,36
-                        identifier 'name' ... ../src/syntax/typing.nit:1557,36--39
-                      ../src/syntax/typing.nit:1557,40--61
-                        literal value '}' doesn't exists in {' ... ../src/syntax/typing.nit:1557,40--61
-                      ../src/syntax/typing.nit:1557,62--70
-                        ../src/syntax/typing.nit:1557,62
-                        identifier 'type_recv' ... ../src/syntax/typing.nit:1557,62--70
-                      ../src/syntax/typing.nit:1557,71--73
-                        '}."' ... ../src/syntax/typing.nit:1557,71--73
+                    ../src/syntax/typing.nit:1557,12--74
+                      '(' ... ../src/syntax/typing.nit:1557,12
+                      ../src/syntax/typing.nit:1557,13--16
+                        keyword 'self' ... ../src/syntax/typing.nit:1557,13--16
+                      ../src/syntax/typing.nit:1557,19--73
+                        ../src/syntax/typing.nit:1557,19--35
+                          literal value '"Error: Method '{' ... ../src/syntax/typing.nit:1557,19--35
+                        ../src/syntax/typing.nit:1557,36--39
+                          ../src/syntax/typing.nit:1557,36
+                          identifier 'name' ... ../src/syntax/typing.nit:1557,36--39
+                          ../src/syntax/typing.nit:1557,36
+                        ../src/syntax/typing.nit:1557,40--61
+                          literal value '}' doesn't exists in {' ... ../src/syntax/typing.nit:1557,40--61
+                        ../src/syntax/typing.nit:1557,62--70
+                          ../src/syntax/typing.nit:1557,62
+                          identifier 'type_recv' ... ../src/syntax/typing.nit:1557,62--70
+                          ../src/syntax/typing.nit:1557,62
+                        ../src/syntax/typing.nit:1557,71--73
+                          '}."' ... ../src/syntax/typing.nit:1557,71--73
+                      ')' ... ../src/syntax/typing.nit:1557,74
                   keyword 'end' ... ../src/syntax/typing.nit:1558,4--6
               ../src/syntax/typing.nit:1559,4--14
                 keyword 'return' ... ../src/syntax/typing.nit:1559,4--9
@@ -9886,6 +12156,7 @@
             ../src/syntax/typing.nit:1561,10--13
               ../src/syntax/typing.nit:1561,10
               identifier 'prop' ... ../src/syntax/typing.nit:1561,10--13
+              ../src/syntax/typing.nit:1561,10
           keyword 'end' ... ../src/syntax/typing.nit:1562,2--4
       ../src/syntax/typing.nit:1564,2--1571,4
         ../src/syntax/typing.nit:1564,2--1565,0
@@ -9916,38 +12187,52 @@
           ../src/syntax/typing.nit:1565,102--112
             type identifier 'MMSignature' ... ../src/syntax/typing.nit:1565,102--112
         ../src/syntax/typing.nit:1567,3--1571,4
-          ../src/syntax/typing.nit:1567,3--64
+          ../src/syntax/typing.nit:1567,3--65
             ../src/syntax/typing.nit:1567,3--13
               ../src/syntax/typing.nit:1567,3--6
                 ../src/syntax/typing.nit:1567,3
                 identifier 'prop' ... ../src/syntax/typing.nit:1567,3--6
+                ../src/syntax/typing.nit:1567,3
               identifier 'global' ... ../src/syntax/typing.nit:1567,8--13
+              ../src/syntax/typing.nit:1567,3
             identifier 'check_visibility' ... ../src/syntax/typing.nit:1567,15--30
-            ../src/syntax/typing.nit:1567,32
+            ../src/syntax/typing.nit:1567,31--65
+              '(' ... ../src/syntax/typing.nit:1567,31
               ../src/syntax/typing.nit:1567,32
-              identifier 'v' ... ../src/syntax/typing.nit:1567,32
-            ../src/syntax/typing.nit:1567,35--38
-              keyword 'self' ... ../src/syntax/typing.nit:1567,35--38
-            ../src/syntax/typing.nit:1567,41--50
-              ../src/syntax/typing.nit:1567,41
+                ../src/syntax/typing.nit:1567,32
+                identifier 'v' ... ../src/syntax/typing.nit:1567,32
+                ../src/syntax/typing.nit:1567,32
+              ../src/syntax/typing.nit:1567,35--38
+                keyword 'self' ... ../src/syntax/typing.nit:1567,35--38
+              ../src/syntax/typing.nit:1567,41--50
                 ../src/syntax/typing.nit:1567,41
-                identifier 'v' ... ../src/syntax/typing.nit:1567,41
-              identifier 'mmmodule' ... ../src/syntax/typing.nit:1567,43--50
-            ../src/syntax/typing.nit:1567,53--64
-              ../src/syntax/typing.nit:1567,53
-              identifier 'recv_is_self' ... ../src/syntax/typing.nit:1567,53--64
-          ../src/syntax/typing.nit:1568,3--41
+                  ../src/syntax/typing.nit:1567,41
+                  identifier 'v' ... ../src/syntax/typing.nit:1567,41
+                  ../src/syntax/typing.nit:1567,41
+                identifier 'mmmodule' ... ../src/syntax/typing.nit:1567,43--50
+                ../src/syntax/typing.nit:1567,41
+              ../src/syntax/typing.nit:1567,53--64
+                ../src/syntax/typing.nit:1567,53
+                identifier 'recv_is_self' ... ../src/syntax/typing.nit:1567,53--64
+                ../src/syntax/typing.nit:1567,53
+              ')' ... ../src/syntax/typing.nit:1567,65
+          ../src/syntax/typing.nit:1568,3--42
             keyword 'var' ... ../src/syntax/typing.nit:1568,3--5
             identifier 'psig' ... ../src/syntax/typing.nit:1568,7--10
             '=' ... ../src/syntax/typing.nit:1568,12
-            ../src/syntax/typing.nit:1568,14--41
+            ../src/syntax/typing.nit:1568,14--42
               ../src/syntax/typing.nit:1568,14--17
                 ../src/syntax/typing.nit:1568,14
                 identifier 'prop' ... ../src/syntax/typing.nit:1568,14--17
+                ../src/syntax/typing.nit:1568,14
               identifier 'signature_for' ... ../src/syntax/typing.nit:1568,19--31
-              ../src/syntax/typing.nit:1568,33--41
-                ../src/syntax/typing.nit:1568,33
-                identifier 'type_recv' ... ../src/syntax/typing.nit:1568,33--41
+              ../src/syntax/typing.nit:1568,32--42
+                '(' ... ../src/syntax/typing.nit:1568,32
+                ../src/syntax/typing.nit:1568,33--41
+                  ../src/syntax/typing.nit:1568,33
+                  identifier 'type_recv' ... ../src/syntax/typing.nit:1568,33--41
+                  ../src/syntax/typing.nit:1568,33
+                ')' ... ../src/syntax/typing.nit:1568,42
           ../src/syntax/typing.nit:1569,3--51
             keyword 'if' ... ../src/syntax/typing.nit:1569,3--4
             ../src/syntax/typing.nit:1569,6--21
@@ -9955,20 +12240,25 @@
               ../src/syntax/typing.nit:1569,10--21
                 ../src/syntax/typing.nit:1569,10
                 identifier 'recv_is_self' ... ../src/syntax/typing.nit:1569,10--21
+                ../src/syntax/typing.nit:1569,10
             ../src/syntax/typing.nit:1569,28--51
               ../src/syntax/typing.nit:1569,35
               identifier 'psig' ... ../src/syntax/typing.nit:1569,28--31
+              ../src/syntax/typing.nit:1569,35
               '=' ... ../src/syntax/typing.nit:1569,33
               ../src/syntax/typing.nit:1569,35--51
                 ../src/syntax/typing.nit:1569,35--38
                   ../src/syntax/typing.nit:1569,35
                   identifier 'psig' ... ../src/syntax/typing.nit:1569,35--38
+                  ../src/syntax/typing.nit:1569,35
                 identifier 'not_for_self' ... ../src/syntax/typing.nit:1569,40--51
+                ../src/syntax/typing.nit:1569,35
           ../src/syntax/typing.nit:1570,3--13
             keyword 'return' ... ../src/syntax/typing.nit:1570,3--8
             ../src/syntax/typing.nit:1570,10--13
               ../src/syntax/typing.nit:1570,10
               identifier 'psig' ... ../src/syntax/typing.nit:1570,10--13
+              ../src/syntax/typing.nit:1570,10
           keyword 'end' ... ../src/syntax/typing.nit:1571,2--4
       ../src/syntax/typing.nit:1573,2--1574,44
         ../src/syntax/typing.nit:1573,2--1574,0
@@ -10046,11 +12336,14 @@
                 ../src/syntax/typing.nit:1586,6--11
                   ../src/syntax/typing.nit:1586,6
                   identifier 'parent' ... ../src/syntax/typing.nit:1586,6--11
+                  ../src/syntax/typing.nit:1586,6
                 ../src/syntax/typing.nit:1586,16--26
                   ../src/syntax/typing.nit:1586,16
                     ../src/syntax/typing.nit:1586,16
                     identifier 'v' ... ../src/syntax/typing.nit:1586,16
+                    ../src/syntax/typing.nit:1586,16
                   identifier 'top_block' ... ../src/syntax/typing.nit:1586,18--26
+                  ../src/syntax/typing.nit:1586,16
               ../src/syntax/typing.nit:1586,32--50
                 ../src/syntax/typing.nit:1586,32--35
                   keyword 'self' ... ../src/syntax/typing.nit:1586,32--35
@@ -10058,46 +12351,63 @@
                   ../src/syntax/typing.nit:1586,40
                     ../src/syntax/typing.nit:1586,40
                     identifier 'v' ... ../src/syntax/typing.nit:1586,40
+                    ../src/syntax/typing.nit:1586,40
                   identifier 'top_block' ... ../src/syntax/typing.nit:1586,42--50
-            ../src/syntax/typing.nit:1587,4--88
-              ../src/syntax/typing.nit:1587,4--88
+                  ../src/syntax/typing.nit:1586,40
+            ../src/syntax/typing.nit:1587,4--89
+              ../src/syntax/typing.nit:1587,4--89
                 ../src/syntax/typing.nit:1587,4
                   ../src/syntax/typing.nit:1587,4
                   identifier 'v' ... ../src/syntax/typing.nit:1587,4
+                  ../src/syntax/typing.nit:1587,4
                 identifier 'error' ... ../src/syntax/typing.nit:1587,6--10
-                ../src/syntax/typing.nit:1587,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:1587,12--15
-                ../src/syntax/typing.nit:1587,18--88
-                  ../src/syntax/typing.nit:1587,18--49
-                    literal value '"Error: Constructor invocation {' ... ../src/syntax/typing.nit:1587,18--49
-                  ../src/syntax/typing.nit:1587,50--57
-                    ../src/syntax/typing.nit:1587,50
-                    identifier 'property' ... ../src/syntax/typing.nit:1587,50--57
-                  ../src/syntax/typing.nit:1587,58--88
-                    '} must not be in nested block."' ... ../src/syntax/typing.nit:1587,58--88
+                ../src/syntax/typing.nit:1587,11--89
+                  '(' ... ../src/syntax/typing.nit:1587,11
+                  ../src/syntax/typing.nit:1587,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:1587,12--15
+                  ../src/syntax/typing.nit:1587,18--88
+                    ../src/syntax/typing.nit:1587,18--49
+                      literal value '"Error: Constructor invocation {' ... ../src/syntax/typing.nit:1587,18--49
+                    ../src/syntax/typing.nit:1587,50--57
+                      ../src/syntax/typing.nit:1587,50
+                      identifier 'property' ... ../src/syntax/typing.nit:1587,50--57
+                      ../src/syntax/typing.nit:1587,50
+                    ../src/syntax/typing.nit:1587,58--88
+                      '} must not be in nested block."' ... ../src/syntax/typing.nit:1587,58--88
+                  ')' ... ../src/syntax/typing.nit:1587,89
             ../src/syntax/typing.nit:1588,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1588,3--5
-          ../src/syntax/typing.nit:1589,3--63
+          ../src/syntax/typing.nit:1589,3--64
             keyword 'var' ... ../src/syntax/typing.nit:1589,3--5
             identifier 'cla' ... ../src/syntax/typing.nit:1589,7--9
             '=' ... ../src/syntax/typing.nit:1589,11
-            ../src/syntax/typing.nit:1589,13--63
+            ../src/syntax/typing.nit:1589,13--64
               ../src/syntax/typing.nit:1589,13--22
                 ../src/syntax/typing.nit:1589,13
                   ../src/syntax/typing.nit:1589,13
                   identifier 'v' ... ../src/syntax/typing.nit:1589,13
+                  ../src/syntax/typing.nit:1589,13
                 identifier 'mmmodule' ... ../src/syntax/typing.nit:1589,15--22
-              ../src/syntax/typing.nit:1589,24--63
-                ../src/syntax/typing.nit:1589,24--56
-                  ../src/syntax/typing.nit:1589,24--44
-                    ../src/syntax/typing.nit:1589,24--38
-                      ../src/syntax/typing.nit:1589,24--31
+                ../src/syntax/typing.nit:1589,13
+              ../src/syntax/typing.nit:1589,23--64
+                '[' ... ../src/syntax/typing.nit:1589,23
+                ../src/syntax/typing.nit:1589,24--63
+                  ../src/syntax/typing.nit:1589,24--56
+                    ../src/syntax/typing.nit:1589,24--44
+                      ../src/syntax/typing.nit:1589,24--38
+                        ../src/syntax/typing.nit:1589,24--31
+                          ../src/syntax/typing.nit:1589,24
+                          identifier 'property' ... ../src/syntax/typing.nit:1589,24--31
+                          ../src/syntax/typing.nit:1589,24
+                        identifier 'global' ... ../src/syntax/typing.nit:1589,33--38
                         ../src/syntax/typing.nit:1589,24
-                        identifier 'property' ... ../src/syntax/typing.nit:1589,24--31
-                      identifier 'global' ... ../src/syntax/typing.nit:1589,33--38
-                    identifier 'intro' ... ../src/syntax/typing.nit:1589,40--44
-                  identifier 'local_class' ... ../src/syntax/typing.nit:1589,46--56
-                identifier 'global' ... ../src/syntax/typing.nit:1589,58--63
+                      identifier 'intro' ... ../src/syntax/typing.nit:1589,40--44
+                      ../src/syntax/typing.nit:1589,24
+                    identifier 'local_class' ... ../src/syntax/typing.nit:1589,46--56
+                    ../src/syntax/typing.nit:1589,24
+                  identifier 'global' ... ../src/syntax/typing.nit:1589,58--63
+                  ../src/syntax/typing.nit:1589,24
+                ']' ... ../src/syntax/typing.nit:1589,64
           ../src/syntax/typing.nit:1590,3--46
             keyword 'var' ... ../src/syntax/typing.nit:1590,3--5
             identifier 'prev_class' ... ../src/syntax/typing.nit:1590,7--16
@@ -10116,7 +12426,9 @@
                 ../src/syntax/typing.nit:1591,14
                   ../src/syntax/typing.nit:1591,14
                   identifier 'v' ... ../src/syntax/typing.nit:1591,14
+                  ../src/syntax/typing.nit:1591,14
                 identifier 'explicit_super_init_calls' ... ../src/syntax/typing.nit:1591,16--40
+                ../src/syntax/typing.nit:1591,14
               keyword 'as' ... ../src/syntax/typing.nit:1591,42--43
               '(' ... ../src/syntax/typing.nit:1591,44
               keyword 'not' ... ../src/syntax/typing.nit:1591,45--47
@@ -10130,11 +12442,14 @@
                 ../src/syntax/typing.nit:1592,10--13
                   ../src/syntax/typing.nit:1592,10
                   identifier 'esic' ... ../src/syntax/typing.nit:1592,10--13
+                  ../src/syntax/typing.nit:1592,10
                 identifier 'is_empty' ... ../src/syntax/typing.nit:1592,15--22
+                ../src/syntax/typing.nit:1592,10
             ../src/syntax/typing.nit:1593,4--50
               ../src/syntax/typing.nit:1593,4--50
                 ../src/syntax/typing.nit:1593,17
                 identifier 'prev_class' ... ../src/syntax/typing.nit:1593,4--13
+                ../src/syntax/typing.nit:1593,17
                 '=' ... ../src/syntax/typing.nit:1593,15
                 ../src/syntax/typing.nit:1593,17--50
                   ../src/syntax/typing.nit:1593,17--38
@@ -10143,10 +12458,15 @@
                         ../src/syntax/typing.nit:1593,17--20
                           ../src/syntax/typing.nit:1593,17
                           identifier 'esic' ... ../src/syntax/typing.nit:1593,17--20
+                          ../src/syntax/typing.nit:1593,17
                         identifier 'last' ... ../src/syntax/typing.nit:1593,22--25
+                        ../src/syntax/typing.nit:1593,17
                       identifier 'global' ... ../src/syntax/typing.nit:1593,27--32
+                      ../src/syntax/typing.nit:1593,17
                     identifier 'intro' ... ../src/syntax/typing.nit:1593,34--38
+                    ../src/syntax/typing.nit:1593,17
                   identifier 'local_class' ... ../src/syntax/typing.nit:1593,40--50
+                  ../src/syntax/typing.nit:1593,17
             ../src/syntax/typing.nit:1594,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1594,3--5
           ../src/syntax/typing.nit:1595,3--57
@@ -10159,91 +12479,121 @@
                   ../src/syntax/typing.nit:1595,15
                     ../src/syntax/typing.nit:1595,15
                     identifier 'v' ... ../src/syntax/typing.nit:1595,15
+                    ../src/syntax/typing.nit:1595,15
                   identifier 'local_class' ... ../src/syntax/typing.nit:1595,17--27
+                  ../src/syntax/typing.nit:1595,15
                 identifier 'cshe' ... ../src/syntax/typing.nit:1595,29--32
+                ../src/syntax/typing.nit:1595,15
               identifier 'reverse_linear_extension' ... ../src/syntax/typing.nit:1595,34--57
+              ../src/syntax/typing.nit:1595,15
           ../src/syntax/typing.nit:1596,3--1614,5
             keyword 'if' ... ../src/syntax/typing.nit:1596,3--4
             ../src/syntax/typing.nit:1596,6--25
               ../src/syntax/typing.nit:1596,6--8
                 ../src/syntax/typing.nit:1596,6
                 identifier 'cla' ... ../src/syntax/typing.nit:1596,6--8
+                ../src/syntax/typing.nit:1596,6
               ../src/syntax/typing.nit:1596,13--25
                 ../src/syntax/typing.nit:1596,13
                   ../src/syntax/typing.nit:1596,13
                   identifier 'v' ... ../src/syntax/typing.nit:1596,13
+                  ../src/syntax/typing.nit:1596,13
                 identifier 'local_class' ... ../src/syntax/typing.nit:1596,15--25
+                ../src/syntax/typing.nit:1596,13
             ../src/syntax/typing.nit:1597,4--36
               ../src/syntax/typing.nit:1597,4--36
                 ../src/syntax/typing.nit:1597,4
                   ../src/syntax/typing.nit:1597,4
                   identifier 'v' ... ../src/syntax/typing.nit:1597,4
+                  ../src/syntax/typing.nit:1597,4
                 identifier 'explicit_other_init_call' ... ../src/syntax/typing.nit:1597,6--29
+                ../src/syntax/typing.nit:1597,33
                 '=' ... ../src/syntax/typing.nit:1597,31
                 ../src/syntax/typing.nit:1597,33--36
                   keyword 'true' ... ../src/syntax/typing.nit:1597,33--36
             ../src/syntax/typing.nit:1598,8--1614,5
               keyword 'if' ... ../src/syntax/typing.nit:1598,8--9
-              ../src/syntax/typing.nit:1598,11--27
+              ../src/syntax/typing.nit:1598,11--28
                 keyword 'not' ... ../src/syntax/typing.nit:1598,11--13
-                ../src/syntax/typing.nit:1598,15--27
+                ../src/syntax/typing.nit:1598,15--28
                   ../src/syntax/typing.nit:1598,15--19
                     ../src/syntax/typing.nit:1598,15
                     identifier 'order' ... ../src/syntax/typing.nit:1598,15--19
+                    ../src/syntax/typing.nit:1598,15
                   identifier 'has' ... ../src/syntax/typing.nit:1598,21--23
-                  ../src/syntax/typing.nit:1598,25--27
-                    ../src/syntax/typing.nit:1598,25
-                    identifier 'cla' ... ../src/syntax/typing.nit:1598,25--27
-              ../src/syntax/typing.nit:1599,4--87
-                ../src/syntax/typing.nit:1599,4--87
+                  ../src/syntax/typing.nit:1598,24--28
+                    '(' ... ../src/syntax/typing.nit:1598,24
+                    ../src/syntax/typing.nit:1598,25--27
+                      ../src/syntax/typing.nit:1598,25
+                      identifier 'cla' ... ../src/syntax/typing.nit:1598,25--27
+                      ../src/syntax/typing.nit:1598,25
+                    ')' ... ../src/syntax/typing.nit:1598,28
+              ../src/syntax/typing.nit:1599,4--88
+                ../src/syntax/typing.nit:1599,4--88
                   ../src/syntax/typing.nit:1599,4
                     ../src/syntax/typing.nit:1599,4
                     identifier 'v' ... ../src/syntax/typing.nit:1599,4
+                    ../src/syntax/typing.nit:1599,4
                   identifier 'error' ... ../src/syntax/typing.nit:1599,6--10
-                  ../src/syntax/typing.nit:1599,12--15
-                    keyword 'self' ... ../src/syntax/typing.nit:1599,12--15
-                  ../src/syntax/typing.nit:1599,18--87
-                    ../src/syntax/typing.nit:1599,18--47
-                      literal value '"Error: Constructor of class {' ... ../src/syntax/typing.nit:1599,18--47
-                    ../src/syntax/typing.nit:1599,48--50
-                      ../src/syntax/typing.nit:1599,48
-                      identifier 'cla' ... ../src/syntax/typing.nit:1599,48--50
-                    ../src/syntax/typing.nit:1599,51--68
-                      literal value '} must be one in {' ... ../src/syntax/typing.nit:1599,51--68
-                    ../src/syntax/typing.nit:1599,69--83
-                      ../src/syntax/typing.nit:1599,69--73
-                        ../src/syntax/typing.nit:1599,69
-                        identifier 'order' ... ../src/syntax/typing.nit:1599,69--73
-                      identifier 'join' ... ../src/syntax/typing.nit:1599,75--78
-                      ../src/syntax/typing.nit:1599,80--83
-                        literal value '", "' ... ../src/syntax/typing.nit:1599,80--83
-                    ../src/syntax/typing.nit:1599,85--87
-                      '}."' ... ../src/syntax/typing.nit:1599,85--87
+                  ../src/syntax/typing.nit:1599,11--88
+                    '(' ... ../src/syntax/typing.nit:1599,11
+                    ../src/syntax/typing.nit:1599,12--15
+                      keyword 'self' ... ../src/syntax/typing.nit:1599,12--15
+                    ../src/syntax/typing.nit:1599,18--87
+                      ../src/syntax/typing.nit:1599,18--47
+                        literal value '"Error: Constructor of class {' ... ../src/syntax/typing.nit:1599,18--47
+                      ../src/syntax/typing.nit:1599,48--50
+                        ../src/syntax/typing.nit:1599,48
+                        identifier 'cla' ... ../src/syntax/typing.nit:1599,48--50
+                        ../src/syntax/typing.nit:1599,48
+                      ../src/syntax/typing.nit:1599,51--68
+                        literal value '} must be one in {' ... ../src/syntax/typing.nit:1599,51--68
+                      ../src/syntax/typing.nit:1599,69--84
+                        ../src/syntax/typing.nit:1599,69--73
+                          ../src/syntax/typing.nit:1599,69
+                          identifier 'order' ... ../src/syntax/typing.nit:1599,69--73
+                          ../src/syntax/typing.nit:1599,69
+                        identifier 'join' ... ../src/syntax/typing.nit:1599,75--78
+                        ../src/syntax/typing.nit:1599,79--84
+                          '(' ... ../src/syntax/typing.nit:1599,79
+                          ../src/syntax/typing.nit:1599,80--83
+                            literal value '", "' ... ../src/syntax/typing.nit:1599,80--83
+                          ')' ... ../src/syntax/typing.nit:1599,84
+                      ../src/syntax/typing.nit:1599,85--87
+                        '}."' ... ../src/syntax/typing.nit:1599,85--87
+                    ')' ... ../src/syntax/typing.nit:1599,88
               ../src/syntax/typing.nit:1600,8--1614,5
                 keyword 'if' ... ../src/syntax/typing.nit:1600,8--9
                 ../src/syntax/typing.nit:1600,11--27
                   ../src/syntax/typing.nit:1600,11--13
                     ../src/syntax/typing.nit:1600,11
                     identifier 'cla' ... ../src/syntax/typing.nit:1600,11--13
+                    ../src/syntax/typing.nit:1600,11
                   ../src/syntax/typing.nit:1600,18--27
                     ../src/syntax/typing.nit:1600,18
                     identifier 'prev_class' ... ../src/syntax/typing.nit:1600,18--27
-                ../src/syntax/typing.nit:1601,4--90
-                  ../src/syntax/typing.nit:1601,4--90
+                    ../src/syntax/typing.nit:1600,18
+                ../src/syntax/typing.nit:1601,4--91
+                  ../src/syntax/typing.nit:1601,4--91
                     ../src/syntax/typing.nit:1601,4
                       ../src/syntax/typing.nit:1601,4
                       identifier 'v' ... ../src/syntax/typing.nit:1601,4
+                      ../src/syntax/typing.nit:1601,4
                     identifier 'error' ... ../src/syntax/typing.nit:1601,6--10
-                    ../src/syntax/typing.nit:1601,12--15
-                      keyword 'self' ... ../src/syntax/typing.nit:1601,12--15
-                    ../src/syntax/typing.nit:1601,18--90
-                      ../src/syntax/typing.nit:1601,18--73
-                        literal value '"Error: Only one super constructor invocation of class {' ... ../src/syntax/typing.nit:1601,18--73
-                      ../src/syntax/typing.nit:1601,74--76
-                        ../src/syntax/typing.nit:1601,74
-                        identifier 'cla' ... ../src/syntax/typing.nit:1601,74--76
-                      ../src/syntax/typing.nit:1601,77--90
-                        '} is allowed."' ... ../src/syntax/typing.nit:1601,77--90
+                    ../src/syntax/typing.nit:1601,11--91
+                      '(' ... ../src/syntax/typing.nit:1601,11
+                      ../src/syntax/typing.nit:1601,12--15
+                        keyword 'self' ... ../src/syntax/typing.nit:1601,12--15
+                      ../src/syntax/typing.nit:1601,18--90
+                        ../src/syntax/typing.nit:1601,18--73
+                          literal value '"Error: Only one super constructor invocation of class {' ... ../src/syntax/typing.nit:1601,18--73
+                        ../src/syntax/typing.nit:1601,74--76
+                          ../src/syntax/typing.nit:1601,74
+                          identifier 'cla' ... ../src/syntax/typing.nit:1601,74--76
+                          ../src/syntax/typing.nit:1601,74
+                        ../src/syntax/typing.nit:1601,77--90
+                          '} is allowed."' ... ../src/syntax/typing.nit:1601,77--90
+                      ')' ... ../src/syntax/typing.nit:1601,91
                 ../src/syntax/typing.nit:1603,4--1614,5
                   ../src/syntax/typing.nit:1603,4--1613,6
                     keyword 'for' ... ../src/syntax/typing.nit:1603,4--6
@@ -10251,6 +12601,7 @@
                     ../src/syntax/typing.nit:1603,13--17
                       ../src/syntax/typing.nit:1603,13
                       identifier 'order' ... ../src/syntax/typing.nit:1603,13--17
+                      ../src/syntax/typing.nit:1603,13
                     keyword 'do' ... ../src/syntax/typing.nit:1603,19--20
                     ../src/syntax/typing.nit:1604,5--1613,6
                       ../src/syntax/typing.nit:1604,5--1612,7
@@ -10259,13 +12610,16 @@
                           ../src/syntax/typing.nit:1604,8
                             ../src/syntax/typing.nit:1604,8
                             identifier 'c' ... ../src/syntax/typing.nit:1604,8
+                            ../src/syntax/typing.nit:1604,8
                           ../src/syntax/typing.nit:1604,13--22
                             ../src/syntax/typing.nit:1604,13
                             identifier 'prev_class' ... ../src/syntax/typing.nit:1604,13--22
+                            ../src/syntax/typing.nit:1604,13
                         ../src/syntax/typing.nit:1605,6--22
                           ../src/syntax/typing.nit:1605,6--22
                             ../src/syntax/typing.nit:1605,19
                             identifier 'prev_class' ... ../src/syntax/typing.nit:1605,6--15
+                            ../src/syntax/typing.nit:1605,19
                             '=' ... ../src/syntax/typing.nit:1605,17
                             ../src/syntax/typing.nit:1605,19--22
                               keyword 'null' ... ../src/syntax/typing.nit:1605,19--22
@@ -10275,9 +12629,11 @@
                             ../src/syntax/typing.nit:1606,13
                               ../src/syntax/typing.nit:1606,13
                               identifier 'c' ... ../src/syntax/typing.nit:1606,13
+                              ../src/syntax/typing.nit:1606,13
                             ../src/syntax/typing.nit:1606,18--20
                               ../src/syntax/typing.nit:1606,18
                               identifier 'cla' ... ../src/syntax/typing.nit:1606,18--20
+                              ../src/syntax/typing.nit:1606,18
                           ../src/syntax/typing.nit:1607,6--1611,10
                             ../src/syntax/typing.nit:1607,6--1609,8
                               keyword 'if' ... ../src/syntax/typing.nit:1607,6--7
@@ -10285,39 +12641,51 @@
                                 ../src/syntax/typing.nit:1607,9--18
                                   ../src/syntax/typing.nit:1607,9
                                   identifier 'prev_class' ... ../src/syntax/typing.nit:1607,9--18
+                                  ../src/syntax/typing.nit:1607,9
                                 ../src/syntax/typing.nit:1607,23--26
                                   keyword 'null' ... ../src/syntax/typing.nit:1607,23--26
-                              ../src/syntax/typing.nit:1608,7--98
-                                ../src/syntax/typing.nit:1608,7--98
+                              ../src/syntax/typing.nit:1608,7--99
+                                ../src/syntax/typing.nit:1608,7--99
                                   ../src/syntax/typing.nit:1608,7
                                     ../src/syntax/typing.nit:1608,7
                                     identifier 'v' ... ../src/syntax/typing.nit:1608,7
+                                    ../src/syntax/typing.nit:1608,7
                                   identifier 'error' ... ../src/syntax/typing.nit:1608,9--13
-                                  ../src/syntax/typing.nit:1608,15--18
-                                    keyword 'self' ... ../src/syntax/typing.nit:1608,15--18
-                                  ../src/syntax/typing.nit:1608,21--98
-                                    ../src/syntax/typing.nit:1608,21--44
-                                      literal value '"Error: Constructor of {' ... ../src/syntax/typing.nit:1608,21--44
-                                    ../src/syntax/typing.nit:1608,45
+                                  ../src/syntax/typing.nit:1608,14--99
+                                    '(' ... ../src/syntax/typing.nit:1608,14
+                                    ../src/syntax/typing.nit:1608,15--18
+                                      keyword 'self' ... ../src/syntax/typing.nit:1608,15--18
+                                    ../src/syntax/typing.nit:1608,21--98
+                                      ../src/syntax/typing.nit:1608,21--44
+                                        literal value '"Error: Constructor of {' ... ../src/syntax/typing.nit:1608,21--44
                                       ../src/syntax/typing.nit:1608,45
-                                      identifier 'c' ... ../src/syntax/typing.nit:1608,45
-                                    ../src/syntax/typing.nit:1608,46--86
-                                      literal value '} must be invoked before constructor of {' ... ../src/syntax/typing.nit:1608,46--86
-                                    ../src/syntax/typing.nit:1608,87--96
-                                      ../src/syntax/typing.nit:1608,87
-                                      identifier 'prev_class' ... ../src/syntax/typing.nit:1608,87--96
-                                    ../src/syntax/typing.nit:1608,97--98
-                                      '}"' ... ../src/syntax/typing.nit:1608,97--98
+                                        ../src/syntax/typing.nit:1608,45
+                                        identifier 'c' ... ../src/syntax/typing.nit:1608,45
+                                        ../src/syntax/typing.nit:1608,45
+                                      ../src/syntax/typing.nit:1608,46--86
+                                        literal value '} must be invoked before constructor of {' ... ../src/syntax/typing.nit:1608,46--86
+                                      ../src/syntax/typing.nit:1608,87--96
+                                        ../src/syntax/typing.nit:1608,87
+                                        identifier 'prev_class' ... ../src/syntax/typing.nit:1608,87--96
+                                        ../src/syntax/typing.nit:1608,87
+                                      ../src/syntax/typing.nit:1608,97--98
+                                        '}"' ... ../src/syntax/typing.nit:1608,97--98
+                                    ')' ... ../src/syntax/typing.nit:1608,99
                               ../src/syntax/typing.nit:1609,6--8
                                 keyword 'end' ... ../src/syntax/typing.nit:1609,6--8
-                            ../src/syntax/typing.nit:1610,6--22
+                            ../src/syntax/typing.nit:1610,6--23
                               ../src/syntax/typing.nit:1610,6--9
                                 ../src/syntax/typing.nit:1610,6
                                 identifier 'esic' ... ../src/syntax/typing.nit:1610,6--9
+                                ../src/syntax/typing.nit:1610,6
                               identifier 'add' ... ../src/syntax/typing.nit:1610,11--13
-                              ../src/syntax/typing.nit:1610,15--22
-                                ../src/syntax/typing.nit:1610,15
-                                identifier 'property' ... ../src/syntax/typing.nit:1610,15--22
+                              ../src/syntax/typing.nit:1610,14--23
+                                '(' ... ../src/syntax/typing.nit:1610,14
+                                ../src/syntax/typing.nit:1610,15--22
+                                  ../src/syntax/typing.nit:1610,15
+                                  identifier 'property' ... ../src/syntax/typing.nit:1610,15--22
+                                  ../src/syntax/typing.nit:1610,15
+                                ')' ... ../src/syntax/typing.nit:1610,23
                             ../src/syntax/typing.nit:1611,6--10
                               keyword 'break' ... ../src/syntax/typing.nit:1611,6--10
                           ../src/syntax/typing.nit:1612,5--7
@@ -10345,7 +12713,9 @@
             ../src/syntax/typing.nit:1620,44--49
               ../src/syntax/typing.nit:1620,44
               identifier 'n_args' ... ../src/syntax/typing.nit:1620,44--49
+              ../src/syntax/typing.nit:1620,44
             identifier 'to_a' ... ../src/syntax/typing.nit:1620,51--54
+            ../src/syntax/typing.nit:1620,44
       ../src/syntax/typing.nit:1621,2--1645,4
         keyword 'redef' ... ../src/syntax/typing.nit:1621,2--6
         ../src/syntax/typing.nit:1621,12
@@ -10364,7 +12734,9 @@
                 ../src/syntax/typing.nit:1623,10--15
                   ../src/syntax/typing.nit:1623,10
                   identifier 'n_type' ... ../src/syntax/typing.nit:1623,10--15
+                  ../src/syntax/typing.nit:1623,10
                 identifier 'is_typed' ... ../src/syntax/typing.nit:1623,17--24
+                ../src/syntax/typing.nit:1623,10
             ../src/syntax/typing.nit:1623,31--36
               keyword 'return' ... ../src/syntax/typing.nit:1623,31--36
           ../src/syntax/typing.nit:1624,3--22
@@ -10375,7 +12747,9 @@
               ../src/syntax/typing.nit:1624,11--16
                 ../src/syntax/typing.nit:1624,11
                 identifier 'n_type' ... ../src/syntax/typing.nit:1624,11--16
+                ../src/syntax/typing.nit:1624,11
               identifier 'stype' ... ../src/syntax/typing.nit:1624,18--22
+              ../src/syntax/typing.nit:1624,11
           ../src/syntax/typing.nit:1625,3--1628,5
             keyword 'if' ... ../src/syntax/typing.nit:1625,3--4
             ../src/syntax/typing.nit:1625,6--37
@@ -10384,27 +12758,37 @@
                   ../src/syntax/typing.nit:1625,6
                     ../src/syntax/typing.nit:1625,6
                     identifier 't' ... ../src/syntax/typing.nit:1625,6
+                    ../src/syntax/typing.nit:1625,6
                   identifier 'local_class' ... ../src/syntax/typing.nit:1625,8--18
+                  ../src/syntax/typing.nit:1625,6
                 identifier 'global' ... ../src/syntax/typing.nit:1625,20--25
+                ../src/syntax/typing.nit:1625,6
               identifier 'is_abstract' ... ../src/syntax/typing.nit:1625,27--37
+              ../src/syntax/typing.nit:1625,6
             ../src/syntax/typing.nit:1626,4--1627,9
-              ../src/syntax/typing.nit:1626,4--76
+              ../src/syntax/typing.nit:1626,4--77
                 ../src/syntax/typing.nit:1626,4
                   ../src/syntax/typing.nit:1626,4
                   identifier 'v' ... ../src/syntax/typing.nit:1626,4
+                  ../src/syntax/typing.nit:1626,4
                 identifier 'error' ... ../src/syntax/typing.nit:1626,6--10
-                ../src/syntax/typing.nit:1626,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:1626,12--15
-                ../src/syntax/typing.nit:1626,18--76
-                  ../src/syntax/typing.nit:1626,18--60
-                    literal value '"Error: try to instantiate abstract class {' ... ../src/syntax/typing.nit:1626,18--60
-                  ../src/syntax/typing.nit:1626,61--73
-                    ../src/syntax/typing.nit:1626,61
+                ../src/syntax/typing.nit:1626,11--77
+                  '(' ... ../src/syntax/typing.nit:1626,11
+                  ../src/syntax/typing.nit:1626,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:1626,12--15
+                  ../src/syntax/typing.nit:1626,18--76
+                    ../src/syntax/typing.nit:1626,18--60
+                      literal value '"Error: try to instantiate abstract class {' ... ../src/syntax/typing.nit:1626,18--60
+                    ../src/syntax/typing.nit:1626,61--73
+                      ../src/syntax/typing.nit:1626,61
+                        ../src/syntax/typing.nit:1626,61
+                        identifier 't' ... ../src/syntax/typing.nit:1626,61
+                        ../src/syntax/typing.nit:1626,61
+                      identifier 'local_class' ... ../src/syntax/typing.nit:1626,63--73
                       ../src/syntax/typing.nit:1626,61
-                      identifier 't' ... ../src/syntax/typing.nit:1626,61
-                    identifier 'local_class' ... ../src/syntax/typing.nit:1626,63--73
-                  ../src/syntax/typing.nit:1626,74--76
-                    '}."' ... ../src/syntax/typing.nit:1626,74--76
+                    ../src/syntax/typing.nit:1626,74--76
+                      '}."' ... ../src/syntax/typing.nit:1626,74--76
+                  ')' ... ../src/syntax/typing.nit:1626,77
               ../src/syntax/typing.nit:1627,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:1627,4--9
             ../src/syntax/typing.nit:1628,3--5
@@ -10420,12 +12804,14 @@
               ../src/syntax/typing.nit:1630,6--9
                 ../src/syntax/typing.nit:1630,6
                 identifier 'n_id' ... ../src/syntax/typing.nit:1630,6--9
+                ../src/syntax/typing.nit:1630,6
               ../src/syntax/typing.nit:1630,14--17
                 keyword 'null' ... ../src/syntax/typing.nit:1630,14--17
             ../src/syntax/typing.nit:1631,4--31
               ../src/syntax/typing.nit:1631,4--31
                 ../src/syntax/typing.nit:1631,16
                 identifier 'name' ... ../src/syntax/typing.nit:1631,4--7
+                ../src/syntax/typing.nit:1631,16
                 '=' ... ../src/syntax/typing.nit:1631,9
                 ../src/syntax/typing.nit:1631,11--31
                   keyword 'once' ... ../src/syntax/typing.nit:1631,11--14
@@ -10433,38 +12819,49 @@
                     ../src/syntax/typing.nit:1631,16--21
                       literal value '"init"' ... ../src/syntax/typing.nit:1631,16--21
                     identifier 'to_symbol' ... ../src/syntax/typing.nit:1631,23--31
+                    ../src/syntax/typing.nit:1631,16
             ../src/syntax/typing.nit:1633,4--1634,5
               ../src/syntax/typing.nit:1633,4--24
                 ../src/syntax/typing.nit:1633,11
                 identifier 'name' ... ../src/syntax/typing.nit:1633,4--7
+                ../src/syntax/typing.nit:1633,11
                 '=' ... ../src/syntax/typing.nit:1633,9
                 ../src/syntax/typing.nit:1633,11--24
                   ../src/syntax/typing.nit:1633,11--14
                     ../src/syntax/typing.nit:1633,11
                     identifier 'n_id' ... ../src/syntax/typing.nit:1633,11--14
+                    ../src/syntax/typing.nit:1633,11
                   identifier 'to_symbol' ... ../src/syntax/typing.nit:1633,16--24
+                  ../src/syntax/typing.nit:1633,11
               keyword 'end' ... ../src/syntax/typing.nit:1634,3--5
-          ../src/syntax/typing.nit:1636,3--57
+          ../src/syntax/typing.nit:1636,3--58
             ../src/syntax/typing.nit:1636,13
             identifier 'do_typing' ... ../src/syntax/typing.nit:1636,3--11
-            ../src/syntax/typing.nit:1636,13
+            ../src/syntax/typing.nit:1636,12--58
+              '(' ... ../src/syntax/typing.nit:1636,12
               ../src/syntax/typing.nit:1636,13
-              identifier 'v' ... ../src/syntax/typing.nit:1636,13
-            ../src/syntax/typing.nit:1636,16
+                ../src/syntax/typing.nit:1636,13
+                identifier 'v' ... ../src/syntax/typing.nit:1636,13
+                ../src/syntax/typing.nit:1636,13
               ../src/syntax/typing.nit:1636,16
-              identifier 't' ... ../src/syntax/typing.nit:1636,16
-            ../src/syntax/typing.nit:1636,19--23
-              keyword 'false' ... ../src/syntax/typing.nit:1636,19--23
-            ../src/syntax/typing.nit:1636,26--30
-              keyword 'false' ... ../src/syntax/typing.nit:1636,26--30
-            ../src/syntax/typing.nit:1636,33--36
-              ../src/syntax/typing.nit:1636,33
-              identifier 'name' ... ../src/syntax/typing.nit:1636,33--36
-            ../src/syntax/typing.nit:1636,39--51
-              ../src/syntax/typing.nit:1636,39
-              identifier 'raw_arguments' ... ../src/syntax/typing.nit:1636,39--51
-            ../src/syntax/typing.nit:1636,54--57
-              keyword 'null' ... ../src/syntax/typing.nit:1636,54--57
+                ../src/syntax/typing.nit:1636,16
+                identifier 't' ... ../src/syntax/typing.nit:1636,16
+                ../src/syntax/typing.nit:1636,16
+              ../src/syntax/typing.nit:1636,19--23
+                keyword 'false' ... ../src/syntax/typing.nit:1636,19--23
+              ../src/syntax/typing.nit:1636,26--30
+                keyword 'false' ... ../src/syntax/typing.nit:1636,26--30
+              ../src/syntax/typing.nit:1636,33--36
+                ../src/syntax/typing.nit:1636,33
+                identifier 'name' ... ../src/syntax/typing.nit:1636,33--36
+                ../src/syntax/typing.nit:1636,33
+              ../src/syntax/typing.nit:1636,39--51
+                ../src/syntax/typing.nit:1636,39
+                identifier 'raw_arguments' ... ../src/syntax/typing.nit:1636,39--51
+                ../src/syntax/typing.nit:1636,39
+              ../src/syntax/typing.nit:1636,54--57
+                keyword 'null' ... ../src/syntax/typing.nit:1636,54--57
+              ')' ... ../src/syntax/typing.nit:1636,58
           ../src/syntax/typing.nit:1637,3--30
             keyword 'if' ... ../src/syntax/typing.nit:1637,3--4
             ../src/syntax/typing.nit:1637,6--18
@@ -10484,24 +12881,32 @@
                   ../src/syntax/typing.nit:1639,10--13
                     ../src/syntax/typing.nit:1639,10
                     identifier 'prop' ... ../src/syntax/typing.nit:1639,10--13
+                    ../src/syntax/typing.nit:1639,10
                   identifier 'global' ... ../src/syntax/typing.nit:1639,15--20
+                  ../src/syntax/typing.nit:1639,10
                 identifier 'is_init' ... ../src/syntax/typing.nit:1639,22--28
+                ../src/syntax/typing.nit:1639,10
             ../src/syntax/typing.nit:1640,4--1641,9
-              ../src/syntax/typing.nit:1640,4--54
+              ../src/syntax/typing.nit:1640,4--55
                 ../src/syntax/typing.nit:1640,4
                   ../src/syntax/typing.nit:1640,4
                   identifier 'v' ... ../src/syntax/typing.nit:1640,4
+                  ../src/syntax/typing.nit:1640,4
                 identifier 'error' ... ../src/syntax/typing.nit:1640,6--10
-                ../src/syntax/typing.nit:1640,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:1640,12--15
-                ../src/syntax/typing.nit:1640,18--54
-                  ../src/syntax/typing.nit:1640,18--26
-                    literal value '"Error: {' ... ../src/syntax/typing.nit:1640,18--26
-                  ../src/syntax/typing.nit:1640,27--30
-                    ../src/syntax/typing.nit:1640,27
-                    identifier 'prop' ... ../src/syntax/typing.nit:1640,27--30
-                  ../src/syntax/typing.nit:1640,31--54
-                    '} is not a constructor."' ... ../src/syntax/typing.nit:1640,31--54
+                ../src/syntax/typing.nit:1640,11--55
+                  '(' ... ../src/syntax/typing.nit:1640,11
+                  ../src/syntax/typing.nit:1640,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:1640,12--15
+                  ../src/syntax/typing.nit:1640,18--54
+                    ../src/syntax/typing.nit:1640,18--26
+                      literal value '"Error: {' ... ../src/syntax/typing.nit:1640,18--26
+                    ../src/syntax/typing.nit:1640,27--30
+                      ../src/syntax/typing.nit:1640,27
+                      identifier 'prop' ... ../src/syntax/typing.nit:1640,27--30
+                      ../src/syntax/typing.nit:1640,27
+                    ../src/syntax/typing.nit:1640,31--54
+                      '} is not a constructor."' ... ../src/syntax/typing.nit:1640,31--54
+                  ')' ... ../src/syntax/typing.nit:1640,55
               ../src/syntax/typing.nit:1641,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:1641,4--9
             ../src/syntax/typing.nit:1642,3--5
@@ -10513,6 +12918,7 @@
             ../src/syntax/typing.nit:1643,12
               ../src/syntax/typing.nit:1643,12
               identifier 't' ... ../src/syntax/typing.nit:1643,12
+              ../src/syntax/typing.nit:1643,12
           ../src/syntax/typing.nit:1644,3--18
             ../src/syntax/typing.nit:1644,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1644,3--11
@@ -10567,12 +12973,16 @@
           ../src/syntax/typing.nit:1656,25
             identifier 'v' ... ../src/syntax/typing.nit:1656,25
         ../src/syntax/typing.nit:1658,3--1659,4
-          ../src/syntax/typing.nit:1658,3--17
+          ../src/syntax/typing.nit:1658,3--18
             ../src/syntax/typing.nit:1658,17
             identifier 'do_all_typing' ... ../src/syntax/typing.nit:1658,3--15
-            ../src/syntax/typing.nit:1658,17
+            ../src/syntax/typing.nit:1658,16--18
+              '(' ... ../src/syntax/typing.nit:1658,16
               ../src/syntax/typing.nit:1658,17
-              identifier 'v' ... ../src/syntax/typing.nit:1658,17
+                ../src/syntax/typing.nit:1658,17
+                identifier 'v' ... ../src/syntax/typing.nit:1658,17
+                ../src/syntax/typing.nit:1658,17
+              ')' ... ../src/syntax/typing.nit:1658,18
           keyword 'end' ... ../src/syntax/typing.nit:1659,2--4
       ../src/syntax/typing.nit:1661,2--1680,4
         ../src/syntax/typing.nit:1661,2--8
@@ -10588,48 +12998,66 @@
         ../src/syntax/typing.nit:1663,3--1680,4
           ../src/syntax/typing.nit:1663,3--41
             keyword 'if' ... ../src/syntax/typing.nit:1663,3--4
-            ../src/syntax/typing.nit:1663,6--28
+            ../src/syntax/typing.nit:1663,6--29
               keyword 'not' ... ../src/syntax/typing.nit:1663,6--8
-              ../src/syntax/typing.nit:1663,10--28
+              ../src/syntax/typing.nit:1663,10--29
                 ../src/syntax/typing.nit:1663,10
                   ../src/syntax/typing.nit:1663,10
                   identifier 'v' ... ../src/syntax/typing.nit:1663,10
+                  ../src/syntax/typing.nit:1663,10
                 identifier 'check_expr' ... ../src/syntax/typing.nit:1663,12--21
-                ../src/syntax/typing.nit:1663,23--28
-                  ../src/syntax/typing.nit:1663,23
-                  identifier 'n_expr' ... ../src/syntax/typing.nit:1663,23--28
+                ../src/syntax/typing.nit:1663,22--29
+                  '(' ... ../src/syntax/typing.nit:1663,22
+                  ../src/syntax/typing.nit:1663,23--28
+                    ../src/syntax/typing.nit:1663,23
+                    identifier 'n_expr' ... ../src/syntax/typing.nit:1663,23--28
+                    ../src/syntax/typing.nit:1663,23
+                  ')' ... ../src/syntax/typing.nit:1663,29
             ../src/syntax/typing.nit:1663,36--41
               keyword 'return' ... ../src/syntax/typing.nit:1663,36--41
-          ../src/syntax/typing.nit:1664,3--103
+          ../src/syntax/typing.nit:1664,3--104
             ../src/syntax/typing.nit:1664,13
             identifier 'do_typing' ... ../src/syntax/typing.nit:1664,3--11
-            ../src/syntax/typing.nit:1664,13
+            ../src/syntax/typing.nit:1664,12--104
+              '(' ... ../src/syntax/typing.nit:1664,12
               ../src/syntax/typing.nit:1664,13
-              identifier 'v' ... ../src/syntax/typing.nit:1664,13
-            ../src/syntax/typing.nit:1664,16--27
-              ../src/syntax/typing.nit:1664,16--21
+                ../src/syntax/typing.nit:1664,13
+                identifier 'v' ... ../src/syntax/typing.nit:1664,13
+                ../src/syntax/typing.nit:1664,13
+              ../src/syntax/typing.nit:1664,16--27
+                ../src/syntax/typing.nit:1664,16--21
+                  ../src/syntax/typing.nit:1664,16
+                  identifier 'n_expr' ... ../src/syntax/typing.nit:1664,16--21
+                  ../src/syntax/typing.nit:1664,16
+                identifier 'stype' ... ../src/syntax/typing.nit:1664,23--27
                 ../src/syntax/typing.nit:1664,16
-                identifier 'n_expr' ... ../src/syntax/typing.nit:1664,16--21
-              identifier 'stype' ... ../src/syntax/typing.nit:1664,23--27
-            ../src/syntax/typing.nit:1664,30--52
-              ../src/syntax/typing.nit:1664,30--35
+              ../src/syntax/typing.nit:1664,30--52
+                ../src/syntax/typing.nit:1664,30--35
+                  ../src/syntax/typing.nit:1664,30
+                  identifier 'n_expr' ... ../src/syntax/typing.nit:1664,30--35
+                  ../src/syntax/typing.nit:1664,30
+                identifier 'is_implicit_self' ... ../src/syntax/typing.nit:1664,37--52
                 ../src/syntax/typing.nit:1664,30
-                identifier 'n_expr' ... ../src/syntax/typing.nit:1664,30--35
-              identifier 'is_implicit_self' ... ../src/syntax/typing.nit:1664,37--52
-            ../src/syntax/typing.nit:1664,55--68
-              ../src/syntax/typing.nit:1664,55--60
+              ../src/syntax/typing.nit:1664,55--68
+                ../src/syntax/typing.nit:1664,55--60
+                  ../src/syntax/typing.nit:1664,55
+                  identifier 'n_expr' ... ../src/syntax/typing.nit:1664,55--60
+                  ../src/syntax/typing.nit:1664,55
+                identifier 'is_self' ... ../src/syntax/typing.nit:1664,62--68
                 ../src/syntax/typing.nit:1664,55
-                identifier 'n_expr' ... ../src/syntax/typing.nit:1664,55--60
-              identifier 'is_self' ... ../src/syntax/typing.nit:1664,62--68
-            ../src/syntax/typing.nit:1664,71--74
-              ../src/syntax/typing.nit:1664,71
-              identifier 'name' ... ../src/syntax/typing.nit:1664,71--74
-            ../src/syntax/typing.nit:1664,77--89
-              ../src/syntax/typing.nit:1664,77
-              identifier 'raw_arguments' ... ../src/syntax/typing.nit:1664,77--89
-            ../src/syntax/typing.nit:1664,92--103
-              ../src/syntax/typing.nit:1664,92
-              identifier 'closure_defs' ... ../src/syntax/typing.nit:1664,92--103
+              ../src/syntax/typing.nit:1664,71--74
+                ../src/syntax/typing.nit:1664,71
+                identifier 'name' ... ../src/syntax/typing.nit:1664,71--74
+                ../src/syntax/typing.nit:1664,71
+              ../src/syntax/typing.nit:1664,77--89
+                ../src/syntax/typing.nit:1664,77
+                identifier 'raw_arguments' ... ../src/syntax/typing.nit:1664,77--89
+                ../src/syntax/typing.nit:1664,77
+              ../src/syntax/typing.nit:1664,92--103
+                ../src/syntax/typing.nit:1664,92
+                identifier 'closure_defs' ... ../src/syntax/typing.nit:1664,92--103
+                ../src/syntax/typing.nit:1664,92
+              ')' ... ../src/syntax/typing.nit:1664,104
           ../src/syntax/typing.nit:1665,3--30
             keyword 'if' ... ../src/syntax/typing.nit:1665,3--4
             ../src/syntax/typing.nit:1665,6--18
@@ -10660,8 +13088,11 @@
                 ../src/syntax/typing.nit:1668,6--9
                   ../src/syntax/typing.nit:1668,6
                   identifier 'prop' ... ../src/syntax/typing.nit:1668,6--9
+                  ../src/syntax/typing.nit:1668,6
                 identifier 'global' ... ../src/syntax/typing.nit:1668,11--16
+                ../src/syntax/typing.nit:1668,6
               identifier 'is_init' ... ../src/syntax/typing.nit:1668,18--24
+              ../src/syntax/typing.nit:1668,6
             ../src/syntax/typing.nit:1669,4--1675,6
               ../src/syntax/typing.nit:1669,4--1675,6
                 keyword 'if' ... ../src/syntax/typing.nit:1669,4--5
@@ -10673,25 +13104,34 @@
                         ../src/syntax/typing.nit:1669,11
                           ../src/syntax/typing.nit:1669,11
                           identifier 'v' ... ../src/syntax/typing.nit:1669,11
+                          ../src/syntax/typing.nit:1669,11
                         identifier 'local_property' ... ../src/syntax/typing.nit:1669,13--26
+                        ../src/syntax/typing.nit:1669,11
                       identifier 'global' ... ../src/syntax/typing.nit:1669,28--33
+                      ../src/syntax/typing.nit:1669,11
                     identifier 'is_init' ... ../src/syntax/typing.nit:1669,35--41
-                ../src/syntax/typing.nit:1670,5--72
-                  ../src/syntax/typing.nit:1670,5--72
+                    ../src/syntax/typing.nit:1669,11
+                ../src/syntax/typing.nit:1670,5--73
+                  ../src/syntax/typing.nit:1670,5--73
                     ../src/syntax/typing.nit:1670,5
                       ../src/syntax/typing.nit:1670,5
                       identifier 'v' ... ../src/syntax/typing.nit:1670,5
+                      ../src/syntax/typing.nit:1670,5
                     identifier 'error' ... ../src/syntax/typing.nit:1670,7--11
-                    ../src/syntax/typing.nit:1670,13--16
-                      keyword 'self' ... ../src/syntax/typing.nit:1670,13--16
-                    ../src/syntax/typing.nit:1670,19--72
-                      ../src/syntax/typing.nit:1670,19--53
-                        literal value '"Error: try to invoke constructor {' ... ../src/syntax/typing.nit:1670,19--53
-                      ../src/syntax/typing.nit:1670,54--57
-                        ../src/syntax/typing.nit:1670,54
-                        identifier 'prop' ... ../src/syntax/typing.nit:1670,54--57
-                      ../src/syntax/typing.nit:1670,58--72
-                        '} in a method."' ... ../src/syntax/typing.nit:1670,58--72
+                    ../src/syntax/typing.nit:1670,12--73
+                      '(' ... ../src/syntax/typing.nit:1670,12
+                      ../src/syntax/typing.nit:1670,13--16
+                        keyword 'self' ... ../src/syntax/typing.nit:1670,13--16
+                      ../src/syntax/typing.nit:1670,19--72
+                        ../src/syntax/typing.nit:1670,19--53
+                          literal value '"Error: try to invoke constructor {' ... ../src/syntax/typing.nit:1670,19--53
+                        ../src/syntax/typing.nit:1670,54--57
+                          ../src/syntax/typing.nit:1670,54
+                          identifier 'prop' ... ../src/syntax/typing.nit:1670,54--57
+                          ../src/syntax/typing.nit:1670,54
+                        ../src/syntax/typing.nit:1670,58--72
+                          '} in a method."' ... ../src/syntax/typing.nit:1670,58--72
+                      ')' ... ../src/syntax/typing.nit:1670,73
                 ../src/syntax/typing.nit:1671,9--1675,6
                   keyword 'if' ... ../src/syntax/typing.nit:1671,9--10
                   ../src/syntax/typing.nit:1671,12--29
@@ -10700,33 +13140,45 @@
                       ../src/syntax/typing.nit:1671,16--21
                         ../src/syntax/typing.nit:1671,16
                         identifier 'n_expr' ... ../src/syntax/typing.nit:1671,16--21
+                        ../src/syntax/typing.nit:1671,16
                       identifier 'is_self' ... ../src/syntax/typing.nit:1671,23--29
-                  ../src/syntax/typing.nit:1672,5--71
-                    ../src/syntax/typing.nit:1672,5--71
+                      ../src/syntax/typing.nit:1671,16
+                  ../src/syntax/typing.nit:1672,5--72
+                    ../src/syntax/typing.nit:1672,5--72
                       ../src/syntax/typing.nit:1672,5
                         ../src/syntax/typing.nit:1672,5
                         identifier 'v' ... ../src/syntax/typing.nit:1672,5
+                        ../src/syntax/typing.nit:1672,5
                       identifier 'error' ... ../src/syntax/typing.nit:1672,7--11
-                      ../src/syntax/typing.nit:1672,13--16
-                        keyword 'self' ... ../src/syntax/typing.nit:1672,13--16
-                      ../src/syntax/typing.nit:1672,19--71
-                        ../src/syntax/typing.nit:1672,19--39
-                          literal value '"Error: constructor {' ... ../src/syntax/typing.nit:1672,19--39
-                        ../src/syntax/typing.nit:1672,40--43
-                          ../src/syntax/typing.nit:1672,40
-                          identifier 'prop' ... ../src/syntax/typing.nit:1672,40--43
-                        ../src/syntax/typing.nit:1672,44--71
-                          '} is not invoken on 'self'."' ... ../src/syntax/typing.nit:1672,44--71
+                      ../src/syntax/typing.nit:1672,12--72
+                        '(' ... ../src/syntax/typing.nit:1672,12
+                        ../src/syntax/typing.nit:1672,13--16
+                          keyword 'self' ... ../src/syntax/typing.nit:1672,13--16
+                        ../src/syntax/typing.nit:1672,19--71
+                          ../src/syntax/typing.nit:1672,19--39
+                            literal value '"Error: constructor {' ... ../src/syntax/typing.nit:1672,19--39
+                          ../src/syntax/typing.nit:1672,40--43
+                            ../src/syntax/typing.nit:1672,40
+                            identifier 'prop' ... ../src/syntax/typing.nit:1672,40--43
+                            ../src/syntax/typing.nit:1672,40
+                          ../src/syntax/typing.nit:1672,44--71
+                            '} is not invoken on 'self'."' ... ../src/syntax/typing.nit:1672,44--71
+                        ')' ... ../src/syntax/typing.nit:1672,72
                   ../src/syntax/typing.nit:1674,5--1675,6
-                    ../src/syntax/typing.nit:1674,5--36
+                    ../src/syntax/typing.nit:1674,5--37
                       ../src/syntax/typing.nit:1674,30
                       identifier 'register_super_init_call' ... ../src/syntax/typing.nit:1674,5--28
-                      ../src/syntax/typing.nit:1674,30
+                      ../src/syntax/typing.nit:1674,29--37
+                        '(' ... ../src/syntax/typing.nit:1674,29
                         ../src/syntax/typing.nit:1674,30
-                        identifier 'v' ... ../src/syntax/typing.nit:1674,30
-                      ../src/syntax/typing.nit:1674,33--36
-                        ../src/syntax/typing.nit:1674,33
-                        identifier 'prop' ... ../src/syntax/typing.nit:1674,33--36
+                          ../src/syntax/typing.nit:1674,30
+                          identifier 'v' ... ../src/syntax/typing.nit:1674,30
+                          ../src/syntax/typing.nit:1674,30
+                        ../src/syntax/typing.nit:1674,33--36
+                          ../src/syntax/typing.nit:1674,33
+                          identifier 'prop' ... ../src/syntax/typing.nit:1674,33--36
+                          ../src/syntax/typing.nit:1674,33
+                        ')' ... ../src/syntax/typing.nit:1674,37
                     keyword 'end' ... ../src/syntax/typing.nit:1675,4--6
             ../src/syntax/typing.nit:1676,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1676,3--5
@@ -10737,6 +13189,7 @@
             ../src/syntax/typing.nit:1678,12--22
               ../src/syntax/typing.nit:1678,12
               identifier 'return_type' ... ../src/syntax/typing.nit:1678,12--22
+              ../src/syntax/typing.nit:1678,12
           ../src/syntax/typing.nit:1679,3--18
             ../src/syntax/typing.nit:1679,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1679,3--11
@@ -10788,16 +13241,21 @@
         ../src/syntax/typing.nit:1688,3--1721,4
           ../src/syntax/typing.nit:1688,3--41
             keyword 'if' ... ../src/syntax/typing.nit:1688,3--4
-            ../src/syntax/typing.nit:1688,6--28
+            ../src/syntax/typing.nit:1688,6--29
               keyword 'not' ... ../src/syntax/typing.nit:1688,6--8
-              ../src/syntax/typing.nit:1688,10--28
+              ../src/syntax/typing.nit:1688,10--29
                 ../src/syntax/typing.nit:1688,10
                   ../src/syntax/typing.nit:1688,10
                   identifier 'v' ... ../src/syntax/typing.nit:1688,10
+                  ../src/syntax/typing.nit:1688,10
                 identifier 'check_expr' ... ../src/syntax/typing.nit:1688,12--21
-                ../src/syntax/typing.nit:1688,23--28
-                  ../src/syntax/typing.nit:1688,23
-                  identifier 'n_expr' ... ../src/syntax/typing.nit:1688,23--28
+                ../src/syntax/typing.nit:1688,22--29
+                  '(' ... ../src/syntax/typing.nit:1688,22
+                  ../src/syntax/typing.nit:1688,23--28
+                    ../src/syntax/typing.nit:1688,23
+                    identifier 'n_expr' ... ../src/syntax/typing.nit:1688,23--28
+                    ../src/syntax/typing.nit:1688,23
+                  ')' ... ../src/syntax/typing.nit:1688,29
             ../src/syntax/typing.nit:1688,36--41
               keyword 'return' ... ../src/syntax/typing.nit:1688,36--41
           ../src/syntax/typing.nit:1689,3--30
@@ -10807,35 +13265,48 @@
             ../src/syntax/typing.nit:1689,18--30
               ../src/syntax/typing.nit:1689,18
               identifier 'raw_arguments' ... ../src/syntax/typing.nit:1689,18--30
-          ../src/syntax/typing.nit:1690,3--90
+              ../src/syntax/typing.nit:1689,18
+          ../src/syntax/typing.nit:1690,3--91
             ../src/syntax/typing.nit:1690,13
             identifier 'do_typing' ... ../src/syntax/typing.nit:1690,3--11
-            ../src/syntax/typing.nit:1690,13
+            ../src/syntax/typing.nit:1690,12--91
+              '(' ... ../src/syntax/typing.nit:1690,12
               ../src/syntax/typing.nit:1690,13
-              identifier 'v' ... ../src/syntax/typing.nit:1690,13
-            ../src/syntax/typing.nit:1690,16--27
-              ../src/syntax/typing.nit:1690,16--21
+                ../src/syntax/typing.nit:1690,13
+                identifier 'v' ... ../src/syntax/typing.nit:1690,13
+                ../src/syntax/typing.nit:1690,13
+              ../src/syntax/typing.nit:1690,16--27
+                ../src/syntax/typing.nit:1690,16--21
+                  ../src/syntax/typing.nit:1690,16
+                  identifier 'n_expr' ... ../src/syntax/typing.nit:1690,16--21
+                  ../src/syntax/typing.nit:1690,16
+                identifier 'stype' ... ../src/syntax/typing.nit:1690,23--27
                 ../src/syntax/typing.nit:1690,16
-                identifier 'n_expr' ... ../src/syntax/typing.nit:1690,16--21
-              identifier 'stype' ... ../src/syntax/typing.nit:1690,23--27
-            ../src/syntax/typing.nit:1690,30--52
-              ../src/syntax/typing.nit:1690,30--35
+              ../src/syntax/typing.nit:1690,30--52
+                ../src/syntax/typing.nit:1690,30--35
+                  ../src/syntax/typing.nit:1690,30
+                  identifier 'n_expr' ... ../src/syntax/typing.nit:1690,30--35
+                  ../src/syntax/typing.nit:1690,30
+                identifier 'is_implicit_self' ... ../src/syntax/typing.nit:1690,37--52
                 ../src/syntax/typing.nit:1690,30
-                identifier 'n_expr' ... ../src/syntax/typing.nit:1690,30--35
-              identifier 'is_implicit_self' ... ../src/syntax/typing.nit:1690,37--52
-            ../src/syntax/typing.nit:1690,55--68
-              ../src/syntax/typing.nit:1690,55--60
+              ../src/syntax/typing.nit:1690,55--68
+                ../src/syntax/typing.nit:1690,55--60
+                  ../src/syntax/typing.nit:1690,55
+                  identifier 'n_expr' ... ../src/syntax/typing.nit:1690,55--60
+                  ../src/syntax/typing.nit:1690,55
+                identifier 'is_self' ... ../src/syntax/typing.nit:1690,62--68
                 ../src/syntax/typing.nit:1690,55
-                identifier 'n_expr' ... ../src/syntax/typing.nit:1690,55--60
-              identifier 'is_self' ... ../src/syntax/typing.nit:1690,62--68
-            ../src/syntax/typing.nit:1690,71--74
-              ../src/syntax/typing.nit:1690,71
-              identifier 'name' ... ../src/syntax/typing.nit:1690,71--74
-            ../src/syntax/typing.nit:1690,77--84
-              ../src/syntax/typing.nit:1690,77
-              identifier 'raw_args' ... ../src/syntax/typing.nit:1690,77--84
-            ../src/syntax/typing.nit:1690,87--90
-              keyword 'null' ... ../src/syntax/typing.nit:1690,87--90
+              ../src/syntax/typing.nit:1690,71--74
+                ../src/syntax/typing.nit:1690,71
+                identifier 'name' ... ../src/syntax/typing.nit:1690,71--74
+                ../src/syntax/typing.nit:1690,71
+              ../src/syntax/typing.nit:1690,77--84
+                ../src/syntax/typing.nit:1690,77
+                identifier 'raw_args' ... ../src/syntax/typing.nit:1690,77--84
+                ../src/syntax/typing.nit:1690,77
+              ../src/syntax/typing.nit:1690,87--90
+                keyword 'null' ... ../src/syntax/typing.nit:1690,87--90
+              ')' ... ../src/syntax/typing.nit:1690,91
           ../src/syntax/typing.nit:1691,3--18
             keyword 'var' ... ../src/syntax/typing.nit:1691,3--5
             identifier 'prop' ... ../src/syntax/typing.nit:1691,7--10
@@ -10849,6 +13320,7 @@
               ../src/syntax/typing.nit:1692,6--9
                 ../src/syntax/typing.nit:1692,6
                 identifier 'prop' ... ../src/syntax/typing.nit:1692,6--9
+                ../src/syntax/typing.nit:1692,6
               ../src/syntax/typing.nit:1692,14--17
                 keyword 'null' ... ../src/syntax/typing.nit:1692,14--17
             ../src/syntax/typing.nit:1692,24--29
@@ -10860,8 +13332,11 @@
                 ../src/syntax/typing.nit:1693,6--9
                   ../src/syntax/typing.nit:1693,6
                   identifier 'prop' ... ../src/syntax/typing.nit:1693,6--9
+                  ../src/syntax/typing.nit:1693,6
                 identifier 'global' ... ../src/syntax/typing.nit:1693,11--16
+                ../src/syntax/typing.nit:1693,6
               identifier 'is_init' ... ../src/syntax/typing.nit:1693,18--24
+              ../src/syntax/typing.nit:1693,6
             ../src/syntax/typing.nit:1694,4--1698,6
               ../src/syntax/typing.nit:1694,4--1698,6
                 keyword 'if' ... ../src/syntax/typing.nit:1694,4--5
@@ -10873,25 +13348,34 @@
                         ../src/syntax/typing.nit:1694,11
                           ../src/syntax/typing.nit:1694,11
                           identifier 'v' ... ../src/syntax/typing.nit:1694,11
+                          ../src/syntax/typing.nit:1694,11
                         identifier 'local_property' ... ../src/syntax/typing.nit:1694,13--26
+                        ../src/syntax/typing.nit:1694,11
                       identifier 'global' ... ../src/syntax/typing.nit:1694,28--33
+                      ../src/syntax/typing.nit:1694,11
                     identifier 'is_init' ... ../src/syntax/typing.nit:1694,35--41
-                ../src/syntax/typing.nit:1695,5--72
-                  ../src/syntax/typing.nit:1695,5--72
+                    ../src/syntax/typing.nit:1694,11
+                ../src/syntax/typing.nit:1695,5--73
+                  ../src/syntax/typing.nit:1695,5--73
                     ../src/syntax/typing.nit:1695,5
                       ../src/syntax/typing.nit:1695,5
                       identifier 'v' ... ../src/syntax/typing.nit:1695,5
+                      ../src/syntax/typing.nit:1695,5
                     identifier 'error' ... ../src/syntax/typing.nit:1695,7--11
-                    ../src/syntax/typing.nit:1695,13--16
-                      keyword 'self' ... ../src/syntax/typing.nit:1695,13--16
-                    ../src/syntax/typing.nit:1695,19--72
-                      ../src/syntax/typing.nit:1695,19--53
-                        literal value '"Error: try to invoke constructor {' ... ../src/syntax/typing.nit:1695,19--53
-                      ../src/syntax/typing.nit:1695,54--57
-                        ../src/syntax/typing.nit:1695,54
-                        identifier 'prop' ... ../src/syntax/typing.nit:1695,54--57
-                      ../src/syntax/typing.nit:1695,58--72
-                        '} in a method."' ... ../src/syntax/typing.nit:1695,58--72
+                    ../src/syntax/typing.nit:1695,12--73
+                      '(' ... ../src/syntax/typing.nit:1695,12
+                      ../src/syntax/typing.nit:1695,13--16
+                        keyword 'self' ... ../src/syntax/typing.nit:1695,13--16
+                      ../src/syntax/typing.nit:1695,19--72
+                        ../src/syntax/typing.nit:1695,19--53
+                          literal value '"Error: try to invoke constructor {' ... ../src/syntax/typing.nit:1695,19--53
+                        ../src/syntax/typing.nit:1695,54--57
+                          ../src/syntax/typing.nit:1695,54
+                          identifier 'prop' ... ../src/syntax/typing.nit:1695,54--57
+                          ../src/syntax/typing.nit:1695,54
+                        ../src/syntax/typing.nit:1695,58--72
+                          '} in a method."' ... ../src/syntax/typing.nit:1695,58--72
+                      ')' ... ../src/syntax/typing.nit:1695,73
                 ../src/syntax/typing.nit:1696,9--1698,6
                   keyword 'if' ... ../src/syntax/typing.nit:1696,9--10
                   ../src/syntax/typing.nit:1696,12--29
@@ -10900,23 +13384,30 @@
                       ../src/syntax/typing.nit:1696,16--21
                         ../src/syntax/typing.nit:1696,16
                         identifier 'n_expr' ... ../src/syntax/typing.nit:1696,16--21
+                        ../src/syntax/typing.nit:1696,16
                       identifier 'is_self' ... ../src/syntax/typing.nit:1696,23--29
-                  ../src/syntax/typing.nit:1697,5--71
-                    ../src/syntax/typing.nit:1697,5--71
+                      ../src/syntax/typing.nit:1696,16
+                  ../src/syntax/typing.nit:1697,5--72
+                    ../src/syntax/typing.nit:1697,5--72
                       ../src/syntax/typing.nit:1697,5
                         ../src/syntax/typing.nit:1697,5
                         identifier 'v' ... ../src/syntax/typing.nit:1697,5
+                        ../src/syntax/typing.nit:1697,5
                       identifier 'error' ... ../src/syntax/typing.nit:1697,7--11
-                      ../src/syntax/typing.nit:1697,13--16
-                        keyword 'self' ... ../src/syntax/typing.nit:1697,13--16
-                      ../src/syntax/typing.nit:1697,19--71
-                        ../src/syntax/typing.nit:1697,19--39
-                          literal value '"Error: constructor {' ... ../src/syntax/typing.nit:1697,19--39
-                        ../src/syntax/typing.nit:1697,40--43
-                          ../src/syntax/typing.nit:1697,40
-                          identifier 'prop' ... ../src/syntax/typing.nit:1697,40--43
-                        ../src/syntax/typing.nit:1697,44--71
-                          '} is not invoken on 'self'."' ... ../src/syntax/typing.nit:1697,44--71
+                      ../src/syntax/typing.nit:1697,12--72
+                        '(' ... ../src/syntax/typing.nit:1697,12
+                        ../src/syntax/typing.nit:1697,13--16
+                          keyword 'self' ... ../src/syntax/typing.nit:1697,13--16
+                        ../src/syntax/typing.nit:1697,19--71
+                          ../src/syntax/typing.nit:1697,19--39
+                            literal value '"Error: constructor {' ... ../src/syntax/typing.nit:1697,19--39
+                          ../src/syntax/typing.nit:1697,40--43
+                            ../src/syntax/typing.nit:1697,40
+                            identifier 'prop' ... ../src/syntax/typing.nit:1697,40--43
+                            ../src/syntax/typing.nit:1697,40
+                          ../src/syntax/typing.nit:1697,44--71
+                            '} is not invoken on 'self'."' ... ../src/syntax/typing.nit:1697,44--71
+                        ')' ... ../src/syntax/typing.nit:1697,72
                   ../src/syntax/typing.nit:1698,4--6
                     keyword 'end' ... ../src/syntax/typing.nit:1698,4--6
             ../src/syntax/typing.nit:1699,3--5
@@ -10927,17 +13418,24 @@
             '=' ... ../src/syntax/typing.nit:1700,9
             ../src/syntax/typing.nit:1700,11--67
               ../src/syntax/typing.nit:1700,11--54
-                ../src/syntax/typing.nit:1700,11--41
+                ../src/syntax/typing.nit:1700,11--42
                   ../src/syntax/typing.nit:1700,11--14
                     ../src/syntax/typing.nit:1700,11
                     identifier 'prop' ... ../src/syntax/typing.nit:1700,11--14
+                    ../src/syntax/typing.nit:1700,11
                   identifier 'signature_for' ... ../src/syntax/typing.nit:1700,16--28
-                  ../src/syntax/typing.nit:1700,30--41
-                    ../src/syntax/typing.nit:1700,30--35
+                  ../src/syntax/typing.nit:1700,29--42
+                    '(' ... ../src/syntax/typing.nit:1700,29
+                    ../src/syntax/typing.nit:1700,30--41
+                      ../src/syntax/typing.nit:1700,30--35
+                        ../src/syntax/typing.nit:1700,30
+                        identifier 'n_expr' ... ../src/syntax/typing.nit:1700,30--35
+                        ../src/syntax/typing.nit:1700,30
+                      identifier 'stype' ... ../src/syntax/typing.nit:1700,37--41
                       ../src/syntax/typing.nit:1700,30
-                      identifier 'n_expr' ... ../src/syntax/typing.nit:1700,30--35
-                    identifier 'stype' ... ../src/syntax/typing.nit:1700,37--41
+                    ')' ... ../src/syntax/typing.nit:1700,42
                 identifier 'return_type' ... ../src/syntax/typing.nit:1700,44--54
+                ../src/syntax/typing.nit:1700,11
               keyword 'as' ... ../src/syntax/typing.nit:1700,56--57
               '(' ... ../src/syntax/typing.nit:1700,58
               keyword 'not' ... ../src/syntax/typing.nit:1700,59--61
@@ -10951,54 +13449,72 @@
                 ../src/syntax/typing.nit:1701,10--15
                   ../src/syntax/typing.nit:1701,10
                   identifier 'n_expr' ... ../src/syntax/typing.nit:1701,10--15
+                  ../src/syntax/typing.nit:1701,10
                 identifier 'is_self' ... ../src/syntax/typing.nit:1701,17--23
+                ../src/syntax/typing.nit:1701,10
             ../src/syntax/typing.nit:1701,30--47
               ../src/syntax/typing.nit:1701,34
               identifier 't' ... ../src/syntax/typing.nit:1701,30
+              ../src/syntax/typing.nit:1701,34
               '=' ... ../src/syntax/typing.nit:1701,32
               ../src/syntax/typing.nit:1701,34--47
                 ../src/syntax/typing.nit:1701,34
                   ../src/syntax/typing.nit:1701,34
                   identifier 't' ... ../src/syntax/typing.nit:1701,34
+                  ../src/syntax/typing.nit:1701,34
                 identifier 'not_for_self' ... ../src/syntax/typing.nit:1701,36--47
-          ../src/syntax/typing.nit:1703,3--32
+                ../src/syntax/typing.nit:1701,34
+          ../src/syntax/typing.nit:1703,3--33
             keyword 'var' ... ../src/syntax/typing.nit:1703,3--5
             identifier 't2' ... ../src/syntax/typing.nit:1703,7--8
             '=' ... ../src/syntax/typing.nit:1703,10
-            ../src/syntax/typing.nit:1703,12--32
+            ../src/syntax/typing.nit:1703,12--33
               ../src/syntax/typing.nit:1703,29
               identifier 'do_rvalue_typing' ... ../src/syntax/typing.nit:1703,12--27
-              ../src/syntax/typing.nit:1703,29
+              ../src/syntax/typing.nit:1703,28--33
+                '(' ... ../src/syntax/typing.nit:1703,28
                 ../src/syntax/typing.nit:1703,29
-                identifier 'v' ... ../src/syntax/typing.nit:1703,29
-              ../src/syntax/typing.nit:1703,32
+                  ../src/syntax/typing.nit:1703,29
+                  identifier 'v' ... ../src/syntax/typing.nit:1703,29
+                  ../src/syntax/typing.nit:1703,29
                 ../src/syntax/typing.nit:1703,32
-                identifier 't' ... ../src/syntax/typing.nit:1703,32
+                  ../src/syntax/typing.nit:1703,32
+                  identifier 't' ... ../src/syntax/typing.nit:1703,32
+                  ../src/syntax/typing.nit:1703,32
+                ')' ... ../src/syntax/typing.nit:1703,33
           ../src/syntax/typing.nit:1704,3--27
             keyword 'if' ... ../src/syntax/typing.nit:1704,3--4
             ../src/syntax/typing.nit:1704,6--15
               ../src/syntax/typing.nit:1704,6--7
                 ../src/syntax/typing.nit:1704,6
                 identifier 't2' ... ../src/syntax/typing.nit:1704,6--7
+                ../src/syntax/typing.nit:1704,6
               ../src/syntax/typing.nit:1704,12--15
                 keyword 'null' ... ../src/syntax/typing.nit:1704,12--15
             ../src/syntax/typing.nit:1704,22--27
               keyword 'return' ... ../src/syntax/typing.nit:1704,22--27
-          ../src/syntax/typing.nit:1705,3--41
+          ../src/syntax/typing.nit:1705,3--42
             ../src/syntax/typing.nit:1705,3
               ../src/syntax/typing.nit:1705,3
               identifier 'v' ... ../src/syntax/typing.nit:1705,3
+              ../src/syntax/typing.nit:1705,3
             identifier 'check_conform' ... ../src/syntax/typing.nit:1705,5--17
-            ../src/syntax/typing.nit:1705,19--22
-              keyword 'self' ... ../src/syntax/typing.nit:1705,19--22
-            ../src/syntax/typing.nit:1705,25--26
-              ../src/syntax/typing.nit:1705,25
-              identifier 't2' ... ../src/syntax/typing.nit:1705,25--26
-            ../src/syntax/typing.nit:1705,29--41
-              ../src/syntax/typing.nit:1705,29--35
+            ../src/syntax/typing.nit:1705,18--42
+              '(' ... ../src/syntax/typing.nit:1705,18
+              ../src/syntax/typing.nit:1705,19--22
+                keyword 'self' ... ../src/syntax/typing.nit:1705,19--22
+              ../src/syntax/typing.nit:1705,25--26
+                ../src/syntax/typing.nit:1705,25
+                identifier 't2' ... ../src/syntax/typing.nit:1705,25--26
+                ../src/syntax/typing.nit:1705,25
+              ../src/syntax/typing.nit:1705,29--41
+                ../src/syntax/typing.nit:1705,29--35
+                  ../src/syntax/typing.nit:1705,29
+                  identifier 'n_value' ... ../src/syntax/typing.nit:1705,29--35
+                  ../src/syntax/typing.nit:1705,29
+                identifier 'stype' ... ../src/syntax/typing.nit:1705,37--41
                 ../src/syntax/typing.nit:1705,29
-                identifier 'n_value' ... ../src/syntax/typing.nit:1705,29--35
-              identifier 'stype' ... ../src/syntax/typing.nit:1705,37--41
+              ')' ... ../src/syntax/typing.nit:1705,42
           ../src/syntax/typing.nit:1707,3--19
             ../src/syntax/typing.nit:1707,16
             attribute '_read_prop' ... ../src/syntax/typing.nit:1707,3--12
@@ -11006,59 +13522,81 @@
             ../src/syntax/typing.nit:1707,16--19
               ../src/syntax/typing.nit:1707,16
               identifier 'prop' ... ../src/syntax/typing.nit:1707,16--19
+              ../src/syntax/typing.nit:1707,16
           ../src/syntax/typing.nit:1708,3--26
             ../src/syntax/typing.nit:1708,14
             identifier 'raw_args' ... ../src/syntax/typing.nit:1708,3--10
+            ../src/syntax/typing.nit:1708,14
             '=' ... ../src/syntax/typing.nit:1708,12
             ../src/syntax/typing.nit:1708,14--26
               ../src/syntax/typing.nit:1708,14--21
                 ../src/syntax/typing.nit:1708,14
                 identifier 'raw_args' ... ../src/syntax/typing.nit:1708,14--21
+                ../src/syntax/typing.nit:1708,14
               identifier 'to_a' ... ../src/syntax/typing.nit:1708,23--26
-          ../src/syntax/typing.nit:1709,3--22
+              ../src/syntax/typing.nit:1708,14
+          ../src/syntax/typing.nit:1709,3--23
             ../src/syntax/typing.nit:1709,3--10
               ../src/syntax/typing.nit:1709,3
               identifier 'raw_args' ... ../src/syntax/typing.nit:1709,3--10
+              ../src/syntax/typing.nit:1709,3
             identifier 'add' ... ../src/syntax/typing.nit:1709,12--14
-            ../src/syntax/typing.nit:1709,16--22
-              ../src/syntax/typing.nit:1709,16
-              identifier 'n_value' ... ../src/syntax/typing.nit:1709,16--22
-          ../src/syntax/typing.nit:1711,3--105
+            ../src/syntax/typing.nit:1709,15--23
+              '(' ... ../src/syntax/typing.nit:1709,15
+              ../src/syntax/typing.nit:1709,16--22
+                ../src/syntax/typing.nit:1709,16
+                identifier 'n_value' ... ../src/syntax/typing.nit:1709,16--22
+                ../src/syntax/typing.nit:1709,16
+              ')' ... ../src/syntax/typing.nit:1709,23
+          ../src/syntax/typing.nit:1711,3--106
             ../src/syntax/typing.nit:1711,13
             identifier 'do_typing' ... ../src/syntax/typing.nit:1711,3--11
-            ../src/syntax/typing.nit:1711,13
+            ../src/syntax/typing.nit:1711,12--106
+              '(' ... ../src/syntax/typing.nit:1711,12
               ../src/syntax/typing.nit:1711,13
-              identifier 'v' ... ../src/syntax/typing.nit:1711,13
-            ../src/syntax/typing.nit:1711,16--27
-              ../src/syntax/typing.nit:1711,16--21
+                ../src/syntax/typing.nit:1711,13
+                identifier 'v' ... ../src/syntax/typing.nit:1711,13
+                ../src/syntax/typing.nit:1711,13
+              ../src/syntax/typing.nit:1711,16--27
+                ../src/syntax/typing.nit:1711,16--21
+                  ../src/syntax/typing.nit:1711,16
+                  identifier 'n_expr' ... ../src/syntax/typing.nit:1711,16--21
+                  ../src/syntax/typing.nit:1711,16
+                identifier 'stype' ... ../src/syntax/typing.nit:1711,23--27
                 ../src/syntax/typing.nit:1711,16
-                identifier 'n_expr' ... ../src/syntax/typing.nit:1711,16--21
-              identifier 'stype' ... ../src/syntax/typing.nit:1711,23--27
-            ../src/syntax/typing.nit:1711,30--52
-              ../src/syntax/typing.nit:1711,30--35
+              ../src/syntax/typing.nit:1711,30--52
+                ../src/syntax/typing.nit:1711,30--35
+                  ../src/syntax/typing.nit:1711,30
+                  identifier 'n_expr' ... ../src/syntax/typing.nit:1711,30--35
+                  ../src/syntax/typing.nit:1711,30
+                identifier 'is_implicit_self' ... ../src/syntax/typing.nit:1711,37--52
                 ../src/syntax/typing.nit:1711,30
-                identifier 'n_expr' ... ../src/syntax/typing.nit:1711,30--35
-              identifier 'is_implicit_self' ... ../src/syntax/typing.nit:1711,37--52
-            ../src/syntax/typing.nit:1711,55--68
-              ../src/syntax/typing.nit:1711,55--60
+              ../src/syntax/typing.nit:1711,55--68
+                ../src/syntax/typing.nit:1711,55--60
+                  ../src/syntax/typing.nit:1711,55
+                  identifier 'n_expr' ... ../src/syntax/typing.nit:1711,55--60
+                  ../src/syntax/typing.nit:1711,55
+                identifier 'is_self' ... ../src/syntax/typing.nit:1711,62--68
                 ../src/syntax/typing.nit:1711,55
-                identifier 'n_expr' ... ../src/syntax/typing.nit:1711,55--60
-              identifier 'is_self' ... ../src/syntax/typing.nit:1711,62--68
-            ../src/syntax/typing.nit:1711,71--89
-              ../src/syntax/typing.nit:1711,71--79
-                ../src/syntax/typing.nit:1711,71--72
-                  literal value '"{' ... ../src/syntax/typing.nit:1711,71--72
-                ../src/syntax/typing.nit:1711,73--76
-                  ../src/syntax/typing.nit:1711,73
-                  identifier 'name' ... ../src/syntax/typing.nit:1711,73--76
-                ../src/syntax/typing.nit:1711,77--79
-                  '}="' ... ../src/syntax/typing.nit:1711,77--79
-              identifier 'to_symbol' ... ../src/syntax/typing.nit:1711,81--89
-            ../src/syntax/typing.nit:1711,92--99
-              ../src/syntax/typing.nit:1711,92
-              identifier 'raw_args' ... ../src/syntax/typing.nit:1711,92--99
-            ../src/syntax/typing.nit:1711,102--105
-              keyword 'null' ... ../src/syntax/typing.nit:1711,102--105
+              ../src/syntax/typing.nit:1711,71--89
+                ../src/syntax/typing.nit:1711,71--79
+                  ../src/syntax/typing.nit:1711,71--72
+                    literal value '"{' ... ../src/syntax/typing.nit:1711,71--72
+                  ../src/syntax/typing.nit:1711,73--76
+                    ../src/syntax/typing.nit:1711,73
+                    identifier 'name' ... ../src/syntax/typing.nit:1711,73--76
+                    ../src/syntax/typing.nit:1711,73
+                  ../src/syntax/typing.nit:1711,77--79
+                    '}="' ... ../src/syntax/typing.nit:1711,77--79
+                identifier 'to_symbol' ... ../src/syntax/typing.nit:1711,81--89
+                ../src/syntax/typing.nit:1711,71
+              ../src/syntax/typing.nit:1711,92--99
+                ../src/syntax/typing.nit:1711,92
+                identifier 'raw_args' ... ../src/syntax/typing.nit:1711,92--99
+                ../src/syntax/typing.nit:1711,92
+              ../src/syntax/typing.nit:1711,102--105
+                keyword 'null' ... ../src/syntax/typing.nit:1711,102--105
+              ')' ... ../src/syntax/typing.nit:1711,106
           ../src/syntax/typing.nit:1712,3--1718,5
             keyword 'if' ... ../src/syntax/typing.nit:1712,3--4
             ../src/syntax/typing.nit:1712,6--24
@@ -11066,8 +13604,11 @@
                 ../src/syntax/typing.nit:1712,6--9
                   ../src/syntax/typing.nit:1712,6
                   identifier 'prop' ... ../src/syntax/typing.nit:1712,6--9
+                  ../src/syntax/typing.nit:1712,6
                 identifier 'global' ... ../src/syntax/typing.nit:1712,11--16
+                ../src/syntax/typing.nit:1712,6
               identifier 'is_init' ... ../src/syntax/typing.nit:1712,18--24
+              ../src/syntax/typing.nit:1712,6
             ../src/syntax/typing.nit:1713,4--1717,6
               ../src/syntax/typing.nit:1713,4--1717,6
                 keyword 'if' ... ../src/syntax/typing.nit:1713,4--5
@@ -11079,25 +13620,34 @@
                         ../src/syntax/typing.nit:1713,11
                           ../src/syntax/typing.nit:1713,11
                           identifier 'v' ... ../src/syntax/typing.nit:1713,11
+                          ../src/syntax/typing.nit:1713,11
                         identifier 'local_property' ... ../src/syntax/typing.nit:1713,13--26
+                        ../src/syntax/typing.nit:1713,11
                       identifier 'global' ... ../src/syntax/typing.nit:1713,28--33
+                      ../src/syntax/typing.nit:1713,11
                     identifier 'is_init' ... ../src/syntax/typing.nit:1713,35--41
-                ../src/syntax/typing.nit:1714,5--72
-                  ../src/syntax/typing.nit:1714,5--72
+                    ../src/syntax/typing.nit:1713,11
+                ../src/syntax/typing.nit:1714,5--73
+                  ../src/syntax/typing.nit:1714,5--73
                     ../src/syntax/typing.nit:1714,5
                       ../src/syntax/typing.nit:1714,5
                       identifier 'v' ... ../src/syntax/typing.nit:1714,5
+                      ../src/syntax/typing.nit:1714,5
                     identifier 'error' ... ../src/syntax/typing.nit:1714,7--11
-                    ../src/syntax/typing.nit:1714,13--16
-                      keyword 'self' ... ../src/syntax/typing.nit:1714,13--16
-                    ../src/syntax/typing.nit:1714,19--72
-                      ../src/syntax/typing.nit:1714,19--53
-                        literal value '"Error: try to invoke constructor {' ... ../src/syntax/typing.nit:1714,19--53
-                      ../src/syntax/typing.nit:1714,54--57
-                        ../src/syntax/typing.nit:1714,54
-                        identifier 'prop' ... ../src/syntax/typing.nit:1714,54--57
-                      ../src/syntax/typing.nit:1714,58--72
-                        '} in a method."' ... ../src/syntax/typing.nit:1714,58--72
+                    ../src/syntax/typing.nit:1714,12--73
+                      '(' ... ../src/syntax/typing.nit:1714,12
+                      ../src/syntax/typing.nit:1714,13--16
+                        keyword 'self' ... ../src/syntax/typing.nit:1714,13--16
+                      ../src/syntax/typing.nit:1714,19--72
+                        ../src/syntax/typing.nit:1714,19--53
+                          literal value '"Error: try to invoke constructor {' ... ../src/syntax/typing.nit:1714,19--53
+                        ../src/syntax/typing.nit:1714,54--57
+                          ../src/syntax/typing.nit:1714,54
+                          identifier 'prop' ... ../src/syntax/typing.nit:1714,54--57
+                          ../src/syntax/typing.nit:1714,54
+                        ../src/syntax/typing.nit:1714,58--72
+                          '} in a method."' ... ../src/syntax/typing.nit:1714,58--72
+                      ')' ... ../src/syntax/typing.nit:1714,73
                 ../src/syntax/typing.nit:1715,9--1717,6
                   keyword 'if' ... ../src/syntax/typing.nit:1715,9--10
                   ../src/syntax/typing.nit:1715,12--29
@@ -11106,23 +13656,30 @@
                       ../src/syntax/typing.nit:1715,16--21
                         ../src/syntax/typing.nit:1715,16
                         identifier 'n_expr' ... ../src/syntax/typing.nit:1715,16--21
+                        ../src/syntax/typing.nit:1715,16
                       identifier 'is_self' ... ../src/syntax/typing.nit:1715,23--29
-                  ../src/syntax/typing.nit:1716,5--71
-                    ../src/syntax/typing.nit:1716,5--71
+                      ../src/syntax/typing.nit:1715,16
+                  ../src/syntax/typing.nit:1716,5--72
+                    ../src/syntax/typing.nit:1716,5--72
                       ../src/syntax/typing.nit:1716,5
                         ../src/syntax/typing.nit:1716,5
                         identifier 'v' ... ../src/syntax/typing.nit:1716,5
+                        ../src/syntax/typing.nit:1716,5
                       identifier 'error' ... ../src/syntax/typing.nit:1716,7--11
-                      ../src/syntax/typing.nit:1716,13--16
-                        keyword 'self' ... ../src/syntax/typing.nit:1716,13--16
-                      ../src/syntax/typing.nit:1716,19--71
-                        ../src/syntax/typing.nit:1716,19--39
-                          literal value '"Error: constructor {' ... ../src/syntax/typing.nit:1716,19--39
-                        ../src/syntax/typing.nit:1716,40--43
-                          ../src/syntax/typing.nit:1716,40
-                          identifier 'prop' ... ../src/syntax/typing.nit:1716,40--43
-                        ../src/syntax/typing.nit:1716,44--71
-                          '} is not invoken on 'self'."' ... ../src/syntax/typing.nit:1716,44--71
+                      ../src/syntax/typing.nit:1716,12--72
+                        '(' ... ../src/syntax/typing.nit:1716,12
+                        ../src/syntax/typing.nit:1716,13--16
+                          keyword 'self' ... ../src/syntax/typing.nit:1716,13--16
+                        ../src/syntax/typing.nit:1716,19--71
+                          ../src/syntax/typing.nit:1716,19--39
+                            literal value '"Error: constructor {' ... ../src/syntax/typing.nit:1716,19--39
+                          ../src/syntax/typing.nit:1716,40--43
+                            ../src/syntax/typing.nit:1716,40
+                            identifier 'prop' ... ../src/syntax/typing.nit:1716,40--43
+                            ../src/syntax/typing.nit:1716,40
+                          ../src/syntax/typing.nit:1716,44--71
+                            '} is not invoken on 'self'."' ... ../src/syntax/typing.nit:1716,44--71
+                        ')' ... ../src/syntax/typing.nit:1716,72
                   ../src/syntax/typing.nit:1717,4--6
                     keyword 'end' ... ../src/syntax/typing.nit:1717,4--6
             ../src/syntax/typing.nit:1718,3--5
@@ -11141,19 +13698,23 @@
       ../src/syntax/typing.nit:1724,7--11
         keyword 'class' ... ../src/syntax/typing.nit:1724,7--11
       type identifier 'ABinopExpr' ... ../src/syntax/typing.nit:1724,13--22
-      ../src/syntax/typing.nit:1725,2--51
+      ../src/syntax/typing.nit:1725,2--52
         keyword 'redef' ... ../src/syntax/typing.nit:1725,2--6
         ../src/syntax/typing.nit:1725,12
         keyword 'fun' ... ../src/syntax/typing.nit:1725,8--10
         ../src/syntax/typing.nit:1725,12--32
           identifier 'compute_raw_arguments' ... ../src/syntax/typing.nit:1725,12--32
         ../src/syntax/typing.nit:1725,45
-        ../src/syntax/typing.nit:1725,37--51
+        ../src/syntax/typing.nit:1725,37--52
           keyword 'return' ... ../src/syntax/typing.nit:1725,37--42
-          ../src/syntax/typing.nit:1725,45--51
-            ../src/syntax/typing.nit:1725,45--51
-              ../src/syntax/typing.nit:1725,45
-              identifier 'n_expr2' ... ../src/syntax/typing.nit:1725,45--51
+          ../src/syntax/typing.nit:1725,44--52
+            ../src/syntax/typing.nit:1725,44--52
+              '[' ... ../src/syntax/typing.nit:1725,44
+              ../src/syntax/typing.nit:1725,45--51
+                ../src/syntax/typing.nit:1725,45
+                identifier 'n_expr2' ... ../src/syntax/typing.nit:1725,45--51
+                ../src/syntax/typing.nit:1725,45
+              ']' ... ../src/syntax/typing.nit:1725,52
       keyword 'end' ... ../src/syntax/typing.nit:1726,1--3
     ../src/syntax/typing.nit:1727,1--1757,3
       keyword 'redef' ... ../src/syntax/typing.nit:1727,1--5
@@ -11176,6 +13737,7 @@
               ../src/syntax/typing.nit:1728,32--35
                 literal value '"=="' ... ../src/syntax/typing.nit:1728,32--35
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1728,37--45
+              ../src/syntax/typing.nit:1728,32
       ../src/syntax/typing.nit:1729,2--1747,4
         keyword 'redef' ... ../src/syntax/typing.nit:1729,2--6
         ../src/syntax/typing.nit:1729,12
@@ -11188,6 +13750,7 @@
         ../src/syntax/typing.nit:1731,3--1747,4
           ../src/syntax/typing.nit:1731,3--7
             keyword 'super' ... ../src/syntax/typing.nit:1731,3--7
+            ../src/syntax/typing.nit:1731,3
           ../src/syntax/typing.nit:1732,3--60
             keyword 'if' ... ../src/syntax/typing.nit:1732,3--4
             ../src/syntax/typing.nit:1732,6--48
@@ -11197,14 +13760,18 @@
                   ../src/syntax/typing.nit:1732,10--15
                     ../src/syntax/typing.nit:1732,10
                     identifier 'n_expr' ... ../src/syntax/typing.nit:1732,10--15
+                    ../src/syntax/typing.nit:1732,10
                   identifier 'is_typed' ... ../src/syntax/typing.nit:1732,17--24
+                  ../src/syntax/typing.nit:1732,10
               ../src/syntax/typing.nit:1732,29--48
                 keyword 'not' ... ../src/syntax/typing.nit:1732,29--31
                 ../src/syntax/typing.nit:1732,33--48
                   ../src/syntax/typing.nit:1732,33--39
                     ../src/syntax/typing.nit:1732,33
                     identifier 'n_expr2' ... ../src/syntax/typing.nit:1732,33--39
+                    ../src/syntax/typing.nit:1732,33
                   identifier 'is_typed' ... ../src/syntax/typing.nit:1732,41--48
+                  ../src/syntax/typing.nit:1732,33
             ../src/syntax/typing.nit:1732,55--60
               keyword 'return' ... ../src/syntax/typing.nit:1732,55--60
           ../src/syntax/typing.nit:1733,3--1736,5
@@ -11217,7 +13784,9 @@
                       ../src/syntax/typing.nit:1733,6--11
                         ../src/syntax/typing.nit:1733,6
                         identifier 'n_expr' ... ../src/syntax/typing.nit:1733,6--11
+                        ../src/syntax/typing.nit:1733,6
                       identifier 'stype' ... ../src/syntax/typing.nit:1733,13--17
+                      ../src/syntax/typing.nit:1733,6
                     ../src/syntax/typing.nit:1733,23--32
                       type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1733,23--32
                   ../src/syntax/typing.nit:1733,38--66
@@ -11227,14 +13796,19 @@
                         ../src/syntax/typing.nit:1733,42--48
                           ../src/syntax/typing.nit:1733,42
                           identifier 'n_expr2' ... ../src/syntax/typing.nit:1733,42--48
+                          ../src/syntax/typing.nit:1733,42
                         identifier 'stype' ... ../src/syntax/typing.nit:1733,50--54
+                        ../src/syntax/typing.nit:1733,42
                       identifier 'is_nullable' ... ../src/syntax/typing.nit:1733,56--66
+                      ../src/syntax/typing.nit:1733,42
                 ../src/syntax/typing.nit:1734,3--30
                   ../src/syntax/typing.nit:1734,3--15
                     ../src/syntax/typing.nit:1734,3--9
                       ../src/syntax/typing.nit:1734,3
                       identifier 'n_expr2' ... ../src/syntax/typing.nit:1734,3--9
+                      ../src/syntax/typing.nit:1734,3
                     identifier 'stype' ... ../src/syntax/typing.nit:1734,11--15
+                    ../src/syntax/typing.nit:1734,3
                   ../src/syntax/typing.nit:1734,21--30
                     type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1734,21--30
               ../src/syntax/typing.nit:1734,36--63
@@ -11244,18 +13818,25 @@
                     ../src/syntax/typing.nit:1734,40--45
                       ../src/syntax/typing.nit:1734,40
                       identifier 'n_expr' ... ../src/syntax/typing.nit:1734,40--45
+                      ../src/syntax/typing.nit:1734,40
                     identifier 'stype' ... ../src/syntax/typing.nit:1734,47--51
+                    ../src/syntax/typing.nit:1734,40
                   identifier 'is_nullable' ... ../src/syntax/typing.nit:1734,53--63
-            ../src/syntax/typing.nit:1735,4--80
-              ../src/syntax/typing.nit:1735,4--80
+                  ../src/syntax/typing.nit:1734,40
+            ../src/syntax/typing.nit:1735,4--81
+              ../src/syntax/typing.nit:1735,4--81
                 ../src/syntax/typing.nit:1735,4
                   ../src/syntax/typing.nit:1735,4
                   identifier 'v' ... ../src/syntax/typing.nit:1735,4
+                  ../src/syntax/typing.nit:1735,4
                 identifier 'warning' ... ../src/syntax/typing.nit:1735,6--12
-                ../src/syntax/typing.nit:1735,14--17
-                  keyword 'self' ... ../src/syntax/typing.nit:1735,14--17
-                ../src/syntax/typing.nit:1735,20--80
-                  literal value '"Warning: comparaison between null and a non nullable value."' ... ../src/syntax/typing.nit:1735,20--80
+                ../src/syntax/typing.nit:1735,13--81
+                  '(' ... ../src/syntax/typing.nit:1735,13
+                  ../src/syntax/typing.nit:1735,14--17
+                    keyword 'self' ... ../src/syntax/typing.nit:1735,14--17
+                  ../src/syntax/typing.nit:1735,20--80
+                    literal value '"Warning: comparaison between null and a non nullable value."' ... ../src/syntax/typing.nit:1735,20--80
+                  ')' ... ../src/syntax/typing.nit:1735,81
             ../src/syntax/typing.nit:1736,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1736,3--5
           ../src/syntax/typing.nit:1738,3--1746,5
@@ -11265,7 +13846,9 @@
                 ../src/syntax/typing.nit:1738,6--11
                   ../src/syntax/typing.nit:1738,6
                   identifier 'n_expr' ... ../src/syntax/typing.nit:1738,6--11
+                  ../src/syntax/typing.nit:1738,6
                 identifier 'stype' ... ../src/syntax/typing.nit:1738,13--17
+                ../src/syntax/typing.nit:1738,6
               ../src/syntax/typing.nit:1738,23--32
                 type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1738,23--32
             ../src/syntax/typing.nit:1739,4--1743,6
@@ -11276,29 +13859,40 @@
                     ../src/syntax/typing.nit:1739,7--13
                       ../src/syntax/typing.nit:1739,7
                       identifier 'n_expr2' ... ../src/syntax/typing.nit:1739,7--13
+                      ../src/syntax/typing.nit:1739,7
                     identifier 'stype' ... ../src/syntax/typing.nit:1739,15--19
+                    ../src/syntax/typing.nit:1739,7
                   ../src/syntax/typing.nit:1739,25--34
                     type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1739,25--34
-                ../src/syntax/typing.nit:1740,5--67
-                  ../src/syntax/typing.nit:1740,5--67
+                ../src/syntax/typing.nit:1740,5--68
+                  ../src/syntax/typing.nit:1740,5--68
                     ../src/syntax/typing.nit:1740,5
                       ../src/syntax/typing.nit:1740,5
                       identifier 'v' ... ../src/syntax/typing.nit:1740,5
+                      ../src/syntax/typing.nit:1740,5
                     identifier 'warning' ... ../src/syntax/typing.nit:1740,7--13
-                    ../src/syntax/typing.nit:1740,15--18
-                      keyword 'self' ... ../src/syntax/typing.nit:1740,15--18
-                    ../src/syntax/typing.nit:1740,21--67
-                      literal value '"Warning: comparaison between two null values."' ... ../src/syntax/typing.nit:1740,21--67
+                    ../src/syntax/typing.nit:1740,14--68
+                      '(' ... ../src/syntax/typing.nit:1740,14
+                      ../src/syntax/typing.nit:1740,15--18
+                        keyword 'self' ... ../src/syntax/typing.nit:1740,15--18
+                      ../src/syntax/typing.nit:1740,21--67
+                        literal value '"Warning: comparaison between two null values."' ... ../src/syntax/typing.nit:1740,21--67
+                      ')' ... ../src/syntax/typing.nit:1740,68
                 ../src/syntax/typing.nit:1742,5--1743,6
-                  ../src/syntax/typing.nit:1742,5--25
+                  ../src/syntax/typing.nit:1742,5--26
                     ../src/syntax/typing.nit:1742,16
                     identifier 'try_to_isa' ... ../src/syntax/typing.nit:1742,5--14
-                    ../src/syntax/typing.nit:1742,16
+                    ../src/syntax/typing.nit:1742,15--26
+                      '(' ... ../src/syntax/typing.nit:1742,15
                       ../src/syntax/typing.nit:1742,16
-                      identifier 'v' ... ../src/syntax/typing.nit:1742,16
-                    ../src/syntax/typing.nit:1742,19--25
-                      ../src/syntax/typing.nit:1742,19
-                      identifier 'n_expr2' ... ../src/syntax/typing.nit:1742,19--25
+                        ../src/syntax/typing.nit:1742,16
+                        identifier 'v' ... ../src/syntax/typing.nit:1742,16
+                        ../src/syntax/typing.nit:1742,16
+                      ../src/syntax/typing.nit:1742,19--25
+                        ../src/syntax/typing.nit:1742,19
+                        identifier 'n_expr2' ... ../src/syntax/typing.nit:1742,19--25
+                        ../src/syntax/typing.nit:1742,19
+                      ')' ... ../src/syntax/typing.nit:1742,26
                   keyword 'end' ... ../src/syntax/typing.nit:1743,4--6
             ../src/syntax/typing.nit:1744,8--1746,5
               keyword 'if' ... ../src/syntax/typing.nit:1744,8--9
@@ -11307,19 +13901,26 @@
                   ../src/syntax/typing.nit:1744,11--17
                     ../src/syntax/typing.nit:1744,11
                     identifier 'n_expr2' ... ../src/syntax/typing.nit:1744,11--17
+                    ../src/syntax/typing.nit:1744,11
                   identifier 'stype' ... ../src/syntax/typing.nit:1744,19--23
+                  ../src/syntax/typing.nit:1744,11
                 ../src/syntax/typing.nit:1744,29--38
                   type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1744,29--38
-              ../src/syntax/typing.nit:1745,4--23
-                ../src/syntax/typing.nit:1745,4--23
+              ../src/syntax/typing.nit:1745,4--24
+                ../src/syntax/typing.nit:1745,4--24
                   ../src/syntax/typing.nit:1745,15
                   identifier 'try_to_isa' ... ../src/syntax/typing.nit:1745,4--13
-                  ../src/syntax/typing.nit:1745,15
+                  ../src/syntax/typing.nit:1745,14--24
+                    '(' ... ../src/syntax/typing.nit:1745,14
                     ../src/syntax/typing.nit:1745,15
-                    identifier 'v' ... ../src/syntax/typing.nit:1745,15
-                  ../src/syntax/typing.nit:1745,18--23
-                    ../src/syntax/typing.nit:1745,18
-                    identifier 'n_expr' ... ../src/syntax/typing.nit:1745,18--23
+                      ../src/syntax/typing.nit:1745,15
+                      identifier 'v' ... ../src/syntax/typing.nit:1745,15
+                      ../src/syntax/typing.nit:1745,15
+                    ../src/syntax/typing.nit:1745,18--23
+                      ../src/syntax/typing.nit:1745,18
+                      identifier 'n_expr' ... ../src/syntax/typing.nit:1745,18--23
+                      ../src/syntax/typing.nit:1745,18
+                    ')' ... ../src/syntax/typing.nit:1745,24
               ../src/syntax/typing.nit:1746,3--5
                 keyword 'end' ... ../src/syntax/typing.nit:1746,3--5
           keyword 'end' ... ../src/syntax/typing.nit:1747,2--4
@@ -11347,7 +13948,9 @@
               ../src/syntax/typing.nit:1751,18
                 ../src/syntax/typing.nit:1751,18
                 identifier 'n' ... ../src/syntax/typing.nit:1751,18
+                ../src/syntax/typing.nit:1751,18
               identifier 'its_variable' ... ../src/syntax/typing.nit:1751,20--31
+              ../src/syntax/typing.nit:1751,18
           ../src/syntax/typing.nit:1752,3--1755,5
             keyword 'if' ... ../src/syntax/typing.nit:1752,3--4
             ../src/syntax/typing.nit:1752,6--52
@@ -11355,6 +13958,7 @@
                 ../src/syntax/typing.nit:1752,6--13
                   ../src/syntax/typing.nit:1752,6
                   identifier 'variable' ... ../src/syntax/typing.nit:1752,6--13
+                  ../src/syntax/typing.nit:1752,6
                 ../src/syntax/typing.nit:1752,18--21
                   keyword 'null' ... ../src/syntax/typing.nit:1752,18--21
               ../src/syntax/typing.nit:1752,27--52
@@ -11362,54 +13966,73 @@
                   ../src/syntax/typing.nit:1752,27
                     ../src/syntax/typing.nit:1752,27
                     identifier 'n' ... ../src/syntax/typing.nit:1752,27
+                    ../src/syntax/typing.nit:1752,27
                   identifier 'stype' ... ../src/syntax/typing.nit:1752,29--33
+                  ../src/syntax/typing.nit:1752,27
                 ../src/syntax/typing.nit:1752,39--52
                   type identifier 'MMNullableType' ... ../src/syntax/typing.nit:1752,39--52
-            ../src/syntax/typing.nit:1753,4--1754,70
-              ../src/syntax/typing.nit:1753,4--78
+            ../src/syntax/typing.nit:1753,4--1754,71
+              ../src/syntax/typing.nit:1753,4--79
                 ../src/syntax/typing.nit:1753,25
                 attribute '_if_false_flow_ctx' ... ../src/syntax/typing.nit:1753,4--21
                 '=' ... ../src/syntax/typing.nit:1753,23
-                ../src/syntax/typing.nit:1753,25--78
+                ../src/syntax/typing.nit:1753,25--79
                   ../src/syntax/typing.nit:1753,25--34
                     ../src/syntax/typing.nit:1753,25
                       ../src/syntax/typing.nit:1753,25
                       identifier 'v' ... ../src/syntax/typing.nit:1753,25
+                      ../src/syntax/typing.nit:1753,25
                     identifier 'flow_ctx' ... ../src/syntax/typing.nit:1753,27--34
+                    ../src/syntax/typing.nit:1753,25
                   identifier 'sub_with' ... ../src/syntax/typing.nit:1753,36--43
-                  ../src/syntax/typing.nit:1753,45--48
-                    keyword 'self' ... ../src/syntax/typing.nit:1753,45--48
-                  ../src/syntax/typing.nit:1753,51--58
-                    ../src/syntax/typing.nit:1753,51
-                    identifier 'variable' ... ../src/syntax/typing.nit:1753,51--58
-                  ../src/syntax/typing.nit:1753,61--78
-                    ../src/syntax/typing.nit:1753,61--67
-                      ../src/syntax/typing.nit:1753,61
+                  ../src/syntax/typing.nit:1753,44--79
+                    '(' ... ../src/syntax/typing.nit:1753,44
+                    ../src/syntax/typing.nit:1753,45--48
+                      keyword 'self' ... ../src/syntax/typing.nit:1753,45--48
+                    ../src/syntax/typing.nit:1753,51--58
+                      ../src/syntax/typing.nit:1753,51
+                      identifier 'variable' ... ../src/syntax/typing.nit:1753,51--58
+                      ../src/syntax/typing.nit:1753,51
+                    ../src/syntax/typing.nit:1753,61--78
+                      ../src/syntax/typing.nit:1753,61--67
+                        ../src/syntax/typing.nit:1753,61
+                          ../src/syntax/typing.nit:1753,61
+                          identifier 'n' ... ../src/syntax/typing.nit:1753,61
+                          ../src/syntax/typing.nit:1753,61
+                        identifier 'stype' ... ../src/syntax/typing.nit:1753,63--67
                         ../src/syntax/typing.nit:1753,61
-                        identifier 'n' ... ../src/syntax/typing.nit:1753,61
-                      identifier 'stype' ... ../src/syntax/typing.nit:1753,63--67
-                    identifier 'as_notnull' ... ../src/syntax/typing.nit:1753,69--78
-              ../src/syntax/typing.nit:1754,4--70
+                      identifier 'as_notnull' ... ../src/syntax/typing.nit:1753,69--78
+                      ../src/syntax/typing.nit:1753,61
+                    ')' ... ../src/syntax/typing.nit:1753,79
+              ../src/syntax/typing.nit:1754,4--71
                 ../src/syntax/typing.nit:1754,24
                 attribute '_if_true_flow_ctx' ... ../src/syntax/typing.nit:1754,4--20
                 '=' ... ../src/syntax/typing.nit:1754,22
-                ../src/syntax/typing.nit:1754,24--70
+                ../src/syntax/typing.nit:1754,24--71
                   ../src/syntax/typing.nit:1754,24--33
                     ../src/syntax/typing.nit:1754,24
                       ../src/syntax/typing.nit:1754,24
                       identifier 'v' ... ../src/syntax/typing.nit:1754,24
+                      ../src/syntax/typing.nit:1754,24
                     identifier 'flow_ctx' ... ../src/syntax/typing.nit:1754,26--33
+                    ../src/syntax/typing.nit:1754,24
                   identifier 'sub_with' ... ../src/syntax/typing.nit:1754,35--42
-                  ../src/syntax/typing.nit:1754,44--47
-                    keyword 'self' ... ../src/syntax/typing.nit:1754,44--47
-                  ../src/syntax/typing.nit:1754,50--57
-                    ../src/syntax/typing.nit:1754,50
-                    identifier 'variable' ... ../src/syntax/typing.nit:1754,50--57
-                  ../src/syntax/typing.nit:1754,60--70
-                    ../src/syntax/typing.nit:1754,60
+                  ../src/syntax/typing.nit:1754,43--71
+                    '(' ... ../src/syntax/typing.nit:1754,43
+                    ../src/syntax/typing.nit:1754,44--47
+                      keyword 'self' ... ../src/syntax/typing.nit:1754,44--47
+                    ../src/syntax/typing.nit:1754,50--57
+                      ../src/syntax/typing.nit:1754,50
+                      identifier 'variable' ... ../src/syntax/typing.nit:1754,50--57
+                      ../src/syntax/typing.nit:1754,50
+                    ../src/syntax/typing.nit:1754,60--70
+                      ../src/syntax/typing.nit:1754,60
+                        ../src/syntax/typing.nit:1754,60
+                        identifier 'v' ... ../src/syntax/typing.nit:1754,60
+                        ../src/syntax/typing.nit:1754,60
+                      identifier 'type_none' ... ../src/syntax/typing.nit:1754,62--70
                       ../src/syntax/typing.nit:1754,60
-                      identifier 'v' ... ../src/syntax/typing.nit:1754,60
-                    identifier 'type_none' ... ../src/syntax/typing.nit:1754,62--70
+                    ')' ... ../src/syntax/typing.nit:1754,71
             ../src/syntax/typing.nit:1755,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1755,3--5
           keyword 'end' ... ../src/syntax/typing.nit:1756,2--4
@@ -11435,6 +14058,7 @@
               ../src/syntax/typing.nit:1759,32--35
                 literal value '"!="' ... ../src/syntax/typing.nit:1759,32--35
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1759,37--45
+              ../src/syntax/typing.nit:1759,32
       ../src/syntax/typing.nit:1760,2--1778,4
         keyword 'redef' ... ../src/syntax/typing.nit:1760,2--6
         ../src/syntax/typing.nit:1760,12
@@ -11447,6 +14071,7 @@
         ../src/syntax/typing.nit:1762,3--1778,4
           ../src/syntax/typing.nit:1762,3--7
             keyword 'super' ... ../src/syntax/typing.nit:1762,3--7
+            ../src/syntax/typing.nit:1762,3
           ../src/syntax/typing.nit:1763,3--60
             keyword 'if' ... ../src/syntax/typing.nit:1763,3--4
             ../src/syntax/typing.nit:1763,6--48
@@ -11456,14 +14081,18 @@
                   ../src/syntax/typing.nit:1763,10--15
                     ../src/syntax/typing.nit:1763,10
                     identifier 'n_expr' ... ../src/syntax/typing.nit:1763,10--15
+                    ../src/syntax/typing.nit:1763,10
                   identifier 'is_typed' ... ../src/syntax/typing.nit:1763,17--24
+                  ../src/syntax/typing.nit:1763,10
               ../src/syntax/typing.nit:1763,29--48
                 keyword 'not' ... ../src/syntax/typing.nit:1763,29--31
                 ../src/syntax/typing.nit:1763,33--48
                   ../src/syntax/typing.nit:1763,33--39
                     ../src/syntax/typing.nit:1763,33
                     identifier 'n_expr2' ... ../src/syntax/typing.nit:1763,33--39
+                    ../src/syntax/typing.nit:1763,33
                   identifier 'is_typed' ... ../src/syntax/typing.nit:1763,41--48
+                  ../src/syntax/typing.nit:1763,33
             ../src/syntax/typing.nit:1763,55--60
               keyword 'return' ... ../src/syntax/typing.nit:1763,55--60
           ../src/syntax/typing.nit:1764,3--1767,5
@@ -11476,7 +14105,9 @@
                       ../src/syntax/typing.nit:1764,6--11
                         ../src/syntax/typing.nit:1764,6
                         identifier 'n_expr' ... ../src/syntax/typing.nit:1764,6--11
+                        ../src/syntax/typing.nit:1764,6
                       identifier 'stype' ... ../src/syntax/typing.nit:1764,13--17
+                      ../src/syntax/typing.nit:1764,6
                     ../src/syntax/typing.nit:1764,23--32
                       type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1764,23--32
                   ../src/syntax/typing.nit:1764,38--66
@@ -11486,14 +14117,19 @@
                         ../src/syntax/typing.nit:1764,42--48
                           ../src/syntax/typing.nit:1764,42
                           identifier 'n_expr2' ... ../src/syntax/typing.nit:1764,42--48
+                          ../src/syntax/typing.nit:1764,42
                         identifier 'stype' ... ../src/syntax/typing.nit:1764,50--54
+                        ../src/syntax/typing.nit:1764,42
                       identifier 'is_nullable' ... ../src/syntax/typing.nit:1764,56--66
+                      ../src/syntax/typing.nit:1764,42
                 ../src/syntax/typing.nit:1765,3--30
                   ../src/syntax/typing.nit:1765,3--15
                     ../src/syntax/typing.nit:1765,3--9
                       ../src/syntax/typing.nit:1765,3
                       identifier 'n_expr2' ... ../src/syntax/typing.nit:1765,3--9
+                      ../src/syntax/typing.nit:1765,3
                     identifier 'stype' ... ../src/syntax/typing.nit:1765,11--15
+                    ../src/syntax/typing.nit:1765,3
                   ../src/syntax/typing.nit:1765,21--30
                     type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1765,21--30
               ../src/syntax/typing.nit:1765,36--63
@@ -11503,18 +14139,25 @@
                     ../src/syntax/typing.nit:1765,40--45
                       ../src/syntax/typing.nit:1765,40
                       identifier 'n_expr' ... ../src/syntax/typing.nit:1765,40--45
+                      ../src/syntax/typing.nit:1765,40
                     identifier 'stype' ... ../src/syntax/typing.nit:1765,47--51
+                    ../src/syntax/typing.nit:1765,40
                   identifier 'is_nullable' ... ../src/syntax/typing.nit:1765,53--63
-            ../src/syntax/typing.nit:1766,4--80
-              ../src/syntax/typing.nit:1766,4--80
+                  ../src/syntax/typing.nit:1765,40
+            ../src/syntax/typing.nit:1766,4--81
+              ../src/syntax/typing.nit:1766,4--81
                 ../src/syntax/typing.nit:1766,4
                   ../src/syntax/typing.nit:1766,4
                   identifier 'v' ... ../src/syntax/typing.nit:1766,4
+                  ../src/syntax/typing.nit:1766,4
                 identifier 'warning' ... ../src/syntax/typing.nit:1766,6--12
-                ../src/syntax/typing.nit:1766,14--17
-                  keyword 'self' ... ../src/syntax/typing.nit:1766,14--17
-                ../src/syntax/typing.nit:1766,20--80
-                  literal value '"Warning: comparaison between null and a non nullable value."' ... ../src/syntax/typing.nit:1766,20--80
+                ../src/syntax/typing.nit:1766,13--81
+                  '(' ... ../src/syntax/typing.nit:1766,13
+                  ../src/syntax/typing.nit:1766,14--17
+                    keyword 'self' ... ../src/syntax/typing.nit:1766,14--17
+                  ../src/syntax/typing.nit:1766,20--80
+                    literal value '"Warning: comparaison between null and a non nullable value."' ... ../src/syntax/typing.nit:1766,20--80
+                  ')' ... ../src/syntax/typing.nit:1766,81
             ../src/syntax/typing.nit:1767,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1767,3--5
           ../src/syntax/typing.nit:1769,3--1777,5
@@ -11524,7 +14167,9 @@
                 ../src/syntax/typing.nit:1769,6--11
                   ../src/syntax/typing.nit:1769,6
                   identifier 'n_expr' ... ../src/syntax/typing.nit:1769,6--11
+                  ../src/syntax/typing.nit:1769,6
                 identifier 'stype' ... ../src/syntax/typing.nit:1769,13--17
+                ../src/syntax/typing.nit:1769,6
               ../src/syntax/typing.nit:1769,23--32
                 type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1769,23--32
             ../src/syntax/typing.nit:1770,4--1774,6
@@ -11535,29 +14180,40 @@
                     ../src/syntax/typing.nit:1770,7--13
                       ../src/syntax/typing.nit:1770,7
                       identifier 'n_expr2' ... ../src/syntax/typing.nit:1770,7--13
+                      ../src/syntax/typing.nit:1770,7
                     identifier 'stype' ... ../src/syntax/typing.nit:1770,15--19
+                    ../src/syntax/typing.nit:1770,7
                   ../src/syntax/typing.nit:1770,25--34
                     type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1770,25--34
-                ../src/syntax/typing.nit:1771,5--67
-                  ../src/syntax/typing.nit:1771,5--67
+                ../src/syntax/typing.nit:1771,5--68
+                  ../src/syntax/typing.nit:1771,5--68
                     ../src/syntax/typing.nit:1771,5
                       ../src/syntax/typing.nit:1771,5
                       identifier 'v' ... ../src/syntax/typing.nit:1771,5
+                      ../src/syntax/typing.nit:1771,5
                     identifier 'warning' ... ../src/syntax/typing.nit:1771,7--13
-                    ../src/syntax/typing.nit:1771,15--18
-                      keyword 'self' ... ../src/syntax/typing.nit:1771,15--18
-                    ../src/syntax/typing.nit:1771,21--67
-                      literal value '"Warning: comparaison between two null values."' ... ../src/syntax/typing.nit:1771,21--67
+                    ../src/syntax/typing.nit:1771,14--68
+                      '(' ... ../src/syntax/typing.nit:1771,14
+                      ../src/syntax/typing.nit:1771,15--18
+                        keyword 'self' ... ../src/syntax/typing.nit:1771,15--18
+                      ../src/syntax/typing.nit:1771,21--67
+                        literal value '"Warning: comparaison between two null values."' ... ../src/syntax/typing.nit:1771,21--67
+                      ')' ... ../src/syntax/typing.nit:1771,68
                 ../src/syntax/typing.nit:1773,5--1774,6
-                  ../src/syntax/typing.nit:1773,5--25
+                  ../src/syntax/typing.nit:1773,5--26
                     ../src/syntax/typing.nit:1773,16
                     identifier 'try_to_isa' ... ../src/syntax/typing.nit:1773,5--14
-                    ../src/syntax/typing.nit:1773,16
+                    ../src/syntax/typing.nit:1773,15--26
+                      '(' ... ../src/syntax/typing.nit:1773,15
                       ../src/syntax/typing.nit:1773,16
-                      identifier 'v' ... ../src/syntax/typing.nit:1773,16
-                    ../src/syntax/typing.nit:1773,19--25
-                      ../src/syntax/typing.nit:1773,19
-                      identifier 'n_expr2' ... ../src/syntax/typing.nit:1773,19--25
+                        ../src/syntax/typing.nit:1773,16
+                        identifier 'v' ... ../src/syntax/typing.nit:1773,16
+                        ../src/syntax/typing.nit:1773,16
+                      ../src/syntax/typing.nit:1773,19--25
+                        ../src/syntax/typing.nit:1773,19
+                        identifier 'n_expr2' ... ../src/syntax/typing.nit:1773,19--25
+                        ../src/syntax/typing.nit:1773,19
+                      ')' ... ../src/syntax/typing.nit:1773,26
                   keyword 'end' ... ../src/syntax/typing.nit:1774,4--6
             ../src/syntax/typing.nit:1775,8--1777,5
               keyword 'if' ... ../src/syntax/typing.nit:1775,8--9
@@ -11566,19 +14222,26 @@
                   ../src/syntax/typing.nit:1775,11--17
                     ../src/syntax/typing.nit:1775,11
                     identifier 'n_expr2' ... ../src/syntax/typing.nit:1775,11--17
+                    ../src/syntax/typing.nit:1775,11
                   identifier 'stype' ... ../src/syntax/typing.nit:1775,19--23
+                  ../src/syntax/typing.nit:1775,11
                 ../src/syntax/typing.nit:1775,29--38
                   type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:1775,29--38
-              ../src/syntax/typing.nit:1776,4--23
-                ../src/syntax/typing.nit:1776,4--23
+              ../src/syntax/typing.nit:1776,4--24
+                ../src/syntax/typing.nit:1776,4--24
                   ../src/syntax/typing.nit:1776,15
                   identifier 'try_to_isa' ... ../src/syntax/typing.nit:1776,4--13
-                  ../src/syntax/typing.nit:1776,15
+                  ../src/syntax/typing.nit:1776,14--24
+                    '(' ... ../src/syntax/typing.nit:1776,14
                     ../src/syntax/typing.nit:1776,15
-                    identifier 'v' ... ../src/syntax/typing.nit:1776,15
-                  ../src/syntax/typing.nit:1776,18--23
-                    ../src/syntax/typing.nit:1776,18
-                    identifier 'n_expr' ... ../src/syntax/typing.nit:1776,18--23
+                      ../src/syntax/typing.nit:1776,15
+                      identifier 'v' ... ../src/syntax/typing.nit:1776,15
+                      ../src/syntax/typing.nit:1776,15
+                    ../src/syntax/typing.nit:1776,18--23
+                      ../src/syntax/typing.nit:1776,18
+                      identifier 'n_expr' ... ../src/syntax/typing.nit:1776,18--23
+                      ../src/syntax/typing.nit:1776,18
+                    ')' ... ../src/syntax/typing.nit:1776,24
               ../src/syntax/typing.nit:1777,3--5
                 keyword 'end' ... ../src/syntax/typing.nit:1777,3--5
           keyword 'end' ... ../src/syntax/typing.nit:1778,2--4
@@ -11606,7 +14269,9 @@
               ../src/syntax/typing.nit:1782,18
                 ../src/syntax/typing.nit:1782,18
                 identifier 'n' ... ../src/syntax/typing.nit:1782,18
+                ../src/syntax/typing.nit:1782,18
               identifier 'its_variable' ... ../src/syntax/typing.nit:1782,20--31
+              ../src/syntax/typing.nit:1782,18
           ../src/syntax/typing.nit:1783,3--1786,5
             keyword 'if' ... ../src/syntax/typing.nit:1783,3--4
             ../src/syntax/typing.nit:1783,6--52
@@ -11614,6 +14279,7 @@
                 ../src/syntax/typing.nit:1783,6--13
                   ../src/syntax/typing.nit:1783,6
                   identifier 'variable' ... ../src/syntax/typing.nit:1783,6--13
+                  ../src/syntax/typing.nit:1783,6
                 ../src/syntax/typing.nit:1783,18--21
                   keyword 'null' ... ../src/syntax/typing.nit:1783,18--21
               ../src/syntax/typing.nit:1783,27--52
@@ -11621,54 +14287,73 @@
                   ../src/syntax/typing.nit:1783,27
                     ../src/syntax/typing.nit:1783,27
                     identifier 'n' ... ../src/syntax/typing.nit:1783,27
+                    ../src/syntax/typing.nit:1783,27
                   identifier 'stype' ... ../src/syntax/typing.nit:1783,29--33
+                  ../src/syntax/typing.nit:1783,27
                 ../src/syntax/typing.nit:1783,39--52
                   type identifier 'MMNullableType' ... ../src/syntax/typing.nit:1783,39--52
-            ../src/syntax/typing.nit:1784,4--1785,71
-              ../src/syntax/typing.nit:1784,4--77
+            ../src/syntax/typing.nit:1784,4--1785,72
+              ../src/syntax/typing.nit:1784,4--78
                 ../src/syntax/typing.nit:1784,24
                 attribute '_if_true_flow_ctx' ... ../src/syntax/typing.nit:1784,4--20
                 '=' ... ../src/syntax/typing.nit:1784,22
-                ../src/syntax/typing.nit:1784,24--77
+                ../src/syntax/typing.nit:1784,24--78
                   ../src/syntax/typing.nit:1784,24--33
                     ../src/syntax/typing.nit:1784,24
                       ../src/syntax/typing.nit:1784,24
                       identifier 'v' ... ../src/syntax/typing.nit:1784,24
+                      ../src/syntax/typing.nit:1784,24
                     identifier 'flow_ctx' ... ../src/syntax/typing.nit:1784,26--33
+                    ../src/syntax/typing.nit:1784,24
                   identifier 'sub_with' ... ../src/syntax/typing.nit:1784,35--42
-                  ../src/syntax/typing.nit:1784,44--47
-                    keyword 'self' ... ../src/syntax/typing.nit:1784,44--47
-                  ../src/syntax/typing.nit:1784,50--57
-                    ../src/syntax/typing.nit:1784,50
-                    identifier 'variable' ... ../src/syntax/typing.nit:1784,50--57
-                  ../src/syntax/typing.nit:1784,60--77
-                    ../src/syntax/typing.nit:1784,60--66
-                      ../src/syntax/typing.nit:1784,60
+                  ../src/syntax/typing.nit:1784,43--78
+                    '(' ... ../src/syntax/typing.nit:1784,43
+                    ../src/syntax/typing.nit:1784,44--47
+                      keyword 'self' ... ../src/syntax/typing.nit:1784,44--47
+                    ../src/syntax/typing.nit:1784,50--57
+                      ../src/syntax/typing.nit:1784,50
+                      identifier 'variable' ... ../src/syntax/typing.nit:1784,50--57
+                      ../src/syntax/typing.nit:1784,50
+                    ../src/syntax/typing.nit:1784,60--77
+                      ../src/syntax/typing.nit:1784,60--66
+                        ../src/syntax/typing.nit:1784,60
+                          ../src/syntax/typing.nit:1784,60
+                          identifier 'n' ... ../src/syntax/typing.nit:1784,60
+                          ../src/syntax/typing.nit:1784,60
+                        identifier 'stype' ... ../src/syntax/typing.nit:1784,62--66
                         ../src/syntax/typing.nit:1784,60
-                        identifier 'n' ... ../src/syntax/typing.nit:1784,60
-                      identifier 'stype' ... ../src/syntax/typing.nit:1784,62--66
-                    identifier 'as_notnull' ... ../src/syntax/typing.nit:1784,68--77
-              ../src/syntax/typing.nit:1785,4--71
+                      identifier 'as_notnull' ... ../src/syntax/typing.nit:1784,68--77
+                      ../src/syntax/typing.nit:1784,60
+                    ')' ... ../src/syntax/typing.nit:1784,78
+              ../src/syntax/typing.nit:1785,4--72
                 ../src/syntax/typing.nit:1785,25
                 attribute '_if_false_flow_ctx' ... ../src/syntax/typing.nit:1785,4--21
                 '=' ... ../src/syntax/typing.nit:1785,23
-                ../src/syntax/typing.nit:1785,25--71
+                ../src/syntax/typing.nit:1785,25--72
                   ../src/syntax/typing.nit:1785,25--34
                     ../src/syntax/typing.nit:1785,25
                       ../src/syntax/typing.nit:1785,25
                       identifier 'v' ... ../src/syntax/typing.nit:1785,25
+                      ../src/syntax/typing.nit:1785,25
                     identifier 'flow_ctx' ... ../src/syntax/typing.nit:1785,27--34
+                    ../src/syntax/typing.nit:1785,25
                   identifier 'sub_with' ... ../src/syntax/typing.nit:1785,36--43
-                  ../src/syntax/typing.nit:1785,45--48
-                    keyword 'self' ... ../src/syntax/typing.nit:1785,45--48
-                  ../src/syntax/typing.nit:1785,51--58
-                    ../src/syntax/typing.nit:1785,51
-                    identifier 'variable' ... ../src/syntax/typing.nit:1785,51--58
-                  ../src/syntax/typing.nit:1785,61--71
-                    ../src/syntax/typing.nit:1785,61
+                  ../src/syntax/typing.nit:1785,44--72
+                    '(' ... ../src/syntax/typing.nit:1785,44
+                    ../src/syntax/typing.nit:1785,45--48
+                      keyword 'self' ... ../src/syntax/typing.nit:1785,45--48
+                    ../src/syntax/typing.nit:1785,51--58
+                      ../src/syntax/typing.nit:1785,51
+                      identifier 'variable' ... ../src/syntax/typing.nit:1785,51--58
+                      ../src/syntax/typing.nit:1785,51
+                    ../src/syntax/typing.nit:1785,61--71
+                      ../src/syntax/typing.nit:1785,61
+                        ../src/syntax/typing.nit:1785,61
+                        identifier 'v' ... ../src/syntax/typing.nit:1785,61
+                        ../src/syntax/typing.nit:1785,61
+                      identifier 'type_none' ... ../src/syntax/typing.nit:1785,63--71
                       ../src/syntax/typing.nit:1785,61
-                      identifier 'v' ... ../src/syntax/typing.nit:1785,61
-                    identifier 'type_none' ... ../src/syntax/typing.nit:1785,63--71
+                    ')' ... ../src/syntax/typing.nit:1785,72
             ../src/syntax/typing.nit:1786,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1786,3--5
           keyword 'end' ... ../src/syntax/typing.nit:1787,2--4
@@ -11694,6 +14379,7 @@
               ../src/syntax/typing.nit:1790,32--34
                 literal value '"<"' ... ../src/syntax/typing.nit:1790,32--34
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1790,36--44
+              ../src/syntax/typing.nit:1790,32
       keyword 'end' ... ../src/syntax/typing.nit:1791,1--3
     ../src/syntax/typing.nit:1792,1--1794,3
       keyword 'redef' ... ../src/syntax/typing.nit:1792,1--5
@@ -11716,6 +14402,7 @@
               ../src/syntax/typing.nit:1793,32--35
                 literal value '"<="' ... ../src/syntax/typing.nit:1793,32--35
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1793,37--45
+              ../src/syntax/typing.nit:1793,32
       keyword 'end' ... ../src/syntax/typing.nit:1794,1--3
     ../src/syntax/typing.nit:1795,1--1797,3
       keyword 'redef' ... ../src/syntax/typing.nit:1795,1--5
@@ -11738,6 +14425,7 @@
               ../src/syntax/typing.nit:1796,32--35
                 literal value '"<<"' ... ../src/syntax/typing.nit:1796,32--35
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1796,37--45
+              ../src/syntax/typing.nit:1796,32
       keyword 'end' ... ../src/syntax/typing.nit:1797,1--3
     ../src/syntax/typing.nit:1798,1--1800,3
       keyword 'redef' ... ../src/syntax/typing.nit:1798,1--5
@@ -11760,6 +14448,7 @@
               ../src/syntax/typing.nit:1799,32--34
                 literal value '">"' ... ../src/syntax/typing.nit:1799,32--34
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1799,36--44
+              ../src/syntax/typing.nit:1799,32
       keyword 'end' ... ../src/syntax/typing.nit:1800,1--3
     ../src/syntax/typing.nit:1801,1--1803,3
       keyword 'redef' ... ../src/syntax/typing.nit:1801,1--5
@@ -11782,6 +14471,7 @@
               ../src/syntax/typing.nit:1802,32--35
                 literal value '">="' ... ../src/syntax/typing.nit:1802,32--35
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1802,37--45
+              ../src/syntax/typing.nit:1802,32
       keyword 'end' ... ../src/syntax/typing.nit:1803,1--3
     ../src/syntax/typing.nit:1804,1--1806,3
       keyword 'redef' ... ../src/syntax/typing.nit:1804,1--5
@@ -11804,6 +14494,7 @@
               ../src/syntax/typing.nit:1805,32--35
                 literal value '">>"' ... ../src/syntax/typing.nit:1805,32--35
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1805,37--45
+              ../src/syntax/typing.nit:1805,32
       keyword 'end' ... ../src/syntax/typing.nit:1806,1--3
     ../src/syntax/typing.nit:1807,1--1809,3
       keyword 'redef' ... ../src/syntax/typing.nit:1807,1--5
@@ -11826,6 +14517,7 @@
               ../src/syntax/typing.nit:1808,32--34
                 literal value '"+"' ... ../src/syntax/typing.nit:1808,32--34
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1808,36--44
+              ../src/syntax/typing.nit:1808,32
       keyword 'end' ... ../src/syntax/typing.nit:1809,1--3
     ../src/syntax/typing.nit:1810,1--1812,3
       keyword 'redef' ... ../src/syntax/typing.nit:1810,1--5
@@ -11848,6 +14540,7 @@
               ../src/syntax/typing.nit:1811,32--34
                 literal value '"-"' ... ../src/syntax/typing.nit:1811,32--34
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1811,36--44
+              ../src/syntax/typing.nit:1811,32
       keyword 'end' ... ../src/syntax/typing.nit:1812,1--3
     ../src/syntax/typing.nit:1813,1--1815,3
       keyword 'redef' ... ../src/syntax/typing.nit:1813,1--5
@@ -11870,6 +14563,7 @@
               ../src/syntax/typing.nit:1814,32--36
                 literal value '"<=>"' ... ../src/syntax/typing.nit:1814,32--36
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1814,38--46
+              ../src/syntax/typing.nit:1814,32
       keyword 'end' ... ../src/syntax/typing.nit:1815,1--3
     ../src/syntax/typing.nit:1816,1--1818,3
       keyword 'redef' ... ../src/syntax/typing.nit:1816,1--5
@@ -11892,6 +14586,7 @@
               ../src/syntax/typing.nit:1817,32--34
                 literal value '"*"' ... ../src/syntax/typing.nit:1817,32--34
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1817,36--44
+              ../src/syntax/typing.nit:1817,32
       keyword 'end' ... ../src/syntax/typing.nit:1818,1--3
     ../src/syntax/typing.nit:1819,1--1821,3
       keyword 'redef' ... ../src/syntax/typing.nit:1819,1--5
@@ -11914,6 +14609,7 @@
               ../src/syntax/typing.nit:1820,32--34
                 literal value '"/"' ... ../src/syntax/typing.nit:1820,32--34
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1820,36--44
+              ../src/syntax/typing.nit:1820,32
       keyword 'end' ... ../src/syntax/typing.nit:1821,1--3
     ../src/syntax/typing.nit:1822,1--1824,3
       keyword 'redef' ... ../src/syntax/typing.nit:1822,1--5
@@ -11936,6 +14632,7 @@
               ../src/syntax/typing.nit:1823,32--34
                 literal value '"%"' ... ../src/syntax/typing.nit:1823,32--34
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1823,36--44
+              ../src/syntax/typing.nit:1823,32
       keyword 'end' ... ../src/syntax/typing.nit:1824,1--3
     ../src/syntax/typing.nit:1826,1--1829,3
       keyword 'redef' ... ../src/syntax/typing.nit:1826,1--5
@@ -11958,6 +14655,7 @@
               ../src/syntax/typing.nit:1827,32--40
                 literal value '"unary -"' ... ../src/syntax/typing.nit:1827,32--40
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1827,42--50
+              ../src/syntax/typing.nit:1827,32
       ../src/syntax/typing.nit:1828,2--47
         keyword 'redef' ... ../src/syntax/typing.nit:1828,2--6
         ../src/syntax/typing.nit:1828,12
@@ -11992,7 +14690,9 @@
               ../src/syntax/typing.nit:1834,6--11
                 ../src/syntax/typing.nit:1834,6
                 identifier 'n_expr' ... ../src/syntax/typing.nit:1834,6--11
+                ../src/syntax/typing.nit:1834,6
               identifier 'is_implicit_self' ... ../src/syntax/typing.nit:1834,13--28
+              ../src/syntax/typing.nit:1834,6
             ../src/syntax/typing.nit:1835,4--1853,6
               ../src/syntax/typing.nit:1835,4--28
                 keyword 'var' ... ../src/syntax/typing.nit:1835,4--6
@@ -12002,26 +14702,35 @@
                   ../src/syntax/typing.nit:1835,15--18
                     ../src/syntax/typing.nit:1835,15
                     identifier 'n_id' ... ../src/syntax/typing.nit:1835,15--18
+                    ../src/syntax/typing.nit:1835,15
                   identifier 'to_symbol' ... ../src/syntax/typing.nit:1835,20--28
-              ../src/syntax/typing.nit:1836,4--34
+                  ../src/syntax/typing.nit:1835,15
+              ../src/syntax/typing.nit:1836,4--35
                 keyword 'var' ... ../src/syntax/typing.nit:1836,4--6
                 identifier 'variable' ... ../src/syntax/typing.nit:1836,8--15
                 '=' ... ../src/syntax/typing.nit:1836,17
-                ../src/syntax/typing.nit:1836,19--34
+                ../src/syntax/typing.nit:1836,19--35
                   ../src/syntax/typing.nit:1836,19--29
                     ../src/syntax/typing.nit:1836,19
                       ../src/syntax/typing.nit:1836,19
                       identifier 'v' ... ../src/syntax/typing.nit:1836,19
+                      ../src/syntax/typing.nit:1836,19
                     identifier 'scope_ctx' ... ../src/syntax/typing.nit:1836,21--29
-                  ../src/syntax/typing.nit:1836,31--34
-                    ../src/syntax/typing.nit:1836,31
-                    identifier 'name' ... ../src/syntax/typing.nit:1836,31--34
+                    ../src/syntax/typing.nit:1836,19
+                  ../src/syntax/typing.nit:1836,30--35
+                    '[' ... ../src/syntax/typing.nit:1836,30
+                    ../src/syntax/typing.nit:1836,31--34
+                      ../src/syntax/typing.nit:1836,31
+                      identifier 'name' ... ../src/syntax/typing.nit:1836,31--34
+                      ../src/syntax/typing.nit:1836,31
+                    ']' ... ../src/syntax/typing.nit:1836,35
               ../src/syntax/typing.nit:1837,4--1853,6
                 keyword 'if' ... ../src/syntax/typing.nit:1837,4--5
                 ../src/syntax/typing.nit:1837,7--22
                   ../src/syntax/typing.nit:1837,7--14
                     ../src/syntax/typing.nit:1837,7
                     identifier 'variable' ... ../src/syntax/typing.nit:1837,7--14
+                    ../src/syntax/typing.nit:1837,7
                   ../src/syntax/typing.nit:1837,19--22
                     keyword 'null' ... ../src/syntax/typing.nit:1837,19--22
                 ../src/syntax/typing.nit:1838,5--1852,10
@@ -12036,100 +14745,136 @@
                       ../src/syntax/typing.nit:1839,8--15
                         ../src/syntax/typing.nit:1839,8
                         identifier 'variable' ... ../src/syntax/typing.nit:1839,8--15
+                        ../src/syntax/typing.nit:1839,8
                       ../src/syntax/typing.nit:1839,21--35
                         type identifier 'ClosureVariable' ... ../src/syntax/typing.nit:1839,21--35
                     ../src/syntax/typing.nit:1840,6--1841,27
-                      ../src/syntax/typing.nit:1840,6--80
+                      ../src/syntax/typing.nit:1840,6--81
                         ../src/syntax/typing.nit:1840,14
                         identifier 'n' ... ../src/syntax/typing.nit:1840,6
+                        ../src/syntax/typing.nit:1840,14
                         '=' ... ../src/syntax/typing.nit:1840,8
-                        ../src/syntax/typing.nit:1840,10--80
+                        ../src/syntax/typing.nit:1840,10--81
                           keyword 'new' ... ../src/syntax/typing.nit:1840,10--12
                           ../src/syntax/typing.nit:1840,14--29
                             type identifier 'AClosureCallExpr' ... ../src/syntax/typing.nit:1840,14--29
                           identifier 'init_aclosurecallexpr' ... ../src/syntax/typing.nit:1840,31--51
-                          ../src/syntax/typing.nit:1840,53--56
-                            ../src/syntax/typing.nit:1840,53
-                            identifier 'n_id' ... ../src/syntax/typing.nit:1840,53--56
-                          ../src/syntax/typing.nit:1840,59--64
-                            ../src/syntax/typing.nit:1840,59
-                            identifier 'n_args' ... ../src/syntax/typing.nit:1840,59--64
-                          ../src/syntax/typing.nit:1840,67--80
-                            ../src/syntax/typing.nit:1840,67
-                            identifier 'n_closure_defs' ... ../src/syntax/typing.nit:1840,67--80
+                          ../src/syntax/typing.nit:1840,52--81
+                            '(' ... ../src/syntax/typing.nit:1840,52
+                            ../src/syntax/typing.nit:1840,53--56
+                              ../src/syntax/typing.nit:1840,53
+                              identifier 'n_id' ... ../src/syntax/typing.nit:1840,53--56
+                              ../src/syntax/typing.nit:1840,53
+                            ../src/syntax/typing.nit:1840,59--64
+                              ../src/syntax/typing.nit:1840,59
+                              identifier 'n_args' ... ../src/syntax/typing.nit:1840,59--64
+                              ../src/syntax/typing.nit:1840,59
+                            ../src/syntax/typing.nit:1840,67--80
+                              ../src/syntax/typing.nit:1840,67
+                              identifier 'n_closure_defs' ... ../src/syntax/typing.nit:1840,67--80
+                              ../src/syntax/typing.nit:1840,67
+                            ')' ... ../src/syntax/typing.nit:1840,81
                       ../src/syntax/typing.nit:1841,6--27
                         ../src/syntax/typing.nit:1841,6
                           ../src/syntax/typing.nit:1841,6
                           identifier 'n' ... ../src/syntax/typing.nit:1841,6
+                          ../src/syntax/typing.nit:1841,6
                         attribute '_variable' ... ../src/syntax/typing.nit:1841,8--16
                         '=' ... ../src/syntax/typing.nit:1841,18
                         ../src/syntax/typing.nit:1841,20--27
                           ../src/syntax/typing.nit:1841,20
                           identifier 'variable' ... ../src/syntax/typing.nit:1841,20--27
+                          ../src/syntax/typing.nit:1841,20
                     ../src/syntax/typing.nit:1843,6--1849,7
                       ../src/syntax/typing.nit:1843,6--1846,8
                         keyword 'if' ... ../src/syntax/typing.nit:1843,6--7
-                        ../src/syntax/typing.nit:1843,9--27
+                        ../src/syntax/typing.nit:1843,9--35
                           keyword 'not' ... ../src/syntax/typing.nit:1843,9--11
-                          ../src/syntax/typing.nit:1843,13--27
-                            ../src/syntax/typing.nit:1843,13--18
+                          ../src/syntax/typing.nit:1843,13--35
+                            ../src/syntax/typing.nit:1843,13--26
+                              ../src/syntax/typing.nit:1843,13--18
+                                ../src/syntax/typing.nit:1843,13
+                                identifier 'n_args' ... ../src/syntax/typing.nit:1843,13--18
+                                ../src/syntax/typing.nit:1843,13
+                              identifier 'n_exprs' ... ../src/syntax/typing.nit:1843,20--26
                               ../src/syntax/typing.nit:1843,13
-                              identifier 'n_args' ... ../src/syntax/typing.nit:1843,13--18
-                            identifier 'is_empty' ... ../src/syntax/typing.nit:1843,20--27
+                            identifier 'is_empty' ... ../src/syntax/typing.nit:1843,28--35
+                            ../src/syntax/typing.nit:1843,13
                         ../src/syntax/typing.nit:1844,7--1845,12
-                          ../src/syntax/typing.nit:1844,7--64
+                          ../src/syntax/typing.nit:1844,7--65
                             ../src/syntax/typing.nit:1844,7
                               ../src/syntax/typing.nit:1844,7
                               identifier 'v' ... ../src/syntax/typing.nit:1844,7
+                              ../src/syntax/typing.nit:1844,7
                             identifier 'error' ... ../src/syntax/typing.nit:1844,9--13
-                            ../src/syntax/typing.nit:1844,15--18
-                              keyword 'self' ... ../src/syntax/typing.nit:1844,15--18
-                            ../src/syntax/typing.nit:1844,21--64
-                              ../src/syntax/typing.nit:1844,21--29
-                                literal value '"Error: {' ... ../src/syntax/typing.nit:1844,21--29
-                              ../src/syntax/typing.nit:1844,30--33
-                                ../src/syntax/typing.nit:1844,30
-                                identifier 'name' ... ../src/syntax/typing.nit:1844,30--33
-                              ../src/syntax/typing.nit:1844,34--64
-                                '} is variable, not a function."' ... ../src/syntax/typing.nit:1844,34--64
+                            ../src/syntax/typing.nit:1844,14--65
+                              '(' ... ../src/syntax/typing.nit:1844,14
+                              ../src/syntax/typing.nit:1844,15--18
+                                keyword 'self' ... ../src/syntax/typing.nit:1844,15--18
+                              ../src/syntax/typing.nit:1844,21--64
+                                ../src/syntax/typing.nit:1844,21--29
+                                  literal value '"Error: {' ... ../src/syntax/typing.nit:1844,21--29
+                                ../src/syntax/typing.nit:1844,30--33
+                                  ../src/syntax/typing.nit:1844,30
+                                  identifier 'name' ... ../src/syntax/typing.nit:1844,30--33
+                                  ../src/syntax/typing.nit:1844,30
+                                ../src/syntax/typing.nit:1844,34--64
+                                  '} is variable, not a function."' ... ../src/syntax/typing.nit:1844,34--64
+                              ')' ... ../src/syntax/typing.nit:1844,65
                           ../src/syntax/typing.nit:1845,7--12
                             keyword 'return' ... ../src/syntax/typing.nit:1845,7--12
                         ../src/syntax/typing.nit:1846,6--8
                           keyword 'end' ... ../src/syntax/typing.nit:1846,6--8
-                      ../src/syntax/typing.nit:1847,6--33
+                      ../src/syntax/typing.nit:1847,6--34
                         ../src/syntax/typing.nit:1847,26
                         identifier 'n' ... ../src/syntax/typing.nit:1847,6
+                        ../src/syntax/typing.nit:1847,26
                         '=' ... ../src/syntax/typing.nit:1847,8
-                        ../src/syntax/typing.nit:1847,10--33
+                        ../src/syntax/typing.nit:1847,10--34
                           ../src/syntax/typing.nit:1847,26
                           identifier 'variable_create' ... ../src/syntax/typing.nit:1847,10--24
-                          ../src/syntax/typing.nit:1847,26--33
-                            ../src/syntax/typing.nit:1847,26
-                            identifier 'variable' ... ../src/syntax/typing.nit:1847,26--33
+                          ../src/syntax/typing.nit:1847,25--34
+                            '(' ... ../src/syntax/typing.nit:1847,25
+                            ../src/syntax/typing.nit:1847,26--33
+                              ../src/syntax/typing.nit:1847,26
+                              identifier 'variable' ... ../src/syntax/typing.nit:1847,26--33
+                              ../src/syntax/typing.nit:1847,26
+                            ')' ... ../src/syntax/typing.nit:1847,34
                       ../src/syntax/typing.nit:1848,6--27
                         ../src/syntax/typing.nit:1848,6
                           ../src/syntax/typing.nit:1848,6
                           identifier 'n' ... ../src/syntax/typing.nit:1848,6
+                          ../src/syntax/typing.nit:1848,6
                         attribute '_variable' ... ../src/syntax/typing.nit:1848,8--16
                         '=' ... ../src/syntax/typing.nit:1848,18
                         ../src/syntax/typing.nit:1848,20--27
                           ../src/syntax/typing.nit:1848,20
                           identifier 'variable' ... ../src/syntax/typing.nit:1848,20--27
+                          ../src/syntax/typing.nit:1848,20
                       keyword 'end' ... ../src/syntax/typing.nit:1849,5--7
-                  ../src/syntax/typing.nit:1850,5--18
+                  ../src/syntax/typing.nit:1850,5--19
                     ../src/syntax/typing.nit:1850,18
                     identifier 'replace_with' ... ../src/syntax/typing.nit:1850,5--16
-                    ../src/syntax/typing.nit:1850,18
+                    ../src/syntax/typing.nit:1850,17--19
+                      '(' ... ../src/syntax/typing.nit:1850,17
                       ../src/syntax/typing.nit:1850,18
-                      identifier 'n' ... ../src/syntax/typing.nit:1850,18
-                  ../src/syntax/typing.nit:1851,5--20
+                        ../src/syntax/typing.nit:1850,18
+                        identifier 'n' ... ../src/syntax/typing.nit:1850,18
+                        ../src/syntax/typing.nit:1850,18
+                      ')' ... ../src/syntax/typing.nit:1850,19
+                  ../src/syntax/typing.nit:1851,5--21
                     ../src/syntax/typing.nit:1851,5
                       ../src/syntax/typing.nit:1851,5
                       identifier 'n' ... ../src/syntax/typing.nit:1851,5
+                      ../src/syntax/typing.nit:1851,5
                     identifier 'after_typing' ... ../src/syntax/typing.nit:1851,7--18
-                    ../src/syntax/typing.nit:1851,20
+                    ../src/syntax/typing.nit:1851,19--21
+                      '(' ... ../src/syntax/typing.nit:1851,19
                       ../src/syntax/typing.nit:1851,20
-                      identifier 'v' ... ../src/syntax/typing.nit:1851,20
+                        ../src/syntax/typing.nit:1851,20
+                        identifier 'v' ... ../src/syntax/typing.nit:1851,20
+                        ../src/syntax/typing.nit:1851,20
+                      ')' ... ../src/syntax/typing.nit:1851,21
                   ../src/syntax/typing.nit:1852,5--10
                     keyword 'return' ... ../src/syntax/typing.nit:1852,5--10
                 ../src/syntax/typing.nit:1853,4--6
@@ -12138,6 +14883,7 @@
               keyword 'end' ... ../src/syntax/typing.nit:1854,3--5
           ../src/syntax/typing.nit:1856,3--7
             keyword 'super' ... ../src/syntax/typing.nit:1856,3--7
+            ../src/syntax/typing.nit:1856,3
           keyword 'end' ... ../src/syntax/typing.nit:1857,2--4
       ../src/syntax/typing.nit:1859,2--1866,4
         keyword 'redef' ... ../src/syntax/typing.nit:1859,2--6
@@ -12153,7 +14899,9 @@
               ../src/syntax/typing.nit:1861,6--19
                 ../src/syntax/typing.nit:1861,6
                 identifier 'n_closure_defs' ... ../src/syntax/typing.nit:1861,6--19
+                ../src/syntax/typing.nit:1861,6
               identifier 'is_empty' ... ../src/syntax/typing.nit:1861,21--28
+              ../src/syntax/typing.nit:1861,6
             ../src/syntax/typing.nit:1862,4--14
               ../src/syntax/typing.nit:1862,4--14
                 keyword 'return' ... ../src/syntax/typing.nit:1862,4--9
@@ -12166,7 +14914,9 @@
                   ../src/syntax/typing.nit:1864,11--24
                     ../src/syntax/typing.nit:1864,11
                     identifier 'n_closure_defs' ... ../src/syntax/typing.nit:1864,11--24
+                    ../src/syntax/typing.nit:1864,11
                   identifier 'to_a' ... ../src/syntax/typing.nit:1864,26--29
+                  ../src/syntax/typing.nit:1864,11
               keyword 'end' ... ../src/syntax/typing.nit:1865,3--5
           keyword 'end' ... ../src/syntax/typing.nit:1866,2--4
       ../src/syntax/typing.nit:1868,2--1869,54
@@ -12201,16 +14951,20 @@
           ../src/syntax/typing.nit:1873,28--35
             identifier 'variable' ... ../src/syntax/typing.nit:1873,28--35
         ../src/syntax/typing.nit:1875,3--1876,4
-          ../src/syntax/typing.nit:1875,3--40
+          ../src/syntax/typing.nit:1875,3--41
             keyword 'return' ... ../src/syntax/typing.nit:1875,3--8
-            ../src/syntax/typing.nit:1875,10--40
+            ../src/syntax/typing.nit:1875,10--41
               keyword 'new' ... ../src/syntax/typing.nit:1875,10--12
               ../src/syntax/typing.nit:1875,14--21
                 type identifier 'AVarExpr' ... ../src/syntax/typing.nit:1875,14--21
               identifier 'init_avarexpr' ... ../src/syntax/typing.nit:1875,23--35
-              ../src/syntax/typing.nit:1875,37--40
-                ../src/syntax/typing.nit:1875,37
-                identifier 'n_id' ... ../src/syntax/typing.nit:1875,37--40
+              ../src/syntax/typing.nit:1875,36--41
+                '(' ... ../src/syntax/typing.nit:1875,36
+                ../src/syntax/typing.nit:1875,37--40
+                  ../src/syntax/typing.nit:1875,37
+                  identifier 'n_id' ... ../src/syntax/typing.nit:1875,37--40
+                  ../src/syntax/typing.nit:1875,37
+                ')' ... ../src/syntax/typing.nit:1875,41
           keyword 'end' ... ../src/syntax/typing.nit:1876,2--4
       ../src/syntax/typing.nit:1878,2--40
         keyword 'redef' ... ../src/syntax/typing.nit:1878,2--6
@@ -12225,7 +14979,9 @@
             ../src/syntax/typing.nit:1878,27--30
               ../src/syntax/typing.nit:1878,27
               identifier 'n_id' ... ../src/syntax/typing.nit:1878,27--30
+              ../src/syntax/typing.nit:1878,27
             identifier 'to_symbol' ... ../src/syntax/typing.nit:1878,32--40
+            ../src/syntax/typing.nit:1878,27
       ../src/syntax/typing.nit:1879,2--54
         keyword 'redef' ... ../src/syntax/typing.nit:1879,2--6
         ../src/syntax/typing.nit:1879,12
@@ -12239,7 +14995,9 @@
             ../src/syntax/typing.nit:1879,44--49
               ../src/syntax/typing.nit:1879,44
               identifier 'n_args' ... ../src/syntax/typing.nit:1879,44--49
+              ../src/syntax/typing.nit:1879,44
             identifier 'to_a' ... ../src/syntax/typing.nit:1879,51--54
+            ../src/syntax/typing.nit:1879,44
       keyword 'end' ... ../src/syntax/typing.nit:1880,1--3
     ../src/syntax/typing.nit:1882,1--1894,3
       keyword 'redef' ... ../src/syntax/typing.nit:1882,1--5
@@ -12257,22 +15015,28 @@
           ../src/syntax/typing.nit:1883,28--35
             identifier 'variable' ... ../src/syntax/typing.nit:1883,28--35
         ../src/syntax/typing.nit:1885,3--1886,4
-          ../src/syntax/typing.nit:1885,3--71
+          ../src/syntax/typing.nit:1885,3--72
             keyword 'return' ... ../src/syntax/typing.nit:1885,3--8
-            ../src/syntax/typing.nit:1885,10--71
+            ../src/syntax/typing.nit:1885,10--72
               keyword 'new' ... ../src/syntax/typing.nit:1885,10--12
               ../src/syntax/typing.nit:1885,14--27
                 type identifier 'AVarAssignExpr' ... ../src/syntax/typing.nit:1885,14--27
               identifier 'init_avarassignexpr' ... ../src/syntax/typing.nit:1885,29--47
-              ../src/syntax/typing.nit:1885,49--52
-                ../src/syntax/typing.nit:1885,49
-                identifier 'n_id' ... ../src/syntax/typing.nit:1885,49--52
-              ../src/syntax/typing.nit:1885,55--62
-                ../src/syntax/typing.nit:1885,55
-                identifier 'n_assign' ... ../src/syntax/typing.nit:1885,55--62
-              ../src/syntax/typing.nit:1885,65--71
-                ../src/syntax/typing.nit:1885,65
-                identifier 'n_value' ... ../src/syntax/typing.nit:1885,65--71
+              ../src/syntax/typing.nit:1885,48--72
+                '(' ... ../src/syntax/typing.nit:1885,48
+                ../src/syntax/typing.nit:1885,49--52
+                  ../src/syntax/typing.nit:1885,49
+                  identifier 'n_id' ... ../src/syntax/typing.nit:1885,49--52
+                  ../src/syntax/typing.nit:1885,49
+                ../src/syntax/typing.nit:1885,55--62
+                  ../src/syntax/typing.nit:1885,55
+                  identifier 'n_assign' ... ../src/syntax/typing.nit:1885,55--62
+                  ../src/syntax/typing.nit:1885,55
+                ../src/syntax/typing.nit:1885,65--71
+                  ../src/syntax/typing.nit:1885,65
+                  identifier 'n_value' ... ../src/syntax/typing.nit:1885,65--71
+                  ../src/syntax/typing.nit:1885,65
+                ')' ... ../src/syntax/typing.nit:1885,72
           keyword 'end' ... ../src/syntax/typing.nit:1886,2--4
       ../src/syntax/typing.nit:1888,2--53
         keyword 'redef' ... ../src/syntax/typing.nit:1888,2--6
@@ -12291,11 +15055,14 @@
                   ../src/syntax/typing.nit:1888,28--31
                     ../src/syntax/typing.nit:1888,28
                     identifier 'n_id' ... ../src/syntax/typing.nit:1888,28--31
+                    ../src/syntax/typing.nit:1888,28
                   identifier 'text' ... ../src/syntax/typing.nit:1888,33--36
+                  ../src/syntax/typing.nit:1888,28
                 ../src/syntax/typing.nit:1888,40--42
                   literal value '"="' ... ../src/syntax/typing.nit:1888,40--42
               ')' ... ../src/syntax/typing.nit:1888,43
             identifier 'to_symbol' ... ../src/syntax/typing.nit:1888,45--53
+            ../src/syntax/typing.nit:1888,27
       ../src/syntax/typing.nit:1889,2--1893,4
         keyword 'redef' ... ../src/syntax/typing.nit:1889,2--6
         ../src/syntax/typing.nit:1889,12
@@ -12312,20 +15079,28 @@
               ../src/syntax/typing.nit:1890,13--18
                 ../src/syntax/typing.nit:1890,13
                 identifier 'n_args' ... ../src/syntax/typing.nit:1890,13--18
+                ../src/syntax/typing.nit:1890,13
               identifier 'to_a' ... ../src/syntax/typing.nit:1890,20--23
-          ../src/syntax/typing.nit:1891,3--17
+              ../src/syntax/typing.nit:1890,13
+          ../src/syntax/typing.nit:1891,3--18
             ../src/syntax/typing.nit:1891,3--5
               ../src/syntax/typing.nit:1891,3
               identifier 'res' ... ../src/syntax/typing.nit:1891,3--5
+              ../src/syntax/typing.nit:1891,3
             identifier 'add' ... ../src/syntax/typing.nit:1891,7--9
-            ../src/syntax/typing.nit:1891,11--17
-              ../src/syntax/typing.nit:1891,11
-              identifier 'n_value' ... ../src/syntax/typing.nit:1891,11--17
+            ../src/syntax/typing.nit:1891,10--18
+              '(' ... ../src/syntax/typing.nit:1891,10
+              ../src/syntax/typing.nit:1891,11--17
+                ../src/syntax/typing.nit:1891,11
+                identifier 'n_value' ... ../src/syntax/typing.nit:1891,11--17
+                ../src/syntax/typing.nit:1891,11
+              ')' ... ../src/syntax/typing.nit:1891,18
           ../src/syntax/typing.nit:1892,3--12
             keyword 'return' ... ../src/syntax/typing.nit:1892,3--8
             ../src/syntax/typing.nit:1892,10--12
               ../src/syntax/typing.nit:1892,10
               identifier 'res' ... ../src/syntax/typing.nit:1892,10--12
+              ../src/syntax/typing.nit:1892,10
           keyword 'end' ... ../src/syntax/typing.nit:1893,2--4
       keyword 'end' ... ../src/syntax/typing.nit:1894,1--3
     ../src/syntax/typing.nit:1896,1--1904,3
@@ -12344,22 +15119,28 @@
           ../src/syntax/typing.nit:1897,28--35
             identifier 'variable' ... ../src/syntax/typing.nit:1897,28--35
         ../src/syntax/typing.nit:1899,3--1900,4
-          ../src/syntax/typing.nit:1899,3--78
+          ../src/syntax/typing.nit:1899,3--79
             keyword 'return' ... ../src/syntax/typing.nit:1899,3--8
-            ../src/syntax/typing.nit:1899,10--78
+            ../src/syntax/typing.nit:1899,10--79
               keyword 'new' ... ../src/syntax/typing.nit:1899,10--12
               ../src/syntax/typing.nit:1899,14--29
                 type identifier 'AVarReassignExpr' ... ../src/syntax/typing.nit:1899,14--29
               identifier 'init_avarreassignexpr' ... ../src/syntax/typing.nit:1899,31--51
-              ../src/syntax/typing.nit:1899,53--56
-                ../src/syntax/typing.nit:1899,53
-                identifier 'n_id' ... ../src/syntax/typing.nit:1899,53--56
-              ../src/syntax/typing.nit:1899,59--69
-                ../src/syntax/typing.nit:1899,59
-                identifier 'n_assign_op' ... ../src/syntax/typing.nit:1899,59--69
-              ../src/syntax/typing.nit:1899,72--78
-                ../src/syntax/typing.nit:1899,72
-                identifier 'n_value' ... ../src/syntax/typing.nit:1899,72--78
+              ../src/syntax/typing.nit:1899,52--79
+                '(' ... ../src/syntax/typing.nit:1899,52
+                ../src/syntax/typing.nit:1899,53--56
+                  ../src/syntax/typing.nit:1899,53
+                  identifier 'n_id' ... ../src/syntax/typing.nit:1899,53--56
+                  ../src/syntax/typing.nit:1899,53
+                ../src/syntax/typing.nit:1899,59--69
+                  ../src/syntax/typing.nit:1899,59
+                  identifier 'n_assign_op' ... ../src/syntax/typing.nit:1899,59--69
+                  ../src/syntax/typing.nit:1899,59
+                ../src/syntax/typing.nit:1899,72--78
+                  ../src/syntax/typing.nit:1899,72
+                  identifier 'n_value' ... ../src/syntax/typing.nit:1899,72--78
+                  ../src/syntax/typing.nit:1899,72
+                ')' ... ../src/syntax/typing.nit:1899,79
           keyword 'end' ... ../src/syntax/typing.nit:1900,2--4
       ../src/syntax/typing.nit:1902,2--40
         keyword 'redef' ... ../src/syntax/typing.nit:1902,2--6
@@ -12374,7 +15155,9 @@
             ../src/syntax/typing.nit:1902,27--30
               ../src/syntax/typing.nit:1902,27
               identifier 'n_id' ... ../src/syntax/typing.nit:1902,27--30
+              ../src/syntax/typing.nit:1902,27
             identifier 'to_symbol' ... ../src/syntax/typing.nit:1902,32--40
+            ../src/syntax/typing.nit:1902,27
       ../src/syntax/typing.nit:1903,2--54
         keyword 'redef' ... ../src/syntax/typing.nit:1903,2--6
         ../src/syntax/typing.nit:1903,12
@@ -12388,7 +15171,9 @@
             ../src/syntax/typing.nit:1903,44--49
               ../src/syntax/typing.nit:1903,44
               identifier 'n_args' ... ../src/syntax/typing.nit:1903,44--49
+              ../src/syntax/typing.nit:1903,44
             identifier 'to_a' ... ../src/syntax/typing.nit:1903,51--54
+            ../src/syntax/typing.nit:1903,44
       keyword 'end' ... ../src/syntax/typing.nit:1904,1--3
     ../src/syntax/typing.nit:1906,1--1917,3
       keyword 'redef' ... ../src/syntax/typing.nit:1906,1--5
@@ -12411,6 +15196,7 @@
               ../src/syntax/typing.nit:1907,32--35
                 literal value '"[]"' ... ../src/syntax/typing.nit:1907,32--35
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1907,37--45
+              ../src/syntax/typing.nit:1907,32
       ../src/syntax/typing.nit:1908,2--54
         keyword 'redef' ... ../src/syntax/typing.nit:1908,2--6
         ../src/syntax/typing.nit:1908,12
@@ -12424,7 +15210,9 @@
             ../src/syntax/typing.nit:1908,44--49
               ../src/syntax/typing.nit:1908,44
               identifier 'n_args' ... ../src/syntax/typing.nit:1908,44--49
+              ../src/syntax/typing.nit:1908,44
             identifier 'to_a' ... ../src/syntax/typing.nit:1908,51--54
+            ../src/syntax/typing.nit:1908,44
       ../src/syntax/typing.nit:1909,2--1916,4
         keyword 'redef' ... ../src/syntax/typing.nit:1909,2--6
         ../src/syntax/typing.nit:1909,12
@@ -12439,7 +15227,9 @@
               ../src/syntax/typing.nit:1911,6--19
                 ../src/syntax/typing.nit:1911,6
                 identifier 'n_closure_defs' ... ../src/syntax/typing.nit:1911,6--19
+                ../src/syntax/typing.nit:1911,6
               identifier 'is_empty' ... ../src/syntax/typing.nit:1911,21--28
+              ../src/syntax/typing.nit:1911,6
             ../src/syntax/typing.nit:1912,4--14
               ../src/syntax/typing.nit:1912,4--14
                 keyword 'return' ... ../src/syntax/typing.nit:1912,4--9
@@ -12452,7 +15242,9 @@
                   ../src/syntax/typing.nit:1914,11--24
                     ../src/syntax/typing.nit:1914,11
                     identifier 'n_closure_defs' ... ../src/syntax/typing.nit:1914,11--24
+                    ../src/syntax/typing.nit:1914,11
                   identifier 'to_a' ... ../src/syntax/typing.nit:1914,26--29
+                  ../src/syntax/typing.nit:1914,11
               keyword 'end' ... ../src/syntax/typing.nit:1915,3--5
           keyword 'end' ... ../src/syntax/typing.nit:1916,2--4
       keyword 'end' ... ../src/syntax/typing.nit:1917,1--3
@@ -12477,6 +15269,7 @@
               ../src/syntax/typing.nit:1920,32--36
                 literal value '"[]="' ... ../src/syntax/typing.nit:1920,32--36
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1920,38--46
+              ../src/syntax/typing.nit:1920,32
       ../src/syntax/typing.nit:1921,2--1925,4
         keyword 'redef' ... ../src/syntax/typing.nit:1921,2--6
         ../src/syntax/typing.nit:1921,12
@@ -12493,20 +15286,28 @@
               ../src/syntax/typing.nit:1922,13--18
                 ../src/syntax/typing.nit:1922,13
                 identifier 'n_args' ... ../src/syntax/typing.nit:1922,13--18
+                ../src/syntax/typing.nit:1922,13
               identifier 'to_a' ... ../src/syntax/typing.nit:1922,20--23
-          ../src/syntax/typing.nit:1923,3--17
+              ../src/syntax/typing.nit:1922,13
+          ../src/syntax/typing.nit:1923,3--18
             ../src/syntax/typing.nit:1923,3--5
               ../src/syntax/typing.nit:1923,3
               identifier 'res' ... ../src/syntax/typing.nit:1923,3--5
+              ../src/syntax/typing.nit:1923,3
             identifier 'add' ... ../src/syntax/typing.nit:1923,7--9
-            ../src/syntax/typing.nit:1923,11--17
-              ../src/syntax/typing.nit:1923,11
-              identifier 'n_value' ... ../src/syntax/typing.nit:1923,11--17
+            ../src/syntax/typing.nit:1923,10--18
+              '(' ... ../src/syntax/typing.nit:1923,10
+              ../src/syntax/typing.nit:1923,11--17
+                ../src/syntax/typing.nit:1923,11
+                identifier 'n_value' ... ../src/syntax/typing.nit:1923,11--17
+                ../src/syntax/typing.nit:1923,11
+              ')' ... ../src/syntax/typing.nit:1923,18
           ../src/syntax/typing.nit:1924,3--12
             keyword 'return' ... ../src/syntax/typing.nit:1924,3--8
             ../src/syntax/typing.nit:1924,10--12
               ../src/syntax/typing.nit:1924,10
               identifier 'res' ... ../src/syntax/typing.nit:1924,10--12
+              ../src/syntax/typing.nit:1924,10
           keyword 'end' ... ../src/syntax/typing.nit:1925,2--4
       keyword 'end' ... ../src/syntax/typing.nit:1926,1--3
     ../src/syntax/typing.nit:1928,1--1931,3
@@ -12530,6 +15331,7 @@
               ../src/syntax/typing.nit:1929,32--35
                 literal value '"[]"' ... ../src/syntax/typing.nit:1929,32--35
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1929,37--45
+              ../src/syntax/typing.nit:1929,32
       ../src/syntax/typing.nit:1930,2--54
         keyword 'redef' ... ../src/syntax/typing.nit:1930,2--6
         ../src/syntax/typing.nit:1930,12
@@ -12543,7 +15345,9 @@
             ../src/syntax/typing.nit:1930,44--49
               ../src/syntax/typing.nit:1930,44
               identifier 'n_args' ... ../src/syntax/typing.nit:1930,44--49
+              ../src/syntax/typing.nit:1930,44
             identifier 'to_a' ... ../src/syntax/typing.nit:1930,51--54
+            ../src/syntax/typing.nit:1930,44
       keyword 'end' ... ../src/syntax/typing.nit:1931,1--3
     ../src/syntax/typing.nit:1933,1--1936,3
       keyword 'redef' ... ../src/syntax/typing.nit:1933,1--5
@@ -12566,6 +15370,7 @@
               ../src/syntax/typing.nit:1934,32--37
                 literal value '"init"' ... ../src/syntax/typing.nit:1934,32--37
               identifier 'to_symbol' ... ../src/syntax/typing.nit:1934,39--47
+              ../src/syntax/typing.nit:1934,32
       ../src/syntax/typing.nit:1935,2--54
         keyword 'redef' ... ../src/syntax/typing.nit:1935,2--6
         ../src/syntax/typing.nit:1935,12
@@ -12579,7 +15384,9 @@
             ../src/syntax/typing.nit:1935,44--49
               ../src/syntax/typing.nit:1935,44
               identifier 'n_args' ... ../src/syntax/typing.nit:1935,44--49
+              ../src/syntax/typing.nit:1935,44
             identifier 'to_a' ... ../src/syntax/typing.nit:1935,51--54
+            ../src/syntax/typing.nit:1935,44
       keyword 'end' ... ../src/syntax/typing.nit:1936,1--3
     ../src/syntax/typing.nit:1938,1--1957,3
       keyword 'redef' ... ../src/syntax/typing.nit:1938,1--5
@@ -12625,7 +15432,9 @@
             ../src/syntax/typing.nit:1941,44--49
               ../src/syntax/typing.nit:1941,44
               identifier 'n_args' ... ../src/syntax/typing.nit:1941,44--49
+              ../src/syntax/typing.nit:1941,44
             identifier 'to_a' ... ../src/syntax/typing.nit:1941,51--54
+            ../src/syntax/typing.nit:1941,44
       ../src/syntax/typing.nit:1943,2--1956,4
         keyword 'redef' ... ../src/syntax/typing.nit:1943,2--6
         ../src/syntax/typing.nit:1943,12
@@ -12643,22 +15452,30 @@
             ../src/syntax/typing.nit:1945,12--19
               ../src/syntax/typing.nit:1945,12
               identifier 'variable' ... ../src/syntax/typing.nit:1945,12--19
-          ../src/syntax/typing.nit:1946,3--49
+              ../src/syntax/typing.nit:1945,12
+          ../src/syntax/typing.nit:1946,3--50
             keyword 'if' ... ../src/syntax/typing.nit:1946,3--4
             ../src/syntax/typing.nit:1946,6--24
               ../src/syntax/typing.nit:1946,6--15
                 ../src/syntax/typing.nit:1946,6--7
                   ../src/syntax/typing.nit:1946,6
                   identifier 'va' ... ../src/syntax/typing.nit:1946,6--7
+                  ../src/syntax/typing.nit:1946,6
                 identifier 'closure' ... ../src/syntax/typing.nit:1946,9--15
+                ../src/syntax/typing.nit:1946,6
               identifier 'is_break' ... ../src/syntax/typing.nit:1946,17--24
-            ../src/syntax/typing.nit:1946,31--49
+              ../src/syntax/typing.nit:1946,6
+            ../src/syntax/typing.nit:1946,31--50
               ../src/syntax/typing.nit:1946,31
                 ../src/syntax/typing.nit:1946,31
                 identifier 'v' ... ../src/syntax/typing.nit:1946,31
+                ../src/syntax/typing.nit:1946,31
               identifier 'mark_unreash' ... ../src/syntax/typing.nit:1946,33--44
-              ../src/syntax/typing.nit:1946,46--49
-                keyword 'self' ... ../src/syntax/typing.nit:1946,46--49
+              ../src/syntax/typing.nit:1946,45--50
+                '(' ... ../src/syntax/typing.nit:1946,45
+                ../src/syntax/typing.nit:1946,46--49
+                  keyword 'self' ... ../src/syntax/typing.nit:1946,46--49
+                ')' ... ../src/syntax/typing.nit:1946,50
           ../src/syntax/typing.nit:1947,3--32
             keyword 'var' ... ../src/syntax/typing.nit:1947,3--5
             identifier 'sig' ... ../src/syntax/typing.nit:1947,7--9
@@ -12668,29 +15485,40 @@
                 ../src/syntax/typing.nit:1947,13--14
                   ../src/syntax/typing.nit:1947,13
                   identifier 'va' ... ../src/syntax/typing.nit:1947,13--14
+                  ../src/syntax/typing.nit:1947,13
                 identifier 'closure' ... ../src/syntax/typing.nit:1947,16--22
+                ../src/syntax/typing.nit:1947,13
               identifier 'signature' ... ../src/syntax/typing.nit:1947,24--32
-          ../src/syntax/typing.nit:1948,3--73
+              ../src/syntax/typing.nit:1947,13
+          ../src/syntax/typing.nit:1948,3--74
             keyword 'var' ... ../src/syntax/typing.nit:1948,3--5
             identifier 's' ... ../src/syntax/typing.nit:1948,7
             '=' ... ../src/syntax/typing.nit:1948,9
-            ../src/syntax/typing.nit:1948,11--73
+            ../src/syntax/typing.nit:1948,11--74
               ../src/syntax/typing.nit:1948,29
               identifier 'process_signature' ... ../src/syntax/typing.nit:1948,11--27
-              ../src/syntax/typing.nit:1948,29
+              ../src/syntax/typing.nit:1948,28--74
+                '(' ... ../src/syntax/typing.nit:1948,28
                 ../src/syntax/typing.nit:1948,29
-                identifier 'v' ... ../src/syntax/typing.nit:1948,29
-              ../src/syntax/typing.nit:1948,32--34
-                ../src/syntax/typing.nit:1948,32
-                identifier 'sig' ... ../src/syntax/typing.nit:1948,32--34
-              ../src/syntax/typing.nit:1948,37--50
-                ../src/syntax/typing.nit:1948,37--40
+                  ../src/syntax/typing.nit:1948,29
+                  identifier 'v' ... ../src/syntax/typing.nit:1948,29
+                  ../src/syntax/typing.nit:1948,29
+                ../src/syntax/typing.nit:1948,32--34
+                  ../src/syntax/typing.nit:1948,32
+                  identifier 'sig' ... ../src/syntax/typing.nit:1948,32--34
+                  ../src/syntax/typing.nit:1948,32
+                ../src/syntax/typing.nit:1948,37--50
+                  ../src/syntax/typing.nit:1948,37--40
+                    ../src/syntax/typing.nit:1948,37
+                    identifier 'n_id' ... ../src/syntax/typing.nit:1948,37--40
+                    ../src/syntax/typing.nit:1948,37
+                  identifier 'to_symbol' ... ../src/syntax/typing.nit:1948,42--50
                   ../src/syntax/typing.nit:1948,37
-                  identifier 'n_id' ... ../src/syntax/typing.nit:1948,37--40
-                identifier 'to_symbol' ... ../src/syntax/typing.nit:1948,42--50
-              ../src/syntax/typing.nit:1948,53--73
-                ../src/syntax/typing.nit:1948,53
-                identifier 'compute_raw_arguments' ... ../src/syntax/typing.nit:1948,53--73
+                ../src/syntax/typing.nit:1948,53--73
+                  ../src/syntax/typing.nit:1948,53
+                  identifier 'compute_raw_arguments' ... ../src/syntax/typing.nit:1948,53--73
+                  ../src/syntax/typing.nit:1948,53
+                ')' ... ../src/syntax/typing.nit:1948,74
           ../src/syntax/typing.nit:1949,3--1951,5
             keyword 'if' ... ../src/syntax/typing.nit:1949,3--4
             ../src/syntax/typing.nit:1949,6--32
@@ -12699,27 +15527,38 @@
                 ../src/syntax/typing.nit:1949,10--23
                   ../src/syntax/typing.nit:1949,10
                   identifier 'n_closure_defs' ... ../src/syntax/typing.nit:1949,10--23
+                  ../src/syntax/typing.nit:1949,10
                 identifier 'is_empty' ... ../src/syntax/typing.nit:1949,25--32
-            ../src/syntax/typing.nit:1950,4--63
-              ../src/syntax/typing.nit:1950,4--63
+                ../src/syntax/typing.nit:1949,10
+            ../src/syntax/typing.nit:1950,4--64
+              ../src/syntax/typing.nit:1950,4--64
                 ../src/syntax/typing.nit:1950,21
                 identifier 'process_closures' ... ../src/syntax/typing.nit:1950,4--19
-                ../src/syntax/typing.nit:1950,21
+                ../src/syntax/typing.nit:1950,20--64
+                  '(' ... ../src/syntax/typing.nit:1950,20
                   ../src/syntax/typing.nit:1950,21
-                  identifier 'v' ... ../src/syntax/typing.nit:1950,21
-                ../src/syntax/typing.nit:1950,24--26
-                  ../src/syntax/typing.nit:1950,24
-                  identifier 'sig' ... ../src/syntax/typing.nit:1950,24--26
-                ../src/syntax/typing.nit:1950,29--42
-                  ../src/syntax/typing.nit:1950,29--32
+                    ../src/syntax/typing.nit:1950,21
+                    identifier 'v' ... ../src/syntax/typing.nit:1950,21
+                    ../src/syntax/typing.nit:1950,21
+                  ../src/syntax/typing.nit:1950,24--26
+                    ../src/syntax/typing.nit:1950,24
+                    identifier 'sig' ... ../src/syntax/typing.nit:1950,24--26
+                    ../src/syntax/typing.nit:1950,24
+                  ../src/syntax/typing.nit:1950,29--42
+                    ../src/syntax/typing.nit:1950,29--32
+                      ../src/syntax/typing.nit:1950,29
+                      identifier 'n_id' ... ../src/syntax/typing.nit:1950,29--32
+                      ../src/syntax/typing.nit:1950,29
+                    identifier 'to_symbol' ... ../src/syntax/typing.nit:1950,34--42
                     ../src/syntax/typing.nit:1950,29
-                    identifier 'n_id' ... ../src/syntax/typing.nit:1950,29--32
-                  identifier 'to_symbol' ... ../src/syntax/typing.nit:1950,34--42
-                ../src/syntax/typing.nit:1950,45--63
-                  ../src/syntax/typing.nit:1950,45--58
+                  ../src/syntax/typing.nit:1950,45--63
+                    ../src/syntax/typing.nit:1950,45--58
+                      ../src/syntax/typing.nit:1950,45
+                      identifier 'n_closure_defs' ... ../src/syntax/typing.nit:1950,45--58
+                      ../src/syntax/typing.nit:1950,45
+                    identifier 'to_a' ... ../src/syntax/typing.nit:1950,60--63
                     ../src/syntax/typing.nit:1950,45
-                    identifier 'n_closure_defs' ... ../src/syntax/typing.nit:1950,45--58
-                  identifier 'to_a' ... ../src/syntax/typing.nit:1950,60--63
+                  ')' ... ../src/syntax/typing.nit:1950,64
             ../src/syntax/typing.nit:1951,3--5
               keyword 'end' ... ../src/syntax/typing.nit:1951,3--5
           ../src/syntax/typing.nit:1952,3--22
@@ -12729,6 +15568,7 @@
               ../src/syntax/typing.nit:1952,10
                 ../src/syntax/typing.nit:1952,10
                 identifier 's' ... ../src/syntax/typing.nit:1952,10
+                ../src/syntax/typing.nit:1952,10
             ../src/syntax/typing.nit:1952,17--22
               keyword 'return' ... ../src/syntax/typing.nit:1952,17--22
           ../src/syntax/typing.nit:1953,3--23
@@ -12738,6 +15578,7 @@
             ../src/syntax/typing.nit:1953,21--23
               ../src/syntax/typing.nit:1953,21
               identifier 'sig' ... ../src/syntax/typing.nit:1953,21--23
+              ../src/syntax/typing.nit:1953,21
           ../src/syntax/typing.nit:1954,3--26
             ../src/syntax/typing.nit:1954,12
             attribute '_stype' ... ../src/syntax/typing.nit:1954,3--8
@@ -12746,7 +15587,9 @@
               ../src/syntax/typing.nit:1954,12--14
                 ../src/syntax/typing.nit:1954,12
                 identifier 'sig' ... ../src/syntax/typing.nit:1954,12--14
+                ../src/syntax/typing.nit:1954,12
               identifier 'return_type' ... ../src/syntax/typing.nit:1954,16--26
+              ../src/syntax/typing.nit:1954,12
           ../src/syntax/typing.nit:1955,3--18
             ../src/syntax/typing.nit:1955,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:1955,3--11
@@ -12791,7 +15634,9 @@
             ../src/syntax/typing.nit:1963,40--43
               ../src/syntax/typing.nit:1963,40
               identifier 'n_id' ... ../src/syntax/typing.nit:1963,40--43
+              ../src/syntax/typing.nit:1963,40
             identifier 'to_symbol' ... ../src/syntax/typing.nit:1963,45--53
+            ../src/syntax/typing.nit:1963,40
       keyword 'end' ... ../src/syntax/typing.nit:1964,1--3
     ../src/syntax/typing.nit:1965,1--1967,3
       keyword 'redef' ... ../src/syntax/typing.nit:1965,1--5
@@ -12814,7 +15659,9 @@
             ../src/syntax/typing.nit:1966,40--48
               ../src/syntax/typing.nit:1966,40
               identifier 'n_kwbreak' ... ../src/syntax/typing.nit:1966,40--48
+              ../src/syntax/typing.nit:1966,40
             identifier 'to_symbol' ... ../src/syntax/typing.nit:1966,50--58
+            ../src/syntax/typing.nit:1966,40
       keyword 'end' ... ../src/syntax/typing.nit:1967,1--3
     ../src/syntax/typing.nit:1969,1--2021,3
       keyword 'redef' ... ../src/syntax/typing.nit:1969,1--5
@@ -12884,6 +15731,7 @@
               attribute '_accept_typing2' ... ../src/syntax/typing.nit:1980,6--20
             ../src/syntax/typing.nit:1980,27--31
               keyword 'super' ... ../src/syntax/typing.nit:1980,27--31
+              ../src/syntax/typing.nit:1980,27
           keyword 'end' ... ../src/syntax/typing.nit:1981,2--4
       ../src/syntax/typing.nit:1983,2--2020,4
         ../src/syntax/typing.nit:1983,2--8
@@ -12908,6 +15756,7 @@
             ../src/syntax/typing.nit:1985,16--18
               ../src/syntax/typing.nit:1985,16
               identifier 'esc' ... ../src/syntax/typing.nit:1985,16--18
+              ../src/syntax/typing.nit:1985,16
           ../src/syntax/typing.nit:1987,3--33
             keyword 'var' ... ../src/syntax/typing.nit:1987,3--5
             identifier 'sig' ... ../src/syntax/typing.nit:1987,7--9
@@ -12917,8 +15766,11 @@
                 ../src/syntax/typing.nit:1987,13--15
                   ../src/syntax/typing.nit:1987,13
                   identifier 'esc' ... ../src/syntax/typing.nit:1987,13--15
+                  ../src/syntax/typing.nit:1987,13
                 identifier 'closure' ... ../src/syntax/typing.nit:1987,17--23
+                ../src/syntax/typing.nit:1987,13
               identifier 'signature' ... ../src/syntax/typing.nit:1987,25--33
+              ../src/syntax/typing.nit:1987,13
           ../src/syntax/typing.nit:1988,3--1991,5
             keyword 'if' ... ../src/syntax/typing.nit:1988,3--4
             ../src/syntax/typing.nit:1988,6--30
@@ -12926,37 +15778,49 @@
                 ../src/syntax/typing.nit:1988,6--8
                   ../src/syntax/typing.nit:1988,6
                   identifier 'sig' ... ../src/syntax/typing.nit:1988,6--8
+                  ../src/syntax/typing.nit:1988,6
                 identifier 'arity' ... ../src/syntax/typing.nit:1988,10--14
+                ../src/syntax/typing.nit:1988,6
               ../src/syntax/typing.nit:1988,19--30
                 ../src/syntax/typing.nit:1988,19--23
                   ../src/syntax/typing.nit:1988,19
                   identifier 'n_ids' ... ../src/syntax/typing.nit:1988,19--23
+                  ../src/syntax/typing.nit:1988,19
                 identifier 'length' ... ../src/syntax/typing.nit:1988,25--30
+                ../src/syntax/typing.nit:1988,19
             ../src/syntax/typing.nit:1989,4--1990,9
-              ../src/syntax/typing.nit:1989,4--94
+              ../src/syntax/typing.nit:1989,4--95
                 ../src/syntax/typing.nit:1989,4
                   ../src/syntax/typing.nit:1989,4
                   identifier 'v' ... ../src/syntax/typing.nit:1989,4
+                  ../src/syntax/typing.nit:1989,4
                 identifier 'error' ... ../src/syntax/typing.nit:1989,6--10
-                ../src/syntax/typing.nit:1989,12--15
-                  keyword 'self' ... ../src/syntax/typing.nit:1989,12--15
-                ../src/syntax/typing.nit:1989,18--94
-                  ../src/syntax/typing.nit:1989,18--26
-                    literal value '"Error: {' ... ../src/syntax/typing.nit:1989,18--26
-                  ../src/syntax/typing.nit:1989,27--35
-                    ../src/syntax/typing.nit:1989,27--29
+                ../src/syntax/typing.nit:1989,11--95
+                  '(' ... ../src/syntax/typing.nit:1989,11
+                  ../src/syntax/typing.nit:1989,12--15
+                    keyword 'self' ... ../src/syntax/typing.nit:1989,12--15
+                  ../src/syntax/typing.nit:1989,18--94
+                    ../src/syntax/typing.nit:1989,18--26
+                      literal value '"Error: {' ... ../src/syntax/typing.nit:1989,18--26
+                    ../src/syntax/typing.nit:1989,27--35
+                      ../src/syntax/typing.nit:1989,27--29
+                        ../src/syntax/typing.nit:1989,27
+                        identifier 'sig' ... ../src/syntax/typing.nit:1989,27--29
+                        ../src/syntax/typing.nit:1989,27
+                      identifier 'arity' ... ../src/syntax/typing.nit:1989,31--35
                       ../src/syntax/typing.nit:1989,27
-                      identifier 'sig' ... ../src/syntax/typing.nit:1989,27--29
-                    identifier 'arity' ... ../src/syntax/typing.nit:1989,31--35
-                  ../src/syntax/typing.nit:1989,36--73
-                    literal value '} automatic variable names expected, {' ... ../src/syntax/typing.nit:1989,36--73
-                  ../src/syntax/typing.nit:1989,74--85
-                    ../src/syntax/typing.nit:1989,74--78
+                    ../src/syntax/typing.nit:1989,36--73
+                      literal value '} automatic variable names expected, {' ... ../src/syntax/typing.nit:1989,36--73
+                    ../src/syntax/typing.nit:1989,74--85
+                      ../src/syntax/typing.nit:1989,74--78
+                        ../src/syntax/typing.nit:1989,74
+                        identifier 'n_ids' ... ../src/syntax/typing.nit:1989,74--78
+                        ../src/syntax/typing.nit:1989,74
+                      identifier 'length' ... ../src/syntax/typing.nit:1989,80--85
                       ../src/syntax/typing.nit:1989,74
-                      identifier 'n_ids' ... ../src/syntax/typing.nit:1989,74--78
-                    identifier 'length' ... ../src/syntax/typing.nit:1989,80--85
-                  ../src/syntax/typing.nit:1989,86--94
-                    '} found."' ... ../src/syntax/typing.nit:1989,86--94
+                    ../src/syntax/typing.nit:1989,86--94
+                      '} found."' ... ../src/syntax/typing.nit:1989,86--94
+                  ')' ... ../src/syntax/typing.nit:1989,95
               ../src/syntax/typing.nit:1990,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:1990,4--9
             ../src/syntax/typing.nit:1991,3--5
@@ -12969,16 +15833,23 @@
               ../src/syntax/typing.nit:1993,14--16
                 ../src/syntax/typing.nit:1993,14
                 identifier 'esc' ... ../src/syntax/typing.nit:1993,14--16
+                ../src/syntax/typing.nit:1993,14
               identifier 'closure' ... ../src/syntax/typing.nit:1993,18--24
-          ../src/syntax/typing.nit:1995,3--23
+              ../src/syntax/typing.nit:1993,14
+          ../src/syntax/typing.nit:1995,3--24
             ../src/syntax/typing.nit:1995,3--13
               ../src/syntax/typing.nit:1995,3
                 ../src/syntax/typing.nit:1995,3
                 identifier 'v' ... ../src/syntax/typing.nit:1995,3
+                ../src/syntax/typing.nit:1995,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:1995,5--13
+              ../src/syntax/typing.nit:1995,3
             identifier 'push' ... ../src/syntax/typing.nit:1995,15--18
-            ../src/syntax/typing.nit:1995,20--23
-              keyword 'self' ... ../src/syntax/typing.nit:1995,20--23
+            ../src/syntax/typing.nit:1995,19--24
+              '(' ... ../src/syntax/typing.nit:1995,19
+              ../src/syntax/typing.nit:1995,20--23
+                keyword 'self' ... ../src/syntax/typing.nit:1995,20--23
+              ')' ... ../src/syntax/typing.nit:1995,24
           ../src/syntax/typing.nit:1996,3--31
             keyword 'var' ... ../src/syntax/typing.nit:1996,3--5
             identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:1996,7--18
@@ -12987,7 +15858,9 @@
               ../src/syntax/typing.nit:1996,22
                 ../src/syntax/typing.nit:1996,22
                 identifier 'v' ... ../src/syntax/typing.nit:1996,22
+                ../src/syntax/typing.nit:1996,22
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:1996,24--31
+              ../src/syntax/typing.nit:1996,22
           ../src/syntax/typing.nit:1997,3--41
             keyword 'var' ... ../src/syntax/typing.nit:1997,3--5
             identifier 'old_base_flow_ctx' ... ../src/syntax/typing.nit:1997,7--23
@@ -12996,21 +15869,28 @@
               ../src/syntax/typing.nit:1997,27
                 ../src/syntax/typing.nit:1997,27
                 identifier 'v' ... ../src/syntax/typing.nit:1997,27
+                ../src/syntax/typing.nit:1997,27
               identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:1997,29--41
+              ../src/syntax/typing.nit:1997,27
           ../src/syntax/typing.nit:1998,3--30
             ../src/syntax/typing.nit:1998,3
               ../src/syntax/typing.nit:1998,3
               identifier 'v' ... ../src/syntax/typing.nit:1998,3
+              ../src/syntax/typing.nit:1998,3
             identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:1998,5--17
+            ../src/syntax/typing.nit:1998,21
             '=' ... ../src/syntax/typing.nit:1998,19
             ../src/syntax/typing.nit:1998,21--30
               ../src/syntax/typing.nit:1998,21
                 ../src/syntax/typing.nit:1998,21
                 identifier 'v' ... ../src/syntax/typing.nit:1998,21
+                ../src/syntax/typing.nit:1998,21
               identifier 'flow_ctx' ... ../src/syntax/typing.nit:1998,23--30
+              ../src/syntax/typing.nit:1998,21
           ../src/syntax/typing.nit:1999,3--36
             ../src/syntax/typing.nit:1999,25
             identifier 'variables' ... ../src/syntax/typing.nit:1999,3--11
+            ../src/syntax/typing.nit:1999,25
             '=' ... ../src/syntax/typing.nit:1999,13
             ../src/syntax/typing.nit:1999,15--36
               keyword 'new' ... ../src/syntax/typing.nit:1999,15--17
@@ -13018,6 +15898,7 @@
                 type identifier 'Array' ... ../src/syntax/typing.nit:1999,19--23
                 ../src/syntax/typing.nit:1999,25--36
                   type identifier 'AutoVariable' ... ../src/syntax/typing.nit:1999,25--36
+              ../src/syntax/typing.nit:1999,15
           ../src/syntax/typing.nit:2000,3--2005,5
             keyword 'for' ... ../src/syntax/typing.nit:2000,3--5
             identifier 'i' ... ../src/syntax/typing.nit:2000,7
@@ -13029,65 +15910,99 @@
                 ../src/syntax/typing.nit:2000,16--20
                   ../src/syntax/typing.nit:2000,16
                   identifier 'n_ids' ... ../src/syntax/typing.nit:2000,16--20
+                  ../src/syntax/typing.nit:2000,16
                 identifier 'length' ... ../src/syntax/typing.nit:2000,22--27
+                ../src/syntax/typing.nit:2000,16
               '[' ... ../src/syntax/typing.nit:2000,28
             keyword 'do' ... ../src/syntax/typing.nit:2000,30--31
             ../src/syntax/typing.nit:2001,4--2005,5
-              ../src/syntax/typing.nit:2001,4--56
+              ../src/syntax/typing.nit:2001,4--58
                 keyword 'var' ... ../src/syntax/typing.nit:2001,4--6
                 identifier 'va' ... ../src/syntax/typing.nit:2001,8--9
                 '=' ... ../src/syntax/typing.nit:2001,11
-                ../src/syntax/typing.nit:2001,13--56
+                ../src/syntax/typing.nit:2001,13--58
                   keyword 'new' ... ../src/syntax/typing.nit:2001,13--15
                   ../src/syntax/typing.nit:2001,17--28
                     type identifier 'AutoVariable' ... ../src/syntax/typing.nit:2001,17--28
-                  ../src/syntax/typing.nit:2001,30--47
-                    ../src/syntax/typing.nit:2001,30--36
-                      ../src/syntax/typing.nit:2001,30--34
-                        ../src/syntax/typing.nit:2001,30
-                        identifier 'n_ids' ... ../src/syntax/typing.nit:2001,30--34
-                      ../src/syntax/typing.nit:2001,36
-                        ../src/syntax/typing.nit:2001,36
-                        identifier 'i' ... ../src/syntax/typing.nit:2001,36
-                    identifier 'to_symbol' ... ../src/syntax/typing.nit:2001,39--47
-                  ../src/syntax/typing.nit:2001,50--56
-                    ../src/syntax/typing.nit:2001,50--54
-                      ../src/syntax/typing.nit:2001,50
-                      identifier 'n_ids' ... ../src/syntax/typing.nit:2001,50--54
-                    ../src/syntax/typing.nit:2001,56
-                      ../src/syntax/typing.nit:2001,56
-                      identifier 'i' ... ../src/syntax/typing.nit:2001,56
-              ../src/syntax/typing.nit:2002,4--19
+                  ../src/syntax/typing.nit:2001,29--58
+                    '(' ... ../src/syntax/typing.nit:2001,29
+                    ../src/syntax/typing.nit:2001,30--47
+                      ../src/syntax/typing.nit:2001,30--37
+                        ../src/syntax/typing.nit:2001,30--34
+                          ../src/syntax/typing.nit:2001,30
+                          identifier 'n_ids' ... ../src/syntax/typing.nit:2001,30--34
+                          ../src/syntax/typing.nit:2001,30
+                        ../src/syntax/typing.nit:2001,35--37
+                          '[' ... ../src/syntax/typing.nit:2001,35
+                          ../src/syntax/typing.nit:2001,36
+                            ../src/syntax/typing.nit:2001,36
+                            identifier 'i' ... ../src/syntax/typing.nit:2001,36
+                            ../src/syntax/typing.nit:2001,36
+                          ']' ... ../src/syntax/typing.nit:2001,37
+                      identifier 'to_symbol' ... ../src/syntax/typing.nit:2001,39--47
+                      ../src/syntax/typing.nit:2001,30
+                    ../src/syntax/typing.nit:2001,50--57
+                      ../src/syntax/typing.nit:2001,50--54
+                        ../src/syntax/typing.nit:2001,50
+                        identifier 'n_ids' ... ../src/syntax/typing.nit:2001,50--54
+                        ../src/syntax/typing.nit:2001,50
+                      ../src/syntax/typing.nit:2001,55--57
+                        '[' ... ../src/syntax/typing.nit:2001,55
+                        ../src/syntax/typing.nit:2001,56
+                          ../src/syntax/typing.nit:2001,56
+                          identifier 'i' ... ../src/syntax/typing.nit:2001,56
+                          ../src/syntax/typing.nit:2001,56
+                        ']' ... ../src/syntax/typing.nit:2001,57
+                    ')' ... ../src/syntax/typing.nit:2001,58
+              ../src/syntax/typing.nit:2002,4--20
                 ../src/syntax/typing.nit:2002,4--12
                   ../src/syntax/typing.nit:2002,4
                   identifier 'variables' ... ../src/syntax/typing.nit:2002,4--12
+                  ../src/syntax/typing.nit:2002,4
                 identifier 'add' ... ../src/syntax/typing.nit:2002,14--16
-                ../src/syntax/typing.nit:2002,18--19
-                  ../src/syntax/typing.nit:2002,18
-                  identifier 'va' ... ../src/syntax/typing.nit:2002,18--19
-              ../src/syntax/typing.nit:2003,4--19
+                ../src/syntax/typing.nit:2002,17--20
+                  '(' ... ../src/syntax/typing.nit:2002,17
+                  ../src/syntax/typing.nit:2002,18--19
+                    ../src/syntax/typing.nit:2002,18
+                    identifier 'va' ... ../src/syntax/typing.nit:2002,18--19
+                    ../src/syntax/typing.nit:2002,18
+                  ')' ... ../src/syntax/typing.nit:2002,20
+              ../src/syntax/typing.nit:2003,4--20
                 ../src/syntax/typing.nit:2003,4--5
                   ../src/syntax/typing.nit:2003,4
                   identifier 'va' ... ../src/syntax/typing.nit:2003,4--5
+                  ../src/syntax/typing.nit:2003,4
                 identifier 'stype' ... ../src/syntax/typing.nit:2003,7--11
+                ../src/syntax/typing.nit:2003,15
                 '=' ... ../src/syntax/typing.nit:2003,13
-                ../src/syntax/typing.nit:2003,15--19
+                ../src/syntax/typing.nit:2003,15--20
                   ../src/syntax/typing.nit:2003,15--17
                     ../src/syntax/typing.nit:2003,15
                     identifier 'sig' ... ../src/syntax/typing.nit:2003,15--17
-                  ../src/syntax/typing.nit:2003,19
+                    ../src/syntax/typing.nit:2003,15
+                  ../src/syntax/typing.nit:2003,18--20
+                    '[' ... ../src/syntax/typing.nit:2003,18
                     ../src/syntax/typing.nit:2003,19
-                    identifier 'i' ... ../src/syntax/typing.nit:2003,19
-              ../src/syntax/typing.nit:2004,4--30
+                      ../src/syntax/typing.nit:2003,19
+                      identifier 'i' ... ../src/syntax/typing.nit:2003,19
+                      ../src/syntax/typing.nit:2003,19
+                    ']' ... ../src/syntax/typing.nit:2003,20
+              ../src/syntax/typing.nit:2004,4--31
                 ../src/syntax/typing.nit:2004,4--14
                   ../src/syntax/typing.nit:2004,4
                     ../src/syntax/typing.nit:2004,4
                     identifier 'v' ... ../src/syntax/typing.nit:2004,4
+                    ../src/syntax/typing.nit:2004,4
                   identifier 'scope_ctx' ... ../src/syntax/typing.nit:2004,6--14
+                  ../src/syntax/typing.nit:2004,4
                 identifier 'add_variable' ... ../src/syntax/typing.nit:2004,16--27
-                ../src/syntax/typing.nit:2004,29--30
-                  ../src/syntax/typing.nit:2004,29
-                  identifier 'va' ... ../src/syntax/typing.nit:2004,29--30
+                ../src/syntax/typing.nit:2004,28--31
+                  '(' ... ../src/syntax/typing.nit:2004,28
+                  ../src/syntax/typing.nit:2004,29--30
+                    ../src/syntax/typing.nit:2004,29
+                    identifier 'va' ... ../src/syntax/typing.nit:2004,29--30
+                    ../src/syntax/typing.nit:2004,29
+                  ')' ... ../src/syntax/typing.nit:2004,31
               keyword 'end' ... ../src/syntax/typing.nit:2005,3--5
           ../src/syntax/typing.nit:2007,3--24
             ../src/syntax/typing.nit:2007,21
@@ -13095,12 +16010,16 @@
             '=' ... ../src/syntax/typing.nit:2007,19
             ../src/syntax/typing.nit:2007,21--24
               keyword 'true' ... ../src/syntax/typing.nit:2007,21--24
-          ../src/syntax/typing.nit:2008,3--17
+          ../src/syntax/typing.nit:2008,3--18
             ../src/syntax/typing.nit:2008,17
             identifier 'accept_typing' ... ../src/syntax/typing.nit:2008,3--15
-            ../src/syntax/typing.nit:2008,17
+            ../src/syntax/typing.nit:2008,16--18
+              '(' ... ../src/syntax/typing.nit:2008,16
               ../src/syntax/typing.nit:2008,17
-              identifier 'v' ... ../src/syntax/typing.nit:2008,17
+                ../src/syntax/typing.nit:2008,17
+                identifier 'v' ... ../src/syntax/typing.nit:2008,17
+                ../src/syntax/typing.nit:2008,17
+              ')' ... ../src/syntax/typing.nit:2008,18
           ../src/syntax/typing.nit:2010,3--2016,5
             keyword 'if' ... ../src/syntax/typing.nit:2010,3--4
             ../src/syntax/typing.nit:2010,6--32
@@ -13109,8 +16028,11 @@
                   ../src/syntax/typing.nit:2010,6
                     ../src/syntax/typing.nit:2010,6
                     identifier 'v' ... ../src/syntax/typing.nit:2010,6
+                    ../src/syntax/typing.nit:2010,6
                   identifier 'flow_ctx' ... ../src/syntax/typing.nit:2010,8--15
+                  ../src/syntax/typing.nit:2010,6
                 identifier 'unreash' ... ../src/syntax/typing.nit:2010,17--23
+                ../src/syntax/typing.nit:2010,6
               ../src/syntax/typing.nit:2010,28--32
                 keyword 'false' ... ../src/syntax/typing.nit:2010,28--32
             ../src/syntax/typing.nit:2011,4--2015,6
@@ -13122,20 +16044,27 @@
                       ../src/syntax/typing.nit:2011,7--13
                         ../src/syntax/typing.nit:2011,7
                         identifier 'closure' ... ../src/syntax/typing.nit:2011,7--13
+                        ../src/syntax/typing.nit:2011,7
                       identifier 'signature' ... ../src/syntax/typing.nit:2011,15--23
+                      ../src/syntax/typing.nit:2011,7
                     identifier 'return_type' ... ../src/syntax/typing.nit:2011,25--35
+                    ../src/syntax/typing.nit:2011,7
                   ../src/syntax/typing.nit:2011,40--43
                     keyword 'null' ... ../src/syntax/typing.nit:2011,40--43
-                ../src/syntax/typing.nit:2012,5--97
-                  ../src/syntax/typing.nit:2012,5--97
+                ../src/syntax/typing.nit:2012,5--98
+                  ../src/syntax/typing.nit:2012,5--98
                     ../src/syntax/typing.nit:2012,5
                       ../src/syntax/typing.nit:2012,5
                       identifier 'v' ... ../src/syntax/typing.nit:2012,5
+                      ../src/syntax/typing.nit:2012,5
                     identifier 'error' ... ../src/syntax/typing.nit:2012,7--11
-                    ../src/syntax/typing.nit:2012,13--16
-                      keyword 'self' ... ../src/syntax/typing.nit:2012,13--16
-                    ../src/syntax/typing.nit:2012,19--97
-                      literal value '"Control error: Reached end of block (a 'continue' with a value was expected)."' ... ../src/syntax/typing.nit:2012,19--97
+                    ../src/syntax/typing.nit:2012,12--98
+                      '(' ... ../src/syntax/typing.nit:2012,12
+                      ../src/syntax/typing.nit:2012,13--16
+                        keyword 'self' ... ../src/syntax/typing.nit:2012,13--16
+                      ../src/syntax/typing.nit:2012,19--97
+                        literal value '"Control error: Reached end of block (a 'continue' with a value was expected)."' ... ../src/syntax/typing.nit:2012,19--97
+                      ')' ... ../src/syntax/typing.nit:2012,98
                 ../src/syntax/typing.nit:2013,9--2015,6
                   keyword 'if' ... ../src/syntax/typing.nit:2013,9--10
                   ../src/syntax/typing.nit:2013,12--54
@@ -13143,25 +16072,33 @@
                       ../src/syntax/typing.nit:2013,12--18
                         ../src/syntax/typing.nit:2013,12
                         identifier 'closure' ... ../src/syntax/typing.nit:2013,12--18
+                        ../src/syntax/typing.nit:2013,12
                       identifier 'is_break' ... ../src/syntax/typing.nit:2013,20--27
+                      ../src/syntax/typing.nit:2013,12
                     ../src/syntax/typing.nit:2013,33--54
                       ../src/syntax/typing.nit:2013,33--46
                         ../src/syntax/typing.nit:2013,33--35
                           ../src/syntax/typing.nit:2013,33
                           identifier 'esc' ... ../src/syntax/typing.nit:2013,33--35
+                          ../src/syntax/typing.nit:2013,33
                         identifier 'break_list' ... ../src/syntax/typing.nit:2013,37--46
+                        ../src/syntax/typing.nit:2013,33
                       ../src/syntax/typing.nit:2013,51--54
                         keyword 'null' ... ../src/syntax/typing.nit:2013,51--54
-                  ../src/syntax/typing.nit:2014,5--100
-                    ../src/syntax/typing.nit:2014,5--100
+                  ../src/syntax/typing.nit:2014,5--101
+                    ../src/syntax/typing.nit:2014,5--101
                       ../src/syntax/typing.nit:2014,5
                         ../src/syntax/typing.nit:2014,5
                         identifier 'v' ... ../src/syntax/typing.nit:2014,5
+                        ../src/syntax/typing.nit:2014,5
                       identifier 'error' ... ../src/syntax/typing.nit:2014,7--11
-                      ../src/syntax/typing.nit:2014,13--16
-                        keyword 'self' ... ../src/syntax/typing.nit:2014,13--16
-                      ../src/syntax/typing.nit:2014,19--100
-                        literal value '"Control error: Reached end of break block (a 'break' with a value was expected)."' ... ../src/syntax/typing.nit:2014,19--100
+                      ../src/syntax/typing.nit:2014,12--101
+                        '(' ... ../src/syntax/typing.nit:2014,12
+                        ../src/syntax/typing.nit:2014,13--16
+                          keyword 'self' ... ../src/syntax/typing.nit:2014,13--16
+                        ../src/syntax/typing.nit:2014,19--100
+                          literal value '"Control error: Reached end of break block (a 'break' with a value was expected)."' ... ../src/syntax/typing.nit:2014,19--100
+                        ')' ... ../src/syntax/typing.nit:2014,101
                   ../src/syntax/typing.nit:2015,4--6
                     keyword 'end' ... ../src/syntax/typing.nit:2015,4--6
             ../src/syntax/typing.nit:2016,3--5
@@ -13170,27 +16107,36 @@
             ../src/syntax/typing.nit:2017,3
               ../src/syntax/typing.nit:2017,3
               identifier 'v' ... ../src/syntax/typing.nit:2017,3
+              ../src/syntax/typing.nit:2017,3
             identifier 'flow_ctx' ... ../src/syntax/typing.nit:2017,5--12
+            ../src/syntax/typing.nit:2017,16
             '=' ... ../src/syntax/typing.nit:2017,14
             ../src/syntax/typing.nit:2017,16--27
               ../src/syntax/typing.nit:2017,16
               identifier 'old_flow_ctx' ... ../src/syntax/typing.nit:2017,16--27
+              ../src/syntax/typing.nit:2017,16
           ../src/syntax/typing.nit:2018,3--37
             ../src/syntax/typing.nit:2018,3
               ../src/syntax/typing.nit:2018,3
               identifier 'v' ... ../src/syntax/typing.nit:2018,3
+              ../src/syntax/typing.nit:2018,3
             identifier 'base_flow_ctx' ... ../src/syntax/typing.nit:2018,5--17
+            ../src/syntax/typing.nit:2018,21
             '=' ... ../src/syntax/typing.nit:2018,19
             ../src/syntax/typing.nit:2018,21--37
               ../src/syntax/typing.nit:2018,21
               identifier 'old_base_flow_ctx' ... ../src/syntax/typing.nit:2018,21--37
+              ../src/syntax/typing.nit:2018,21
           ../src/syntax/typing.nit:2019,3--17
             ../src/syntax/typing.nit:2019,3--13
               ../src/syntax/typing.nit:2019,3
                 ../src/syntax/typing.nit:2019,3
                 identifier 'v' ... ../src/syntax/typing.nit:2019,3
+                ../src/syntax/typing.nit:2019,3
               identifier 'scope_ctx' ... ../src/syntax/typing.nit:2019,5--13
+              ../src/syntax/typing.nit:2019,3
             identifier 'pop' ... ../src/syntax/typing.nit:2019,15--17
+            ../src/syntax/typing.nit:2019,3
           keyword 'end' ... ../src/syntax/typing.nit:2020,2--4
       keyword 'end' ... ../src/syntax/typing.nit:2021,1--3
     ../src/syntax/typing.nit:2023,1--2052,3
@@ -13224,16 +16170,21 @@
         ../src/syntax/typing.nit:2027,3--2051,4
           ../src/syntax/typing.nit:2027,3--41
             keyword 'if' ... ../src/syntax/typing.nit:2027,3--4
-            ../src/syntax/typing.nit:2027,6--28
+            ../src/syntax/typing.nit:2027,6--29
               keyword 'not' ... ../src/syntax/typing.nit:2027,6--8
-              ../src/syntax/typing.nit:2027,10--28
+              ../src/syntax/typing.nit:2027,10--29
                 ../src/syntax/typing.nit:2027,10
                   ../src/syntax/typing.nit:2027,10
                   identifier 'v' ... ../src/syntax/typing.nit:2027,10
+                  ../src/syntax/typing.nit:2027,10
                 identifier 'check_expr' ... ../src/syntax/typing.nit:2027,12--21
-                ../src/syntax/typing.nit:2027,23--28
-                  ../src/syntax/typing.nit:2027,23
-                  identifier 'n_expr' ... ../src/syntax/typing.nit:2027,23--28
+                ../src/syntax/typing.nit:2027,22--29
+                  '(' ... ../src/syntax/typing.nit:2027,22
+                  ../src/syntax/typing.nit:2027,23--28
+                    ../src/syntax/typing.nit:2027,23
+                    identifier 'n_expr' ... ../src/syntax/typing.nit:2027,23--28
+                    ../src/syntax/typing.nit:2027,23
+                  ')' ... ../src/syntax/typing.nit:2027,29
             ../src/syntax/typing.nit:2027,36--41
               keyword 'return' ... ../src/syntax/typing.nit:2027,36--41
           ../src/syntax/typing.nit:2028,3--36
@@ -13244,7 +16195,9 @@
                 ../src/syntax/typing.nit:2028,10--15
                   ../src/syntax/typing.nit:2028,10
                   identifier 'n_type' ... ../src/syntax/typing.nit:2028,10--15
+                  ../src/syntax/typing.nit:2028,10
                 identifier 'is_typed' ... ../src/syntax/typing.nit:2028,17--24
+                ../src/syntax/typing.nit:2028,10
             ../src/syntax/typing.nit:2028,31--36
               keyword 'return' ... ../src/syntax/typing.nit:2028,31--36
           ../src/syntax/typing.nit:2029,3--26
@@ -13255,7 +16208,9 @@
               ../src/syntax/typing.nit:2029,15--20
                 ../src/syntax/typing.nit:2029,15
                 identifier 'n_expr' ... ../src/syntax/typing.nit:2029,15--20
+                ../src/syntax/typing.nit:2029,15
               identifier 'stype' ... ../src/syntax/typing.nit:2029,22--26
+              ../src/syntax/typing.nit:2029,15
           ../src/syntax/typing.nit:2030,3--26
             keyword 'var' ... ../src/syntax/typing.nit:2030,3--5
             identifier 'ttype' ... ../src/syntax/typing.nit:2030,7--11
@@ -13264,86 +16219,109 @@
               ../src/syntax/typing.nit:2030,15--20
                 ../src/syntax/typing.nit:2030,15
                 identifier 'n_type' ... ../src/syntax/typing.nit:2030,15--20
+                ../src/syntax/typing.nit:2030,15
               identifier 'stype' ... ../src/syntax/typing.nit:2030,22--26
+              ../src/syntax/typing.nit:2030,15
           ../src/syntax/typing.nit:2031,3--2050,5
             keyword 'if' ... ../src/syntax/typing.nit:2031,3--4
             ../src/syntax/typing.nit:2031,6--19
               ../src/syntax/typing.nit:2031,6--10
                 ../src/syntax/typing.nit:2031,6
                 identifier 'etype' ... ../src/syntax/typing.nit:2031,6--10
+                ../src/syntax/typing.nit:2031,6
               ../src/syntax/typing.nit:2031,15--19
                 ../src/syntax/typing.nit:2031,15
                 identifier 'ttype' ... ../src/syntax/typing.nit:2031,15--19
-            ../src/syntax/typing.nit:2032,4--62
-              ../src/syntax/typing.nit:2032,4--62
+                ../src/syntax/typing.nit:2031,15
+            ../src/syntax/typing.nit:2032,4--63
+              ../src/syntax/typing.nit:2032,4--63
                 ../src/syntax/typing.nit:2032,4
                   ../src/syntax/typing.nit:2032,4
                   identifier 'v' ... ../src/syntax/typing.nit:2032,4
+                  ../src/syntax/typing.nit:2032,4
                 identifier 'warning' ... ../src/syntax/typing.nit:2032,6--12
-                ../src/syntax/typing.nit:2032,14--17
-                  keyword 'self' ... ../src/syntax/typing.nit:2032,14--17
-                ../src/syntax/typing.nit:2032,20--62
-                  ../src/syntax/typing.nit:2032,20--54
-                    literal value '"Warning: Expression is already a {' ... ../src/syntax/typing.nit:2032,20--54
-                  ../src/syntax/typing.nit:2032,55--59
-                    ../src/syntax/typing.nit:2032,55
-                    identifier 'ttype' ... ../src/syntax/typing.nit:2032,55--59
-                  ../src/syntax/typing.nit:2032,60--62
-                    '}."' ... ../src/syntax/typing.nit:2032,60--62
+                ../src/syntax/typing.nit:2032,13--63
+                  '(' ... ../src/syntax/typing.nit:2032,13
+                  ../src/syntax/typing.nit:2032,14--17
+                    keyword 'self' ... ../src/syntax/typing.nit:2032,14--17
+                  ../src/syntax/typing.nit:2032,20--62
+                    ../src/syntax/typing.nit:2032,20--54
+                      literal value '"Warning: Expression is already a {' ... ../src/syntax/typing.nit:2032,20--54
+                    ../src/syntax/typing.nit:2032,55--59
+                      ../src/syntax/typing.nit:2032,55
+                      identifier 'ttype' ... ../src/syntax/typing.nit:2032,55--59
+                      ../src/syntax/typing.nit:2032,55
+                    ../src/syntax/typing.nit:2032,60--62
+                      '}."' ... ../src/syntax/typing.nit:2032,60--62
+                  ')' ... ../src/syntax/typing.nit:2032,63
             ../src/syntax/typing.nit:2033,8--2050,5
               keyword 'if' ... ../src/syntax/typing.nit:2033,8--9
               ../src/syntax/typing.nit:2033,11--23
                 ../src/syntax/typing.nit:2033,11--15
                   ../src/syntax/typing.nit:2033,11
                   identifier 'etype' ... ../src/syntax/typing.nit:2033,11--15
+                  ../src/syntax/typing.nit:2033,11
                 ../src/syntax/typing.nit:2033,19--23
                   ../src/syntax/typing.nit:2033,19
                   identifier 'ttype' ... ../src/syntax/typing.nit:2033,19--23
-              ../src/syntax/typing.nit:2034,4--84
-                ../src/syntax/typing.nit:2034,4--84
+                  ../src/syntax/typing.nit:2033,19
+              ../src/syntax/typing.nit:2034,4--85
+                ../src/syntax/typing.nit:2034,4--85
                   ../src/syntax/typing.nit:2034,4
                     ../src/syntax/typing.nit:2034,4
                     identifier 'v' ... ../src/syntax/typing.nit:2034,4
+                    ../src/syntax/typing.nit:2034,4
                   identifier 'warning' ... ../src/syntax/typing.nit:2034,6--12
-                  ../src/syntax/typing.nit:2034,14--17
-                    keyword 'self' ... ../src/syntax/typing.nit:2034,14--17
-                  ../src/syntax/typing.nit:2034,20--84
-                    ../src/syntax/typing.nit:2034,20--54
-                      literal value '"Warning: Expression is already a {' ... ../src/syntax/typing.nit:2034,20--54
-                    ../src/syntax/typing.nit:2034,55--59
-                      ../src/syntax/typing.nit:2034,55
-                      identifier 'ttype' ... ../src/syntax/typing.nit:2034,55--59
-                    ../src/syntax/typing.nit:2034,60--76
-                      literal value '} since it is a {' ... ../src/syntax/typing.nit:2034,60--76
-                    ../src/syntax/typing.nit:2034,77--81
-                      ../src/syntax/typing.nit:2034,77
-                      identifier 'etype' ... ../src/syntax/typing.nit:2034,77--81
-                    ../src/syntax/typing.nit:2034,82--84
-                      '}."' ... ../src/syntax/typing.nit:2034,82--84
+                  ../src/syntax/typing.nit:2034,13--85
+                    '(' ... ../src/syntax/typing.nit:2034,13
+                    ../src/syntax/typing.nit:2034,14--17
+                      keyword 'self' ... ../src/syntax/typing.nit:2034,14--17
+                    ../src/syntax/typing.nit:2034,20--84
+                      ../src/syntax/typing.nit:2034,20--54
+                        literal value '"Warning: Expression is already a {' ... ../src/syntax/typing.nit:2034,20--54
+                      ../src/syntax/typing.nit:2034,55--59
+                        ../src/syntax/typing.nit:2034,55
+                        identifier 'ttype' ... ../src/syntax/typing.nit:2034,55--59
+                        ../src/syntax/typing.nit:2034,55
+                      ../src/syntax/typing.nit:2034,60--76
+                        literal value '} since it is a {' ... ../src/syntax/typing.nit:2034,60--76
+                      ../src/syntax/typing.nit:2034,77--81
+                        ../src/syntax/typing.nit:2034,77
+                        identifier 'etype' ... ../src/syntax/typing.nit:2034,77--81
+                        ../src/syntax/typing.nit:2034,77
+                      ../src/syntax/typing.nit:2034,82--84
+                        '}."' ... ../src/syntax/typing.nit:2034,82--84
+                    ')' ... ../src/syntax/typing.nit:2034,85
               ../src/syntax/typing.nit:2035,8--2050,5
                 keyword 'if' ... ../src/syntax/typing.nit:2035,8--9
                 ../src/syntax/typing.nit:2035,11--30
                   ../src/syntax/typing.nit:2035,11--15
                     ../src/syntax/typing.nit:2035,11
                     identifier 'etype' ... ../src/syntax/typing.nit:2035,11--15
+                    ../src/syntax/typing.nit:2035,11
                   ../src/syntax/typing.nit:2035,21--30
                     type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:2035,21--30
-                ../src/syntax/typing.nit:2037,4--79
-                  ../src/syntax/typing.nit:2037,4--79
+                ../src/syntax/typing.nit:2037,4--80
+                  ../src/syntax/typing.nit:2037,4--80
                     ../src/syntax/typing.nit:2037,4
                       ../src/syntax/typing.nit:2037,4
                       identifier 'v' ... ../src/syntax/typing.nit:2037,4
+                      ../src/syntax/typing.nit:2037,4
                     identifier 'warning' ... ../src/syntax/typing.nit:2037,6--12
-                    ../src/syntax/typing.nit:2037,14--17
-                      keyword 'self' ... ../src/syntax/typing.nit:2037,14--17
-                    ../src/syntax/typing.nit:2037,20--79
-                      ../src/syntax/typing.nit:2037,20--71
-                        literal value '"Warning: Expression is null therefore cannot be a {' ... ../src/syntax/typing.nit:2037,20--71
-                      ../src/syntax/typing.nit:2037,72--76
-                        ../src/syntax/typing.nit:2037,72
-                        identifier 'ttype' ... ../src/syntax/typing.nit:2037,72--76
-                      ../src/syntax/typing.nit:2037,77--79
-                        '}."' ... ../src/syntax/typing.nit:2037,77--79
+                    ../src/syntax/typing.nit:2037,13--80
+                      '(' ... ../src/syntax/typing.nit:2037,13
+                      ../src/syntax/typing.nit:2037,14--17
+                        keyword 'self' ... ../src/syntax/typing.nit:2037,14--17
+                      ../src/syntax/typing.nit:2037,20--79
+                        ../src/syntax/typing.nit:2037,20--71
+                          literal value '"Warning: Expression is null therefore cannot be a {' ... ../src/syntax/typing.nit:2037,20--71
+                        ../src/syntax/typing.nit:2037,72--76
+                          ../src/syntax/typing.nit:2037,72
+                          identifier 'ttype' ... ../src/syntax/typing.nit:2037,72--76
+                          ../src/syntax/typing.nit:2037,72
+                        ../src/syntax/typing.nit:2037,77--79
+                          '}."' ... ../src/syntax/typing.nit:2037,77--79
+                      ')' ... ../src/syntax/typing.nit:2037,80
                 ../src/syntax/typing.nit:2038,8--2050,5
                   keyword 'if' ... ../src/syntax/typing.nit:2038,8--9
                   ../src/syntax/typing.nit:2038,11--57
@@ -13351,16 +16329,21 @@
                       ../src/syntax/typing.nit:2038,11--15
                         ../src/syntax/typing.nit:2038,11
                         identifier 'etype' ... ../src/syntax/typing.nit:2038,11--15
+                        ../src/syntax/typing.nit:2038,11
                       identifier 'is_nullable' ... ../src/syntax/typing.nit:2038,17--27
+                      ../src/syntax/typing.nit:2038,11
                     ../src/syntax/typing.nit:2038,33--57
                       ../src/syntax/typing.nit:2038,33--48
                         ../src/syntax/typing.nit:2038,33--37
                           ../src/syntax/typing.nit:2038,33
                           identifier 'etype' ... ../src/syntax/typing.nit:2038,33--37
+                          ../src/syntax/typing.nit:2038,33
                         identifier 'as_notnull' ... ../src/syntax/typing.nit:2038,39--48
+                        ../src/syntax/typing.nit:2038,33
                       ../src/syntax/typing.nit:2038,53--57
                         ../src/syntax/typing.nit:2038,53
                         identifier 'ttype' ... ../src/syntax/typing.nit:2038,53--57
+                        ../src/syntax/typing.nit:2038,53
                   ../src/syntax/typing.nit:2039,4--2049,6
                     ../src/syntax/typing.nit:2039,4--2049,6
                       keyword 'if' ... ../src/syntax/typing.nit:2039,4--5
@@ -13369,6 +16352,7 @@
                           ../src/syntax/typing.nit:2039,7--11
                             ../src/syntax/typing.nit:2039,7
                             identifier 'ttype' ... ../src/syntax/typing.nit:2039,7--11
+                            ../src/syntax/typing.nit:2039,7
                           ../src/syntax/typing.nit:2039,17--28
                             type identifier 'MMTypeFormal' ... ../src/syntax/typing.nit:2039,17--28
                         ../src/syntax/typing.nit:2039,34--56
@@ -13376,8 +16360,11 @@
                             ../src/syntax/typing.nit:2039,34--38
                               ../src/syntax/typing.nit:2039,34
                               identifier 'ttype' ... ../src/syntax/typing.nit:2039,34--38
+                              ../src/syntax/typing.nit:2039,34
                             identifier 'bound' ... ../src/syntax/typing.nit:2039,40--44
+                            ../src/syntax/typing.nit:2039,34
                           identifier 'is_nullable' ... ../src/syntax/typing.nit:2039,46--56
+                          ../src/syntax/typing.nit:2039,34
                       ../src/syntax/typing.nit:2045,9--2049,6
                         keyword 'if' ... ../src/syntax/typing.nit:2045,9--10
                         ../src/syntax/typing.nit:2045,12--28
@@ -13385,26 +16372,34 @@
                             keyword 'self' ... ../src/syntax/typing.nit:2045,12--15
                           ../src/syntax/typing.nit:2045,21--28
                             type identifier 'AIsaExpr' ... ../src/syntax/typing.nit:2045,21--28
-                        ../src/syntax/typing.nit:2046,5--48
-                          ../src/syntax/typing.nit:2046,5--48
+                        ../src/syntax/typing.nit:2046,5--49
+                          ../src/syntax/typing.nit:2046,5--49
                             ../src/syntax/typing.nit:2046,5
                               ../src/syntax/typing.nit:2046,5
                               identifier 'v' ... ../src/syntax/typing.nit:2046,5
+                              ../src/syntax/typing.nit:2046,5
                             identifier 'warning' ... ../src/syntax/typing.nit:2046,7--13
-                            ../src/syntax/typing.nit:2046,15--18
-                              keyword 'self' ... ../src/syntax/typing.nit:2046,15--18
-                            ../src/syntax/typing.nit:2046,21--48
-                              literal value '"Warning: Prefer '!= null'."' ... ../src/syntax/typing.nit:2046,21--48
+                            ../src/syntax/typing.nit:2046,14--49
+                              '(' ... ../src/syntax/typing.nit:2046,14
+                              ../src/syntax/typing.nit:2046,15--18
+                                keyword 'self' ... ../src/syntax/typing.nit:2046,15--18
+                              ../src/syntax/typing.nit:2046,21--48
+                                literal value '"Warning: Prefer '!= null'."' ... ../src/syntax/typing.nit:2046,21--48
+                              ')' ... ../src/syntax/typing.nit:2046,49
                         ../src/syntax/typing.nit:2048,5--2049,6
-                          ../src/syntax/typing.nit:2048,5--54
+                          ../src/syntax/typing.nit:2048,5--55
                             ../src/syntax/typing.nit:2048,5
                               ../src/syntax/typing.nit:2048,5
                               identifier 'v' ... ../src/syntax/typing.nit:2048,5
+                              ../src/syntax/typing.nit:2048,5
                             identifier 'warning' ... ../src/syntax/typing.nit:2048,7--13
-                            ../src/syntax/typing.nit:2048,15--18
-                              keyword 'self' ... ../src/syntax/typing.nit:2048,15--18
-                            ../src/syntax/typing.nit:2048,21--54
-                              literal value '"Warning: Prefer '.as(not null)'."' ... ../src/syntax/typing.nit:2048,21--54
+                            ../src/syntax/typing.nit:2048,14--55
+                              '(' ... ../src/syntax/typing.nit:2048,14
+                              ../src/syntax/typing.nit:2048,15--18
+                                keyword 'self' ... ../src/syntax/typing.nit:2048,15--18
+                              ../src/syntax/typing.nit:2048,21--54
+                                literal value '"Warning: Prefer '.as(not null)'."' ... ../src/syntax/typing.nit:2048,21--54
+                              ')' ... ../src/syntax/typing.nit:2048,55
                           keyword 'end' ... ../src/syntax/typing.nit:2049,4--6
                   ../src/syntax/typing.nit:2050,3--5
                     keyword 'end' ... ../src/syntax/typing.nit:2050,3--5
@@ -13430,18 +16425,24 @@
           ../src/syntax/typing.nit:2056,25
             identifier 'v' ... ../src/syntax/typing.nit:2056,25
         ../src/syntax/typing.nit:2058,3--2066,4
-          ../src/syntax/typing.nit:2058,3--35
+          ../src/syntax/typing.nit:2058,3--36
             ../src/syntax/typing.nit:2058,19
             identifier 'check_expr_cast' ... ../src/syntax/typing.nit:2058,3--17
-            ../src/syntax/typing.nit:2058,19
+            ../src/syntax/typing.nit:2058,18--36
+              '(' ... ../src/syntax/typing.nit:2058,18
               ../src/syntax/typing.nit:2058,19
-              identifier 'v' ... ../src/syntax/typing.nit:2058,19
-            ../src/syntax/typing.nit:2058,22--27
-              ../src/syntax/typing.nit:2058,22
-              identifier 'n_expr' ... ../src/syntax/typing.nit:2058,22--27
-            ../src/syntax/typing.nit:2058,30--35
-              ../src/syntax/typing.nit:2058,30
-              identifier 'n_type' ... ../src/syntax/typing.nit:2058,30--35
+                ../src/syntax/typing.nit:2058,19
+                identifier 'v' ... ../src/syntax/typing.nit:2058,19
+                ../src/syntax/typing.nit:2058,19
+              ../src/syntax/typing.nit:2058,22--27
+                ../src/syntax/typing.nit:2058,22
+                identifier 'n_expr' ... ../src/syntax/typing.nit:2058,22--27
+                ../src/syntax/typing.nit:2058,22
+              ../src/syntax/typing.nit:2058,30--35
+                ../src/syntax/typing.nit:2058,30
+                identifier 'n_type' ... ../src/syntax/typing.nit:2058,30--35
+                ../src/syntax/typing.nit:2058,30
+              ')' ... ../src/syntax/typing.nit:2058,36
           ../src/syntax/typing.nit:2059,3--36
             keyword 'if' ... ../src/syntax/typing.nit:2059,3--4
             ../src/syntax/typing.nit:2059,6--24
@@ -13450,7 +16451,9 @@
                 ../src/syntax/typing.nit:2059,10--15
                   ../src/syntax/typing.nit:2059,10
                   identifier 'n_type' ... ../src/syntax/typing.nit:2059,10--15
+                  ../src/syntax/typing.nit:2059,10
                 identifier 'is_typed' ... ../src/syntax/typing.nit:2059,17--24
+                ../src/syntax/typing.nit:2059,10
             ../src/syntax/typing.nit:2059,31--36
               keyword 'return' ... ../src/syntax/typing.nit:2059,31--36
           ../src/syntax/typing.nit:2060,3--36
@@ -13461,37 +16464,48 @@
               ../src/syntax/typing.nit:2060,18--23
                 ../src/syntax/typing.nit:2060,18
                 identifier 'n_expr' ... ../src/syntax/typing.nit:2060,18--23
+                ../src/syntax/typing.nit:2060,18
               identifier 'its_variable' ... ../src/syntax/typing.nit:2060,25--36
+              ../src/syntax/typing.nit:2060,18
           ../src/syntax/typing.nit:2061,3--2063,5
             keyword 'if' ... ../src/syntax/typing.nit:2061,3--4
             ../src/syntax/typing.nit:2061,6--21
               ../src/syntax/typing.nit:2061,6--13
                 ../src/syntax/typing.nit:2061,6
                 identifier 'variable' ... ../src/syntax/typing.nit:2061,6--13
+                ../src/syntax/typing.nit:2061,6
               ../src/syntax/typing.nit:2061,18--21
                 keyword 'null' ... ../src/syntax/typing.nit:2061,18--21
-            ../src/syntax/typing.nit:2062,4--71
-              ../src/syntax/typing.nit:2062,4--71
+            ../src/syntax/typing.nit:2062,4--72
+              ../src/syntax/typing.nit:2062,4--72
                 ../src/syntax/typing.nit:2062,24
                 attribute '_if_true_flow_ctx' ... ../src/syntax/typing.nit:2062,4--20
                 '=' ... ../src/syntax/typing.nit:2062,22
-                ../src/syntax/typing.nit:2062,24--71
+                ../src/syntax/typing.nit:2062,24--72
                   ../src/syntax/typing.nit:2062,24--33
                     ../src/syntax/typing.nit:2062,24
                       ../src/syntax/typing.nit:2062,24
                       identifier 'v' ... ../src/syntax/typing.nit:2062,24
+                      ../src/syntax/typing.nit:2062,24
                     identifier 'flow_ctx' ... ../src/syntax/typing.nit:2062,26--33
+                    ../src/syntax/typing.nit:2062,24
                   identifier 'sub_with' ... ../src/syntax/typing.nit:2062,35--42
-                  ../src/syntax/typing.nit:2062,44--47
-                    keyword 'self' ... ../src/syntax/typing.nit:2062,44--47
-                  ../src/syntax/typing.nit:2062,50--57
-                    ../src/syntax/typing.nit:2062,50
-                    identifier 'variable' ... ../src/syntax/typing.nit:2062,50--57
-                  ../src/syntax/typing.nit:2062,60--71
-                    ../src/syntax/typing.nit:2062,60--65
+                  ../src/syntax/typing.nit:2062,43--72
+                    '(' ... ../src/syntax/typing.nit:2062,43
+                    ../src/syntax/typing.nit:2062,44--47
+                      keyword 'self' ... ../src/syntax/typing.nit:2062,44--47
+                    ../src/syntax/typing.nit:2062,50--57
+                      ../src/syntax/typing.nit:2062,50
+                      identifier 'variable' ... ../src/syntax/typing.nit:2062,50--57
+                      ../src/syntax/typing.nit:2062,50
+                    ../src/syntax/typing.nit:2062,60--71
+                      ../src/syntax/typing.nit:2062,60--65
+                        ../src/syntax/typing.nit:2062,60
+                        identifier 'n_type' ... ../src/syntax/typing.nit:2062,60--65
+                        ../src/syntax/typing.nit:2062,60
+                      identifier 'stype' ... ../src/syntax/typing.nit:2062,67--71
                       ../src/syntax/typing.nit:2062,60
-                      identifier 'n_type' ... ../src/syntax/typing.nit:2062,60--65
-                    identifier 'stype' ... ../src/syntax/typing.nit:2062,67--71
+                    ')' ... ../src/syntax/typing.nit:2062,72
             ../src/syntax/typing.nit:2063,3--5
               keyword 'end' ... ../src/syntax/typing.nit:2063,3--5
           ../src/syntax/typing.nit:2064,3--22
@@ -13502,7 +16516,9 @@
               ../src/syntax/typing.nit:2064,12
                 ../src/syntax/typing.nit:2064,12
                 identifier 'v' ... ../src/syntax/typing.nit:2064,12
+                ../src/syntax/typing.nit:2064,12
               identifier 'type_bool' ... ../src/syntax/typing.nit:2064,14--22
+              ../src/syntax/typing.nit:2064,12
           ../src/syntax/typing.nit:2065,3--18
             ../src/syntax/typing.nit:2065,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:2065,3--11
@@ -13531,18 +16547,24 @@
           ../src/syntax/typing.nit:2071,25
             identifier 'v' ... ../src/syntax/typing.nit:2071,25
         ../src/syntax/typing.nit:2073,3--2077,4
-          ../src/syntax/typing.nit:2073,3--35
+          ../src/syntax/typing.nit:2073,3--36
             ../src/syntax/typing.nit:2073,19
             identifier 'check_expr_cast' ... ../src/syntax/typing.nit:2073,3--17
-            ../src/syntax/typing.nit:2073,19
+            ../src/syntax/typing.nit:2073,18--36
+              '(' ... ../src/syntax/typing.nit:2073,18
               ../src/syntax/typing.nit:2073,19
-              identifier 'v' ... ../src/syntax/typing.nit:2073,19
-            ../src/syntax/typing.nit:2073,22--27
-              ../src/syntax/typing.nit:2073,22
-              identifier 'n_expr' ... ../src/syntax/typing.nit:2073,22--27
-            ../src/syntax/typing.nit:2073,30--35
-              ../src/syntax/typing.nit:2073,30
-              identifier 'n_type' ... ../src/syntax/typing.nit:2073,30--35
+                ../src/syntax/typing.nit:2073,19
+                identifier 'v' ... ../src/syntax/typing.nit:2073,19
+                ../src/syntax/typing.nit:2073,19
+              ../src/syntax/typing.nit:2073,22--27
+                ../src/syntax/typing.nit:2073,22
+                identifier 'n_expr' ... ../src/syntax/typing.nit:2073,22--27
+                ../src/syntax/typing.nit:2073,22
+              ../src/syntax/typing.nit:2073,30--35
+                ../src/syntax/typing.nit:2073,30
+                identifier 'n_type' ... ../src/syntax/typing.nit:2073,30--35
+                ../src/syntax/typing.nit:2073,30
+              ')' ... ../src/syntax/typing.nit:2073,36
           ../src/syntax/typing.nit:2074,3--36
             keyword 'if' ... ../src/syntax/typing.nit:2074,3--4
             ../src/syntax/typing.nit:2074,6--24
@@ -13551,7 +16573,9 @@
                 ../src/syntax/typing.nit:2074,10--15
                   ../src/syntax/typing.nit:2074,10
                   identifier 'n_type' ... ../src/syntax/typing.nit:2074,10--15
+                  ../src/syntax/typing.nit:2074,10
                 identifier 'is_typed' ... ../src/syntax/typing.nit:2074,17--24
+                ../src/syntax/typing.nit:2074,10
             ../src/syntax/typing.nit:2074,31--36
               keyword 'return' ... ../src/syntax/typing.nit:2074,31--36
           ../src/syntax/typing.nit:2075,3--23
@@ -13562,7 +16586,9 @@
               ../src/syntax/typing.nit:2075,12--17
                 ../src/syntax/typing.nit:2075,12
                 identifier 'n_type' ... ../src/syntax/typing.nit:2075,12--17
+                ../src/syntax/typing.nit:2075,12
               identifier 'stype' ... ../src/syntax/typing.nit:2075,19--23
+              ../src/syntax/typing.nit:2075,12
           ../src/syntax/typing.nit:2076,3--28
             ../src/syntax/typing.nit:2076,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:2076,3--11
@@ -13593,16 +16619,21 @@
         ../src/syntax/typing.nit:2083,3--2093,4
           ../src/syntax/typing.nit:2083,3--41
             keyword 'if' ... ../src/syntax/typing.nit:2083,3--4
-            ../src/syntax/typing.nit:2083,6--28
+            ../src/syntax/typing.nit:2083,6--29
               keyword 'not' ... ../src/syntax/typing.nit:2083,6--8
-              ../src/syntax/typing.nit:2083,10--28
+              ../src/syntax/typing.nit:2083,10--29
                 ../src/syntax/typing.nit:2083,10
                   ../src/syntax/typing.nit:2083,10
                   identifier 'v' ... ../src/syntax/typing.nit:2083,10
+                  ../src/syntax/typing.nit:2083,10
                 identifier 'check_expr' ... ../src/syntax/typing.nit:2083,12--21
-                ../src/syntax/typing.nit:2083,23--28
-                  ../src/syntax/typing.nit:2083,23
-                  identifier 'n_expr' ... ../src/syntax/typing.nit:2083,23--28
+                ../src/syntax/typing.nit:2083,22--29
+                  '(' ... ../src/syntax/typing.nit:2083,22
+                  ../src/syntax/typing.nit:2083,23--28
+                    ../src/syntax/typing.nit:2083,23
+                    identifier 'n_expr' ... ../src/syntax/typing.nit:2083,23--28
+                    ../src/syntax/typing.nit:2083,23
+                  ')' ... ../src/syntax/typing.nit:2083,29
             ../src/syntax/typing.nit:2083,36--41
               keyword 'return' ... ../src/syntax/typing.nit:2083,36--41
           ../src/syntax/typing.nit:2084,3--22
@@ -13613,26 +16644,34 @@
               ../src/syntax/typing.nit:2084,11--16
                 ../src/syntax/typing.nit:2084,11
                 identifier 'n_expr' ... ../src/syntax/typing.nit:2084,11--16
+                ../src/syntax/typing.nit:2084,11
               identifier 'stype' ... ../src/syntax/typing.nit:2084,18--22
+              ../src/syntax/typing.nit:2084,11
           ../src/syntax/typing.nit:2085,3--2090,5
             keyword 'if' ... ../src/syntax/typing.nit:2085,3--4
             ../src/syntax/typing.nit:2085,6--21
               ../src/syntax/typing.nit:2085,6
                 ../src/syntax/typing.nit:2085,6
                 identifier 't' ... ../src/syntax/typing.nit:2085,6
+                ../src/syntax/typing.nit:2085,6
               ../src/syntax/typing.nit:2085,12--21
                 type identifier 'MMTypeNone' ... ../src/syntax/typing.nit:2085,12--21
             ../src/syntax/typing.nit:2086,4--2087,9
-              ../src/syntax/typing.nit:2086,4--64
+              ../src/syntax/typing.nit:2086,4--65
                 ../src/syntax/typing.nit:2086,4
                   ../src/syntax/typing.nit:2086,4
                   identifier 'v' ... ../src/syntax/typing.nit:2086,4
+                  ../src/syntax/typing.nit:2086,4
                 identifier 'error' ... ../src/syntax/typing.nit:2086,6--10
-                ../src/syntax/typing.nit:2086,12--17
-                  ../src/syntax/typing.nit:2086,12
-                  identifier 'n_expr' ... ../src/syntax/typing.nit:2086,12--17
-                ../src/syntax/typing.nit:2086,20--64
-                  literal value '"Type error: 'as(not null)' on 'null' value."' ... ../src/syntax/typing.nit:2086,20--64
+                ../src/syntax/typing.nit:2086,11--65
+                  '(' ... ../src/syntax/typing.nit:2086,11
+                  ../src/syntax/typing.nit:2086,12--17
+                    ../src/syntax/typing.nit:2086,12
+                    identifier 'n_expr' ... ../src/syntax/typing.nit:2086,12--17
+                    ../src/syntax/typing.nit:2086,12
+                  ../src/syntax/typing.nit:2086,20--64
+                    literal value '"Type error: 'as(not null)' on 'null' value."' ... ../src/syntax/typing.nit:2086,20--64
+                  ')' ... ../src/syntax/typing.nit:2086,65
               ../src/syntax/typing.nit:2087,4--9
                 keyword 'return' ... ../src/syntax/typing.nit:2087,4--9
             ../src/syntax/typing.nit:2088,8--2090,5
@@ -13643,18 +16682,25 @@
                   ../src/syntax/typing.nit:2088,15
                     ../src/syntax/typing.nit:2088,15
                     identifier 't' ... ../src/syntax/typing.nit:2088,15
+                    ../src/syntax/typing.nit:2088,15
                   identifier 'is_nullable' ... ../src/syntax/typing.nit:2088,17--27
-              ../src/syntax/typing.nit:2089,4--68
-                ../src/syntax/typing.nit:2089,4--68
+                  ../src/syntax/typing.nit:2088,15
+              ../src/syntax/typing.nit:2089,4--69
+                ../src/syntax/typing.nit:2089,4--69
                   ../src/syntax/typing.nit:2089,4
                     ../src/syntax/typing.nit:2089,4
                     identifier 'v' ... ../src/syntax/typing.nit:2089,4
+                    ../src/syntax/typing.nit:2089,4
                   identifier 'warning' ... ../src/syntax/typing.nit:2089,6--12
-                  ../src/syntax/typing.nit:2089,14--19
-                    ../src/syntax/typing.nit:2089,14
-                    identifier 'n_expr' ... ../src/syntax/typing.nit:2089,14--19
-                  ../src/syntax/typing.nit:2089,22--68
-                    literal value '"Warning: 'as(not null)' on non nullable type."' ... ../src/syntax/typing.nit:2089,22--68
+                  ../src/syntax/typing.nit:2089,13--69
+                    '(' ... ../src/syntax/typing.nit:2089,13
+                    ../src/syntax/typing.nit:2089,14--19
+                      ../src/syntax/typing.nit:2089,14
+                      identifier 'n_expr' ... ../src/syntax/typing.nit:2089,14--19
+                      ../src/syntax/typing.nit:2089,14
+                    ../src/syntax/typing.nit:2089,22--68
+                      literal value '"Warning: 'as(not null)' on non nullable type."' ... ../src/syntax/typing.nit:2089,22--68
+                    ')' ... ../src/syntax/typing.nit:2089,69
               ../src/syntax/typing.nit:2090,3--5
                 keyword 'end' ... ../src/syntax/typing.nit:2090,3--5
           ../src/syntax/typing.nit:2091,3--34
@@ -13666,8 +16712,11 @@
                 ../src/syntax/typing.nit:2091,12--17
                   ../src/syntax/typing.nit:2091,12
                   identifier 'n_expr' ... ../src/syntax/typing.nit:2091,12--17
+                  ../src/syntax/typing.nit:2091,12
                 identifier 'stype' ... ../src/syntax/typing.nit:2091,19--23
+                ../src/syntax/typing.nit:2091,12
               identifier 'as_notnull' ... ../src/syntax/typing.nit:2091,25--34
+              ../src/syntax/typing.nit:2091,12
           ../src/syntax/typing.nit:2092,3--18
             ../src/syntax/typing.nit:2092,15
             attribute '_is_typed' ... ../src/syntax/typing.nit:2092,3--11
@@ -13700,7 +16749,9 @@
                 ../src/syntax/typing.nit:2099,10--15
                   ../src/syntax/typing.nit:2099,10
                   identifier 'n_expr' ... ../src/syntax/typing.nit:2099,10--15
+                  ../src/syntax/typing.nit:2099,10
                 identifier 'is_typed' ... ../src/syntax/typing.nit:2099,17--24
+                ../src/syntax/typing.nit:2099,10
             ../src/syntax/typing.nit:2099,31--36
               keyword 'return' ... ../src/syntax/typing.nit:2099,31--36
           ../src/syntax/typing.nit:2100,3--18
@@ -13715,7 +16766,9 @@
               ../src/syntax/typing.nit:2101,6--11
                 ../src/syntax/typing.nit:2101,6
                 identifier 'n_expr' ... ../src/syntax/typing.nit:2101,6--11
+                ../src/syntax/typing.nit:2101,6
               identifier 'is_statement' ... ../src/syntax/typing.nit:2101,13--24
+              ../src/syntax/typing.nit:2101,6
             ../src/syntax/typing.nit:2101,31--36
               keyword 'return' ... ../src/syntax/typing.nit:2101,31--36
           ../src/syntax/typing.nit:2102,3--23
@@ -13726,7 +16779,9 @@
               ../src/syntax/typing.nit:2102,12--17
                 ../src/syntax/typing.nit:2102,12
                 identifier 'n_expr' ... ../src/syntax/typing.nit:2102,12--17
+                ../src/syntax/typing.nit:2102,12
               identifier 'stype' ... ../src/syntax/typing.nit:2102,19--23
+              ../src/syntax/typing.nit:2102,12
           ../src/syntax/typing.nit:2103,3--46
             ../src/syntax/typing.nit:2103,23
             attribute '_if_true_flow_ctx' ... ../src/syntax/typing.nit:2103,3--19
@@ -13735,6 +16790,7 @@
               ../src/syntax/typing.nit:2103,23--28
                 ../src/syntax/typing.nit:2103,23
                 identifier 'n_expr' ... ../src/syntax/typing.nit:2103,23--28
+                ../src/syntax/typing.nit:2103,23
               attribute '_if_true_flow_ctx' ... ../src/syntax/typing.nit:2103,30--46
           ../src/syntax/typing.nit:2104,3--48
             ../src/syntax/typing.nit:2104,24
@@ -13744,6 +16800,7 @@
               ../src/syntax/typing.nit:2104,24--29
                 ../src/syntax/typing.nit:2104,24
                 identifier 'n_expr' ... ../src/syntax/typing.nit:2104,24--29
+                ../src/syntax/typing.nit:2104,24
               attribute '_if_false_flow_ctx' ... ../src/syntax/typing.nit:2104,31--48
           keyword 'end' ... ../src/syntax/typing.nit:2105,2--4
       ../src/syntax/typing.nit:2107,2--43
@@ -13759,7 +16816,9 @@
             ../src/syntax/typing.nit:2107,30--35
               ../src/syntax/typing.nit:2107,30
               identifier 'n_expr' ... ../src/syntax/typing.nit:2107,30--35
+              ../src/syntax/typing.nit:2107,30
             identifier 'is_self' ... ../src/syntax/typing.nit:2107,37--43
+            ../src/syntax/typing.nit:2107,30
       ../src/syntax/typing.nit:2109,2--53
         keyword 'redef' ... ../src/syntax/typing.nit:2109,2--6
         ../src/syntax/typing.nit:2109,12
@@ -13773,7 +16832,9 @@
             ../src/syntax/typing.nit:2109,35--40
               ../src/syntax/typing.nit:2109,35
               identifier 'n_expr' ... ../src/syntax/typing.nit:2109,35--40
+              ../src/syntax/typing.nit:2109,35
             identifier 'its_variable' ... ../src/syntax/typing.nit:2109,42--53
+            ../src/syntax/typing.nit:2109,35
       keyword 'end' ... ../src/syntax/typing.nit:2110,1--3
     ../src/syntax/typing.nit:2112,1--2124,3
       keyword 'redef' ... ../src/syntax/typing.nit:2112,1--5
@@ -13798,49 +16859,64 @@
                 ../src/syntax/typing.nit:2115,6
                   ../src/syntax/typing.nit:2115,6
                   identifier 'v' ... ../src/syntax/typing.nit:2115,6
+                  ../src/syntax/typing.nit:2115,6
                 identifier 'once_count' ... ../src/syntax/typing.nit:2115,8--17
+                ../src/syntax/typing.nit:2115,6
               ../src/syntax/typing.nit:2115,21
                 literal value '0' ... ../src/syntax/typing.nit:2115,21
-            ../src/syntax/typing.nit:2116,4--55
-              ../src/syntax/typing.nit:2116,4--55
+            ../src/syntax/typing.nit:2116,4--56
+              ../src/syntax/typing.nit:2116,4--56
                 ../src/syntax/typing.nit:2116,4
                   ../src/syntax/typing.nit:2116,4
                   identifier 'v' ... ../src/syntax/typing.nit:2116,4
+                  ../src/syntax/typing.nit:2116,4
                 identifier 'warning' ... ../src/syntax/typing.nit:2116,6--12
-                ../src/syntax/typing.nit:2116,14--17
-                  keyword 'self' ... ../src/syntax/typing.nit:2116,14--17
-                ../src/syntax/typing.nit:2116,20--55
-                  literal value '"Useless once in a once expression."' ... ../src/syntax/typing.nit:2116,20--55
+                ../src/syntax/typing.nit:2116,13--56
+                  '(' ... ../src/syntax/typing.nit:2116,13
+                  ../src/syntax/typing.nit:2116,14--17
+                    keyword 'self' ... ../src/syntax/typing.nit:2116,14--17
+                  ../src/syntax/typing.nit:2116,20--55
+                    literal value '"Useless once in a once expression."' ... ../src/syntax/typing.nit:2116,20--55
+                  ')' ... ../src/syntax/typing.nit:2116,56
             ../src/syntax/typing.nit:2117,3--5
               keyword 'end' ... ../src/syntax/typing.nit:2117,3--5
           ../src/syntax/typing.nit:2118,3--33
             ../src/syntax/typing.nit:2118,3
               ../src/syntax/typing.nit:2118,3
               identifier 'v' ... ../src/syntax/typing.nit:2118,3
+              ../src/syntax/typing.nit:2118,3
             identifier 'once_count' ... ../src/syntax/typing.nit:2118,5--14
+            ../src/syntax/typing.nit:2118,18
             '=' ... ../src/syntax/typing.nit:2118,16
             ../src/syntax/typing.nit:2118,18--33
               ../src/syntax/typing.nit:2118,18--29
                 ../src/syntax/typing.nit:2118,18
                   ../src/syntax/typing.nit:2118,18
                   identifier 'v' ... ../src/syntax/typing.nit:2118,18
+                  ../src/syntax/typing.nit:2118,18
                 identifier 'once_count' ... ../src/syntax/typing.nit:2118,20--29
+                ../src/syntax/typing.nit:2118,18
               ../src/syntax/typing.nit:2118,33
                 literal value '1' ... ../src/syntax/typing.nit:2118,33
           ../src/syntax/typing.nit:2120,3--7
             keyword 'super' ... ../src/syntax/typing.nit:2120,3--7
+            ../src/syntax/typing.nit:2120,3
           ../src/syntax/typing.nit:2122,3--33
             ../src/syntax/typing.nit:2122,3
               ../src/syntax/typing.nit:2122,3
               identifier 'v' ... ../src/syntax/typing.nit:2122,3
+              ../src/syntax/typing.nit:2122,3
             identifier 'once_count' ... ../src/syntax/typing.nit:2122,5--14
+            ../src/syntax/typing.nit:2122,18
             '=' ... ../src/syntax/typing.nit:2122,16
             ../src/syntax/typing.nit:2122,18--33
               ../src/syntax/typing.nit:2122,18--29
                 ../src/syntax/typing.nit:2122,18
                   ../src/syntax/typing.nit:2122,18
                   identifier 'v' ... ../src/syntax/typing.nit:2122,18
+                  ../src/syntax/typing.nit:2122,18
                 identifier 'once_count' ... ../src/syntax/typing.nit:2122,20--29
+                ../src/syntax/typing.nit:2122,18
               ../src/syntax/typing.nit:2122,33
                 literal value '1' ... ../src/syntax/typing.nit:2122,33
           keyword 'end' ... ../src/syntax/typing.nit:2123,2--4

diff --git a/tests/sav/test_parser_args2.sav b/tests/sav/test_parser_args2.sav
index 569e5e0..d76f146 100644 (file)
--- a/tests/sav/test_parser_args2.sav
+++ b/tests/sav/test_parser_args2.sav
@@ -6502,8 +6502,10 @@ Read token at ../src/syntax/typing.nit:1113,40 text='('
 Read token at ../src/syntax/typing.nit:1113,41--44 text='null'
 Read token at ../src/syntax/typing.nit:1113,45 text=','
 Read token at ../src/syntax/typing.nit:1113,47--53 text='n_exprs'
-Read token at ../src/syntax/typing.nit:1113,54 text=')'
-Read token at ../src/syntax/typing.nit:1113,55--1114,0 text='
+Read token at ../src/syntax/typing.nit:1113,54 text='.'
+Read token at ../src/syntax/typing.nit:1113,55--61 text='n_exprs'
+Read token at ../src/syntax/typing.nit:1113,62 text=')'
+Read token at ../src/syntax/typing.nit:1113,63--1114,0 text='
 '
 Read token at ../src/syntax/typing.nit:1114,3--4 text='if'
 Read token at ../src/syntax/typing.nit:1114,6--10 text='stype'
@@ -6961,11 +6963,13 @@ Read token at ../src/syntax/typing.nit:1170,34--1171,0 text='
 Read token at ../src/syntax/typing.nit:1171,4--5 text='if'
 Read token at ../src/syntax/typing.nit:1171,7--12 text='n_args'
 Read token at ../src/syntax/typing.nit:1171,13 text='.'
-Read token at ../src/syntax/typing.nit:1171,14--19 text='length'
-Read token at ../src/syntax/typing.nit:1171,21 text='>'
-Read token at ../src/syntax/typing.nit:1171,23 text='0'
-Read token at ../src/syntax/typing.nit:1171,25--28 text='then'
-Read token at ../src/syntax/typing.nit:1171,29--1172,0 text='
+Read token at ../src/syntax/typing.nit:1171,14--20 text='n_exprs'
+Read token at ../src/syntax/typing.nit:1171,21 text='.'
+Read token at ../src/syntax/typing.nit:1171,22--27 text='length'
+Read token at ../src/syntax/typing.nit:1171,29 text='>'
+Read token at ../src/syntax/typing.nit:1171,31 text='0'
+Read token at ../src/syntax/typing.nit:1171,33--36 text='then'
+Read token at ../src/syntax/typing.nit:1171,37--1172,0 text='
 '
 Read token at ../src/syntax/typing.nit:1172,5--7 text='var'
 Read token at ../src/syntax/typing.nit:1172,9--17 text='signature'
@@ -11757,9 +11761,11 @@ Read token at ../src/syntax/typing.nit:1843,6--7 text='if'
 Read token at ../src/syntax/typing.nit:1843,9--11 text='not'
 Read token at ../src/syntax/typing.nit:1843,13--18 text='n_args'
 Read token at ../src/syntax/typing.nit:1843,19 text='.'
-Read token at ../src/syntax/typing.nit:1843,20--27 text='is_empty'
-Read token at ../src/syntax/typing.nit:1843,29--32 text='then'
-Read token at ../src/syntax/typing.nit:1843,33--1844,0 text='
+Read token at ../src/syntax/typing.nit:1843,20--26 text='n_exprs'
+Read token at ../src/syntax/typing.nit:1843,27 text='.'
+Read token at ../src/syntax/typing.nit:1843,28--35 text='is_empty'
+Read token at ../src/syntax/typing.nit:1843,37--40 text='then'
+Read token at ../src/syntax/typing.nit:1843,41--1844,0 text='
 '
 Read token at ../src/syntax/typing.nit:1844,7 text='v'
 Read token at ../src/syntax/typing.nit:1844,8 text='.'