Rename REAMDE to README.md
[nit.git] / src / parser / parser.nit
index a63572c..a815804 100644 (file)
@@ -38,26 +38,26 @@ redef class Parser
                        new ReduceAction24(5),
                        new ReduceAction26(6),
                        new ReduceAction27(6),
+                       new ReduceAction28(6),
+                       new ReduceAction29(6),
                        new ReduceAction22(7),
-                       new ReduceAction29(7),
-                       new ReduceAction30(8),
-                       new ReduceAction31(8),
+                       new ReduceAction31(7),
                        new ReduceAction32(8),
                        new ReduceAction33(8),
                        new ReduceAction34(8),
-                       new ReduceAction35(9),
-                       new ReduceAction36(9),
+                       new ReduceAction35(8),
+                       new ReduceAction36(8),
                        new ReduceAction37(9),
-                       new ReduceAction38(10),
-                       new ReduceAction39(11),
-                       new ReduceAction40(11),
-                       new ReduceAction41(12),
-                       new ReduceAction42(13),
-                       new ReduceAction43(13),
+                       new ReduceAction38(9),
+                       new ReduceAction39(9),
+                       new ReduceAction40(10),
+                       new ReduceAction41(11),
+                       new ReduceAction42(11),
+                       new ReduceAction43(12),
                        new ReduceAction44(13),
-                       new ReduceAction45(14),
-                       new ReduceAction46(15),
-                       new ReduceAction47(15),
+                       new ReduceAction45(13),
+                       new ReduceAction46(13),
+                       new ReduceAction47(14),
                        new ReduceAction48(15),
                        new ReduceAction49(15),
                        new ReduceAction50(15),
@@ -83,19 +83,19 @@ redef class Parser
                        new ReduceAction70(15),
                        new ReduceAction71(15),
                        new ReduceAction72(15),
-                       new ReduceAction72(15),
-                       new ReduceAction74(16),
-                       new ReduceAction75(16),
+                       new ReduceAction73(15),
+                       new ReduceAction74(15),
+                       new ReduceAction74(15),
+                       new ReduceAction76(16),
+                       new ReduceAction77(16),
                        new ReduceAction22(16),
-                       new ReduceAction74(17),
-                       new ReduceAction78(17),
-                       new ReduceAction79(18),
-                       new ReduceAction80(18),
+                       new ReduceAction76(17),
+                       new ReduceAction80(17),
                        new ReduceAction81(18),
                        new ReduceAction82(18),
                        new ReduceAction83(18),
-                       new ReduceAction84(19),
-                       new ReduceAction85(19),
+                       new ReduceAction84(18),
+                       new ReduceAction85(18),
                        new ReduceAction86(19),
                        new ReduceAction87(19),
                        new ReduceAction88(19),
@@ -117,124 +117,124 @@ redef class Parser
                        new ReduceAction104(19),
                        new ReduceAction105(19),
                        new ReduceAction106(19),
-                       new ReduceAction107(20),
-                       new ReduceAction108(20),
+                       new ReduceAction107(19),
+                       new ReduceAction108(19),
                        new ReduceAction109(20),
                        new ReduceAction110(20),
-                       new ReduceAction111(21),
-                       new ReduceAction112(21),
-                       new ReduceAction37(21),
-                       new ReduceAction114(22),
-                       new ReduceAction115(23),
-                       new ReduceAction116(23),
+                       new ReduceAction111(20),
+                       new ReduceAction112(20),
+                       new ReduceAction113(21),
+                       new ReduceAction114(21),
+                       new ReduceAction39(21),
+                       new ReduceAction116(22),
                        new ReduceAction117(23),
                        new ReduceAction118(23),
                        new ReduceAction119(23),
-                       new ReduceAction120(24),
-                       new ReduceAction121(24),
+                       new ReduceAction120(23),
+                       new ReduceAction121(23),
+                       new ReduceAction122(24),
+                       new ReduceAction123(24),
                        new ReduceAction22(24),
-                       new ReduceAction123(25),
-                       new ReduceAction124(26),
-                       new ReduceAction124(26),
+                       new ReduceAction125(25),
+                       new ReduceAction126(26),
                        new ReduceAction126(26),
-                       new ReduceAction127(27),
-                       new ReduceAction128(27),
+                       new ReduceAction128(26),
                        new ReduceAction129(27),
-                       new ReduceAction130(28),
-                       new ReduceAction131(28),
+                       new ReduceAction130(27),
+                       new ReduceAction131(27),
                        new ReduceAction132(28),
                        new ReduceAction133(28),
                        new ReduceAction134(28),
                        new ReduceAction135(28),
+                       new ReduceAction136(28),
+                       new ReduceAction137(28),
                        new ReduceAction22(29),
-                       new ReduceAction137(29),
-                       new ReduceAction138(30),
-                       new ReduceAction139(31),
-                       new ReduceAction140(31),
-                       new ReduceAction141(32),
+                       new ReduceAction139(29),
+                       new ReduceAction140(30),
+                       new ReduceAction141(31),
+                       new ReduceAction142(31),
+                       new ReduceAction143(32),
                        new ReduceAction22(32),
-                       new ReduceAction143(33),
-                       new ReduceAction144(34),
-                       new ReduceAction145(34),
+                       new ReduceAction145(33),
                        new ReduceAction146(34),
                        new ReduceAction147(34),
-                       new ReduceAction148(35),
-                       new ReduceAction149(35),
-                       new ReduceAction150(36),
-                       new ReduceAction150(37),
-                       new ReduceAction150(38),
+                       new ReduceAction148(34),
+                       new ReduceAction149(34),
+                       new ReduceAction150(35),
+                       new ReduceAction151(35),
+                       new ReduceAction152(36),
+                       new ReduceAction152(37),
+                       new ReduceAction152(38),
                        new ReduceAction22(38),
-                       new ReduceAction154(39),
-                       new ReduceAction155(39),
                        new ReduceAction156(39),
                        new ReduceAction157(39),
-                       new ReduceAction158(40),
-                       new ReduceAction159(40),
-                       new ReduceAction160(41),
-                       new ReduceAction161(41),
-                       new ReduceAction162(42),
-                       new ReduceAction163(42),
-                       new ReduceAction154(43),
-                       new ReduceAction157(44),
-                       new ReduceAction157(44),
-                       new ReduceAction167(44),
-                       new ReduceAction168(44),
+                       new ReduceAction158(39),
+                       new ReduceAction159(39),
+                       new ReduceAction160(40),
+                       new ReduceAction161(40),
+                       new ReduceAction162(41),
+                       new ReduceAction163(41),
+                       new ReduceAction164(42),
+                       new ReduceAction165(42),
+                       new ReduceAction156(43),
+                       new ReduceAction159(44),
+                       new ReduceAction159(44),
                        new ReduceAction169(44),
                        new ReduceAction170(44),
                        new ReduceAction171(44),
                        new ReduceAction172(44),
                        new ReduceAction173(44),
-                       new ReduceAction157(44),
-                       new ReduceAction157(44),
-                       new ReduceAction157(44),
-                       new ReduceAction157(44),
-                       new ReduceAction157(44),
-                       new ReduceAction157(44),
-                       new ReduceAction157(44),
-                       new ReduceAction181(44),
-                       new ReduceAction182(44),
+                       new ReduceAction174(44),
+                       new ReduceAction175(44),
+                       new ReduceAction159(44),
+                       new ReduceAction159(44),
+                       new ReduceAction159(44),
+                       new ReduceAction159(44),
+                       new ReduceAction159(44),
+                       new ReduceAction159(44),
+                       new ReduceAction159(44),
                        new ReduceAction183(44),
-                       new ReduceAction182(44),
+                       new ReduceAction184(44),
                        new ReduceAction185(44),
-                       new ReduceAction186(44),
+                       new ReduceAction184(44),
                        new ReduceAction187(44),
-                       new ReduceAction186(44),
+                       new ReduceAction188(44),
                        new ReduceAction189(44),
-                       new ReduceAction190(44),
+                       new ReduceAction188(44),
                        new ReduceAction191(44),
                        new ReduceAction192(44),
                        new ReduceAction193(44),
-                       new ReduceAction192(44),
-                       new ReduceAction195(44),
-                       new ReduceAction196(44),
+                       new ReduceAction194(44),
                        new ReduceAction195(44),
+                       new ReduceAction194(44),
+                       new ReduceAction197(44),
                        new ReduceAction198(44),
-                       new ReduceAction199(45),
-                       new ReduceAction200(45),
-                       new ReduceAction201(46),
-                       new ReduceAction202(46),
+                       new ReduceAction197(44),
+                       new ReduceAction200(44),
+                       new ReduceAction201(45),
+                       new ReduceAction202(45),
                        new ReduceAction203(46),
                        new ReduceAction204(46),
-                       new ReduceAction205(47),
-                       new ReduceAction206(47),
+                       new ReduceAction205(46),
+                       new ReduceAction206(46),
                        new ReduceAction207(47),
                        new ReduceAction208(47),
                        new ReduceAction209(47),
                        new ReduceAction210(47),
                        new ReduceAction211(47),
                        new ReduceAction212(47),
-                       new ReduceAction209(47),
-                       new ReduceAction210(47),
-                       new ReduceAction215(47),
-                       new ReduceAction216(47),
+                       new ReduceAction213(47),
+                       new ReduceAction214(47),
+                       new ReduceAction211(47),
+                       new ReduceAction212(47),
                        new ReduceAction217(47),
                        new ReduceAction218(47),
                        new ReduceAction219(47),
                        new ReduceAction220(47),
-                       new ReduceAction217(47),
-                       new ReduceAction218(47),
-                       new ReduceAction223(47),
-                       new ReduceAction224(47),
+                       new ReduceAction221(47),
+                       new ReduceAction222(47),
+                       new ReduceAction219(47),
+                       new ReduceAction220(47),
                        new ReduceAction225(47),
                        new ReduceAction226(47),
                        new ReduceAction227(47),
@@ -242,19 +242,19 @@ redef class Parser
                        new ReduceAction229(47),
                        new ReduceAction230(47),
                        new ReduceAction231(47),
-                       new ReduceAction228(47),
-                       new ReduceAction229(47),
-                       new ReduceAction234(47),
-                       new ReduceAction235(47),
+                       new ReduceAction232(47),
+                       new ReduceAction233(47),
+                       new ReduceAction230(47),
+                       new ReduceAction231(47),
                        new ReduceAction236(47),
                        new ReduceAction237(47),
                        new ReduceAction238(47),
                        new ReduceAction239(47),
-                       new ReduceAction236(47),
-                       new ReduceAction237(47),
-                       new ReduceAction242(47),
-                       new ReduceAction243(48),
-                       new ReduceAction244(48),
+                       new ReduceAction240(47),
+                       new ReduceAction241(47),
+                       new ReduceAction238(47),
+                       new ReduceAction239(47),
+                       new ReduceAction244(47),
                        new ReduceAction245(48),
                        new ReduceAction246(48),
                        new ReduceAction247(48),
@@ -264,417 +264,430 @@ redef class Parser
                        new ReduceAction251(48),
                        new ReduceAction252(48),
                        new ReduceAction253(48),
-                       new ReduceAction254(49),
-                       new ReduceAction255(49),
-                       new ReduceAction256(50),
-                       new ReduceAction257(50),
+                       new ReduceAction254(48),
+                       new ReduceAction255(48),
+                       new ReduceAction256(49),
+                       new ReduceAction257(49),
                        new ReduceAction258(50),
                        new ReduceAction259(50),
                        new ReduceAction260(50),
-                       new ReduceAction154(51),
-                       new ReduceAction156(51),
-                       new ReduceAction263(52),
-                       new ReduceAction264(52),
-                       new ReduceAction265(53),
-                       new ReduceAction266(53),
-                       new ReduceAction267(54),
-                       new ReduceAction268(54),
-                       new ReduceAction269(55),
-                       new ReduceAction270(55),
-                       new ReduceAction271(56),
-                       new ReduceAction272(56),
-                       new ReduceAction157(56),
-                       new ReduceAction274(57),
-                       new ReduceAction275(57),
-                       new ReduceAction276(57),
-                       new ReduceAction277(57),
-                       new ReduceAction278(58),
-                       new ReduceAction157(59),
-                       new ReduceAction280(59),
-                       new ReduceAction157(60),
-                       new ReduceAction282(60),
-                       new ReduceAction283(60),
-                       new ReduceAction284(60),
-                       new ReduceAction285(60),
-                       new ReduceAction157(61),
-                       new ReduceAction287(61),
-                       new ReduceAction157(62),
-                       new ReduceAction289(62),
-                       new ReduceAction290(62),
-                       new ReduceAction291(62),
-                       new ReduceAction292(62),
+                       new ReduceAction261(50),
+                       new ReduceAction262(50),
+                       new ReduceAction263(50),
+                       new ReduceAction264(50),
+                       new ReduceAction265(50),
+                       new ReduceAction158(51),
+                       new ReduceAction267(52),
+                       new ReduceAction268(52),
+                       new ReduceAction269(53),
+                       new ReduceAction270(53),
+                       new ReduceAction271(54),
+                       new ReduceAction272(54),
+                       new ReduceAction273(55),
+                       new ReduceAction274(55),
+                       new ReduceAction275(56),
+                       new ReduceAction276(56),
+                       new ReduceAction159(56),
+                       new ReduceAction278(57),
+                       new ReduceAction279(57),
+                       new ReduceAction280(57),
+                       new ReduceAction281(57),
+                       new ReduceAction282(58),
+                       new ReduceAction159(59),
+                       new ReduceAction284(59),
+                       new ReduceAction159(60),
+                       new ReduceAction286(60),
+                       new ReduceAction287(60),
+                       new ReduceAction288(60),
+                       new ReduceAction289(60),
+                       new ReduceAction159(61),
+                       new ReduceAction291(61),
+                       new ReduceAction159(62),
                        new ReduceAction293(62),
                        new ReduceAction294(62),
                        new ReduceAction295(62),
                        new ReduceAction296(62),
-                       new ReduceAction157(63),
-                       new ReduceAction298(63),
-                       new ReduceAction157(64),
-                       new ReduceAction300(64),
-                       new ReduceAction157(65),
-                       new ReduceAction302(65),
-                       new ReduceAction157(66),
-                       new ReduceAction304(66),
-                       new ReduceAction305(66),
-                       new ReduceAction157(67),
-                       new ReduceAction307(67),
-                       new ReduceAction308(67),
-                       new ReduceAction157(68),
-                       new ReduceAction310(68),
-                       new ReduceAction311(68),
-                       new ReduceAction312(68),
-                       new ReduceAction157(69),
-                       new ReduceAction314(69),
-                       new ReduceAction157(70),
-                       new ReduceAction316(70),
-                       new ReduceAction317(70),
-                       new ReduceAction318(70),
-                       new ReduceAction319(70),
-                       new ReduceAction157(71),
-                       new ReduceAction321(71),
-                       new ReduceAction322(71),
-                       new ReduceAction323(71),
-                       new ReduceAction324(71),
-                       new ReduceAction157(72),
-                       new ReduceAction326(72),
-                       new ReduceAction327(72),
-                       new ReduceAction181(72),
-                       new ReduceAction329(72),
-                       new ReduceAction182(72),
+                       new ReduceAction297(62),
+                       new ReduceAction298(62),
+                       new ReduceAction299(62),
+                       new ReduceAction300(62),
+                       new ReduceAction159(63),
+                       new ReduceAction302(63),
+                       new ReduceAction159(64),
+                       new ReduceAction304(64),
+                       new ReduceAction159(65),
+                       new ReduceAction306(65),
+                       new ReduceAction159(66),
+                       new ReduceAction308(66),
+                       new ReduceAction309(66),
+                       new ReduceAction159(67),
+                       new ReduceAction311(67),
+                       new ReduceAction312(67),
+                       new ReduceAction159(68),
+                       new ReduceAction314(68),
+                       new ReduceAction315(68),
+                       new ReduceAction316(68),
+                       new ReduceAction159(69),
+                       new ReduceAction318(69),
+                       new ReduceAction159(70),
+                       new ReduceAction320(70),
+                       new ReduceAction321(70),
+                       new ReduceAction322(70),
+                       new ReduceAction323(70),
+                       new ReduceAction159(71),
+                       new ReduceAction325(71),
+                       new ReduceAction326(71),
+                       new ReduceAction327(71),
+                       new ReduceAction328(71),
+                       new ReduceAction159(72),
+                       new ReduceAction330(72),
                        new ReduceAction331(72),
                        new ReduceAction183(72),
                        new ReduceAction333(72),
-                       new ReduceAction182(72),
-                       new ReduceAction331(72),
+                       new ReduceAction184(72),
+                       new ReduceAction335(72),
                        new ReduceAction185(72),
                        new ReduceAction337(72),
-                       new ReduceAction186(72),
-                       new ReduceAction339(72),
+                       new ReduceAction184(72),
+                       new ReduceAction335(72),
                        new ReduceAction187(72),
                        new ReduceAction341(72),
-                       new ReduceAction186(72),
-                       new ReduceAction339(72),
+                       new ReduceAction188(72),
+                       new ReduceAction343(72),
                        new ReduceAction189(72),
                        new ReduceAction345(72),
-                       new ReduceAction190(72),
-                       new ReduceAction347(72),
+                       new ReduceAction188(72),
+                       new ReduceAction343(72),
                        new ReduceAction191(72),
                        new ReduceAction349(72),
-                       new ReduceAction350(72),
+                       new ReduceAction192(72),
                        new ReduceAction351(72),
-                       new ReduceAction352(72),
+                       new ReduceAction193(72),
                        new ReduceAction353(72),
                        new ReduceAction354(72),
                        new ReduceAction355(72),
                        new ReduceAction356(72),
-                       new ReduceAction353(72),
-                       new ReduceAction354(72),
+                       new ReduceAction357(72),
+                       new ReduceAction358(72),
                        new ReduceAction359(72),
                        new ReduceAction360(72),
-                       new ReduceAction361(72),
-                       new ReduceAction362(72),
-                       new ReduceAction363(73),
-                       new ReduceAction364(73),
-                       new ReduceAction365(73),
-                       new ReduceAction366(73),
+                       new ReduceAction357(72),
+                       new ReduceAction358(72),
+                       new ReduceAction363(72),
+                       new ReduceAction364(72),
+                       new ReduceAction365(72),
+                       new ReduceAction159(73),
                        new ReduceAction367(73),
                        new ReduceAction368(73),
-                       new ReduceAction369(73),
-                       new ReduceAction370(73),
-                       new ReduceAction371(73),
-                       new ReduceAction157(73),
-                       new ReduceAction157(73),
-                       new ReduceAction374(73),
-                       new ReduceAction375(73),
-                       new ReduceAction376(73),
-                       new ReduceAction377(74),
+                       new ReduceAction369(74),
+                       new ReduceAction370(74),
+                       new ReduceAction371(74),
+                       new ReduceAction372(74),
+                       new ReduceAction373(74),
+                       new ReduceAction374(74),
+                       new ReduceAction375(74),
+                       new ReduceAction376(74),
                        new ReduceAction377(74),
-                       new ReduceAction379(75),
-                       new ReduceAction380(76),
-                       new ReduceAction381(77),
-                       new ReduceAction382(77),
-                       new ReduceAction380(78),
-                       new ReduceAction384(79),
-                       new ReduceAction268(79),
+                       new ReduceAction159(74),
+                       new ReduceAction159(74),
+                       new ReduceAction380(74),
+                       new ReduceAction381(74),
+                       new ReduceAction382(74),
+                       new ReduceAction383(75),
+                       new ReduceAction383(75),
+                       new ReduceAction385(76),
+                       new ReduceAction386(77),
+                       new ReduceAction387(78),
+                       new ReduceAction388(78),
                        new ReduceAction386(79),
-                       new ReduceAction387(80),
-                       new ReduceAction388(80),
-                       new ReduceAction389(81),
-                       new ReduceAction390(81),
-                       new ReduceAction391(82),
-                       new ReduceAction389(83),
-                       new ReduceAction390(83),
-                       new ReduceAction394(84),
-                       new ReduceAction395(85),
-                       new ReduceAction396(86),
-                       new ReduceAction397(86),
-                       new ReduceAction398(87),
-                       new ReduceAction22(87),
-                       new ReduceAction400(88),
-                       new ReduceAction401(88),
-                       new ReduceAction402(89),
-                       new ReduceAction403(90),
-                       new ReduceAction404(90),
-                       new ReduceAction400(91),
-                       new ReduceAction401(91),
+                       new ReduceAction390(80),
+                       new ReduceAction272(80),
+                       new ReduceAction392(80),
+                       new ReduceAction393(81),
+                       new ReduceAction394(81),
+                       new ReduceAction395(82),
+                       new ReduceAction396(82),
+                       new ReduceAction397(83),
+                       new ReduceAction395(84),
+                       new ReduceAction396(84),
+                       new ReduceAction400(85),
+                       new ReduceAction401(86),
+                       new ReduceAction402(87),
+                       new ReduceAction403(87),
+                       new ReduceAction404(88),
+                       new ReduceAction22(88),
+                       new ReduceAction406(89),
+                       new ReduceAction407(89),
+                       new ReduceAction408(90),
+                       new ReduceAction409(90),
+                       new ReduceAction406(91),
                        new ReduceAction407(91),
-                       new ReduceAction157(92),
-                       new ReduceAction409(93),
-                       new ReduceAction402(94),
-                       new ReduceAction411(95),
-                       new ReduceAction412(95),
-                       new ReduceAction413(95),
-                       new ReduceAction414(95),
-                       new ReduceAction415(95),
-                       new ReduceAction416(96),
-                       new ReduceAction417(96),
-                       new ReduceAction418(96),
-                       new ReduceAction419(96),
-                       new ReduceAction420(96),
-                       new ReduceAction381(97),
-                       new ReduceAction382(97),
-                       new ReduceAction380(98),
-                       new ReduceAction424(99),
-                       new ReduceAction157(99),
-                       new ReduceAction157(99),
-                       new ReduceAction427(99),
-                       new ReduceAction428(99),
-                       new ReduceAction429(99),
-                       new ReduceAction430(100),
-                       new ReduceAction431(100),
-                       new ReduceAction432(100),
-                       new ReduceAction433(101),
-                       new ReduceAction434(101),
-                       new ReduceAction433(102),
-                       new ReduceAction436(102),
-                       new ReduceAction434(102),
-                       new ReduceAction438(102),
-                       new ReduceAction439(103),
-                       new ReduceAction440(104),
-                       new ReduceAction390(105),
-                       new ReduceAction442(105),
-                       new ReduceAction443(106),
-                       new ReduceAction444(107),
-                       new ReduceAction445(107),
-                       new ReduceAction446(108),
-                       new ReduceAction447(108),
-                       new ReduceAction448(109),
-                       new ReduceAction449(109),
-                       new ReduceAction450(109),
-                       new ReduceAction451(109),
-                       new ReduceAction452(110),
-                       new ReduceAction453(110),
-                       new ReduceAction454(110),
-                       new ReduceAction22(110),
-                       new ReduceAction456(111),
-                       new ReduceAction457(111),
-                       new ReduceAction458(111),
-                       new ReduceAction457(111),
-                       new ReduceAction460(112),
-                       new ReduceAction461(112),
-                       new ReduceAction462(112),
-                       new ReduceAction461(112),
-                       new ReduceAction464(113),
-                       new ReduceAction465(114),
-                       new ReduceAction22(115),
-                       new ReduceAction467(115),
-                       new ReduceAction468(116),
-                       new ReduceAction468(116),
-                       new ReduceAction470(117),
+                       new ReduceAction412(91),
+                       new ReduceAction159(92),
+                       new ReduceAction414(93),
+                       new ReduceAction415(94),
+                       new ReduceAction416(94),
+                       new ReduceAction417(94),
+                       new ReduceAction418(94),
+                       new ReduceAction419(94),
+                       new ReduceAction420(95),
+                       new ReduceAction421(95),
+                       new ReduceAction422(95),
+                       new ReduceAction423(95),
+                       new ReduceAction424(95),
+                       new ReduceAction387(96),
+                       new ReduceAction388(96),
+                       new ReduceAction386(97),
+                       new ReduceAction428(98),
+                       new ReduceAction159(98),
+                       new ReduceAction159(98),
+                       new ReduceAction431(98),
+                       new ReduceAction432(98),
+                       new ReduceAction433(98),
+                       new ReduceAction434(99),
+                       new ReduceAction435(99),
+                       new ReduceAction436(99),
+                       new ReduceAction437(100),
+                       new ReduceAction438(100),
+                       new ReduceAction437(101),
+                       new ReduceAction440(101),
+                       new ReduceAction438(101),
+                       new ReduceAction442(101),
+                       new ReduceAction443(102),
+                       new ReduceAction396(103),
+                       new ReduceAction445(103),
+                       new ReduceAction446(104),
+                       new ReduceAction447(105),
+                       new ReduceAction448(105),
+                       new ReduceAction449(106),
+                       new ReduceAction450(106),
+                       new ReduceAction451(107),
+                       new ReduceAction452(107),
+                       new ReduceAction453(107),
+                       new ReduceAction454(107),
+                       new ReduceAction455(108),
+                       new ReduceAction456(108),
+                       new ReduceAction457(108),
+                       new ReduceAction22(108),
+                       new ReduceAction459(109),
+                       new ReduceAction460(109),
+                       new ReduceAction461(109),
+                       new ReduceAction460(109),
+                       new ReduceAction463(110),
+                       new ReduceAction464(110),
+                       new ReduceAction465(110),
+                       new ReduceAction464(110),
+                       new ReduceAction467(111),
+                       new ReduceAction468(112),
+                       new ReduceAction22(113),
+                       new ReduceAction470(113),
+                       new ReduceAction471(114),
+                       new ReduceAction471(114),
+                       new ReduceAction471(114),
+                       new ReduceAction474(115),
+                       new ReduceAction475(115),
+                       new ReduceAction23(115),
+                       new ReduceAction23(115),
+                       new ReduceAction478(115),
+                       new ReduceAction478(115),
+                       new ReduceAction480(115),
+                       new ReduceAction481(115),
+                       new ReduceAction482(115),
+                       new ReduceAction482(115),
+                       new ReduceAction484(115),
+                       new ReduceAction22(116),
+                       new ReduceAction486(116),
+                       new ReduceAction487(117),
                        new ReduceAction471(117),
-                       new ReduceAction23(117),
-                       new ReduceAction22(118),
-                       new ReduceAction474(118),
-                       new ReduceAction475(119),
-                       new ReduceAction476(119),
-                       new ReduceAction468(119),
-                       new ReduceAction46(120),
-                       new ReduceAction47(120),
-                       new ReduceAction48(120),
-                       new ReduceAction55(120),
-                       new ReduceAction56(120),
-                       new ReduceAction74(121),
-                       new ReduceAction75(121),
-                       new ReduceAction84(122),
-                       new ReduceAction85(122),
-                       new ReduceAction86(122),
-                       new ReduceAction87(122),
-                       new ReduceAction88(122),
-                       new ReduceAction89(122),
-                       new ReduceAction90(122),
-                       new ReduceAction91(122),
-                       new ReduceAction92(122),
-                       new ReduceAction93(122),
-                       new ReduceAction94(122),
-                       new ReduceAction95(122),
-                       new ReduceAction96(122),
-                       new ReduceAction97(122),
-                       new ReduceAction98(122),
-                       new ReduceAction99(122),
-                       new ReduceAction100(122),
-                       new ReduceAction101(122),
-                       new ReduceAction102(122),
-                       new ReduceAction103(122),
-                       new ReduceAction104(122),
-                       new ReduceAction105(122),
-                       new ReduceAction460(123),
-                       new ReduceAction461(123),
-                       new ReduceAction462(123),
-                       new ReduceAction461(123),
-                       new ReduceAction144(124),
-                       new ReduceAction145(124),
-                       new ReduceAction157(125),
-                       new ReduceAction280(125),
-                       new ReduceAction157(126),
-                       new ReduceAction282(126),
-                       new ReduceAction283(126),
-                       new ReduceAction284(126),
-                       new ReduceAction285(126),
-                       new ReduceAction157(127),
-                       new ReduceAction287(127),
-                       new ReduceAction157(128),
-                       new ReduceAction289(128),
-                       new ReduceAction290(128),
-                       new ReduceAction291(128),
-                       new ReduceAction292(128),
-                       new ReduceAction293(128),
-                       new ReduceAction294(128),
-                       new ReduceAction295(128),
-                       new ReduceAction296(128),
-                       new ReduceAction157(129),
-                       new ReduceAction298(129),
-                       new ReduceAction157(130),
-                       new ReduceAction300(130),
-                       new ReduceAction157(131),
-                       new ReduceAction302(131),
-                       new ReduceAction157(132),
-                       new ReduceAction304(132),
-                       new ReduceAction305(132),
-                       new ReduceAction157(133),
-                       new ReduceAction307(133),
-                       new ReduceAction308(133),
-                       new ReduceAction157(134),
-                       new ReduceAction310(134),
-                       new ReduceAction311(134),
-                       new ReduceAction312(134),
-                       new ReduceAction157(135),
-                       new ReduceAction314(135),
-                       new ReduceAction157(136),
-                       new ReduceAction316(136),
-                       new ReduceAction317(136),
-                       new ReduceAction318(136),
-                       new ReduceAction319(136),
-                       new ReduceAction157(137),
-                       new ReduceAction321(137),
-                       new ReduceAction322(137),
-                       new ReduceAction323(137),
-                       new ReduceAction324(137),
-                       new ReduceAction157(138),
-                       new ReduceAction326(138),
-                       new ReduceAction327(138),
-                       new ReduceAction181(138),
-                       new ReduceAction185(138),
-                       new ReduceAction329(138),
-                       new ReduceAction337(138),
-                       new ReduceAction182(138),
-                       new ReduceAction186(138),
-                       new ReduceAction331(138),
-                       new ReduceAction339(138),
-                       new ReduceAction183(138),
-                       new ReduceAction187(138),
-                       new ReduceAction333(138),
-                       new ReduceAction341(138),
-                       new ReduceAction182(138),
-                       new ReduceAction186(138),
-                       new ReduceAction331(138),
-                       new ReduceAction339(138),
-                       new ReduceAction189(138),
-                       new ReduceAction345(138),
-                       new ReduceAction190(138),
-                       new ReduceAction191(138),
-                       new ReduceAction347(138),
-                       new ReduceAction349(138),
-                       new ReduceAction351(138),
-                       new ReduceAction352(138),
-                       new ReduceAction353(138),
-                       new ReduceAction354(138),
-                       new ReduceAction355(138),
-                       new ReduceAction356(138),
-                       new ReduceAction353(138),
-                       new ReduceAction354(138),
-                       new ReduceAction359(138),
-                       new ReduceAction360(138),
-                       new ReduceAction361(138),
-                       new ReduceAction362(138),
-                       new ReduceAction363(139),
-                       new ReduceAction364(139),
-                       new ReduceAction365(139),
-                       new ReduceAction366(139),
-                       new ReduceAction367(139),
-                       new ReduceAction368(139),
+                       new ReduceAction471(118),
+                       new ReduceAction490(118),
+                       new ReduceAction48(119),
+                       new ReduceAction49(119),
+                       new ReduceAction50(119),
+                       new ReduceAction57(119),
+                       new ReduceAction58(119),
+                       new ReduceAction76(120),
+                       new ReduceAction77(120),
+                       new ReduceAction86(121),
+                       new ReduceAction87(121),
+                       new ReduceAction88(121),
+                       new ReduceAction89(121),
+                       new ReduceAction90(121),
+                       new ReduceAction91(121),
+                       new ReduceAction92(121),
+                       new ReduceAction93(121),
+                       new ReduceAction94(121),
+                       new ReduceAction95(121),
+                       new ReduceAction96(121),
+                       new ReduceAction97(121),
+                       new ReduceAction98(121),
+                       new ReduceAction99(121),
+                       new ReduceAction100(121),
+                       new ReduceAction101(121),
+                       new ReduceAction102(121),
+                       new ReduceAction103(121),
+                       new ReduceAction104(121),
+                       new ReduceAction105(121),
+                       new ReduceAction106(121),
+                       new ReduceAction107(121),
+                       new ReduceAction463(122),
+                       new ReduceAction464(122),
+                       new ReduceAction465(122),
+                       new ReduceAction464(122),
+                       new ReduceAction146(123),
+                       new ReduceAction147(123),
+                       new ReduceAction159(124),
+                       new ReduceAction284(124),
+                       new ReduceAction159(125),
+                       new ReduceAction286(125),
+                       new ReduceAction287(125),
+                       new ReduceAction288(125),
+                       new ReduceAction289(125),
+                       new ReduceAction159(126),
+                       new ReduceAction291(126),
+                       new ReduceAction159(127),
+                       new ReduceAction293(127),
+                       new ReduceAction294(127),
+                       new ReduceAction295(127),
+                       new ReduceAction296(127),
+                       new ReduceAction297(127),
+                       new ReduceAction298(127),
+                       new ReduceAction299(127),
+                       new ReduceAction300(127),
+                       new ReduceAction159(128),
+                       new ReduceAction302(128),
+                       new ReduceAction159(129),
+                       new ReduceAction304(129),
+                       new ReduceAction159(130),
+                       new ReduceAction306(130),
+                       new ReduceAction159(131),
+                       new ReduceAction308(131),
+                       new ReduceAction309(131),
+                       new ReduceAction159(132),
+                       new ReduceAction311(132),
+                       new ReduceAction312(132),
+                       new ReduceAction159(133),
+                       new ReduceAction314(133),
+                       new ReduceAction315(133),
+                       new ReduceAction316(133),
+                       new ReduceAction159(134),
+                       new ReduceAction318(134),
+                       new ReduceAction159(135),
+                       new ReduceAction320(135),
+                       new ReduceAction321(135),
+                       new ReduceAction322(135),
+                       new ReduceAction323(135),
+                       new ReduceAction159(136),
+                       new ReduceAction325(136),
+                       new ReduceAction326(136),
+                       new ReduceAction327(136),
+                       new ReduceAction328(136),
+                       new ReduceAction159(137),
+                       new ReduceAction330(137),
+                       new ReduceAction331(137),
+                       new ReduceAction183(137),
+                       new ReduceAction187(137),
+                       new ReduceAction333(137),
+                       new ReduceAction341(137),
+                       new ReduceAction184(137),
+                       new ReduceAction188(137),
+                       new ReduceAction335(137),
+                       new ReduceAction343(137),
+                       new ReduceAction185(137),
+                       new ReduceAction189(137),
+                       new ReduceAction337(137),
+                       new ReduceAction345(137),
+                       new ReduceAction184(137),
+                       new ReduceAction188(137),
+                       new ReduceAction335(137),
+                       new ReduceAction343(137),
+                       new ReduceAction191(137),
+                       new ReduceAction349(137),
+                       new ReduceAction192(137),
+                       new ReduceAction193(137),
+                       new ReduceAction351(137),
+                       new ReduceAction353(137),
+                       new ReduceAction355(137),
+                       new ReduceAction356(137),
+                       new ReduceAction357(137),
+                       new ReduceAction358(137),
+                       new ReduceAction359(137),
+                       new ReduceAction360(137),
+                       new ReduceAction357(137),
+                       new ReduceAction358(137),
+                       new ReduceAction363(137),
+                       new ReduceAction364(137),
+                       new ReduceAction365(137),
+                       new ReduceAction159(138),
+                       new ReduceAction367(138),
+                       new ReduceAction368(138),
                        new ReduceAction369(139),
                        new ReduceAction370(139),
                        new ReduceAction371(139),
-                       new ReduceAction157(139),
-                       new ReduceAction157(139),
-                       new ReduceAction144(140),
-                       new ReduceAction145(140),
+                       new ReduceAction372(139),
+                       new ReduceAction373(139),
+                       new ReduceAction374(139),
+                       new ReduceAction375(139),
+                       new ReduceAction376(139),
+                       new ReduceAction377(139),
+                       new ReduceAction159(139),
+                       new ReduceAction159(139),
                        new ReduceAction146(140),
                        new ReduceAction147(140),
-                       new ReduceAction157(141),
-                       new ReduceAction157(141),
-                       new ReduceAction167(141),
-                       new ReduceAction168(141),
+                       new ReduceAction148(140),
+                       new ReduceAction149(140),
+                       new ReduceAction159(141),
+                       new ReduceAction159(141),
                        new ReduceAction169(141),
                        new ReduceAction170(141),
                        new ReduceAction171(141),
                        new ReduceAction172(141),
                        new ReduceAction173(141),
-                       new ReduceAction157(141),
-                       new ReduceAction157(141),
-                       new ReduceAction157(141),
-                       new ReduceAction157(141),
-                       new ReduceAction157(141),
-                       new ReduceAction157(141),
-                       new ReduceAction157(141),
-                       new ReduceAction181(141),
-                       new ReduceAction182(141),
+                       new ReduceAction174(141),
+                       new ReduceAction175(141),
+                       new ReduceAction159(141),
+                       new ReduceAction159(141),
+                       new ReduceAction159(141),
+                       new ReduceAction159(141),
+                       new ReduceAction159(141),
+                       new ReduceAction159(141),
+                       new ReduceAction159(141),
                        new ReduceAction183(141),
-                       new ReduceAction182(141),
+                       new ReduceAction184(141),
                        new ReduceAction185(141),
-                       new ReduceAction186(141),
+                       new ReduceAction184(141),
                        new ReduceAction187(141),
-                       new ReduceAction186(141),
+                       new ReduceAction188(141),
                        new ReduceAction189(141),
-                       new ReduceAction190(141),
+                       new ReduceAction188(141),
                        new ReduceAction191(141),
                        new ReduceAction192(141),
                        new ReduceAction193(141),
-                       new ReduceAction192(141),
-                       new ReduceAction195(141),
-                       new ReduceAction196(141),
+                       new ReduceAction194(141),
                        new ReduceAction195(141),
+                       new ReduceAction194(141),
+                       new ReduceAction197(141),
                        new ReduceAction198(141),
-                       new ReduceAction205(142),
-                       new ReduceAction206(142),
+                       new ReduceAction197(141),
+                       new ReduceAction200(141),
                        new ReduceAction207(142),
                        new ReduceAction208(142),
                        new ReduceAction209(142),
                        new ReduceAction210(142),
                        new ReduceAction211(142),
                        new ReduceAction212(142),
-                       new ReduceAction209(142),
-                       new ReduceAction210(142),
-                       new ReduceAction215(142),
-                       new ReduceAction216(142),
+                       new ReduceAction213(142),
+                       new ReduceAction214(142),
+                       new ReduceAction211(142),
+                       new ReduceAction212(142),
                        new ReduceAction217(142),
                        new ReduceAction218(142),
                        new ReduceAction219(142),
                        new ReduceAction220(142),
-                       new ReduceAction217(142),
-                       new ReduceAction218(142),
-                       new ReduceAction223(142),
-                       new ReduceAction224(142),
+                       new ReduceAction221(142),
+                       new ReduceAction222(142),
+                       new ReduceAction219(142),
+                       new ReduceAction220(142),
                        new ReduceAction225(142),
                        new ReduceAction226(142),
                        new ReduceAction227(142),
@@ -682,404 +695,413 @@ redef class Parser
                        new ReduceAction229(142),
                        new ReduceAction230(142),
                        new ReduceAction231(142),
-                       new ReduceAction228(142),
-                       new ReduceAction229(142),
-                       new ReduceAction234(142),
-                       new ReduceAction235(142),
+                       new ReduceAction232(142),
+                       new ReduceAction233(142),
+                       new ReduceAction230(142),
+                       new ReduceAction231(142),
                        new ReduceAction236(142),
                        new ReduceAction237(142),
                        new ReduceAction238(142),
                        new ReduceAction239(142),
-                       new ReduceAction236(142),
-                       new ReduceAction237(142),
-                       new ReduceAction242(142),
-                       new ReduceAction157(143),
-                       new ReduceAction280(143),
-                       new ReduceAction157(144),
-                       new ReduceAction282(144),
-                       new ReduceAction283(144),
-                       new ReduceAction284(144),
-                       new ReduceAction285(144),
-                       new ReduceAction157(145),
-                       new ReduceAction287(145),
-                       new ReduceAction157(146),
-                       new ReduceAction289(146),
-                       new ReduceAction290(146),
-                       new ReduceAction291(146),
-                       new ReduceAction292(146),
+                       new ReduceAction240(142),
+                       new ReduceAction241(142),
+                       new ReduceAction238(142),
+                       new ReduceAction239(142),
+                       new ReduceAction244(142),
+                       new ReduceAction159(143),
+                       new ReduceAction284(143),
+                       new ReduceAction159(144),
+                       new ReduceAction286(144),
+                       new ReduceAction287(144),
+                       new ReduceAction288(144),
+                       new ReduceAction289(144),
+                       new ReduceAction159(145),
+                       new ReduceAction291(145),
+                       new ReduceAction159(146),
                        new ReduceAction293(146),
                        new ReduceAction294(146),
                        new ReduceAction295(146),
                        new ReduceAction296(146),
-                       new ReduceAction157(147),
-                       new ReduceAction298(147),
-                       new ReduceAction157(148),
-                       new ReduceAction300(148),
-                       new ReduceAction157(149),
-                       new ReduceAction302(149),
-                       new ReduceAction157(150),
-                       new ReduceAction304(150),
-                       new ReduceAction305(150),
-                       new ReduceAction157(151),
-                       new ReduceAction307(151),
-                       new ReduceAction308(151),
-                       new ReduceAction157(152),
-                       new ReduceAction310(152),
-                       new ReduceAction311(152),
-                       new ReduceAction312(152),
-                       new ReduceAction157(153),
-                       new ReduceAction314(153),
-                       new ReduceAction157(154),
-                       new ReduceAction316(154),
-                       new ReduceAction317(154),
-                       new ReduceAction318(154),
-                       new ReduceAction319(154),
-                       new ReduceAction157(155),
-                       new ReduceAction321(155),
-                       new ReduceAction322(155),
-                       new ReduceAction323(155),
-                       new ReduceAction324(155),
-                       new ReduceAction157(156),
-                       new ReduceAction326(156),
-                       new ReduceAction327(156),
-                       new ReduceAction181(156),
-                       new ReduceAction329(156),
-                       new ReduceAction182(156),
+                       new ReduceAction297(146),
+                       new ReduceAction298(146),
+                       new ReduceAction299(146),
+                       new ReduceAction300(146),
+                       new ReduceAction159(147),
+                       new ReduceAction302(147),
+                       new ReduceAction159(148),
+                       new ReduceAction304(148),
+                       new ReduceAction159(149),
+                       new ReduceAction306(149),
+                       new ReduceAction159(150),
+                       new ReduceAction308(150),
+                       new ReduceAction309(150),
+                       new ReduceAction159(151),
+                       new ReduceAction311(151),
+                       new ReduceAction312(151),
+                       new ReduceAction159(152),
+                       new ReduceAction314(152),
+                       new ReduceAction315(152),
+                       new ReduceAction316(152),
+                       new ReduceAction159(153),
+                       new ReduceAction318(153),
+                       new ReduceAction159(154),
+                       new ReduceAction320(154),
+                       new ReduceAction321(154),
+                       new ReduceAction322(154),
+                       new ReduceAction323(154),
+                       new ReduceAction159(155),
+                       new ReduceAction325(155),
+                       new ReduceAction326(155),
+                       new ReduceAction327(155),
+                       new ReduceAction328(155),
+                       new ReduceAction159(156),
+                       new ReduceAction330(156),
                        new ReduceAction331(156),
                        new ReduceAction183(156),
                        new ReduceAction333(156),
-                       new ReduceAction182(156),
-                       new ReduceAction331(156),
+                       new ReduceAction184(156),
+                       new ReduceAction335(156),
                        new ReduceAction185(156),
                        new ReduceAction337(156),
-                       new ReduceAction186(156),
-                       new ReduceAction339(156),
+                       new ReduceAction184(156),
+                       new ReduceAction335(156),
                        new ReduceAction187(156),
                        new ReduceAction341(156),
-                       new ReduceAction186(156),
-                       new ReduceAction339(156),
+                       new ReduceAction188(156),
+                       new ReduceAction343(156),
                        new ReduceAction189(156),
                        new ReduceAction345(156),
-                       new ReduceAction190(156),
-                       new ReduceAction347(156),
+                       new ReduceAction188(156),
+                       new ReduceAction343(156),
                        new ReduceAction191(156),
                        new ReduceAction349(156),
-                       new ReduceAction350(156),
+                       new ReduceAction192(156),
                        new ReduceAction351(156),
-                       new ReduceAction352(156),
+                       new ReduceAction193(156),
                        new ReduceAction353(156),
                        new ReduceAction354(156),
                        new ReduceAction355(156),
                        new ReduceAction356(156),
-                       new ReduceAction353(156),
-                       new ReduceAction354(156),
+                       new ReduceAction357(156),
+                       new ReduceAction358(156),
                        new ReduceAction359(156),
                        new ReduceAction360(156),
-                       new ReduceAction361(156),
-                       new ReduceAction362(156),
-                       new ReduceAction363(157),
-                       new ReduceAction364(157),
-                       new ReduceAction365(157),
-                       new ReduceAction366(157),
+                       new ReduceAction357(156),
+                       new ReduceAction358(156),
+                       new ReduceAction363(156),
+                       new ReduceAction364(156),
+                       new ReduceAction365(156),
+                       new ReduceAction159(157),
                        new ReduceAction367(157),
                        new ReduceAction368(157),
-                       new ReduceAction369(157),
-                       new ReduceAction370(157),
-                       new ReduceAction371(157),
-                       new ReduceAction157(157),
-                       new ReduceAction396(158),
-                       new ReduceAction397(158),
-                       new ReduceAction398(159),
-                       new ReduceAction22(159),
-                       new ReduceAction400(160),
-                       new ReduceAction400(161),
-                       new ReduceAction381(162),
-                       new ReduceAction382(162),
-                       new ReduceAction424(163),
-                       new ReduceAction157(163),
-                       new ReduceAction157(163),
-                       new ReduceAction427(163),
-                       new ReduceAction428(163),
-                       new ReduceAction144(164),
-                       new ReduceAction145(164),
-                       new ReduceAction157(165),
-                       new ReduceAction280(165),
-                       new ReduceAction157(166),
-                       new ReduceAction282(166),
-                       new ReduceAction283(166),
+                       new ReduceAction369(158),
+                       new ReduceAction370(158),
+                       new ReduceAction371(158),
+                       new ReduceAction372(158),
+                       new ReduceAction373(158),
+                       new ReduceAction374(158),
+                       new ReduceAction375(158),
+                       new ReduceAction376(158),
+                       new ReduceAction377(158),
+                       new ReduceAction159(158),
+                       new ReduceAction402(159),
+                       new ReduceAction403(159),
+                       new ReduceAction404(160),
+                       new ReduceAction22(160),
+                       new ReduceAction406(161),
+                       new ReduceAction406(162),
+                       new ReduceAction387(163),
+                       new ReduceAction388(163),
+                       new ReduceAction428(164),
+                       new ReduceAction159(164),
+                       new ReduceAction159(164),
+                       new ReduceAction431(164),
+                       new ReduceAction432(164),
+                       new ReduceAction146(165),
+                       new ReduceAction147(165),
+                       new ReduceAction159(166),
                        new ReduceAction284(166),
-                       new ReduceAction285(166),
-                       new ReduceAction157(167),
+                       new ReduceAction159(167),
+                       new ReduceAction286(167),
                        new ReduceAction287(167),
-                       new ReduceAction157(168),
-                       new ReduceAction289(168),
-                       new ReduceAction290(168),
+                       new ReduceAction288(167),
+                       new ReduceAction289(167),
+                       new ReduceAction159(168),
                        new ReduceAction291(168),
-                       new ReduceAction292(168),
-                       new ReduceAction293(168),
-                       new ReduceAction294(168),
-                       new ReduceAction295(168),
-                       new ReduceAction296(168),
-                       new ReduceAction157(169),
+                       new ReduceAction159(169),
+                       new ReduceAction293(169),
+                       new ReduceAction294(169),
+                       new ReduceAction295(169),
+                       new ReduceAction296(169),
+                       new ReduceAction297(169),
                        new ReduceAction298(169),
-                       new ReduceAction157(170),
-                       new ReduceAction300(170),
-                       new ReduceAction157(171),
-                       new ReduceAction302(171),
-                       new ReduceAction157(172),
-                       new ReduceAction304(172),
-                       new ReduceAction305(172),
-                       new ReduceAction157(173),
-                       new ReduceAction307(173),
+                       new ReduceAction299(169),
+                       new ReduceAction300(169),
+                       new ReduceAction159(170),
+                       new ReduceAction302(170),
+                       new ReduceAction159(171),
+                       new ReduceAction304(171),
+                       new ReduceAction159(172),
+                       new ReduceAction306(172),
+                       new ReduceAction159(173),
                        new ReduceAction308(173),
-                       new ReduceAction157(174),
-                       new ReduceAction310(174),
+                       new ReduceAction309(173),
+                       new ReduceAction159(174),
                        new ReduceAction311(174),
                        new ReduceAction312(174),
-                       new ReduceAction157(175),
+                       new ReduceAction159(175),
                        new ReduceAction314(175),
-                       new ReduceAction157(176),
-                       new ReduceAction316(176),
-                       new ReduceAction317(176),
+                       new ReduceAction315(175),
+                       new ReduceAction316(175),
+                       new ReduceAction159(176),
                        new ReduceAction318(176),
-                       new ReduceAction319(176),
-                       new ReduceAction157(177),
+                       new ReduceAction159(177),
+                       new ReduceAction320(177),
                        new ReduceAction321(177),
                        new ReduceAction322(177),
-                       new ReduceAction836(177),
-                       new ReduceAction157(178),
-                       new ReduceAction838(178),
-                       new ReduceAction839(178),
-                       new ReduceAction840(178),
-                       new ReduceAction841(178),
-                       new ReduceAction842(178),
-                       new ReduceAction181(178),
-                       new ReduceAction329(178),
-                       new ReduceAction841(178),
-                       new ReduceAction842(178),
-                       new ReduceAction189(178),
-                       new ReduceAction345(178),
-                       new ReduceAction849(178),
-                       new ReduceAction850(178),
-                       new ReduceAction351(178),
-                       new ReduceAction352(178),
-                       new ReduceAction353(178),
-                       new ReduceAction354(178),
-                       new ReduceAction355(178),
-                       new ReduceAction356(178),
-                       new ReduceAction353(178),
-                       new ReduceAction354(178),
-                       new ReduceAction359(178),
-                       new ReduceAction360(178),
-                       new ReduceAction361(178),
-                       new ReduceAction362(178),
+                       new ReduceAction323(177),
+                       new ReduceAction159(178),
+                       new ReduceAction325(178),
+                       new ReduceAction326(178),
+                       new ReduceAction853(178),
+                       new ReduceAction159(179),
+                       new ReduceAction855(179),
+                       new ReduceAction856(179),
+                       new ReduceAction857(179),
+                       new ReduceAction858(179),
+                       new ReduceAction859(179),
+                       new ReduceAction183(179),
+                       new ReduceAction333(179),
+                       new ReduceAction858(179),
+                       new ReduceAction859(179),
+                       new ReduceAction191(179),
+                       new ReduceAction349(179),
+                       new ReduceAction866(179),
+                       new ReduceAction867(179),
+                       new ReduceAction355(179),
+                       new ReduceAction356(179),
+                       new ReduceAction357(179),
+                       new ReduceAction358(179),
+                       new ReduceAction359(179),
+                       new ReduceAction360(179),
+                       new ReduceAction357(179),
+                       new ReduceAction358(179),
                        new ReduceAction363(179),
                        new ReduceAction364(179),
                        new ReduceAction365(179),
-                       new ReduceAction366(179),
-                       new ReduceAction367(179),
-                       new ReduceAction368(179),
-                       new ReduceAction369(179),
-                       new ReduceAction370(179),
-                       new ReduceAction371(179),
-                       new ReduceAction157(179),
-                       new ReduceAction873(180),
-                       new ReduceAction874(180),
-                       new ReduceAction154(181),
-                       new ReduceAction155(181),
-                       new ReduceAction156(181),
-                       new ReduceAction157(181),
-                       new ReduceAction157(182),
-                       new ReduceAction157(182),
-                       new ReduceAction167(182),
-                       new ReduceAction168(182),
-                       new ReduceAction169(182),
-                       new ReduceAction170(182),
-                       new ReduceAction171(182),
-                       new ReduceAction172(182),
-                       new ReduceAction173(182),
-                       new ReduceAction157(182),
-                       new ReduceAction157(182),
-                       new ReduceAction157(182),
-                       new ReduceAction157(182),
-                       new ReduceAction157(182),
-                       new ReduceAction157(182),
-                       new ReduceAction157(182),
-                       new ReduceAction181(182),
-                       new ReduceAction182(182),
-                       new ReduceAction183(182),
-                       new ReduceAction182(182),
-                       new ReduceAction185(182),
-                       new ReduceAction186(182),
-                       new ReduceAction187(182),
-                       new ReduceAction186(182),
-                       new ReduceAction189(182),
-                       new ReduceAction190(182),
-                       new ReduceAction191(182),
-                       new ReduceAction192(182),
-                       new ReduceAction193(182),
-                       new ReduceAction192(182),
-                       new ReduceAction195(182),
-                       new ReduceAction196(182),
-                       new ReduceAction195(182),
-                       new ReduceAction198(182),
-                       new ReduceAction254(183),
-                       new ReduceAction255(183),
-                       new ReduceAction256(184),
-                       new ReduceAction263(185),
-                       new ReduceAction264(185),
-                       new ReduceAction265(186),
-                       new ReduceAction266(186),
+                       new ReduceAction159(180),
+                       new ReduceAction367(180),
+                       new ReduceAction368(180),
+                       new ReduceAction369(181),
+                       new ReduceAction370(181),
+                       new ReduceAction371(181),
+                       new ReduceAction372(181),
+                       new ReduceAction373(181),
+                       new ReduceAction374(181),
+                       new ReduceAction375(181),
+                       new ReduceAction376(181),
+                       new ReduceAction377(181),
+                       new ReduceAction159(181),
+                       new ReduceAction892(182),
+                       new ReduceAction893(182),
+                       new ReduceAction156(183),
+                       new ReduceAction157(183),
+                       new ReduceAction158(183),
+                       new ReduceAction159(183),
+                       new ReduceAction159(184),
+                       new ReduceAction159(184),
+                       new ReduceAction169(184),
+                       new ReduceAction170(184),
+                       new ReduceAction171(184),
+                       new ReduceAction172(184),
+                       new ReduceAction173(184),
+                       new ReduceAction174(184),
+                       new ReduceAction175(184),
+                       new ReduceAction159(184),
+                       new ReduceAction159(184),
+                       new ReduceAction159(184),
+                       new ReduceAction159(184),
+                       new ReduceAction159(184),
+                       new ReduceAction159(184),
+                       new ReduceAction159(184),
+                       new ReduceAction183(184),
+                       new ReduceAction184(184),
+                       new ReduceAction185(184),
+                       new ReduceAction184(184),
+                       new ReduceAction187(184),
+                       new ReduceAction188(184),
+                       new ReduceAction189(184),
+                       new ReduceAction188(184),
+                       new ReduceAction191(184),
+                       new ReduceAction192(184),
+                       new ReduceAction193(184),
+                       new ReduceAction194(184),
+                       new ReduceAction195(184),
+                       new ReduceAction194(184),
+                       new ReduceAction197(184),
+                       new ReduceAction198(184),
+                       new ReduceAction197(184),
+                       new ReduceAction200(184),
+                       new ReduceAction256(185),
+                       new ReduceAction257(185),
+                       new ReduceAction258(186),
                        new ReduceAction267(187),
                        new ReduceAction268(187),
                        new ReduceAction269(188),
                        new ReduceAction270(188),
-                       new ReduceAction274(189),
-                       new ReduceAction275(189),
-                       new ReduceAction157(190),
-                       new ReduceAction157(190),
-                       new ReduceAction167(190),
-                       new ReduceAction168(190),
-                       new ReduceAction169(190),
-                       new ReduceAction170(190),
-                       new ReduceAction171(190),
-                       new ReduceAction172(190),
-                       new ReduceAction173(190),
-                       new ReduceAction157(190),
-                       new ReduceAction157(190),
-                       new ReduceAction157(190),
-                       new ReduceAction157(190),
-                       new ReduceAction157(190),
-                       new ReduceAction157(190),
-                       new ReduceAction157(190),
-                       new ReduceAction181(190),
-                       new ReduceAction182(190),
-                       new ReduceAction183(190),
-                       new ReduceAction182(190),
-                       new ReduceAction185(190),
-                       new ReduceAction186(190),
-                       new ReduceAction187(190),
-                       new ReduceAction186(190),
-                       new ReduceAction189(190),
-                       new ReduceAction190(190),
-                       new ReduceAction191(190),
-                       new ReduceAction192(190),
-                       new ReduceAction193(190),
-                       new ReduceAction192(190),
-                       new ReduceAction195(190),
-                       new ReduceAction196(190),
-                       new ReduceAction195(190),
-                       new ReduceAction198(190),
-                       new ReduceAction154(191),
-                       new ReduceAction155(191),
-                       new ReduceAction156(191),
-                       new ReduceAction154(192),
-                       new ReduceAction155(192),
-                       new ReduceAction156(192),
-                       new ReduceAction157(193),
-                       new ReduceAction157(193),
-                       new ReduceAction167(193),
-                       new ReduceAction168(193),
-                       new ReduceAction169(193),
-                       new ReduceAction170(193),
-                       new ReduceAction171(193),
-                       new ReduceAction172(193),
-                       new ReduceAction173(193),
-                       new ReduceAction157(193),
+                       new ReduceAction271(189),
+                       new ReduceAction272(189),
+                       new ReduceAction273(190),
+                       new ReduceAction274(190),
+                       new ReduceAction278(191),
+                       new ReduceAction279(191),
+                       new ReduceAction159(192),
+                       new ReduceAction159(192),
+                       new ReduceAction169(192),
+                       new ReduceAction170(192),
+                       new ReduceAction171(192),
+                       new ReduceAction172(192),
+                       new ReduceAction173(192),
+                       new ReduceAction174(192),
+                       new ReduceAction175(192),
+                       new ReduceAction159(192),
+                       new ReduceAction159(192),
+                       new ReduceAction159(192),
+                       new ReduceAction159(192),
+                       new ReduceAction159(192),
+                       new ReduceAction159(192),
+                       new ReduceAction159(192),
+                       new ReduceAction183(192),
+                       new ReduceAction184(192),
+                       new ReduceAction185(192),
+                       new ReduceAction184(192),
+                       new ReduceAction187(192),
+                       new ReduceAction188(192),
+                       new ReduceAction189(192),
+                       new ReduceAction188(192),
+                       new ReduceAction191(192),
+                       new ReduceAction192(192),
+                       new ReduceAction193(192),
+                       new ReduceAction194(192),
+                       new ReduceAction195(192),
+                       new ReduceAction194(192),
+                       new ReduceAction197(192),
+                       new ReduceAction198(192),
+                       new ReduceAction197(192),
+                       new ReduceAction200(192),
+                       new ReduceAction156(193),
                        new ReduceAction157(193),
-                       new ReduceAction157(193),
-                       new ReduceAction157(193),
-                       new ReduceAction157(193),
-                       new ReduceAction157(193),
-                       new ReduceAction198(193),
-                       new ReduceAction157(194),
-                       new ReduceAction157(194),
-                       new ReduceAction167(194),
-                       new ReduceAction168(194),
-                       new ReduceAction169(194),
-                       new ReduceAction170(194),
-                       new ReduceAction171(194),
-                       new ReduceAction172(194),
-                       new ReduceAction173(194),
-                       new ReduceAction157(194),
-                       new ReduceAction157(194),
+                       new ReduceAction158(193),
+                       new ReduceAction156(194),
                        new ReduceAction157(194),
-                       new ReduceAction157(194),
-                       new ReduceAction157(194),
-                       new ReduceAction157(194),
-                       new ReduceAction198(194),
-                       new ReduceAction157(195),
-                       new ReduceAction157(195),
-                       new ReduceAction167(195),
-                       new ReduceAction168(195),
+                       new ReduceAction158(194),
+                       new ReduceAction159(195),
+                       new ReduceAction159(195),
                        new ReduceAction169(195),
                        new ReduceAction170(195),
                        new ReduceAction171(195),
                        new ReduceAction172(195),
                        new ReduceAction173(195),
-                       new ReduceAction157(195),
-                       new ReduceAction157(195),
-                       new ReduceAction157(195),
-                       new ReduceAction157(195),
-                       new ReduceAction157(195),
-                       new ReduceAction157(195),
-                       new ReduceAction198(195),
-                       new ReduceAction157(196),
-                       new ReduceAction157(196),
-                       new ReduceAction167(196),
-                       new ReduceAction168(196),
+                       new ReduceAction174(195),
+                       new ReduceAction175(195),
+                       new ReduceAction159(195),
+                       new ReduceAction159(195),
+                       new ReduceAction159(195),
+                       new ReduceAction159(195),
+                       new ReduceAction159(195),
+                       new ReduceAction159(195),
+                       new ReduceAction200(195),
+                       new ReduceAction159(196),
+                       new ReduceAction159(196),
                        new ReduceAction169(196),
                        new ReduceAction170(196),
                        new ReduceAction171(196),
                        new ReduceAction172(196),
                        new ReduceAction173(196),
-                       new ReduceAction157(196),
-                       new ReduceAction157(196),
-                       new ReduceAction157(196),
-                       new ReduceAction157(196),
-                       new ReduceAction157(196),
-                       new ReduceAction157(196),
-                       new ReduceAction198(196),
-                       new ReduceAction430(197),
-                       new ReduceAction432(197),
-                       new ReduceAction1032(198),
-                       new ReduceAction1033(198),
-                       new ReduceAction1034(199),
-                       new ReduceAction1035(199),
-                       new ReduceAction1036(200),
-                       new ReduceAction1037(200),
-                       new ReduceAction1038(201),
-                       new ReduceAction1039(201),
-                       new ReduceAction43(202),
-                       new ReduceAction1041(202),
-                       new ReduceAction1042(203),
-                       new ReduceAction1043(203),
-                       new ReduceAction1044(204),
-                       new ReduceAction1045(204),
-                       new ReduceAction148(205),
-                       new ReduceAction1047(205),
-                       new ReduceAction381(206),
-                       new ReduceAction1049(206),
-                       new ReduceAction381(207),
-                       new ReduceAction1049(207),
-                       new ReduceAction381(208),
-                       new ReduceAction1049(208),
-                       new ReduceAction445(209),
-                       new ReduceAction1055(209),
-                       new ReduceAction403(210),
-                       new ReduceAction1057(210),
-                       new ReduceAction403(211),
-                       new ReduceAction1057(211),
-                       new ReduceAction381(212),
-                       new ReduceAction1049(212),
-                       new ReduceAction381(213),
-                       new ReduceAction1049(213),
-                       new ReduceAction446(214),
+                       new ReduceAction174(196),
+                       new ReduceAction175(196),
+                       new ReduceAction159(196),
+                       new ReduceAction159(196),
+                       new ReduceAction159(196),
+                       new ReduceAction159(196),
+                       new ReduceAction159(196),
+                       new ReduceAction159(196),
+                       new ReduceAction200(196),
+                       new ReduceAction159(197),
+                       new ReduceAction159(197),
+                       new ReduceAction169(197),
+                       new ReduceAction170(197),
+                       new ReduceAction171(197),
+                       new ReduceAction172(197),
+                       new ReduceAction173(197),
+                       new ReduceAction174(197),
+                       new ReduceAction175(197),
+                       new ReduceAction159(197),
+                       new ReduceAction159(197),
+                       new ReduceAction159(197),
+                       new ReduceAction159(197),
+                       new ReduceAction159(197),
+                       new ReduceAction159(197),
+                       new ReduceAction200(197),
+                       new ReduceAction159(198),
+                       new ReduceAction159(198),
+                       new ReduceAction169(198),
+                       new ReduceAction170(198),
+                       new ReduceAction171(198),
+                       new ReduceAction172(198),
+                       new ReduceAction173(198),
+                       new ReduceAction174(198),
+                       new ReduceAction175(198),
+                       new ReduceAction159(198),
+                       new ReduceAction159(198),
+                       new ReduceAction159(198),
+                       new ReduceAction159(198),
+                       new ReduceAction159(198),
+                       new ReduceAction159(198),
+                       new ReduceAction200(198),
+                       new ReduceAction434(199),
+                       new ReduceAction436(199),
+                       new ReduceAction474(200),
+                       new ReduceAction475(200),
+                       new ReduceAction23(200),
+                       new ReduceAction1054(201),
+                       new ReduceAction1055(201),
+                       new ReduceAction1056(202),
+                       new ReduceAction1057(202),
+                       new ReduceAction1058(203),
+                       new ReduceAction1059(203),
+                       new ReduceAction37(204),
+                       new ReduceAction1061(204),
+                       new ReduceAction45(205),
+                       new ReduceAction1063(205),
+                       new ReduceAction408(206),
+                       new ReduceAction1065(206),
+                       new ReduceAction1066(207),
+                       new ReduceAction1067(207),
+                       new ReduceAction1068(208),
+                       new ReduceAction1069(208),
+                       new ReduceAction150(209),
+                       new ReduceAction1071(209),
+                       new ReduceAction387(210),
+                       new ReduceAction1073(210),
+                       new ReduceAction387(211),
+                       new ReduceAction1073(211),
+                       new ReduceAction387(212),
+                       new ReduceAction1073(212),
+                       new ReduceAction448(213),
+                       new ReduceAction1079(213),
+                       new ReduceAction408(214),
                        new ReduceAction1065(214),
-                       new ReduceAction1066(215),
-                       new ReduceAction1067(215),
-                       new ReduceAction1068(216),
-                       new ReduceAction1069(216)
+                       new ReduceAction387(215),
+                       new ReduceAction1073(215),
+                       new ReduceAction387(216),
+                       new ReduceAction1073(216),
+                       new ReduceAction449(217),
+                       new ReduceAction1087(217),
+                       new ReduceAction1088(218),
+                       new ReduceAction1089(218),
+                       new ReduceAction471(219),
+                       new ReduceAction490(219)
                )
        end
 end
@@ -1774,7 +1796,6 @@ private class ReduceAction26
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -1784,7 +1805,7 @@ private class ReduceAction26
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
+                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
@@ -1795,24 +1816,23 @@ private class ReduceAction26
                                        assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
                                        assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var listnode10 = nodearraylist8
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode12 = nodearraylist9
-                                       assert tkwendnode12 isa nullable TKwend
+                                       var listnode11 = nodearraylist7
+                                       assert listnode11 isa Array[Object]
+                                       listnode12 = concat(listnode12, listnode11)
+                                       var tkwendnode13 = nodearraylist8
+                                       assert tkwendnode13 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
                                                pclasskindnode5,
                                                tclassidnode6,
+                                               null,
                                                listnode8,
                                                null,
-                                               listnode11,
-                                               tkwendnode12
+                                               null,
+                                               listnode12,
+                                               tkwendnode13
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -1823,7 +1843,6 @@ private class ReduceAction27
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
@@ -1834,7 +1853,7 @@ private class ReduceAction27
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var listnode8 = new Array[Object]
-                                       var listnode11 = new Array[Object]
+                                       var listnode12 = new Array[Object]
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
                                        var tkwredefnode3 = nodearraylist2
@@ -1845,26 +1864,83 @@ private class ReduceAction27
                                        assert pclasskindnode5 isa nullable AClasskind
                                        var tclassidnode6 = nodearraylist6
                                        assert tclassidnode6 isa nullable TClassid
-                                       var listnode7 = nodearraylist7
-                                       assert listnode7 isa Array[Object]
-                                       listnode8 = concat(listnode8, listnode7)
-                                       var pexterncodeblocknode9 = nodearraylist8
-                                       assert pexterncodeblocknode9 isa nullable AExternCodeBlock
-                                       var listnode10 = nodearraylist9
-                                       assert listnode10 isa Array[Object]
-                                       listnode11 = concat(listnode11, listnode10)
-                                       var tkwendnode12 = nodearraylist10
-                                       assert tkwendnode12 isa nullable TKwend
+                                       var pexterncodeblocknode10 = nodearraylist7
+                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
+                                       var listnode11 = nodearraylist8
+                                       assert listnode11 isa Array[Object]
+                                       listnode12 = concat(listnode12, listnode11)
+                                       var tkwendnode13 = nodearraylist9
+                                       assert tkwendnode13 isa nullable TKwend
                                        var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
                                                pdocnode2,
                                                tkwredefnode3,
                                                pvisibilitynode4,
                                                pclasskindnode5,
                                                tclassidnode6,
+                                               null,
                                                listnode8,
-                                               pexterncodeblocknode9,
-                                               listnode11,
-                                               tkwendnode12
+                                               null,
+                                               pexterncodeblocknode10,
+                                               listnode12,
+                                               tkwendnode13
+                                       )
+                                       node_list = pclassdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction28
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       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 listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4 = nodearraylist3
+                                       assert pvisibilitynode4 isa nullable AVisibility
+                                       var pclasskindnode5 = nodearraylist4
+                                       assert pclasskindnode5 isa nullable AClasskind
+                                       var tclassidnode6 = nodearraylist6
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var tobranode7 = nodearraylist7
+                                       assert tobranode7 isa nullable TObra
+                                       var listnode8 = nodearraylist9
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcbranode10 = nodearraylist10
+                                       assert tcbranode10 isa nullable TCbra
+                                       var listnode12 = nodearraylist11
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist12
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               pclasskindnode5,
+                                               tclassidnode6,
+                                               tobranode7,
+                                               listnode9,
+                                               tcbranode10,
+                                               null,
+                                               listnode13,
+                                               tkwendnode14
                                        )
                                        node_list = pclassdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -1875,13 +1951,74 @@ private class ReduceAction29
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist13 = p.pop
+                                       var nodearraylist12 = p.pop
+                                       var nodearraylist11 = p.pop
+                                       var nodearraylist10 = p.pop
+                                       var nodearraylist9 = p.pop
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       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 listnode9 = new Array[Object]
+                                       var listnode13 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4 = nodearraylist3
+                                       assert pvisibilitynode4 isa nullable AVisibility
+                                       var pclasskindnode5 = nodearraylist4
+                                       assert pclasskindnode5 isa nullable AClasskind
+                                       var tclassidnode6 = nodearraylist6
+                                       assert tclassidnode6 isa nullable TClassid
+                                       var tobranode7 = nodearraylist7
+                                       assert tobranode7 isa nullable TObra
+                                       var listnode8 = nodearraylist9
+                                       assert listnode8 isa Array[Object]
+                                       listnode9 = concat(listnode9, listnode8)
+                                       var tcbranode10 = nodearraylist10
+                                       assert tcbranode10 isa nullable TCbra
+                                       var pexterncodeblocknode11 = nodearraylist11
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var listnode12 = nodearraylist12
+                                       assert listnode12 isa Array[Object]
+                                       listnode13 = concat(listnode13, listnode12)
+                                       var tkwendnode14 = nodearraylist13
+                                       assert tkwendnode14 isa nullable TKwend
+                                       var pclassdefnode1: nullable AStdClassdef = new AStdClassdef.init_astdclassdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               pclasskindnode5,
+                                               tclassidnode6,
+                                               tobranode7,
+                                               listnode9,
+                                               tcbranode10,
+                                               pexterncodeblocknode11,
+                                               listnode13,
+                                               tkwendnode14
+                                       )
+                                       node_list = pclassdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction31
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var tkwredefnode1 = nodearraylist1
                                        node_list = tkwredefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction30
+private class ReduceAction32
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -1896,7 +2033,7 @@ private class ReduceAction30
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction31
+private class ReduceAction33
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -1915,7 +2052,7 @@ private class ReduceAction31
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction32
+private class ReduceAction34
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -1930,7 +2067,7 @@ private class ReduceAction32
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction33
+private class ReduceAction35
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -1945,7 +2082,7 @@ private class ReduceAction33
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction34
+private class ReduceAction36
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -1964,18 +2101,14 @@ private class ReduceAction34
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction35
+private class ReduceAction37
        super ReduceAction
        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 pformaldefnode1 = nodearraylist3
+                                       var pformaldefnode1 = nodearraylist1
                                        if pformaldefnode1 != null then
                                                listnode2.add(pformaldefnode1)
                                        end
@@ -1983,20 +2116,16 @@ private class ReduceAction35
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction36
+private class ReduceAction38
        super ReduceAction
        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 pformaldefnode1 = nodearraylist3
-                                       var listnode2 = nodearraylist4
+                                       var pformaldefnode1 = nodearraylist1
+                                       var listnode2 = nodearraylist2
                                        assert listnode2 isa Array[Object]
                                        if pformaldefnode1 != null then
                                                listnode3.add(pformaldefnode1)
@@ -2006,7 +2135,7 @@ private class ReduceAction36
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction37
+private class ReduceAction39
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2016,7 +2145,7 @@ private class ReduceAction37
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction38
+private class ReduceAction40
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2029,11 +2158,12 @@ private class ReduceAction38
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction39
+private class ReduceAction41
        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 tclassidnode2 = nodearraylist1
@@ -2049,11 +2179,12 @@ private class ReduceAction39
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction40
+private class ReduceAction42
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
@@ -2072,7 +2203,7 @@ private class ReduceAction40
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction41
+private class ReduceAction43
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2108,7 +2239,7 @@ private class ReduceAction41
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction42
+private class ReduceAction44
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2123,7 +2254,7 @@ private class ReduceAction42
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction43
+private class ReduceAction45
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2138,7 +2269,7 @@ private class ReduceAction43
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction44
+private class ReduceAction46
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2149,7 +2280,7 @@ private class ReduceAction44
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction45
+private class ReduceAction47
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2161,7 +2292,7 @@ private class ReduceAction45
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction46
+private class ReduceAction48
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2187,8 +2318,12 @@ private class ReduceAction46
                                        assert pmethidnode8 isa nullable AMethid
                                        var psignaturenode9 = nodearraylist6
                                        assert psignaturenode9 isa nullable ASignature
-                                       var pexprnode13 = nodearraylist8
-                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwdonode13 = nodearraylist7
+                                       assert tkwdonode13 isa nullable TKwdo
+                                       var pexprnode14 = nodearraylist8
+                                       assert pexprnode14 isa nullable AExpr
+                                       var tkwendnode15 = nodearraylist9
+                                       assert tkwendnode15 isa nullable TKwend
                                        var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2201,13 +2336,15 @@ private class ReduceAction46
                                                null,
                                                null,
                                                null,
-                                               pexprnode13
+                                               tkwdonode13,
+                                               pexprnode14,
+                                               tkwendnode15
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction47
+private class ReduceAction49
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2236,8 +2373,12 @@ private class ReduceAction47
                                        assert psignaturenode9 isa nullable ASignature
                                        var pannotationsnode10 = nodearraylist7
                                        assert pannotationsnode10 isa nullable AAnnotations
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwdonode13 = nodearraylist8
+                                       assert tkwdonode13 isa nullable TKwdo
+                                       var pexprnode14 = nodearraylist9
+                                       assert pexprnode14 isa nullable AExpr
+                                       var tkwendnode15 = nodearraylist10
+                                       assert tkwendnode15 isa nullable TKwend
                                        var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2250,13 +2391,15 @@ private class ReduceAction47
                                                pannotationsnode10,
                                                null,
                                                null,
-                                               pexprnode13
+                                               tkwdonode13,
+                                               pexprnode14,
+                                               tkwendnode15
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction48
+private class ReduceAction50
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2294,13 +2437,15 @@ private class ReduceAction48
                                                pannotationsnode10,
                                                null,
                                                null,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction49
+private class ReduceAction51
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2335,13 +2480,15 @@ private class ReduceAction49
                                                pannotationsnode10,
                                                null,
                                                null,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction50
+private class ReduceAction52
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2379,13 +2526,15 @@ private class ReduceAction50
                                                pannotationsnode10,
                                                null,
                                                null,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction51
+private class ReduceAction53
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2408,8 +2557,12 @@ private class ReduceAction51
                                        assert tkwnewnode7 isa nullable TKwnew
                                        var psignaturenode9 = nodearraylist5
                                        assert psignaturenode9 isa nullable ASignature
-                                       var pexprnode13 = nodearraylist7
-                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwdonode13 = nodearraylist6
+                                       assert tkwdonode13 isa nullable TKwdo
+                                       var pexprnode14 = nodearraylist7
+                                       assert pexprnode14 isa nullable AExpr
+                                       var tkwendnode15 = nodearraylist8
+                                       assert tkwendnode15 isa nullable TKwend
                                        var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2422,13 +2575,15 @@ private class ReduceAction51
                                                null,
                                                null,
                                                null,
-                                               pexprnode13
+                                               tkwdonode13,
+                                               pexprnode14,
+                                               tkwendnode15
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction52
+private class ReduceAction54
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2454,8 +2609,12 @@ private class ReduceAction52
                                        assert pmethidnode8 isa nullable AMethid
                                        var psignaturenode9 = nodearraylist6
                                        assert psignaturenode9 isa nullable ASignature
-                                       var pexprnode13 = nodearraylist8
-                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwdonode13 = nodearraylist7
+                                       assert tkwdonode13 isa nullable TKwdo
+                                       var pexprnode14 = nodearraylist8
+                                       assert pexprnode14 isa nullable AExpr
+                                       var tkwendnode15 = nodearraylist9
+                                       assert tkwendnode15 isa nullable TKwend
                                        var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2468,13 +2627,15 @@ private class ReduceAction52
                                                null,
                                                null,
                                                null,
-                                               pexprnode13
+                                               tkwdonode13,
+                                               pexprnode14,
+                                               tkwendnode15
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction53
+private class ReduceAction55
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2500,8 +2661,12 @@ private class ReduceAction53
                                        assert psignaturenode9 isa nullable ASignature
                                        var pannotationsnode10 = nodearraylist6
                                        assert pannotationsnode10 isa nullable AAnnotations
-                                       var pexprnode13 = nodearraylist8
-                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwdonode13 = nodearraylist7
+                                       assert tkwdonode13 isa nullable TKwdo
+                                       var pexprnode14 = nodearraylist8
+                                       assert pexprnode14 isa nullable AExpr
+                                       var tkwendnode15 = nodearraylist9
+                                       assert tkwendnode15 isa nullable TKwend
                                        var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2514,13 +2679,15 @@ private class ReduceAction53
                                                pannotationsnode10,
                                                null,
                                                null,
-                                               pexprnode13
+                                               tkwdonode13,
+                                               pexprnode14,
+                                               tkwendnode15
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction54
+private class ReduceAction56
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2549,8 +2716,12 @@ private class ReduceAction54
                                        assert psignaturenode9 isa nullable ASignature
                                        var pannotationsnode10 = nodearraylist7
                                        assert pannotationsnode10 isa nullable AAnnotations
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwdonode13 = nodearraylist8
+                                       assert tkwdonode13 isa nullable TKwdo
+                                       var pexprnode14 = nodearraylist9
+                                       assert pexprnode14 isa nullable AExpr
+                                       var tkwendnode15 = nodearraylist10
+                                       assert tkwendnode15 isa nullable TKwend
                                        var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2563,13 +2734,15 @@ private class ReduceAction54
                                                pannotationsnode10,
                                                null,
                                                null,
-                                               pexprnode13
+                                               tkwdonode13,
+                                               pexprnode14,
+                                               tkwendnode15
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction55
+private class ReduceAction57
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2610,13 +2783,15 @@ private class ReduceAction55
                                                null,
                                                pexterncallsnode11,
                                                pexterncodeblocknode12,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction56
+private class ReduceAction58
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2660,13 +2835,15 @@ private class ReduceAction56
                                                pannotationsnode10,
                                                pexterncallsnode11,
                                                pexterncodeblocknode12,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction57
+private class ReduceAction59
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2690,8 +2867,8 @@ private class ReduceAction57
                                        assert tidnode6 isa nullable TId
                                        var ptypenode7 = nodearraylist6
                                        assert ptypenode7 isa nullable AType
-                                       var pannotationsnode9 = nodearraylist7
-                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var pannotationsnode10 = nodearraylist7
+                                       assert pannotationsnode10 isa nullable AAnnotations
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2700,14 +2877,17 @@ private class ReduceAction57
                                                tidnode6,
                                                ptypenode7,
                                                null,
-                                               pannotationsnode9,
+                                               null,
+                                               pannotationsnode10,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction58
+private class ReduceAction60
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2734,10 +2914,12 @@ private class ReduceAction58
                                        assert tidnode6 isa nullable TId
                                        var ptypenode7 = nodearraylist6
                                        assert ptypenode7 isa nullable AType
-                                       var pexprnode8 = nodearraylist9
-                                       assert pexprnode8 isa nullable AExpr
-                                       var pannotationsnode9 = nodearraylist10
-                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var tassignnode8 = nodearraylist7
+                                       assert tassignnode8 isa nullable TAssign
+                                       var pexprnode9 = nodearraylist9
+                                       assert pexprnode9 isa nullable AExpr
+                                       var pannotationsnode10 = nodearraylist10
+                                       assert pannotationsnode10 isa nullable AAnnotations
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2745,15 +2927,18 @@ private class ReduceAction58
                                                tkwvarnode5,
                                                tidnode6,
                                                ptypenode7,
-                                               pexprnode8,
-                                               pannotationsnode9,
+                                               tassignnode8,
+                                               pexprnode9,
+                                               pannotationsnode10,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction59
+private class ReduceAction61
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2778,8 +2963,10 @@ private class ReduceAction59
                                        assert tidnode6 isa nullable TId
                                        var ptypenode7 = nodearraylist6
                                        assert ptypenode7 isa nullable AType
-                                       var pexprnode10 = nodearraylist8
-                                       assert pexprnode10 isa nullable AExpr
+                                       var tkwdonode11 = nodearraylist7
+                                       assert tkwdonode11 isa nullable TKwdo
+                                       var pexprnode12 = nodearraylist8
+                                       assert pexprnode12 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2789,13 +2976,16 @@ private class ReduceAction59
                                                ptypenode7,
                                                null,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               tkwdonode11,
+                                               pexprnode12,
+                                               null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction60
+private class ReduceAction62
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2821,10 +3011,12 @@ private class ReduceAction60
                                        assert tidnode6 isa nullable TId
                                        var ptypenode7 = nodearraylist6
                                        assert ptypenode7 isa nullable AType
-                                       var pannotationsnode9 = nodearraylist7
-                                       assert pannotationsnode9 isa nullable AAnnotations
-                                       var pexprnode10 = nodearraylist9
-                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode10 = nodearraylist7
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var tkwdonode11 = nodearraylist8
+                                       assert tkwdonode11 isa nullable TKwdo
+                                       var pexprnode12 = nodearraylist9
+                                       assert pexprnode12 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2833,14 +3025,17 @@ private class ReduceAction60
                                                tidnode6,
                                                ptypenode7,
                                                null,
-                                               pannotationsnode9,
-                                               pexprnode10
-                                       )
-                                       node_list = ppropdefnode1
+                                               null,
+                                               pannotationsnode10,
+                                               tkwdonode11,
+                                               pexprnode12,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction61
+private class ReduceAction63
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2866,8 +3061,12 @@ private class ReduceAction61
                                        assert tidnode6 isa nullable TId
                                        var ptypenode7 = nodearraylist6
                                        assert ptypenode7 isa nullable AType
-                                       var pexprnode10 = nodearraylist8
-                                       assert pexprnode10 isa nullable AExpr
+                                       var tkwdonode11 = nodearraylist7
+                                       assert tkwdonode11 isa nullable TKwdo
+                                       var pexprnode12 = nodearraylist8
+                                       assert pexprnode12 isa nullable AExpr
+                                       var tkwendnode13 = nodearraylist9
+                                       assert tkwendnode13 isa nullable TKwend
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2877,13 +3076,16 @@ private class ReduceAction61
                                                ptypenode7,
                                                null,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               tkwdonode11,
+                                               pexprnode12,
+                                               tkwendnode13
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction62
+private class ReduceAction64
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2910,10 +3112,14 @@ private class ReduceAction62
                                        assert tidnode6 isa nullable TId
                                        var ptypenode7 = nodearraylist6
                                        assert ptypenode7 isa nullable AType
-                                       var pannotationsnode9 = nodearraylist7
-                                       assert pannotationsnode9 isa nullable AAnnotations
-                                       var pexprnode10 = nodearraylist9
-                                       assert pexprnode10 isa nullable AExpr
+                                       var pannotationsnode10 = nodearraylist7
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var tkwdonode11 = nodearraylist8
+                                       assert tkwdonode11 isa nullable TKwdo
+                                       var pexprnode12 = nodearraylist9
+                                       assert pexprnode12 isa nullable AExpr
+                                       var tkwendnode13 = nodearraylist10
+                                       assert tkwendnode13 isa nullable TKwend
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2922,14 +3128,17 @@ private class ReduceAction62
                                                tidnode6,
                                                ptypenode7,
                                                null,
-                                               pannotationsnode9,
-                                               pexprnode10
+                                               null,
+                                               pannotationsnode10,
+                                               tkwdonode11,
+                                               pexprnode12,
+                                               tkwendnode13
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction63
+private class ReduceAction65
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2952,8 +3161,12 @@ private class ReduceAction63
                                        assert tkwinitnode6 isa nullable TKwinit
                                        var psignaturenode9 = nodearraylist5
                                        assert psignaturenode9 isa nullable ASignature
-                                       var pexprnode13 = nodearraylist7
-                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwdonode13 = nodearraylist6
+                                       assert tkwdonode13 isa nullable TKwdo
+                                       var pexprnode14 = nodearraylist7
+                                       assert pexprnode14 isa nullable AExpr
+                                       var tkwendnode15 = nodearraylist8
+                                       assert tkwendnode15 isa nullable TKwend
                                        var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2966,13 +3179,15 @@ private class ReduceAction63
                                                null,
                                                null,
                                                null,
-                                               pexprnode13
+                                               tkwdonode13,
+                                               pexprnode14,
+                                               tkwendnode15
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction64
+private class ReduceAction66
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -2998,8 +3213,12 @@ private class ReduceAction64
                                        assert pmethidnode8 isa nullable AMethid
                                        var psignaturenode9 = nodearraylist6
                                        assert psignaturenode9 isa nullable ASignature
-                                       var pexprnode13 = nodearraylist8
-                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwdonode13 = nodearraylist7
+                                       assert tkwdonode13 isa nullable TKwdo
+                                       var pexprnode14 = nodearraylist8
+                                       assert pexprnode14 isa nullable AExpr
+                                       var tkwendnode15 = nodearraylist9
+                                       assert tkwendnode15 isa nullable TKwend
                                        var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -3012,13 +3231,15 @@ private class ReduceAction64
                                                null,
                                                null,
                                                null,
-                                               pexprnode13
+                                               tkwdonode13,
+                                               pexprnode14,
+                                               tkwendnode15
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction65
+private class ReduceAction67
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3044,8 +3265,12 @@ private class ReduceAction65
                                        assert psignaturenode9 isa nullable ASignature
                                        var pannotationsnode10 = nodearraylist6
                                        assert pannotationsnode10 isa nullable AAnnotations
-                                       var pexprnode13 = nodearraylist8
-                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwdonode13 = nodearraylist7
+                                       assert tkwdonode13 isa nullable TKwdo
+                                       var pexprnode14 = nodearraylist8
+                                       assert pexprnode14 isa nullable AExpr
+                                       var tkwendnode15 = nodearraylist9
+                                       assert tkwendnode15 isa nullable TKwend
                                        var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -3058,13 +3283,15 @@ private class ReduceAction65
                                                pannotationsnode10,
                                                null,
                                                null,
-                                               pexprnode13
+                                               tkwdonode13,
+                                               pexprnode14,
+                                               tkwendnode15
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction66
+private class ReduceAction68
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3093,8 +3320,12 @@ private class ReduceAction66
                                        assert psignaturenode9 isa nullable ASignature
                                        var pannotationsnode10 = nodearraylist7
                                        assert pannotationsnode10 isa nullable AAnnotations
-                                       var pexprnode13 = nodearraylist9
-                                       assert pexprnode13 isa nullable AExpr
+                                       var tkwdonode13 = nodearraylist8
+                                       assert tkwdonode13 isa nullable TKwdo
+                                       var pexprnode14 = nodearraylist9
+                                       assert pexprnode14 isa nullable AExpr
+                                       var tkwendnode15 = nodearraylist10
+                                       assert tkwendnode15 isa nullable TKwend
                                        var ppropdefnode1: nullable AMethPropdef = new AMethPropdef.init_amethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -3107,13 +3338,15 @@ private class ReduceAction66
                                                pannotationsnode10,
                                                null,
                                                null,
-                                               pexprnode13
+                                               tkwdonode13,
+                                               pexprnode14,
+                                               tkwendnode15
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction67
+private class ReduceAction69
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3152,7 +3385,7 @@ private class ReduceAction67
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction68
+private class ReduceAction70
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3190,13 +3423,15 @@ private class ReduceAction68
                                                null,
                                                pexterncallsnode11,
                                                pexterncodeblocknode12,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction69
+private class ReduceAction71
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3237,13 +3472,15 @@ private class ReduceAction69
                                                null,
                                                pexterncallsnode11,
                                                pexterncodeblocknode12,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction70
+private class ReduceAction72
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3284,13 +3521,15 @@ private class ReduceAction70
                                                pannotationsnode10,
                                                pexterncallsnode11,
                                                pexterncodeblocknode12,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction71
+private class ReduceAction73
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3334,13 +3573,15 @@ private class ReduceAction71
                                                pannotationsnode10,
                                                pexterncallsnode11,
                                                pexterncodeblocknode12,
+                                               null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction72
+private class ReduceAction74
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3351,19 +3592,32 @@ private class ReduceAction72
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction74
+private class ReduceAction76
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pannotationsnode1 = nodearraylist2
+                                       var listnode6 = new Array[Object]
+                                       var tkwisnode2 = nodearraylist1
+                                       assert tkwisnode2 isa nullable TKwis
+                                       var listnode5 = nodearraylist2
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                               tkwisnode2,
+                                               null,
+                                               null,
+                                               listnode6,
+                                               null,
+                                               null
+                                       )
                                        node_list = pannotationsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction75
+private class ReduceAction77
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3372,12 +3626,27 @@ private class ReduceAction75
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pannotationsnode1 = nodearraylist3
+                                       var listnode6 = new Array[Object]
+                                       var tkwisnode2 = nodearraylist1
+                                       assert tkwisnode2 isa nullable TKwis
+                                       var listnode5 = nodearraylist3
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tkwendnode8 = nodearraylist4
+                                       assert tkwendnode8 isa nullable TKwend
+                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                               tkwisnode2,
+                                               null,
+                                               null,
+                                               listnode6,
+                                               null,
+                                               tkwendnode8
+                                       )
                                        node_list = pannotationsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction78
+private class ReduceAction80
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3385,12 +3654,25 @@ private class ReduceAction78
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pannotationsnode1 = nodearraylist3
+                                       var listnode6 = new Array[Object]
+                                       var tkwisnode2 = nodearraylist1
+                                       assert tkwisnode2 isa nullable TKwis
+                                       var listnode5 = nodearraylist3
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
+                                               tkwisnode2,
+                                               null,
+                                               null,
+                                               listnode6,
+                                               null,
+                                               null
+                                       )
                                        node_list = pannotationsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction79
+private class ReduceAction81
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3402,7 +3684,7 @@ private class ReduceAction79
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction80
+private class ReduceAction82
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3418,7 +3700,7 @@ private class ReduceAction80
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction81
+private class ReduceAction83
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3434,7 +3716,7 @@ private class ReduceAction81
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction82
+private class ReduceAction84
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3450,7 +3732,7 @@ private class ReduceAction82
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction83
+private class ReduceAction85
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3466,7 +3748,7 @@ private class ReduceAction83
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction84
+private class ReduceAction86
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3481,7 +3763,7 @@ private class ReduceAction84
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction85
+private class ReduceAction87
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3496,7 +3778,7 @@ private class ReduceAction85
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction86
+private class ReduceAction88
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3511,7 +3793,7 @@ private class ReduceAction86
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction87
+private class ReduceAction89
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3526,7 +3808,7 @@ private class ReduceAction87
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction88
+private class ReduceAction90
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3541,7 +3823,7 @@ private class ReduceAction88
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction89
+private class ReduceAction91
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3556,7 +3838,7 @@ private class ReduceAction89
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction90
+private class ReduceAction92
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3571,7 +3853,7 @@ private class ReduceAction90
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction91
+private class ReduceAction93
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3586,7 +3868,7 @@ private class ReduceAction91
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction92
+private class ReduceAction94
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3601,7 +3883,7 @@ private class ReduceAction92
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction93
+private class ReduceAction95
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3616,7 +3898,7 @@ private class ReduceAction93
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction94
+private class ReduceAction96
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3631,7 +3913,7 @@ private class ReduceAction94
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction95
+private class ReduceAction97
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3646,7 +3928,7 @@ private class ReduceAction95
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction96
+private class ReduceAction98
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3661,7 +3943,7 @@ private class ReduceAction96
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction97
+private class ReduceAction99
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3676,7 +3958,7 @@ private class ReduceAction97
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction98
+private class ReduceAction100
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3691,7 +3973,7 @@ private class ReduceAction98
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction99
+private class ReduceAction101
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3706,7 +3988,7 @@ private class ReduceAction99
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction100
+private class ReduceAction102
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3721,7 +4003,7 @@ private class ReduceAction100
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction101
+private class ReduceAction103
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3736,7 +4018,7 @@ private class ReduceAction101
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction102
+private class ReduceAction104
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3755,7 +4037,7 @@ private class ReduceAction102
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction103
+private class ReduceAction105
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3770,7 +4052,7 @@ private class ReduceAction103
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction104
+private class ReduceAction106
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3789,7 +4071,7 @@ private class ReduceAction104
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction105
+private class ReduceAction107
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3812,7 +4094,7 @@ private class ReduceAction105
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction106
+private class ReduceAction108
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3827,7 +4109,7 @@ private class ReduceAction106
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction107
+private class ReduceAction109
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3858,7 +4140,7 @@ private class ReduceAction107
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction108
+private class ReduceAction110
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3886,7 +4168,7 @@ private class ReduceAction108
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction109
+private class ReduceAction111
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3906,7 +4188,7 @@ private class ReduceAction109
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction110
+private class ReduceAction112
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3923,7 +4205,7 @@ private class ReduceAction110
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction111
+private class ReduceAction113
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3939,7 +4221,7 @@ private class ReduceAction111
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction112
+private class ReduceAction114
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3959,7 +4241,7 @@ private class ReduceAction112
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction114
+private class ReduceAction116
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3972,7 +4254,7 @@ private class ReduceAction114
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction115
+private class ReduceAction117
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3993,7 +4275,7 @@ private class ReduceAction115
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction116
+private class ReduceAction118
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4014,7 +4296,7 @@ private class ReduceAction116
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction117
+private class ReduceAction119
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4038,7 +4320,7 @@ private class ReduceAction117
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction118
+private class ReduceAction120
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4062,7 +4344,7 @@ private class ReduceAction118
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction119
+private class ReduceAction121
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4089,7 +4371,7 @@ private class ReduceAction119
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction120
+private class ReduceAction122
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4113,7 +4395,7 @@ private class ReduceAction120
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction121
+private class ReduceAction123
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4141,7 +4423,7 @@ private class ReduceAction121
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction123
+private class ReduceAction125
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4154,7 +4436,7 @@ private class ReduceAction123
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction124
+private class ReduceAction126
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4165,7 +4447,7 @@ private class ReduceAction124
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction126
+private class ReduceAction128
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4180,7 +4462,7 @@ private class ReduceAction126
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction127
+private class ReduceAction129
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4195,7 +4477,7 @@ private class ReduceAction127
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction128
+private class ReduceAction130
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4218,7 +4500,7 @@ private class ReduceAction128
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction129
+private class ReduceAction131
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4233,7 +4515,7 @@ private class ReduceAction129
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction130
+private class ReduceAction132
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4265,7 +4547,7 @@ private class ReduceAction130
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction131
+private class ReduceAction133
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4293,7 +4575,7 @@ private class ReduceAction131
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction132
+private class ReduceAction134
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4322,7 +4604,7 @@ private class ReduceAction132
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction133
+private class ReduceAction135
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4347,7 +4629,7 @@ private class ReduceAction133
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction134
+private class ReduceAction136
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4381,7 +4663,7 @@ private class ReduceAction134
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction135
+private class ReduceAction137
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4411,7 +4693,7 @@ private class ReduceAction135
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction137
+private class ReduceAction139
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4422,7 +4704,7 @@ private class ReduceAction137
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction138
+private class ReduceAction140
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4443,7 +4725,7 @@ private class ReduceAction138
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction139
+private class ReduceAction141
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4459,7 +4741,7 @@ private class ReduceAction139
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction140
+private class ReduceAction142
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4478,7 +4760,7 @@ private class ReduceAction140
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction141
+private class ReduceAction143
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4489,7 +4771,7 @@ private class ReduceAction141
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction143
+private class ReduceAction145
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4501,29 +4783,31 @@ private class ReduceAction143
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction144
+private class ReduceAction146
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
+                                       var listnode5 = new Array[Object]
                                        var tclassidnode3 = nodearraylist1
                                        assert tclassidnode3 isa nullable TClassid
-                                       var pannotationsnode5 = nodearraylist2
-                                       assert pannotationsnode5 isa nullable AAnnotations
+                                       var pannotationsnode7 = nodearraylist2
+                                       assert pannotationsnode7 isa nullable AAnnotations
                                        var ptypenode1: nullable AType = new AType.init_atype(
                                                null,
                                                tclassidnode3,
-                                               listnode4,
-                                               pannotationsnode5
+                                               null,
+                                               listnode5,
+                                               null,
+                                               pannotationsnode7
                                        )
                                        node_list = ptypenode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction145
+private class ReduceAction147
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4531,24 +4815,26 @@ private class ReduceAction145
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode4 = new Array[Object]
+                                       var listnode5 = new Array[Object]
                                        var tkwnullablenode2 = nodearraylist1
                                        assert tkwnullablenode2 isa nullable TKwnullable
                                        var tclassidnode3 = nodearraylist2
                                        assert tclassidnode3 isa nullable TClassid
-                                       var pannotationsnode5 = nodearraylist3
-                                       assert pannotationsnode5 isa nullable AAnnotations
+                                       var pannotationsnode7 = nodearraylist3
+                                       assert pannotationsnode7 isa nullable AAnnotations
                                        var ptypenode1: nullable AType = new AType.init_atype(
                                                tkwnullablenode2,
                                                tclassidnode3,
-                                               listnode4,
-                                               pannotationsnode5
+                                               null,
+                                               listnode5,
+                                               null,
+                                               pannotationsnode7
                                        )
                                        node_list = ptypenode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction146
+private class ReduceAction148
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4560,25 +4846,31 @@ private class ReduceAction146
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
+                                       var listnode6 = new Array[Object]
                                        var tclassidnode3 = nodearraylist1
                                        assert tclassidnode3 isa nullable TClassid
-                                       var listnode4 = nodearraylist4
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pannotationsnode6 = nodearraylist7
-                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var tobranode4 = nodearraylist2
+                                       assert tobranode4 isa nullable TObra
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tcbranode7 = nodearraylist6
+                                       assert tcbranode7 isa nullable TCbra
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
                                        var ptypenode1: nullable AType = new AType.init_atype(
                                                null,
                                                tclassidnode3,
-                                               listnode5,
-                                               pannotationsnode6
+                                               tobranode4,
+                                               listnode6,
+                                               tcbranode7,
+                                               pannotationsnode8
                                        )
                                        node_list = ptypenode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction147
+private class ReduceAction149
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4591,27 +4883,33 @@ private class ReduceAction147
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
+                                       var listnode6 = new Array[Object]
                                        var tkwnullablenode2 = nodearraylist1
                                        assert tkwnullablenode2 isa nullable TKwnullable
                                        var tclassidnode3 = nodearraylist2
                                        assert tclassidnode3 isa nullable TClassid
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pannotationsnode6 = nodearraylist8
-                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var tobranode4 = nodearraylist3
+                                       assert tobranode4 isa nullable TObra
+                                       var listnode5 = nodearraylist5
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tcbranode7 = nodearraylist7
+                                       assert tcbranode7 isa nullable TCbra
+                                       var pannotationsnode8 = nodearraylist8
+                                       assert pannotationsnode8 isa nullable AAnnotations
                                        var ptypenode1: nullable AType = new AType.init_atype(
                                                tkwnullablenode2,
                                                tclassidnode3,
-                                               listnode5,
-                                               pannotationsnode6
+                                               tobranode4,
+                                               listnode6,
+                                               tcbranode7,
+                                               pannotationsnode8
                                        )
                                        node_list = ptypenode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction148
+private class ReduceAction150
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4626,7 +4924,7 @@ private class ReduceAction148
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction149
+private class ReduceAction151
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4645,7 +4943,7 @@ private class ReduceAction149
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction150
+private class ReduceAction152
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4658,7 +4956,7 @@ private class ReduceAction150
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction154
+private class ReduceAction156
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4670,7 +4968,7 @@ private class ReduceAction154
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction155
+private class ReduceAction157
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4688,7 +4986,7 @@ private class ReduceAction155
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction156
+private class ReduceAction158
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4705,7 +5003,7 @@ private class ReduceAction156
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction157
+private class ReduceAction159
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4716,7 +5014,7 @@ private class ReduceAction157
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction158
+private class ReduceAction160
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4736,7 +5034,7 @@ private class ReduceAction158
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction159
+private class ReduceAction161
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4760,7 +5058,7 @@ private class ReduceAction159
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction160
+private class ReduceAction162
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4781,7 +5079,7 @@ private class ReduceAction160
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction161
+private class ReduceAction163
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4806,7 +5104,7 @@ private class ReduceAction161
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction162
+private class ReduceAction164
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4830,7 +5128,7 @@ private class ReduceAction162
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction163
+private class ReduceAction165
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4858,7 +5156,7 @@ private class ReduceAction163
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction167
+private class ReduceAction169
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4874,7 +5172,7 @@ private class ReduceAction167
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction168
+private class ReduceAction170
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4893,7 +5191,7 @@ private class ReduceAction168
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction169
+private class ReduceAction171
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4909,7 +5207,7 @@ private class ReduceAction169
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction170
+private class ReduceAction172
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4928,7 +5226,7 @@ private class ReduceAction170
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction171
+private class ReduceAction173
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4943,7 +5241,7 @@ private class ReduceAction171
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction172
+private class ReduceAction174
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4959,7 +5257,7 @@ private class ReduceAction172
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction173
+private class ReduceAction175
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4978,7 +5276,7 @@ private class ReduceAction173
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction181
+private class ReduceAction183
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5003,7 +5301,7 @@ private class ReduceAction181
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction182
+private class ReduceAction184
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5029,7 +5327,7 @@ private class ReduceAction182
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction183
+private class ReduceAction185
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5056,7 +5354,7 @@ private class ReduceAction183
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction185
+private class ReduceAction187
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5077,7 +5375,7 @@ private class ReduceAction185
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction186
+private class ReduceAction188
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5099,7 +5397,7 @@ private class ReduceAction186
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction187
+private class ReduceAction189
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5122,7 +5420,7 @@ private class ReduceAction187
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction189
+private class ReduceAction191
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5145,7 +5443,7 @@ private class ReduceAction189
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction190
+private class ReduceAction192
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5170,7 +5468,7 @@ private class ReduceAction190
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction191
+private class ReduceAction193
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5191,7 +5489,7 @@ private class ReduceAction191
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction192
+private class ReduceAction194
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5217,7 +5515,7 @@ private class ReduceAction192
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction193
+private class ReduceAction195
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5244,7 +5542,7 @@ private class ReduceAction193
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction195
+private class ReduceAction197
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5266,7 +5564,7 @@ private class ReduceAction195
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction196
+private class ReduceAction198
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5289,7 +5587,7 @@ private class ReduceAction196
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction198
+private class ReduceAction200
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5317,7 +5615,7 @@ private class ReduceAction198
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction199
+private class ReduceAction201
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5333,7 +5631,7 @@ private class ReduceAction199
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction200
+private class ReduceAction202
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5352,7 +5650,7 @@ private class ReduceAction200
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction201
+private class ReduceAction203
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5378,7 +5676,7 @@ private class ReduceAction201
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction202
+private class ReduceAction204
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5407,7 +5705,7 @@ private class ReduceAction202
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction203
+private class ReduceAction205
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5440,7 +5738,7 @@ private class ReduceAction203
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction204
+private class ReduceAction206
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5476,7 +5774,7 @@ private class ReduceAction204
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction205
+private class ReduceAction207
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5506,7 +5804,7 @@ private class ReduceAction205
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction206
+private class ReduceAction208
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5532,7 +5830,7 @@ private class ReduceAction206
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction207
+private class ReduceAction209
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5565,7 +5863,7 @@ private class ReduceAction207
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction208
+private class ReduceAction210
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5599,7 +5897,7 @@ private class ReduceAction208
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction209
+private class ReduceAction211
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5633,7 +5931,7 @@ private class ReduceAction209
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction210
+private class ReduceAction212
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5668,7 +5966,7 @@ private class ReduceAction210
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction211
+private class ReduceAction213
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5703,7 +6001,7 @@ private class ReduceAction211
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction212
+private class ReduceAction214
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5739,7 +6037,7 @@ private class ReduceAction212
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction215
+private class ReduceAction217
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5768,7 +6066,7 @@ private class ReduceAction215
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction216
+private class ReduceAction218
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5798,7 +6096,7 @@ private class ReduceAction216
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction217
+private class ReduceAction219
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5828,7 +6126,7 @@ private class ReduceAction217
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction218
+private class ReduceAction220
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5859,7 +6157,7 @@ private class ReduceAction218
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction219
+private class ReduceAction221
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5890,7 +6188,7 @@ private class ReduceAction219
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction220
+private class ReduceAction222
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5922,7 +6220,7 @@ private class ReduceAction220
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction223
+private class ReduceAction225
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5949,7 +6247,7 @@ private class ReduceAction223
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction224
+private class ReduceAction226
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5979,7 +6277,7 @@ private class ReduceAction224
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction225
+private class ReduceAction227
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6005,7 +6303,7 @@ private class ReduceAction225
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction226
+private class ReduceAction228
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6038,7 +6336,7 @@ private class ReduceAction226
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction227
+private class ReduceAction229
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6072,7 +6370,7 @@ private class ReduceAction227
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction228
+private class ReduceAction230
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6106,7 +6404,7 @@ private class ReduceAction228
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction229
+private class ReduceAction231
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6141,7 +6439,7 @@ private class ReduceAction229
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction230
+private class ReduceAction232
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6176,7 +6474,7 @@ private class ReduceAction230
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction231
+private class ReduceAction233
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6212,7 +6510,7 @@ private class ReduceAction231
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction234
+private class ReduceAction236
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6241,7 +6539,7 @@ private class ReduceAction234
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction235
+private class ReduceAction237
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6271,7 +6569,7 @@ private class ReduceAction235
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction236
+private class ReduceAction238
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6301,7 +6599,7 @@ private class ReduceAction236
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction237
+private class ReduceAction239
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6332,7 +6630,7 @@ private class ReduceAction237
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction238
+private class ReduceAction240
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6363,7 +6661,7 @@ private class ReduceAction238
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction239
+private class ReduceAction241
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6395,7 +6693,7 @@ private class ReduceAction239
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction242
+private class ReduceAction244
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6422,7 +6720,7 @@ private class ReduceAction242
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction243
+private class ReduceAction245
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6437,7 +6735,7 @@ private class ReduceAction243
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction244
+private class ReduceAction246
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6452,7 +6750,7 @@ private class ReduceAction244
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction245
+private class ReduceAction247
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6467,7 +6765,7 @@ private class ReduceAction245
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction246
+private class ReduceAction248
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6482,7 +6780,7 @@ private class ReduceAction246
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction247
+private class ReduceAction249
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6497,7 +6795,7 @@ private class ReduceAction247
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction248
+private class ReduceAction250
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6512,7 +6810,7 @@ private class ReduceAction248
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction249
+private class ReduceAction251
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6527,7 +6825,7 @@ private class ReduceAction249
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction250
+private class ReduceAction252
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6542,7 +6840,7 @@ private class ReduceAction250
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction251
+private class ReduceAction253
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6557,7 +6855,7 @@ private class ReduceAction251
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction252
+private class ReduceAction254
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6572,7 +6870,7 @@ private class ReduceAction252
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction253
+private class ReduceAction255
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6587,7 +6885,7 @@ private class ReduceAction253
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction254
+private class ReduceAction256
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6610,7 +6908,7 @@ private class ReduceAction254
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction255
+private class ReduceAction257
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6630,7 +6928,7 @@ private class ReduceAction255
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction256
+private class ReduceAction258
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6647,21 +6945,27 @@ private class ReduceAction256
                                        assert tkwifnode2 isa nullable TKwif
                                        var pexprnode3 = nodearraylist3
                                        assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist6
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist8
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode5 = nodearraylist6
                                        assert pexprnode5 isa nullable AExpr
+                                       var tkwelsenode6 = nodearraylist7
+                                       assert tkwelsenode6 isa nullable TKwelse
+                                       var pexprnode7 = nodearraylist8
+                                       assert pexprnode7 isa nullable AExpr
                                        var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
                                                tkwifnode2,
                                                pexprnode3,
-                                               pexprnode4,
-                                               pexprnode5
+                                               tkwthennode4,
+                                               pexprnode5,
+                                               tkwelsenode6,
+                                               pexprnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction257
+private class ReduceAction259
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6676,23 +6980,28 @@ private class ReduceAction257
                                        assert tkwifnode2 isa nullable TKwif
                                        var pexprnode3 = nodearraylist3
                                        assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist6
-                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode5 = nodearraylist6
+                                       assert pexprnode5 isa nullable AExpr
                                        var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
                                                tkwifnode2,
                                                pexprnode3,
-                                               pexprnode4,
+                                               tkwthennode4,
+                                               pexprnode5,
+                                               null,
                                                null
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction258
+private class ReduceAction260
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist9 = p.pop
                                        var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
@@ -6705,25 +7014,32 @@ private class ReduceAction258
                                        assert tkwifnode2 isa nullable TKwif
                                        var pexprnode3 = nodearraylist3
                                        assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist7
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist8
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode5 = nodearraylist7
                                        assert pexprnode5 isa nullable AExpr
+                                       var tkwelsenode6 = nodearraylist8
+                                       assert tkwelsenode6 isa nullable TKwelse
+                                       var pexprnode7 = nodearraylist9
+                                       assert pexprnode7 isa nullable AExpr
                                        var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
                                                tkwifnode2,
                                                pexprnode3,
-                                               pexprnode4,
-                                               pexprnode5
+                                               tkwthennode4,
+                                               pexprnode5,
+                                               tkwelsenode6,
+                                               pexprnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction259
+private class ReduceAction261
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
                                        var nodearraylist4 = p.pop
@@ -6734,23 +7050,30 @@ private class ReduceAction259
                                        assert tkwifnode2 isa nullable TKwif
                                        var pexprnode3 = nodearraylist3
                                        assert pexprnode3 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var tkwelsenode6 = nodearraylist6
+                                       assert tkwelsenode6 isa nullable TKwelse
+                                       var pexprnode7 = nodearraylist7
+                                       assert pexprnode7 isa nullable AExpr
                                        var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
                                                tkwifnode2,
                                                pexprnode3,
+                                               tkwthennode4,
                                                null,
-                                               pexprnode5
+                                               tkwelsenode6,
+                                               pexprnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction260
+private class ReduceAction262
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
                                        var nodearraylist7 = p.pop
                                        var nodearraylist6 = p.pop
                                        var nodearraylist5 = p.pop
@@ -6762,13 +7085,19 @@ private class ReduceAction260
                                        assert tkwifnode2 isa nullable TKwif
                                        var pexprnode3 = nodearraylist3
                                        assert pexprnode3 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var tkwelsenode6 = nodearraylist7
+                                       assert tkwelsenode6 isa nullable TKwelse
+                                       var pexprnode7 = nodearraylist8
+                                       assert pexprnode7 isa nullable AExpr
                                        var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
                                                tkwifnode2,
                                                pexprnode3,
+                                               tkwthennode4,
                                                null,
-                                               pexprnode5
+                                               tkwelsenode6,
+                                               pexprnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -6779,19 +7108,31 @@ private class ReduceAction263
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist8 = p.pop
+                                       var nodearraylist7 = p.pop
+                                       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 tkwloopnode2 = nodearraylist1
-                                       assert tkwloopnode2 isa nullable TKwloop
-                                       var pexprnode3 = nodearraylist2
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
                                        assert pexprnode3 isa nullable AExpr
-                                       var plabelnode4 = nodearraylist3
-                                       assert plabelnode4 isa nullable ALabel
-                                       var pexprnode1: nullable ALoopExpr = new ALoopExpr.init_aloopexpr(
-                                               tkwloopnode2,
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       var pexprnode7 = nodearraylist8
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
                                                pexprnode3,
-                                               plabelnode4
+                                               tkwthennode4,
+                                               pexprnode5,
+                                               null,
+                                               pexprnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -6802,16 +7143,27 @@ private class ReduceAction264
        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 tkwloopnode2 = nodearraylist1
-                                       assert tkwloopnode2 isa nullable TKwloop
-                                       var pexprnode3 = nodearraylist2
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
+                                       var pexprnode3 = nodearraylist3
                                        assert pexprnode3 isa nullable AExpr
-                                       var pexprnode1: nullable ALoopExpr = new ALoopExpr.init_aloopexpr(
-                                               tkwloopnode2,
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode7 = nodearraylist6
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
                                                pexprnode3,
-                                               null
+                                               tkwthennode4,
+                                               null,
+                                               null,
+                                               pexprnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -6829,28 +7181,103 @@ private class ReduceAction265
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwwhilenode2 = nodearraylist1
-                                       assert tkwwhilenode2 isa nullable TKwwhile
+                                       var tkwifnode2 = nodearraylist1
+                                       assert tkwifnode2 isa nullable TKwif
                                        var pexprnode3 = nodearraylist3
                                        assert pexprnode3 isa nullable AExpr
-                                       var tkwdonode4 = nodearraylist5
-                                       assert tkwdonode4 isa nullable TKwdo
-                                       var pexprnode5 = nodearraylist6
-                                       assert pexprnode5 isa nullable AExpr
-                                       var plabelnode6 = nodearraylist7
-                                       assert plabelnode6 isa nullable ALabel
-                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
-                                               tkwwhilenode2,
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode7 = nodearraylist7
+                                       assert pexprnode7 isa nullable AExpr
+                                       var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
+                                               tkwifnode2,
                                                pexprnode3,
-                                               tkwdonode4,
-                                               pexprnode5,
-                                               plabelnode6
+                                               tkwthennode4,
+                                               null,
+                                               null,
+                                               pexprnode7
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction267
+       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 tkwloopnode2 = nodearraylist1
+                                       assert tkwloopnode2 isa nullable TKwloop
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var plabelnode4 = nodearraylist3
+                                       assert plabelnode4 isa nullable ALabel
+                                       var pexprnode1: nullable ALoopExpr = new ALoopExpr.init_aloopexpr(
+                                               tkwloopnode2,
+                                               pexprnode3,
+                                               plabelnode4
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction268
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwloopnode2 = nodearraylist1
+                                       assert tkwloopnode2 isa nullable TKwloop
+                                       var pexprnode3 = nodearraylist2
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ALoopExpr = new ALoopExpr.init_aloopexpr(
+                                               tkwloopnode2,
+                                               pexprnode3,
+                                               null
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction269
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist7 = p.pop
+                                       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 tkwwhilenode2 = nodearraylist1
+                                       assert tkwwhilenode2 isa nullable TKwwhile
+                                       var pexprnode3 = nodearraylist3
+                                       assert pexprnode3 isa nullable AExpr
+                                       var tkwdonode4 = nodearraylist5
+                                       assert tkwdonode4 isa nullable TKwdo
+                                       var pexprnode5 = nodearraylist6
+                                       assert pexprnode5 isa nullable AExpr
+                                       var plabelnode6 = nodearraylist7
+                                       assert plabelnode6 isa nullable ALabel
+                                       var pexprnode1: nullable AWhileExpr = new AWhileExpr.init_awhileexpr(
+                                               tkwwhilenode2,
+                                               pexprnode3,
+                                               tkwdonode4,
+                                               pexprnode5,
+                                               plabelnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction266
+private class ReduceAction270
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6880,7 +7307,7 @@ private class ReduceAction266
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction267
+private class ReduceAction271
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6902,27 +7329,30 @@ private class ReduceAction267
                                        var listnode3 = nodearraylist3
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa nullable AExpr
-                                       var tkwdonode6 = nodearraylist9
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist10
-                                       assert pexprnode7 isa nullable AExpr
-                                       var plabelnode8 = nodearraylist11
-                                       assert plabelnode8 isa nullable ALabel
+                                       var tkwinnode5 = nodearraylist5
+                                       assert tkwinnode5 isa nullable TKwin
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
+                                       var tkwdonode7 = nodearraylist9
+                                       assert tkwdonode7 isa nullable TKwdo
+                                       var pexprnode8 = nodearraylist10
+                                       assert pexprnode8 isa nullable AExpr
+                                       var plabelnode9 = nodearraylist11
+                                       assert plabelnode9 isa nullable ALabel
                                        var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
                                                tkwfornode2,
                                                listnode4,
-                                               pexprnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
-                                               plabelnode8
+                                               tkwinnode5,
+                                               pexprnode6,
+                                               tkwdonode7,
+                                               pexprnode8,
+                                               plabelnode9
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction268
+private class ReduceAction272
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6943,25 +7373,28 @@ private class ReduceAction268
                                        var listnode3 = nodearraylist3
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
-                                       var pexprnode5 = nodearraylist7
-                                       assert pexprnode5 isa nullable AExpr
-                                       var tkwdonode6 = nodearraylist9
-                                       assert tkwdonode6 isa nullable TKwdo
-                                       var pexprnode7 = nodearraylist10
-                                       assert pexprnode7 isa nullable AExpr
+                                       var tkwinnode5 = nodearraylist5
+                                       assert tkwinnode5 isa nullable TKwin
+                                       var pexprnode6 = nodearraylist7
+                                       assert pexprnode6 isa nullable AExpr
+                                       var tkwdonode7 = nodearraylist9
+                                       assert tkwdonode7 isa nullable TKwdo
+                                       var pexprnode8 = nodearraylist10
+                                       assert pexprnode8 isa nullable AExpr
                                        var pexprnode1: nullable AForExpr = new AForExpr.init_aforexpr(
                                                tkwfornode2,
                                                listnode4,
-                                               pexprnode5,
-                                               tkwdonode6,
-                                               pexprnode7,
+                                               tkwinnode5,
+                                               pexprnode6,
+                                               tkwdonode7,
+                                               pexprnode8,
                                                null
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction269
+private class ReduceAction273
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6994,7 +7427,7 @@ private class ReduceAction269
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction270
+private class ReduceAction274
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7024,7 +7457,7 @@ private class ReduceAction270
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction271
+private class ReduceAction275
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7054,7 +7487,7 @@ private class ReduceAction271
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction272
+private class ReduceAction276
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7087,7 +7520,7 @@ private class ReduceAction272
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction274
+private class ReduceAction278
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7100,19 +7533,22 @@ private class ReduceAction274
                                        assert tkwassertnode2 isa nullable TKwassert
                                        var pexprnode4 = nodearraylist2
                                        assert pexprnode4 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist4
-                                       assert pexprnode5 isa nullable AExpr
+                                       var tkwelsenode5 = nodearraylist3
+                                       assert tkwelsenode5 isa nullable TKwelse
+                                       var pexprnode6 = nodearraylist4
+                                       assert pexprnode6 isa nullable AExpr
                                        var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
                                                tkwassertnode2,
                                                null,
                                                pexprnode4,
-                                               pexprnode5
+                                               tkwelsenode5,
+                                               pexprnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction275
+private class ReduceAction279
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7128,19 +7564,22 @@ private class ReduceAction275
                                        assert tidnode3 isa nullable TId
                                        var pexprnode4 = nodearraylist3
                                        assert pexprnode4 isa nullable AExpr
-                                       var pexprnode5 = nodearraylist5
-                                       assert pexprnode5 isa nullable AExpr
+                                       var tkwelsenode5 = nodearraylist4
+                                       assert tkwelsenode5 isa nullable TKwelse
+                                       var pexprnode6 = nodearraylist5
+                                       assert pexprnode6 isa nullable AExpr
                                        var pexprnode1: nullable AAssertExpr = new AAssertExpr.init_aassertexpr(
                                                tkwassertnode2,
                                                tidnode3,
                                                pexprnode4,
-                                               pexprnode5
+                                               tkwelsenode5,
+                                               pexprnode6
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction276
+private class ReduceAction280
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7155,13 +7594,14 @@ private class ReduceAction276
                                                tkwassertnode2,
                                                null,
                                                pexprnode4,
+                                               null,
                                                null
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction277
+private class ReduceAction281
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7179,13 +7619,14 @@ private class ReduceAction277
                                                tkwassertnode2,
                                                tidnode3,
                                                pexprnode4,
+                                               null,
                                                null
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction278
+private class ReduceAction282
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7197,7 +7638,7 @@ private class ReduceAction278
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction280
+private class ReduceAction284
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7237,7 +7678,7 @@ private class ReduceAction280
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction282
+private class ReduceAction286
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7261,7 +7702,7 @@ private class ReduceAction282
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction283
+private class ReduceAction287
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7285,7 +7726,7 @@ private class ReduceAction283
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction284
+private class ReduceAction288
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7313,7 +7754,7 @@ private class ReduceAction284
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction285
+private class ReduceAction289
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7337,7 +7778,7 @@ private class ReduceAction285
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction287
+private class ReduceAction291
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7357,7 +7798,7 @@ private class ReduceAction287
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction289
+private class ReduceAction293
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7381,7 +7822,7 @@ private class ReduceAction289
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction290
+private class ReduceAction294
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7405,7 +7846,7 @@ private class ReduceAction290
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction291
+private class ReduceAction295
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7429,7 +7870,7 @@ private class ReduceAction291
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction292
+private class ReduceAction296
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7453,7 +7894,7 @@ private class ReduceAction292
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction293
+private class ReduceAction297
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7477,7 +7918,7 @@ private class ReduceAction293
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction294
+private class ReduceAction298
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7501,7 +7942,7 @@ private class ReduceAction294
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction295
+private class ReduceAction299
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7525,7 +7966,7 @@ private class ReduceAction295
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction296
+private class ReduceAction300
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7549,7 +7990,7 @@ private class ReduceAction296
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction298
+private class ReduceAction302
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7573,7 +8014,7 @@ private class ReduceAction298
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction300
+private class ReduceAction304
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7597,7 +8038,7 @@ private class ReduceAction300
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction302
+private class ReduceAction306
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7621,7 +8062,7 @@ private class ReduceAction302
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction304
+private class ReduceAction308
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7645,7 +8086,7 @@ private class ReduceAction304
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction305
+private class ReduceAction309
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7669,7 +8110,7 @@ private class ReduceAction305
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction307
+private class ReduceAction311
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7693,7 +8134,7 @@ private class ReduceAction307
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction308
+private class ReduceAction312
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7717,7 +8158,7 @@ private class ReduceAction308
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction310
+private class ReduceAction314
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7741,7 +8182,7 @@ private class ReduceAction310
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction311
+private class ReduceAction315
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7765,7 +8206,7 @@ private class ReduceAction311
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction312
+private class ReduceAction316
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7789,7 +8230,7 @@ private class ReduceAction312
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction314
+private class ReduceAction318
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7813,7 +8254,7 @@ private class ReduceAction314
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction316
+private class ReduceAction320
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7832,7 +8273,7 @@ private class ReduceAction316
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction317
+private class ReduceAction321
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7851,7 +8292,7 @@ private class ReduceAction317
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction318
+private class ReduceAction322
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7870,7 +8311,7 @@ private class ReduceAction318
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction319
+private class ReduceAction323
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7890,7 +8331,7 @@ private class ReduceAction319
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction321
+private class ReduceAction325
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7915,7 +8356,7 @@ private class ReduceAction321
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction322
+private class ReduceAction326
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7941,7 +8382,7 @@ private class ReduceAction322
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction323
+private class ReduceAction327
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7967,7 +8408,7 @@ private class ReduceAction323
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction324
+private class ReduceAction328
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7989,7 +8430,7 @@ private class ReduceAction324
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction326
+private class ReduceAction330
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8011,7 +8452,7 @@ private class ReduceAction326
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction327
+private class ReduceAction331
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8029,7 +8470,7 @@ private class ReduceAction327
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction329
+private class ReduceAction333
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8055,7 +8496,7 @@ private class ReduceAction329
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction331
+private class ReduceAction335
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8082,7 +8523,7 @@ private class ReduceAction331
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction333
+private class ReduceAction337
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8110,7 +8551,7 @@ private class ReduceAction333
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction337
+private class ReduceAction341
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8132,7 +8573,7 @@ private class ReduceAction337
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction339
+private class ReduceAction343
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8155,7 +8596,7 @@ private class ReduceAction339
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction341
+private class ReduceAction345
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8179,7 +8620,7 @@ private class ReduceAction341
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction345
+private class ReduceAction349
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8203,7 +8644,7 @@ private class ReduceAction345
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction347
+private class ReduceAction351
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8229,7 +8670,7 @@ private class ReduceAction347
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction349
+private class ReduceAction353
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8251,7 +8692,7 @@ private class ReduceAction349
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction350
+private class ReduceAction354
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8270,7 +8711,7 @@ private class ReduceAction350
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction351
+private class ReduceAction355
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8300,7 +8741,7 @@ private class ReduceAction351
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction352
+private class ReduceAction356
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8331,7 +8772,7 @@ private class ReduceAction352
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction353
+private class ReduceAction357
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8362,7 +8803,7 @@ private class ReduceAction353
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction354
+private class ReduceAction358
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8394,7 +8835,7 @@ private class ReduceAction354
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction355
+private class ReduceAction359
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8426,7 +8867,7 @@ private class ReduceAction355
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction356
+private class ReduceAction360
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8459,7 +8900,7 @@ private class ReduceAction356
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction359
+private class ReduceAction363
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8495,7 +8936,7 @@ private class ReduceAction359
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction360
+private class ReduceAction364
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8536,7 +8977,7 @@ private class ReduceAction360
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction361
+private class ReduceAction365
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8569,7 +9010,7 @@ private class ReduceAction361
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction362
+private class ReduceAction367
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8588,7 +9029,30 @@ private class ReduceAction362
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction363
+private class ReduceAction368
+       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 tidnode2 = nodearraylist1
+                                       assert tidnode2 isa nullable TId
+                                       var tassignnode3 = nodearraylist2
+                                       assert tassignnode3 isa nullable TAssign
+                                       var pexprnode4 = nodearraylist3
+                                       assert pexprnode4 isa nullable AExpr
+                                       var pexprnode1: nullable ANamedargExpr = new ANamedargExpr.init_anamedargexpr(
+                                               tidnode2,
+                                               tassignnode3,
+                                               pexprnode4
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction369
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8607,7 +9071,7 @@ private class ReduceAction363
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction364
+private class ReduceAction370
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8626,7 +9090,7 @@ private class ReduceAction364
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction365
+private class ReduceAction371
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8645,7 +9109,7 @@ private class ReduceAction365
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction366
+private class ReduceAction372
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8664,7 +9128,7 @@ private class ReduceAction366
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction367
+private class ReduceAction373
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8683,7 +9147,7 @@ private class ReduceAction367
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction368
+private class ReduceAction374
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8702,7 +9166,7 @@ private class ReduceAction368
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction369
+private class ReduceAction375
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8721,7 +9185,7 @@ private class ReduceAction369
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction370
+private class ReduceAction376
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8740,7 +9204,7 @@ private class ReduceAction370
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction371
+private class ReduceAction377
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8759,7 +9223,7 @@ private class ReduceAction371
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction374
+private class ReduceAction380
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8778,24 +9242,27 @@ private class ReduceAction374
                                        assert tobranode2 isa nullable TObra
                                        var pexprnode3 = nodearraylist3
                                        assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist7
-                                       assert pexprnode4 isa nullable AExpr
-                                       var tcbranode5 = nodearraylist9
-                                       assert tcbranode5 isa nullable TCbra
-                                       var pannotationsnode6 = nodearraylist10
-                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var tdotdotnode4 = nodearraylist5
+                                       assert tdotdotnode4 isa nullable TDotdot
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       var tcbranode6 = nodearraylist9
+                                       assert tcbranode6 isa nullable TCbra
+                                       var pannotationsnode7 = nodearraylist10
+                                       assert pannotationsnode7 isa nullable AAnnotations
                                        var pexprnode1: nullable ACrangeExpr = new ACrangeExpr.init_acrangeexpr(
                                                tobranode2,
                                                pexprnode3,
-                                               pexprnode4,
-                                               tcbranode5,
-                                               pannotationsnode6
+                                               tdotdotnode4,
+                                               pexprnode5,
+                                               tcbranode6,
+                                               pannotationsnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction375
+private class ReduceAction381
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8814,24 +9281,27 @@ private class ReduceAction375
                                        assert tobranode2 isa nullable TObra
                                        var pexprnode3 = nodearraylist3
                                        assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist7
-                                       assert pexprnode4 isa nullable AExpr
-                                       var tobranode5 = nodearraylist9
-                                       assert tobranode5 isa nullable TObra
-                                       var pannotationsnode6 = nodearraylist10
-                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var tdotdotnode4 = nodearraylist5
+                                       assert tdotdotnode4 isa nullable TDotdot
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
+                                       var tobranode6 = nodearraylist9
+                                       assert tobranode6 isa nullable TObra
+                                       var pannotationsnode7 = nodearraylist10
+                                       assert pannotationsnode7 isa nullable AAnnotations
                                        var pexprnode1: nullable AOrangeExpr = new AOrangeExpr.init_aorangeexpr(
                                                tobranode2,
                                                pexprnode3,
-                                               pexprnode4,
-                                               tobranode5,
-                                               pannotationsnode6
+                                               tdotdotnode4,
+                                               pexprnode5,
+                                               tobranode6,
+                                               pannotationsnode7
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction376
+private class ReduceAction382
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8865,7 +9335,7 @@ private class ReduceAction376
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction377
+private class ReduceAction383
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8894,7 +9364,7 @@ private class ReduceAction377
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction379
+private class ReduceAction385
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8917,7 +9387,7 @@ private class ReduceAction379
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction380
+private class ReduceAction386
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8930,7 +9400,7 @@ private class ReduceAction380
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction381
+private class ReduceAction387
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8945,7 +9415,7 @@ private class ReduceAction381
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction382
+private class ReduceAction388
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8964,7 +9434,7 @@ private class ReduceAction382
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction384
+private class ReduceAction390
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8976,7 +9446,7 @@ private class ReduceAction384
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction386
+private class ReduceAction392
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8992,19 +9462,23 @@ private class ReduceAction386
                                        assert tkwifnode2 isa nullable TKwif
                                        var pexprnode3 = nodearraylist3
                                        assert pexprnode3 isa nullable AExpr
-                                       var pexprnode4 = nodearraylist7
-                                       assert pexprnode4 isa nullable AExpr
+                                       var tkwthennode4 = nodearraylist5
+                                       assert tkwthennode4 isa nullable TKwthen
+                                       var pexprnode5 = nodearraylist7
+                                       assert pexprnode5 isa nullable AExpr
                                        var pexprnode1: nullable AIfExpr = new AIfExpr.init_aifexpr(
                                                tkwifnode2,
                                                pexprnode3,
-                                               pexprnode4,
+                                               tkwthennode4,
+                                               pexprnode5,
+                                               null,
                                                null
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction387
+private class ReduceAction393
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9031,7 +9505,7 @@ private class ReduceAction387
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction388
+private class ReduceAction394
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9062,7 +9536,7 @@ private class ReduceAction388
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction389
+private class ReduceAction395
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9084,7 +9558,7 @@ private class ReduceAction389
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction390
+private class ReduceAction396
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9100,7 +9574,7 @@ private class ReduceAction390
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction391
+private class ReduceAction397
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9115,7 +9589,7 @@ private class ReduceAction391
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction394
+private class ReduceAction400
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9130,7 +9604,7 @@ private class ReduceAction394
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction395
+private class ReduceAction401
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9145,32 +9619,34 @@ private class ReduceAction395
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction396
+private class ReduceAction402
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tatnode2 = nodearraylist1
-                                       assert tatnode2 isa nullable TAt
-                                       var pannotationnode4 = nodearraylist2
-                                       assert pannotationnode4 isa nullable AAnnotation
-                                       if pannotationnode4 != null then
-                                               listnode5.add(pannotationnode4)
+                                       var listnode6 = new Array[Object]
+                                       var tatnode3 = nodearraylist1
+                                       assert tatnode3 isa nullable TAt
+                                       var pannotationnode5 = nodearraylist2
+                                       assert pannotationnode5 isa nullable AAnnotation
+                                       if pannotationnode5 != null then
+                                               listnode6.add(pannotationnode5)
                                        end
                                        var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               tatnode2,
                                                null,
-                                               listnode5,
+                                               tatnode3,
+                                               null,
+                                               listnode6,
+                                               null,
                                                null
                                        )
                                        node_list = pannotationsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction397
+private class ReduceAction403
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9181,27 +9657,29 @@ private class ReduceAction397
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var tatnode2 = nodearraylist1
-                                       assert tatnode2 isa nullable TAt
-                                       var toparnode3 = nodearraylist2
-                                       assert toparnode3 isa nullable TOpar
-                                       var listnode4 = nodearraylist4
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tcparnode6 = nodearraylist6
-                                       assert tcparnode6 isa nullable TCpar
+                                       var listnode6 = new Array[Object]
+                                       var tatnode3 = nodearraylist1
+                                       assert tatnode3 isa nullable TAt
+                                       var toparnode4 = nodearraylist2
+                                       assert toparnode4 isa nullable TOpar
+                                       var listnode5 = nodearraylist4
+                                       assert listnode5 isa Array[Object]
+                                       listnode6 = concat(listnode6, listnode5)
+                                       var tcparnode7 = nodearraylist6
+                                       assert tcparnode7 isa nullable TCpar
                                        var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               tatnode2,
-                                               toparnode3,
-                                               listnode5,
-                                               tcparnode6
+                                               null,
+                                               tatnode3,
+                                               toparnode4,
+                                               listnode6,
+                                               tcparnode7,
+                                               null
                                        )
                                        node_list = pannotationsnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction398
+private class ReduceAction404
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9212,7 +9690,7 @@ private class ReduceAction398
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction400
+private class ReduceAction406
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9244,7 +9722,7 @@ private class ReduceAction400
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction401
+private class ReduceAction407
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9288,27 +9766,7 @@ private class ReduceAction401
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction402
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var listnode4 = nodearraylist1
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var pannotationsnode1: nullable AAnnotations = new AAnnotations.init_aannotations(
-                                               null,
-                                               null,
-                                               listnode5,
-                                               null
-                                       )
-                                       node_list = pannotationsnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction403
+private class ReduceAction408
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9323,7 +9781,7 @@ private class ReduceAction403
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction404
+private class ReduceAction409
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9342,7 +9800,7 @@ private class ReduceAction404
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction407
+private class ReduceAction412
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9377,7 +9835,7 @@ private class ReduceAction407
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction409
+private class ReduceAction414
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9390,7 +9848,7 @@ private class ReduceAction409
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction411
+private class ReduceAction415
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9423,7 +9881,7 @@ private class ReduceAction411
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction412
+private class ReduceAction416
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9459,7 +9917,7 @@ private class ReduceAction412
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction413
+private class ReduceAction417
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9503,7 +9961,7 @@ private class ReduceAction413
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction414
+private class ReduceAction418
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9550,7 +10008,7 @@ private class ReduceAction414
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction415
+private class ReduceAction419
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9587,7 +10045,7 @@ private class ReduceAction415
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction416
+private class ReduceAction420
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9613,7 +10071,7 @@ private class ReduceAction416
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction417
+private class ReduceAction421
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9642,7 +10100,7 @@ private class ReduceAction417
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction418
+private class ReduceAction422
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9679,7 +10137,7 @@ private class ReduceAction418
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction419
+private class ReduceAction423
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9719,7 +10177,7 @@ private class ReduceAction419
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction420
+private class ReduceAction424
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9749,7 +10207,7 @@ private class ReduceAction420
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction424
+private class ReduceAction428
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9764,7 +10222,7 @@ private class ReduceAction424
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction427
+private class ReduceAction431
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9785,7 +10243,7 @@ private class ReduceAction427
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction428
+private class ReduceAction432
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9802,7 +10260,7 @@ private class ReduceAction428
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction429
+private class ReduceAction433
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9817,7 +10275,7 @@ private class ReduceAction429
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction430
+private class ReduceAction434
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9832,7 +10290,7 @@ private class ReduceAction430
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction431
+private class ReduceAction435
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9847,7 +10305,7 @@ private class ReduceAction431
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction432
+private class ReduceAction436
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9862,7 +10320,7 @@ private class ReduceAction432
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction433
+private class ReduceAction437
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9888,7 +10346,7 @@ private class ReduceAction433
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction434
+private class ReduceAction438
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9910,7 +10368,7 @@ private class ReduceAction434
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction436
+private class ReduceAction440
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9929,7 +10387,7 @@ private class ReduceAction436
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction438
+private class ReduceAction442
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9942,7 +10400,7 @@ private class ReduceAction438
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction439
+private class ReduceAction443
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9968,24 +10426,7 @@ private class ReduceAction439
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction440
-       super ReduceAction
-       redef fun action(p: Parser)
-       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 pexprsnode1: nullable AListExprs = new AListExprs.init_alistexprs(
-                                               listnode3
-                                       )
-                                       node_list = pexprsnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction442
+private class ReduceAction445
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10005,7 +10446,7 @@ private class ReduceAction442
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction443
+private class ReduceAction446
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10019,7 +10460,7 @@ private class ReduceAction443
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction444
+private class ReduceAction447
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10037,7 +10478,7 @@ private class ReduceAction444
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction445
+private class ReduceAction448
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10051,7 +10492,7 @@ private class ReduceAction445
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction446
+private class ReduceAction449
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10066,7 +10507,7 @@ private class ReduceAction446
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction447
+private class ReduceAction450
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10087,7 +10528,7 @@ private class ReduceAction447
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction448
+private class ReduceAction451
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10105,7 +10546,7 @@ private class ReduceAction448
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction449
+private class ReduceAction452
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10127,7 +10568,7 @@ private class ReduceAction449
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction450
+private class ReduceAction453
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10149,7 +10590,7 @@ private class ReduceAction450
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction451
+private class ReduceAction454
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10175,7 +10616,7 @@ private class ReduceAction451
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction452
+private class ReduceAction455
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10192,7 +10633,7 @@ private class ReduceAction452
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction453
+private class ReduceAction456
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10213,7 +10654,7 @@ private class ReduceAction453
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction454
+private class ReduceAction457
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10231,7 +10672,7 @@ private class ReduceAction454
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction456
+private class ReduceAction459
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10242,7 +10683,7 @@ private class ReduceAction456
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction457
+private class ReduceAction460
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10254,7 +10695,7 @@ private class ReduceAction457
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction458
+private class ReduceAction461
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10267,7 +10708,7 @@ private class ReduceAction458
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction460
+private class ReduceAction463
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10278,7 +10719,7 @@ private class ReduceAction460
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction461
+private class ReduceAction464
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10290,7 +10731,7 @@ private class ReduceAction461
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction462
+private class ReduceAction465
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10303,7 +10744,7 @@ private class ReduceAction462
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction464
+private class ReduceAction467
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10316,7 +10757,7 @@ private class ReduceAction464
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction465
+private class ReduceAction468
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10329,7 +10770,7 @@ private class ReduceAction465
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction467
+private class ReduceAction470
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10340,7 +10781,7 @@ private class ReduceAction467
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction468
+private class ReduceAction471
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10349,7 +10790,7 @@ private class ReduceAction468
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction470
+private class ReduceAction474
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10366,7 +10807,7 @@ private class ReduceAction470
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction471
+private class ReduceAction475
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10384,39 +10825,98 @@ private class ReduceAction471
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction474
+private class ReduceAction478
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pdocnode1 = nodearraylist1
+                                       node_list = null
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction480
+       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
+                                       node_list = null
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction481
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pdocnode1 = nodearraylist2
                                        node_list = pdocnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction475
+private class ReduceAction482
        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 pdocnode1 = nodearraylist3
+                                       node_list = pdocnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction476
+private class ReduceAction484
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
+                                       var pdocnode1 = nodearraylist4
+                                       node_list = pdocnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction486
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var pdocnode1 = nodearraylist1
+                                       node_list = pdocnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction487
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction490
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction836
+private class ReduceAction853
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10440,7 +10940,7 @@ private class ReduceAction836
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction838
+private class ReduceAction855
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10460,7 +10960,7 @@ private class ReduceAction838
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction839
+private class ReduceAction856
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10483,7 +10983,7 @@ private class ReduceAction839
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction840
+private class ReduceAction857
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10507,7 +11007,7 @@ private class ReduceAction840
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction841
+private class ReduceAction858
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10531,7 +11031,7 @@ private class ReduceAction841
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction842
+private class ReduceAction859
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10556,7 +11056,7 @@ private class ReduceAction842
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction849
+private class ReduceAction866
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10579,7 +11079,7 @@ private class ReduceAction849
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction850
+private class ReduceAction867
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10603,7 +11103,7 @@ private class ReduceAction850
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction873
+private class ReduceAction892
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10616,7 +11116,7 @@ private class ReduceAction873
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction874
+private class ReduceAction893
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10626,7 +11126,7 @@ private class ReduceAction874
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1032
+private class ReduceAction1054
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10641,7 +11141,7 @@ private class ReduceAction1032
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1033
+private class ReduceAction1055
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10660,7 +11160,7 @@ private class ReduceAction1033
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1034
+private class ReduceAction1056
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10675,7 +11175,7 @@ private class ReduceAction1034
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1035
+private class ReduceAction1057
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10694,7 +11194,7 @@ private class ReduceAction1035
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1036
+private class ReduceAction1058
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10709,7 +11209,7 @@ private class ReduceAction1036
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1037
+private class ReduceAction1059
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10728,22 +11228,26 @@ private class ReduceAction1037
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1038
+private class ReduceAction1061
        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 pformaldefnode1 = nodearraylist1
-                                       if pformaldefnode1 != null then
-                                               listnode2.add(pformaldefnode1)
+                                       var listnode3 = new Array[Object]
+                                       var listnode1 = nodearraylist1
+                                       assert listnode1 isa Array[Object]
+                                       var pformaldefnode2 = nodearraylist2
+                                       listnode3 = concat(listnode3, listnode1)
+                                       if pformaldefnode2 != null then
+                                               listnode3.add(pformaldefnode2)
                                        end
-                                       node_list = listnode2
+                                       node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1039
+private class ReduceAction1063
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10753,16 +11257,16 @@ private class ReduceAction1039
                                        var listnode3 = new Array[Object]
                                        var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
-                                       var pformaldefnode2 = nodearraylist2
+                                       var ppropdefnode2 = nodearraylist2
                                        listnode3 = concat(listnode3, listnode1)
-                                       if pformaldefnode2 != null then
-                                               listnode3.add(pformaldefnode2)
+                                       if ppropdefnode2 != null then
+                                               listnode3.add(ppropdefnode2)
                                        end
                                        node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1041
+private class ReduceAction1065
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10772,16 +11276,16 @@ private class ReduceAction1041
                                        var listnode3 = new Array[Object]
                                        var listnode1 = nodearraylist1
                                        assert listnode1 isa Array[Object]
-                                       var ppropdefnode2 = nodearraylist2
+                                       var pannotationnode2 = nodearraylist2
                                        listnode3 = concat(listnode3, listnode1)
-                                       if ppropdefnode2 != null then
-                                               listnode3.add(ppropdefnode2)
+                                       if pannotationnode2 != null then
+                                               listnode3.add(pannotationnode2)
                                        end
                                        node_list = listnode3
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1042
+private class ReduceAction1066
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10796,7 +11300,7 @@ private class ReduceAction1042
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1043
+private class ReduceAction1067
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10815,7 +11319,7 @@ private class ReduceAction1043
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1044
+private class ReduceAction1068
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10830,7 +11334,7 @@ private class ReduceAction1044
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1045
+private class ReduceAction1069
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10849,7 +11353,7 @@ private class ReduceAction1045
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1047
+private class ReduceAction1071
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10868,7 +11372,7 @@ private class ReduceAction1047
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1049
+private class ReduceAction1073
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10887,7 +11391,7 @@ private class ReduceAction1049
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1055
+private class ReduceAction1079
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10905,26 +11409,7 @@ private class ReduceAction1055
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1057
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1
-                                       assert listnode1 isa Array[Object]
-                                       var pannotationnode2 = nodearraylist2
-                                       listnode3 = concat(listnode3, listnode1)
-                                       if pannotationnode2 != null then
-                                               listnode3.add(pannotationnode2)
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction1065
+private class ReduceAction1087
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10943,7 +11428,7 @@ private class ReduceAction1065
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1066
+private class ReduceAction1088
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10958,7 +11443,7 @@ private class ReduceAction1066
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1067
+private class ReduceAction1089
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -10977,37 +11462,3 @@ private class ReduceAction1067
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction1068
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var listnode2 = new Array[Object]
-                                       var teolnode1 = nodearraylist1
-                                       if teolnode1 != null then
-                                               listnode2.add(teolnode1)
-                                       end
-                                       node_list = listnode2
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction1069
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var listnode3 = new Array[Object]
-                                       var listnode1 = nodearraylist1
-                                       assert listnode1 isa Array[Object]
-                                       var teolnode2 = nodearraylist2
-                                       listnode3 = concat(listnode3, listnode1)
-                                       if teolnode2 != null then
-                                               listnode3.add(teolnode2)
-                                       end
-                                       node_list = listnode3
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end