grammar: remove old-style syntax for attributes
[nit.git] / src / parser / parser.nit
index d2599f5..924cb87 100644 (file)
@@ -4,7 +4,7 @@ module parser
 
 intrude import parser_prod
 intrude import parser_work
-import tables
+private import tables
 
 redef class Parser
        redef fun build_reduce_table
@@ -95,23 +95,23 @@ redef class Parser
                        new ReduceAction82(14),
                        new ReduceAction83(14),
                        new ReduceAction84(14),
-                       new ReduceAction85(15),
-                       new ReduceAction86(15),
+                       new ReduceAction85(14),
+                       new ReduceAction86(14),
+                       new ReduceAction87(14),
+                       new ReduceAction88(14),
+                       new ReduceAction89(14),
+                       new ReduceAction90(15),
+                       new ReduceAction91(15),
                        new ReduceAction22(15),
-                       new ReduceAction85(16),
-                       new ReduceAction89(16),
-                       new ReduceAction90(17),
-                       new ReduceAction91(18),
-                       new ReduceAction92(19),
-                       new ReduceAction93(19),
-                       new ReduceAction94(19),
-                       new ReduceAction95(19),
-                       new ReduceAction96(20),
-                       new ReduceAction97(20),
-                       new ReduceAction98(20),
-                       new ReduceAction99(20),
-                       new ReduceAction100(20),
-                       new ReduceAction101(20),
+                       new ReduceAction90(16),
+                       new ReduceAction94(16),
+                       new ReduceAction95(17),
+                       new ReduceAction96(18),
+                       new ReduceAction97(19),
+                       new ReduceAction98(19),
+                       new ReduceAction99(19),
+                       new ReduceAction100(19),
+                       new ReduceAction101(19),
                        new ReduceAction102(20),
                        new ReduceAction103(20),
                        new ReduceAction104(20),
@@ -124,298 +124,305 @@ redef class Parser
                        new ReduceAction111(20),
                        new ReduceAction112(20),
                        new ReduceAction113(20),
-                       new ReduceAction114(21),
-                       new ReduceAction115(21),
-                       new ReduceAction116(21),
-                       new ReduceAction117(21),
-                       new ReduceAction118(22),
-                       new ReduceAction119(22),
+                       new ReduceAction114(20),
+                       new ReduceAction115(20),
+                       new ReduceAction116(20),
+                       new ReduceAction117(20),
+                       new ReduceAction118(20),
+                       new ReduceAction119(20),
+                       new ReduceAction120(21),
+                       new ReduceAction121(21),
+                       new ReduceAction122(21),
+                       new ReduceAction123(21),
+                       new ReduceAction124(22),
+                       new ReduceAction125(22),
                        new ReduceAction51(22),
-                       new ReduceAction121(23),
-                       new ReduceAction122(24),
-                       new ReduceAction123(24),
-                       new ReduceAction124(24),
-                       new ReduceAction125(24),
-                       new ReduceAction126(24),
-                       new ReduceAction127(25),
-                       new ReduceAction128(25),
+                       new ReduceAction127(23),
+                       new ReduceAction128(24),
+                       new ReduceAction129(24),
+                       new ReduceAction130(24),
+                       new ReduceAction131(24),
+                       new ReduceAction132(24),
+                       new ReduceAction133(25),
+                       new ReduceAction134(25),
                        new ReduceAction22(25),
-                       new ReduceAction130(26),
-                       new ReduceAction131(27),
-                       new ReduceAction131(27),
-                       new ReduceAction133(27),
-                       new ReduceAction134(28),
-                       new ReduceAction135(28),
-                       new ReduceAction136(28),
-                       new ReduceAction137(29),
-                       new ReduceAction138(29),
-                       new ReduceAction139(29),
-                       new ReduceAction140(29),
-                       new ReduceAction141(29),
-                       new ReduceAction142(29),
+                       new ReduceAction136(26),
+                       new ReduceAction137(27),
+                       new ReduceAction137(27),
+                       new ReduceAction139(27),
+                       new ReduceAction140(28),
+                       new ReduceAction141(28),
+                       new ReduceAction142(28),
+                       new ReduceAction143(29),
+                       new ReduceAction144(29),
+                       new ReduceAction145(29),
+                       new ReduceAction146(29),
+                       new ReduceAction147(29),
+                       new ReduceAction148(29),
                        new ReduceAction22(30),
-                       new ReduceAction144(30),
-                       new ReduceAction145(31),
-                       new ReduceAction146(32),
-                       new ReduceAction147(32),
-                       new ReduceAction148(33),
+                       new ReduceAction150(30),
+                       new ReduceAction151(31),
+                       new ReduceAction152(32),
+                       new ReduceAction153(32),
+                       new ReduceAction154(33),
                        new ReduceAction22(33),
-                       new ReduceAction150(34),
-                       new ReduceAction151(35),
-                       new ReduceAction152(35),
-                       new ReduceAction153(35),
-                       new ReduceAction154(35),
-                       new ReduceAction155(36),
-                       new ReduceAction156(36),
-                       new ReduceAction157(37),
-                       new ReduceAction157(38),
-                       new ReduceAction157(39),
+                       new ReduceAction156(34),
+                       new ReduceAction157(35),
+                       new ReduceAction158(35),
+                       new ReduceAction159(35),
+                       new ReduceAction160(35),
+                       new ReduceAction161(36),
+                       new ReduceAction162(36),
+                       new ReduceAction163(37),
+                       new ReduceAction163(38),
+                       new ReduceAction163(39),
                        new ReduceAction22(39),
-                       new ReduceAction161(40),
-                       new ReduceAction162(40),
-                       new ReduceAction163(40),
-                       new ReduceAction164(40),
-                       new ReduceAction165(41),
-                       new ReduceAction166(41),
-                       new ReduceAction167(42),
-                       new ReduceAction168(42),
-                       new ReduceAction169(43),
-                       new ReduceAction170(43),
-                       new ReduceAction161(44),
-                       new ReduceAction164(45),
-                       new ReduceAction164(45),
-                       new ReduceAction174(45),
-                       new ReduceAction175(45),
-                       new ReduceAction176(45),
-                       new ReduceAction177(45),
-                       new ReduceAction178(45),
-                       new ReduceAction179(45),
+                       new ReduceAction167(40),
+                       new ReduceAction168(40),
+                       new ReduceAction169(40),
+                       new ReduceAction170(40),
+                       new ReduceAction171(41),
+                       new ReduceAction172(41),
+                       new ReduceAction173(42),
+                       new ReduceAction174(42),
+                       new ReduceAction175(43),
+                       new ReduceAction176(43),
+                       new ReduceAction167(44),
+                       new ReduceAction170(45),
+                       new ReduceAction170(45),
                        new ReduceAction180(45),
                        new ReduceAction181(45),
                        new ReduceAction182(45),
                        new ReduceAction183(45),
                        new ReduceAction184(45),
-                       new ReduceAction164(45),
-                       new ReduceAction164(45),
-                       new ReduceAction164(45),
-                       new ReduceAction164(45),
-                       new ReduceAction164(45),
-                       new ReduceAction164(45),
-                       new ReduceAction191(45),
-                       new ReduceAction192(45),
+                       new ReduceAction185(45),
+                       new ReduceAction186(45),
+                       new ReduceAction170(45),
+                       new ReduceAction170(45),
+                       new ReduceAction170(45),
+                       new ReduceAction170(45),
+                       new ReduceAction170(45),
+                       new ReduceAction170(45),
                        new ReduceAction193(45),
                        new ReduceAction194(45),
                        new ReduceAction195(45),
                        new ReduceAction196(45),
                        new ReduceAction197(45),
-                       new ReduceAction196(45),
-                       new ReduceAction199(45),
-                       new ReduceAction200(45),
+                       new ReduceAction198(45),
                        new ReduceAction199(45),
+                       new ReduceAction198(45),
+                       new ReduceAction201(45),
                        new ReduceAction202(45),
-                       new ReduceAction203(46),
-                       new ReduceAction204(47),
-                       new ReduceAction205(48),
-                       new ReduceAction206(48),
-                       new ReduceAction207(48),
-                       new ReduceAction208(48),
-                       new ReduceAction209(49),
-                       new ReduceAction210(49),
-                       new ReduceAction211(49),
-                       new ReduceAction212(49),
-                       new ReduceAction213(49),
-                       new ReduceAction214(49),
-                       new ReduceAction215(49),
-                       new ReduceAction216(49),
-                       new ReduceAction217(49),
-                       new ReduceAction218(49),
-                       new ReduceAction219(50),
-                       new ReduceAction220(50),
-                       new ReduceAction221(51),
-                       new ReduceAction222(51),
-                       new ReduceAction223(52),
-                       new ReduceAction224(52),
-                       new ReduceAction225(52),
-                       new ReduceAction226(52),
-                       new ReduceAction227(52),
-                       new ReduceAction161(53),
-                       new ReduceAction163(53),
-                       new ReduceAction230(54),
-                       new ReduceAction231(54),
-                       new ReduceAction232(55),
-                       new ReduceAction233(55),
-                       new ReduceAction234(56),
-                       new ReduceAction235(56),
-                       new ReduceAction236(56),
-                       new ReduceAction237(56),
-                       new ReduceAction238(57),
-                       new ReduceAction239(57),
-                       new ReduceAction240(57),
-                       new ReduceAction241(57),
-                       new ReduceAction242(58),
-                       new ReduceAction164(59),
-                       new ReduceAction164(60),
-                       new ReduceAction245(60),
-                       new ReduceAction164(61),
-                       new ReduceAction247(61),
-                       new ReduceAction248(61),
-                       new ReduceAction249(61),
-                       new ReduceAction250(61),
-                       new ReduceAction164(62),
-                       new ReduceAction252(62),
-                       new ReduceAction164(63),
-                       new ReduceAction254(63),
-                       new ReduceAction255(63),
-                       new ReduceAction256(63),
-                       new ReduceAction257(63),
-                       new ReduceAction258(63),
-                       new ReduceAction259(63),
-                       new ReduceAction260(63),
-                       new ReduceAction261(63),
-                       new ReduceAction262(63),
-                       new ReduceAction263(63),
-                       new ReduceAction164(64),
-                       new ReduceAction265(64),
-                       new ReduceAction266(64),
-                       new ReduceAction164(65),
-                       new ReduceAction268(65),
-                       new ReduceAction269(65),
-                       new ReduceAction270(65),
-                       new ReduceAction164(66),
-                       new ReduceAction272(66),
-                       new ReduceAction273(66),
-                       new ReduceAction164(67),
-                       new ReduceAction275(67),
-                       new ReduceAction276(67),
-                       new ReduceAction277(67),
-                       new ReduceAction278(68),
-                       new ReduceAction279(68),
-                       new ReduceAction191(68),
-                       new ReduceAction192(68),
-                       new ReduceAction193(68),
-                       new ReduceAction194(68),
-                       new ReduceAction195(68),
-                       new ReduceAction285(68),
-                       new ReduceAction286(68),
-                       new ReduceAction287(68),
-                       new ReduceAction288(68),
-                       new ReduceAction289(68),
-                       new ReduceAction290(68),
-                       new ReduceAction291(68),
-                       new ReduceAction292(68),
-                       new ReduceAction293(68),
-                       new ReduceAction294(68),
-                       new ReduceAction295(68),
-                       new ReduceAction296(68),
-                       new ReduceAction297(68),
-                       new ReduceAction298(68),
-                       new ReduceAction164(68),
-                       new ReduceAction300(68),
-                       new ReduceAction301(68),
-                       new ReduceAction302(68),
-                       new ReduceAction303(68),
-                       new ReduceAction304(69),
-                       new ReduceAction305(69),
-                       new ReduceAction306(70),
-                       new ReduceAction307(70),
-                       new ReduceAction308(71),
-                       new ReduceAction306(72),
-                       new ReduceAction307(72),
-                       new ReduceAction311(73),
-                       new ReduceAction312(74),
-                       new ReduceAction313(75),
-                       new ReduceAction314(75),
-                       new ReduceAction315(76),
-                       new ReduceAction22(76),
-                       new ReduceAction317(77),
-                       new ReduceAction318(77),
-                       new ReduceAction319(78),
-                       new ReduceAction320(79),
-                       new ReduceAction321(79),
-                       new ReduceAction319(80),
-                       new ReduceAction323(81),
-                       new ReduceAction324(81),
-                       new ReduceAction325(81),
-                       new ReduceAction326(81),
-                       new ReduceAction327(81),
-                       new ReduceAction328(82),
-                       new ReduceAction329(83),
-                       new ReduceAction330(83),
-                       new ReduceAction331(84),
-                       new ReduceAction332(85),
-                       new ReduceAction333(85),
-                       new ReduceAction333(85),
-                       new ReduceAction335(85),
-                       new ReduceAction336(86),
-                       new ReduceAction337(86),
-                       new ReduceAction338(86),
-                       new ReduceAction339(86),
-                       new ReduceAction340(87),
-                       new ReduceAction341(87),
-                       new ReduceAction342(87),
-                       new ReduceAction340(88),
-                       new ReduceAction344(88),
-                       new ReduceAction341(88),
-                       new ReduceAction342(88),
-                       new ReduceAction347(89),
-                       new ReduceAction307(90),
-                       new ReduceAction349(90),
-                       new ReduceAction350(91),
-                       new ReduceAction351(92),
-                       new ReduceAction352(92),
-                       new ReduceAction353(93),
-                       new ReduceAction354(93),
-                       new ReduceAction355(93),
-                       new ReduceAction356(93),
-                       new ReduceAction357(94),
-                       new ReduceAction358(94),
-                       new ReduceAction359(94),
+                       new ReduceAction201(45),
+                       new ReduceAction204(45),
+                       new ReduceAction205(46),
+                       new ReduceAction206(46),
+                       new ReduceAction207(47),
+                       new ReduceAction208(47),
+                       new ReduceAction209(47),
+                       new ReduceAction210(47),
+                       new ReduceAction211(48),
+                       new ReduceAction212(48),
+                       new ReduceAction213(48),
+                       new ReduceAction214(48),
+                       new ReduceAction215(48),
+                       new ReduceAction216(48),
+                       new ReduceAction217(48),
+                       new ReduceAction218(48),
+                       new ReduceAction219(48),
+                       new ReduceAction220(48),
+                       new ReduceAction221(49),
+                       new ReduceAction222(49),
+                       new ReduceAction223(50),
+                       new ReduceAction224(50),
+                       new ReduceAction225(51),
+                       new ReduceAction226(51),
+                       new ReduceAction227(51),
+                       new ReduceAction228(51),
+                       new ReduceAction229(51),
+                       new ReduceAction167(52),
+                       new ReduceAction169(52),
+                       new ReduceAction232(53),
+                       new ReduceAction233(53),
+                       new ReduceAction234(54),
+                       new ReduceAction235(54),
+                       new ReduceAction236(55),
+                       new ReduceAction237(55),
+                       new ReduceAction238(55),
+                       new ReduceAction239(55),
+                       new ReduceAction240(56),
+                       new ReduceAction241(56),
+                       new ReduceAction242(56),
+                       new ReduceAction243(56),
+                       new ReduceAction244(57),
+                       new ReduceAction170(58),
+                       new ReduceAction170(59),
+                       new ReduceAction247(59),
+                       new ReduceAction170(60),
+                       new ReduceAction249(60),
+                       new ReduceAction250(60),
+                       new ReduceAction251(60),
+                       new ReduceAction252(60),
+                       new ReduceAction170(61),
+                       new ReduceAction254(61),
+                       new ReduceAction170(62),
+                       new ReduceAction256(62),
+                       new ReduceAction257(62),
+                       new ReduceAction258(62),
+                       new ReduceAction259(62),
+                       new ReduceAction260(62),
+                       new ReduceAction261(62),
+                       new ReduceAction262(62),
+                       new ReduceAction263(62),
+                       new ReduceAction264(62),
+                       new ReduceAction265(62),
+                       new ReduceAction170(63),
+                       new ReduceAction267(63),
+                       new ReduceAction268(63),
+                       new ReduceAction170(64),
+                       new ReduceAction270(64),
+                       new ReduceAction271(64),
+                       new ReduceAction272(64),
+                       new ReduceAction170(65),
+                       new ReduceAction274(65),
+                       new ReduceAction275(65),
+                       new ReduceAction170(66),
+                       new ReduceAction277(66),
+                       new ReduceAction278(66),
+                       new ReduceAction279(66),
+                       new ReduceAction280(67),
+                       new ReduceAction281(67),
+                       new ReduceAction193(67),
+                       new ReduceAction194(67),
+                       new ReduceAction195(67),
+                       new ReduceAction196(67),
+                       new ReduceAction197(67),
+                       new ReduceAction287(67),
+                       new ReduceAction288(67),
+                       new ReduceAction289(67),
+                       new ReduceAction290(67),
+                       new ReduceAction291(67),
+                       new ReduceAction292(67),
+                       new ReduceAction293(67),
+                       new ReduceAction294(67),
+                       new ReduceAction295(67),
+                       new ReduceAction296(67),
+                       new ReduceAction297(67),
+                       new ReduceAction298(67),
+                       new ReduceAction299(67),
+                       new ReduceAction300(67),
+                       new ReduceAction170(67),
+                       new ReduceAction302(67),
+                       new ReduceAction303(67),
+                       new ReduceAction304(67),
+                       new ReduceAction305(67),
+                       new ReduceAction306(67),
+                       new ReduceAction307(68),
+                       new ReduceAction308(68),
+                       new ReduceAction309(69),
+                       new ReduceAction310(69),
+                       new ReduceAction311(70),
+                       new ReduceAction309(71),
+                       new ReduceAction310(71),
+                       new ReduceAction314(72),
+                       new ReduceAction315(73),
+                       new ReduceAction316(74),
+                       new ReduceAction317(74),
+                       new ReduceAction318(75),
+                       new ReduceAction22(75),
+                       new ReduceAction320(76),
+                       new ReduceAction321(76),
+                       new ReduceAction322(77),
+                       new ReduceAction323(78),
+                       new ReduceAction324(78),
+                       new ReduceAction322(79),
+                       new ReduceAction326(80),
+                       new ReduceAction327(80),
+                       new ReduceAction328(80),
+                       new ReduceAction329(80),
+                       new ReduceAction330(80),
+                       new ReduceAction331(81),
+                       new ReduceAction332(81),
+                       new ReduceAction333(81),
+                       new ReduceAction334(81),
+                       new ReduceAction335(81),
+                       new ReduceAction336(82),
+                       new ReduceAction337(83),
+                       new ReduceAction338(83),
+                       new ReduceAction339(84),
+                       new ReduceAction340(85),
+                       new ReduceAction341(85),
+                       new ReduceAction341(85),
+                       new ReduceAction343(85),
+                       new ReduceAction344(86),
+                       new ReduceAction345(86),
+                       new ReduceAction346(86),
+                       new ReduceAction347(87),
+                       new ReduceAction348(87),
+                       new ReduceAction349(87),
+                       new ReduceAction347(88),
+                       new ReduceAction351(88),
+                       new ReduceAction348(88),
+                       new ReduceAction349(88),
+                       new ReduceAction354(89),
+                       new ReduceAction310(90),
+                       new ReduceAction356(90),
+                       new ReduceAction357(91),
+                       new ReduceAction358(92),
+                       new ReduceAction359(92),
+                       new ReduceAction360(93),
+                       new ReduceAction361(93),
+                       new ReduceAction362(93),
+                       new ReduceAction363(93),
+                       new ReduceAction364(94),
+                       new ReduceAction365(94),
+                       new ReduceAction366(94),
                        new ReduceAction22(94),
-                       new ReduceAction361(95),
-                       new ReduceAction362(95),
-                       new ReduceAction363(95),
-                       new ReduceAction362(95),
-                       new ReduceAction365(96),
-                       new ReduceAction366(96),
-                       new ReduceAction367(96),
-                       new ReduceAction366(96),
-                       new ReduceAction369(97),
-                       new ReduceAction370(98),
+                       new ReduceAction368(95),
+                       new ReduceAction369(95),
+                       new ReduceAction370(95),
+                       new ReduceAction369(95),
+                       new ReduceAction372(96),
+                       new ReduceAction373(96),
+                       new ReduceAction374(96),
+                       new ReduceAction373(96),
+                       new ReduceAction376(97),
+                       new ReduceAction377(98),
                        new ReduceAction22(99),
-                       new ReduceAction372(99),
-                       new ReduceAction373(100),
-                       new ReduceAction373(100),
-                       new ReduceAction375(101),
-                       new ReduceAction376(101),
+                       new ReduceAction379(99),
+                       new ReduceAction380(100),
+                       new ReduceAction380(100),
+                       new ReduceAction382(101),
+                       new ReduceAction383(101),
                        new ReduceAction23(101),
                        new ReduceAction22(102),
-                       new ReduceAction379(102),
+                       new ReduceAction386(102),
+                       new ReduceAction387(103),
+                       new ReduceAction388(103),
                        new ReduceAction380(103),
-                       new ReduceAction381(103),
-                       new ReduceAction373(103),
                        new ReduceAction56(104),
                        new ReduceAction57(105),
                        new ReduceAction58(105),
                        new ReduceAction59(105),
-                       new ReduceAction62(105),
-                       new ReduceAction63(105),
-                       new ReduceAction85(106),
-                       new ReduceAction86(106),
-                       new ReduceAction151(107),
-                       new ReduceAction152(107),
-                       new ReduceAction164(108),
-                       new ReduceAction164(109),
-                       new ReduceAction245(109),
-                       new ReduceAction164(110),
-                       new ReduceAction247(110),
-                       new ReduceAction248(110),
+                       new ReduceAction61(105),
+                       new ReduceAction64(105),
+                       new ReduceAction65(105),
+                       new ReduceAction66(105),
+                       new ReduceAction90(106),
+                       new ReduceAction91(106),
+                       new ReduceAction157(107),
+                       new ReduceAction158(107),
+                       new ReduceAction170(108),
+                       new ReduceAction170(109),
+                       new ReduceAction247(109),
+                       new ReduceAction170(110),
                        new ReduceAction249(110),
                        new ReduceAction250(110),
-                       new ReduceAction164(111),
-                       new ReduceAction252(111),
-                       new ReduceAction164(112),
-                       new ReduceAction254(112),
-                       new ReduceAction255(112),
+                       new ReduceAction251(110),
+                       new ReduceAction252(110),
+                       new ReduceAction170(111),
+                       new ReduceAction254(111),
+                       new ReduceAction170(112),
                        new ReduceAction256(112),
                        new ReduceAction257(112),
                        new ReduceAction258(112),
@@ -424,30 +431,30 @@ redef class Parser
                        new ReduceAction261(112),
                        new ReduceAction262(112),
                        new ReduceAction263(112),
-                       new ReduceAction164(113),
-                       new ReduceAction265(113),
-                       new ReduceAction266(113),
-                       new ReduceAction164(114),
-                       new ReduceAction268(114),
-                       new ReduceAction269(114),
+                       new ReduceAction264(112),
+                       new ReduceAction265(112),
+                       new ReduceAction170(113),
+                       new ReduceAction267(113),
+                       new ReduceAction268(113),
+                       new ReduceAction170(114),
                        new ReduceAction270(114),
-                       new ReduceAction164(115),
-                       new ReduceAction272(115),
-                       new ReduceAction273(115),
-                       new ReduceAction164(116),
-                       new ReduceAction275(116),
-                       new ReduceAction276(116),
+                       new ReduceAction271(114),
+                       new ReduceAction272(114),
+                       new ReduceAction170(115),
+                       new ReduceAction274(115),
+                       new ReduceAction275(115),
+                       new ReduceAction170(116),
                        new ReduceAction277(116),
-                       new ReduceAction278(117),
-                       new ReduceAction279(117),
-                       new ReduceAction191(117),
-                       new ReduceAction192(117),
+                       new ReduceAction278(116),
+                       new ReduceAction279(116),
+                       new ReduceAction280(117),
+                       new ReduceAction281(117),
                        new ReduceAction193(117),
                        new ReduceAction194(117),
                        new ReduceAction195(117),
-                       new ReduceAction286(117),
-                       new ReduceAction290(117),
-                       new ReduceAction291(117),
+                       new ReduceAction196(117),
+                       new ReduceAction197(117),
+                       new ReduceAction288(117),
                        new ReduceAction292(117),
                        new ReduceAction293(117),
                        new ReduceAction294(117),
@@ -455,48 +462,45 @@ redef class Parser
                        new ReduceAction296(117),
                        new ReduceAction297(117),
                        new ReduceAction298(117),
-                       new ReduceAction164(117),
+                       new ReduceAction299(117),
                        new ReduceAction300(117),
-                       new ReduceAction301(117),
+                       new ReduceAction170(117),
                        new ReduceAction302(117),
                        new ReduceAction303(117),
-                       new ReduceAction151(118),
-                       new ReduceAction152(118),
-                       new ReduceAction153(118),
-                       new ReduceAction154(118),
-                       new ReduceAction164(119),
-                       new ReduceAction164(119),
-                       new ReduceAction174(119),
-                       new ReduceAction175(119),
-                       new ReduceAction176(119),
-                       new ReduceAction177(119),
-                       new ReduceAction178(119),
-                       new ReduceAction179(119),
+                       new ReduceAction304(117),
+                       new ReduceAction305(117),
+                       new ReduceAction306(117),
+                       new ReduceAction157(118),
+                       new ReduceAction158(118),
+                       new ReduceAction159(118),
+                       new ReduceAction160(118),
+                       new ReduceAction170(119),
+                       new ReduceAction170(119),
                        new ReduceAction180(119),
                        new ReduceAction181(119),
                        new ReduceAction182(119),
                        new ReduceAction183(119),
                        new ReduceAction184(119),
-                       new ReduceAction164(119),
-                       new ReduceAction164(119),
-                       new ReduceAction164(119),
-                       new ReduceAction164(119),
-                       new ReduceAction164(119),
-                       new ReduceAction164(119),
-                       new ReduceAction191(119),
-                       new ReduceAction192(119),
+                       new ReduceAction185(119),
+                       new ReduceAction186(119),
+                       new ReduceAction170(119),
+                       new ReduceAction170(119),
+                       new ReduceAction170(119),
+                       new ReduceAction170(119),
+                       new ReduceAction170(119),
+                       new ReduceAction170(119),
                        new ReduceAction193(119),
                        new ReduceAction194(119),
                        new ReduceAction195(119),
                        new ReduceAction196(119),
                        new ReduceAction197(119),
-                       new ReduceAction196(119),
-                       new ReduceAction199(119),
-                       new ReduceAction200(119),
+                       new ReduceAction198(119),
                        new ReduceAction199(119),
+                       new ReduceAction198(119),
+                       new ReduceAction201(119),
                        new ReduceAction202(119),
-                       new ReduceAction209(120),
-                       new ReduceAction210(120),
+                       new ReduceAction201(119),
+                       new ReduceAction204(119),
                        new ReduceAction211(120),
                        new ReduceAction212(120),
                        new ReduceAction213(120),
@@ -505,19 +509,19 @@ redef class Parser
                        new ReduceAction216(120),
                        new ReduceAction217(120),
                        new ReduceAction218(120),
-                       new ReduceAction164(121),
-                       new ReduceAction164(122),
-                       new ReduceAction245(122),
-                       new ReduceAction164(123),
-                       new ReduceAction247(123),
-                       new ReduceAction248(123),
+                       new ReduceAction219(120),
+                       new ReduceAction220(120),
+                       new ReduceAction170(121),
+                       new ReduceAction170(122),
+                       new ReduceAction247(122),
+                       new ReduceAction170(123),
                        new ReduceAction249(123),
                        new ReduceAction250(123),
-                       new ReduceAction164(124),
-                       new ReduceAction252(124),
-                       new ReduceAction164(125),
-                       new ReduceAction254(125),
-                       new ReduceAction255(125),
+                       new ReduceAction251(123),
+                       new ReduceAction252(123),
+                       new ReduceAction170(124),
+                       new ReduceAction254(124),
+                       new ReduceAction170(125),
                        new ReduceAction256(125),
                        new ReduceAction257(125),
                        new ReduceAction258(125),
@@ -526,31 +530,31 @@ redef class Parser
                        new ReduceAction261(125),
                        new ReduceAction262(125),
                        new ReduceAction263(125),
-                       new ReduceAction164(126),
-                       new ReduceAction265(126),
-                       new ReduceAction266(126),
-                       new ReduceAction164(127),
-                       new ReduceAction268(127),
-                       new ReduceAction269(127),
+                       new ReduceAction264(125),
+                       new ReduceAction265(125),
+                       new ReduceAction170(126),
+                       new ReduceAction267(126),
+                       new ReduceAction268(126),
+                       new ReduceAction170(127),
                        new ReduceAction270(127),
-                       new ReduceAction164(128),
-                       new ReduceAction272(128),
-                       new ReduceAction273(128),
-                       new ReduceAction164(129),
-                       new ReduceAction275(129),
-                       new ReduceAction276(129),
+                       new ReduceAction271(127),
+                       new ReduceAction272(127),
+                       new ReduceAction170(128),
+                       new ReduceAction274(128),
+                       new ReduceAction275(128),
+                       new ReduceAction170(129),
                        new ReduceAction277(129),
-                       new ReduceAction278(130),
-                       new ReduceAction279(130),
-                       new ReduceAction191(130),
-                       new ReduceAction192(130),
+                       new ReduceAction278(129),
+                       new ReduceAction279(129),
+                       new ReduceAction280(130),
+                       new ReduceAction281(130),
                        new ReduceAction193(130),
                        new ReduceAction194(130),
                        new ReduceAction195(130),
-                       new ReduceAction285(130),
-                       new ReduceAction286(130),
-                       new ReduceAction290(130),
-                       new ReduceAction291(130),
+                       new ReduceAction196(130),
+                       new ReduceAction197(130),
+                       new ReduceAction287(130),
+                       new ReduceAction288(130),
                        new ReduceAction292(130),
                        new ReduceAction293(130),
                        new ReduceAction294(130),
@@ -558,35 +562,36 @@ redef class Parser
                        new ReduceAction296(130),
                        new ReduceAction297(130),
                        new ReduceAction298(130),
-                       new ReduceAction164(130),
-                       new ReduceAction301(130),
-                       new ReduceAction302(130),
+                       new ReduceAction299(130),
+                       new ReduceAction300(130),
+                       new ReduceAction170(130),
                        new ReduceAction303(130),
-                       new ReduceAction313(131),
-                       new ReduceAction314(131),
-                       new ReduceAction315(132),
+                       new ReduceAction304(130),
+                       new ReduceAction305(130),
+                       new ReduceAction306(130),
+                       new ReduceAction316(131),
+                       new ReduceAction317(131),
+                       new ReduceAction318(132),
                        new ReduceAction22(132),
-                       new ReduceAction317(133),
-                       new ReduceAction329(134),
-                       new ReduceAction330(134),
-                       new ReduceAction332(135),
-                       new ReduceAction333(135),
-                       new ReduceAction333(135),
-                       new ReduceAction151(136),
-                       new ReduceAction152(136),
-                       new ReduceAction164(137),
-                       new ReduceAction164(138),
-                       new ReduceAction245(138),
-                       new ReduceAction164(139),
-                       new ReduceAction247(139),
-                       new ReduceAction248(139),
+                       new ReduceAction320(133),
+                       new ReduceAction337(134),
+                       new ReduceAction338(134),
+                       new ReduceAction340(135),
+                       new ReduceAction341(135),
+                       new ReduceAction341(135),
+                       new ReduceAction157(136),
+                       new ReduceAction158(136),
+                       new ReduceAction170(137),
+                       new ReduceAction170(138),
+                       new ReduceAction247(138),
+                       new ReduceAction170(139),
                        new ReduceAction249(139),
                        new ReduceAction250(139),
-                       new ReduceAction164(140),
-                       new ReduceAction252(140),
-                       new ReduceAction164(141),
-                       new ReduceAction254(141),
-                       new ReduceAction255(141),
+                       new ReduceAction251(139),
+                       new ReduceAction252(139),
+                       new ReduceAction170(140),
+                       new ReduceAction254(140),
+                       new ReduceAction170(141),
                        new ReduceAction256(141),
                        new ReduceAction257(141),
                        new ReduceAction258(141),
@@ -595,26 +600,26 @@ redef class Parser
                        new ReduceAction261(141),
                        new ReduceAction262(141),
                        new ReduceAction263(141),
-                       new ReduceAction164(142),
-                       new ReduceAction265(142),
-                       new ReduceAction266(142),
-                       new ReduceAction164(143),
-                       new ReduceAction268(143),
-                       new ReduceAction269(143),
+                       new ReduceAction264(141),
+                       new ReduceAction265(141),
+                       new ReduceAction170(142),
+                       new ReduceAction267(142),
+                       new ReduceAction268(142),
+                       new ReduceAction170(143),
                        new ReduceAction270(143),
-                       new ReduceAction164(144),
-                       new ReduceAction272(144),
-                       new ReduceAction273(144),
-                       new ReduceAction164(145),
-                       new ReduceAction275(145),
-                       new ReduceAction597(145),
-                       new ReduceAction598(146),
-                       new ReduceAction599(146),
-                       new ReduceAction193(146),
-                       new ReduceAction601(146),
-                       new ReduceAction286(146),
-                       new ReduceAction290(146),
-                       new ReduceAction291(146),
+                       new ReduceAction271(143),
+                       new ReduceAction272(143),
+                       new ReduceAction170(144),
+                       new ReduceAction274(144),
+                       new ReduceAction275(144),
+                       new ReduceAction170(145),
+                       new ReduceAction277(145),
+                       new ReduceAction604(145),
+                       new ReduceAction605(146),
+                       new ReduceAction606(146),
+                       new ReduceAction195(146),
+                       new ReduceAction608(146),
+                       new ReduceAction288(146),
                        new ReduceAction292(146),
                        new ReduceAction293(146),
                        new ReduceAction294(146),
@@ -622,247 +627,219 @@ redef class Parser
                        new ReduceAction296(146),
                        new ReduceAction297(146),
                        new ReduceAction298(146),
-                       new ReduceAction164(146),
-                       new ReduceAction301(146),
-                       new ReduceAction302(146),
+                       new ReduceAction299(146),
+                       new ReduceAction300(146),
+                       new ReduceAction170(146),
                        new ReduceAction303(146),
-                       new ReduceAction616(147),
-                       new ReduceAction617(147),
-                       new ReduceAction161(148),
-                       new ReduceAction162(148),
-                       new ReduceAction163(148),
-                       new ReduceAction164(148),
-                       new ReduceAction164(149),
-                       new ReduceAction164(149),
-                       new ReduceAction174(149),
-                       new ReduceAction175(149),
-                       new ReduceAction176(149),
-                       new ReduceAction177(149),
-                       new ReduceAction178(149),
-                       new ReduceAction179(149),
+                       new ReduceAction304(146),
+                       new ReduceAction305(146),
+                       new ReduceAction306(146),
+                       new ReduceAction624(147),
+                       new ReduceAction625(147),
+                       new ReduceAction167(148),
+                       new ReduceAction168(148),
+                       new ReduceAction169(148),
+                       new ReduceAction170(148),
+                       new ReduceAction170(149),
+                       new ReduceAction170(149),
                        new ReduceAction180(149),
                        new ReduceAction181(149),
                        new ReduceAction182(149),
                        new ReduceAction183(149),
                        new ReduceAction184(149),
-                       new ReduceAction164(149),
-                       new ReduceAction164(149),
-                       new ReduceAction164(149),
-                       new ReduceAction164(149),
-                       new ReduceAction164(149),
-                       new ReduceAction164(149),
-                       new ReduceAction191(149),
-                       new ReduceAction192(149),
+                       new ReduceAction185(149),
+                       new ReduceAction186(149),
+                       new ReduceAction170(149),
+                       new ReduceAction170(149),
+                       new ReduceAction170(149),
+                       new ReduceAction170(149),
+                       new ReduceAction170(149),
+                       new ReduceAction170(149),
                        new ReduceAction193(149),
                        new ReduceAction194(149),
                        new ReduceAction195(149),
                        new ReduceAction196(149),
                        new ReduceAction197(149),
-                       new ReduceAction196(149),
-                       new ReduceAction199(149),
-                       new ReduceAction200(149),
+                       new ReduceAction198(149),
                        new ReduceAction199(149),
+                       new ReduceAction198(149),
+                       new ReduceAction201(149),
                        new ReduceAction202(149),
-                       new ReduceAction204(150),
-                       new ReduceAction205(151),
-                       new ReduceAction206(151),
-                       new ReduceAction207(151),
-                       new ReduceAction208(151),
-                       new ReduceAction209(152),
-                       new ReduceAction210(152),
-                       new ReduceAction211(152),
-                       new ReduceAction212(152),
-                       new ReduceAction213(152),
-                       new ReduceAction214(152),
-                       new ReduceAction215(152),
-                       new ReduceAction216(152),
-                       new ReduceAction217(152),
-                       new ReduceAction218(152),
-                       new ReduceAction221(153),
-                       new ReduceAction222(153),
-                       new ReduceAction223(154),
-                       new ReduceAction230(155),
-                       new ReduceAction231(155),
-                       new ReduceAction232(156),
-                       new ReduceAction233(156),
-                       new ReduceAction234(157),
-                       new ReduceAction235(157),
-                       new ReduceAction236(157),
-                       new ReduceAction237(157),
-                       new ReduceAction238(158),
-                       new ReduceAction239(158),
-                       new ReduceAction164(159),
-                       new ReduceAction164(160),
-                       new ReduceAction164(161),
-                       new ReduceAction164(161),
-                       new ReduceAction174(161),
-                       new ReduceAction175(161),
-                       new ReduceAction176(161),
-                       new ReduceAction177(161),
-                       new ReduceAction178(161),
-                       new ReduceAction179(161),
-                       new ReduceAction180(161),
-                       new ReduceAction181(161),
-                       new ReduceAction182(161),
-                       new ReduceAction183(161),
-                       new ReduceAction184(161),
-                       new ReduceAction164(161),
-                       new ReduceAction164(161),
-                       new ReduceAction164(161),
-                       new ReduceAction164(161),
-                       new ReduceAction164(161),
-                       new ReduceAction164(161),
-                       new ReduceAction191(161),
-                       new ReduceAction192(161),
-                       new ReduceAction193(161),
-                       new ReduceAction194(161),
-                       new ReduceAction195(161),
-                       new ReduceAction196(161),
-                       new ReduceAction197(161),
-                       new ReduceAction196(161),
-                       new ReduceAction199(161),
-                       new ReduceAction200(161),
-                       new ReduceAction199(161),
-                       new ReduceAction202(161),
-                       new ReduceAction209(162),
-                       new ReduceAction210(162),
-                       new ReduceAction211(162),
-                       new ReduceAction212(162),
-                       new ReduceAction213(162),
-                       new ReduceAction214(162),
-                       new ReduceAction215(162),
-                       new ReduceAction216(162),
-                       new ReduceAction217(162),
-                       new ReduceAction218(162),
-                       new ReduceAction164(163),
-                       new ReduceAction164(164),
-                       new ReduceAction161(165),
-                       new ReduceAction162(165),
-                       new ReduceAction163(165),
-                       new ReduceAction161(166),
-                       new ReduceAction162(166),
-                       new ReduceAction163(166),
-                       new ReduceAction164(167),
-                       new ReduceAction164(167),
-                       new ReduceAction174(167),
-                       new ReduceAction175(167),
-                       new ReduceAction176(167),
-                       new ReduceAction177(167),
-                       new ReduceAction178(167),
-                       new ReduceAction179(167),
+                       new ReduceAction201(149),
+                       new ReduceAction204(149),
+                       new ReduceAction207(150),
+                       new ReduceAction208(150),
+                       new ReduceAction209(150),
+                       new ReduceAction210(150),
+                       new ReduceAction211(151),
+                       new ReduceAction212(151),
+                       new ReduceAction213(151),
+                       new ReduceAction214(151),
+                       new ReduceAction215(151),
+                       new ReduceAction216(151),
+                       new ReduceAction217(151),
+                       new ReduceAction218(151),
+                       new ReduceAction219(151),
+                       new ReduceAction220(151),
+                       new ReduceAction223(152),
+                       new ReduceAction224(152),
+                       new ReduceAction225(153),
+                       new ReduceAction232(154),
+                       new ReduceAction233(154),
+                       new ReduceAction234(155),
+                       new ReduceAction235(155),
+                       new ReduceAction236(156),
+                       new ReduceAction237(156),
+                       new ReduceAction238(156),
+                       new ReduceAction239(156),
+                       new ReduceAction240(157),
+                       new ReduceAction241(157),
+                       new ReduceAction170(158),
+                       new ReduceAction170(159),
+                       new ReduceAction170(160),
+                       new ReduceAction170(160),
+                       new ReduceAction180(160),
+                       new ReduceAction181(160),
+                       new ReduceAction182(160),
+                       new ReduceAction183(160),
+                       new ReduceAction184(160),
+                       new ReduceAction185(160),
+                       new ReduceAction186(160),
+                       new ReduceAction170(160),
+                       new ReduceAction170(160),
+                       new ReduceAction170(160),
+                       new ReduceAction170(160),
+                       new ReduceAction170(160),
+                       new ReduceAction170(160),
+                       new ReduceAction193(160),
+                       new ReduceAction194(160),
+                       new ReduceAction195(160),
+                       new ReduceAction196(160),
+                       new ReduceAction197(160),
+                       new ReduceAction198(160),
+                       new ReduceAction199(160),
+                       new ReduceAction198(160),
+                       new ReduceAction201(160),
+                       new ReduceAction202(160),
+                       new ReduceAction201(160),
+                       new ReduceAction204(160),
+                       new ReduceAction211(161),
+                       new ReduceAction212(161),
+                       new ReduceAction213(161),
+                       new ReduceAction214(161),
+                       new ReduceAction215(161),
+                       new ReduceAction216(161),
+                       new ReduceAction217(161),
+                       new ReduceAction218(161),
+                       new ReduceAction219(161),
+                       new ReduceAction220(161),
+                       new ReduceAction170(162),
+                       new ReduceAction170(163),
+                       new ReduceAction167(164),
+                       new ReduceAction168(164),
+                       new ReduceAction169(164),
+                       new ReduceAction167(165),
+                       new ReduceAction168(165),
+                       new ReduceAction169(165),
+                       new ReduceAction170(166),
+                       new ReduceAction170(166),
+                       new ReduceAction180(166),
+                       new ReduceAction181(166),
+                       new ReduceAction182(166),
+                       new ReduceAction183(166),
+                       new ReduceAction184(166),
+                       new ReduceAction185(166),
+                       new ReduceAction186(166),
+                       new ReduceAction170(166),
+                       new ReduceAction170(166),
+                       new ReduceAction170(166),
+                       new ReduceAction170(166),
+                       new ReduceAction170(166),
+                       new ReduceAction204(166),
+                       new ReduceAction170(167),
+                       new ReduceAction170(167),
                        new ReduceAction180(167),
                        new ReduceAction181(167),
                        new ReduceAction182(167),
                        new ReduceAction183(167),
                        new ReduceAction184(167),
-                       new ReduceAction164(167),
-                       new ReduceAction164(167),
-                       new ReduceAction164(167),
-                       new ReduceAction164(167),
-                       new ReduceAction164(167),
-                       new ReduceAction202(167),
-                       new ReduceAction164(168),
-                       new ReduceAction164(168),
-                       new ReduceAction174(168),
-                       new ReduceAction175(168),
-                       new ReduceAction176(168),
-                       new ReduceAction177(168),
-                       new ReduceAction178(168),
-                       new ReduceAction179(168),
+                       new ReduceAction185(167),
+                       new ReduceAction186(167),
+                       new ReduceAction170(167),
+                       new ReduceAction170(167),
+                       new ReduceAction170(167),
+                       new ReduceAction170(167),
+                       new ReduceAction170(167),
+                       new ReduceAction204(167),
+                       new ReduceAction170(168),
+                       new ReduceAction170(168),
                        new ReduceAction180(168),
                        new ReduceAction181(168),
                        new ReduceAction182(168),
                        new ReduceAction183(168),
                        new ReduceAction184(168),
-                       new ReduceAction164(168),
-                       new ReduceAction164(168),
-                       new ReduceAction164(168),
-                       new ReduceAction164(168),
-                       new ReduceAction164(168),
-                       new ReduceAction202(168),
-                       new ReduceAction164(169),
-                       new ReduceAction164(169),
-                       new ReduceAction174(169),
-                       new ReduceAction175(169),
-                       new ReduceAction176(169),
-                       new ReduceAction177(169),
-                       new ReduceAction178(169),
-                       new ReduceAction179(169),
+                       new ReduceAction185(168),
+                       new ReduceAction186(168),
+                       new ReduceAction170(168),
+                       new ReduceAction170(168),
+                       new ReduceAction170(168),
+                       new ReduceAction170(168),
+                       new ReduceAction170(168),
+                       new ReduceAction204(168),
+                       new ReduceAction170(169),
+                       new ReduceAction170(169),
                        new ReduceAction180(169),
                        new ReduceAction181(169),
                        new ReduceAction182(169),
                        new ReduceAction183(169),
                        new ReduceAction184(169),
-                       new ReduceAction164(169),
-                       new ReduceAction164(169),
-                       new ReduceAction164(169),
-                       new ReduceAction164(169),
-                       new ReduceAction164(169),
-                       new ReduceAction202(169),
-                       new ReduceAction164(170),
-                       new ReduceAction164(170),
-                       new ReduceAction174(170),
-                       new ReduceAction175(170),
-                       new ReduceAction176(170),
-                       new ReduceAction177(170),
-                       new ReduceAction178(170),
-                       new ReduceAction179(170),
-                       new ReduceAction180(170),
-                       new ReduceAction181(170),
-                       new ReduceAction182(170),
-                       new ReduceAction183(170),
-                       new ReduceAction184(170),
-                       new ReduceAction164(170),
-                       new ReduceAction164(170),
-                       new ReduceAction164(170),
-                       new ReduceAction164(170),
-                       new ReduceAction164(170),
-                       new ReduceAction202(170),
-                       new ReduceAction323(171),
-                       new ReduceAction324(171),
-                       new ReduceAction325(171),
-                       new ReduceAction326(171),
-                       new ReduceAction327(171),
-                       new ReduceAction336(172),
-                       new ReduceAction339(172),
-                       new ReduceAction815(173),
-                       new ReduceAction816(173),
-                       new ReduceAction817(174),
-                       new ReduceAction818(174),
-                       new ReduceAction819(175),
-                       new ReduceAction820(175),
-                       new ReduceAction821(176),
-                       new ReduceAction822(176),
-                       new ReduceAction823(177),
-                       new ReduceAction824(177),
-                       new ReduceAction825(178),
-                       new ReduceAction826(178),
-                       new ReduceAction827(179),
-                       new ReduceAction828(179),
-                       new ReduceAction829(180),
-                       new ReduceAction830(180),
-                       new ReduceAction155(181),
-                       new ReduceAction832(181),
-                       new ReduceAction833(182),
-                       new ReduceAction834(182),
-                       new ReduceAction835(183),
-                       new ReduceAction836(183),
-                       new ReduceAction320(184),
-                       new ReduceAction838(184),
-                       new ReduceAction320(185),
-                       new ReduceAction838(185),
-                       new ReduceAction329(186),
-                       new ReduceAction842(186),
-                       new ReduceAction833(187),
-                       new ReduceAction834(187),
-                       new ReduceAction351(188),
-                       new ReduceAction846(188),
-                       new ReduceAction847(189),
-                       new ReduceAction848(189),
-                       new ReduceAction849(190),
-                       new ReduceAction850(190),
-                       new ReduceAction320(191),
-                       new ReduceAction838(191)
+                       new ReduceAction185(169),
+                       new ReduceAction186(169),
+                       new ReduceAction170(169),
+                       new ReduceAction170(169),
+                       new ReduceAction170(169),
+                       new ReduceAction170(169),
+                       new ReduceAction170(169),
+                       new ReduceAction204(169),
+                       new ReduceAction344(170),
+                       new ReduceAction792(171),
+                       new ReduceAction793(171),
+                       new ReduceAction794(172),
+                       new ReduceAction795(172),
+                       new ReduceAction796(173),
+                       new ReduceAction797(173),
+                       new ReduceAction798(174),
+                       new ReduceAction799(174),
+                       new ReduceAction800(175),
+                       new ReduceAction801(175),
+                       new ReduceAction802(176),
+                       new ReduceAction803(176),
+                       new ReduceAction804(177),
+                       new ReduceAction805(177),
+                       new ReduceAction806(178),
+                       new ReduceAction807(178),
+                       new ReduceAction161(179),
+                       new ReduceAction809(179),
+                       new ReduceAction810(180),
+                       new ReduceAction811(180),
+                       new ReduceAction812(181),
+                       new ReduceAction813(181),
+                       new ReduceAction323(182),
+                       new ReduceAction815(182),
+                       new ReduceAction323(183),
+                       new ReduceAction815(183),
+                       new ReduceAction323(184),
+                       new ReduceAction815(184),
+                       new ReduceAction337(185),
+                       new ReduceAction821(185),
+                       new ReduceAction810(186),
+                       new ReduceAction811(186),
+                       new ReduceAction358(187),
+                       new ReduceAction825(187),
+                       new ReduceAction826(188),
+                       new ReduceAction827(188),
+                       new ReduceAction828(189),
+                       new ReduceAction829(189)
                )
        end
 end
@@ -1376,6 +1353,8 @@ private class ReduceAction16
        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
@@ -1384,17 +1363,23 @@ private class ReduceAction16
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwmodulenode3 = nodearraylist2
-                                       assert tkwmodulenode3 isa nullable TKwmodule
-                                       var pmodulenamenode4 = nodearraylist4
-                                       assert pmodulenamenode4 isa nullable AModuleName
-                                       var pannotationsnode5 = nodearraylist5
-                                       assert pannotationsnode5 isa nullable AAnnotations
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4 = nodearraylist3
+                                       assert pvisibilitynode4 isa nullable AVisibility
+                                       var tkwmodulenode5 = nodearraylist4
+                                       assert tkwmodulenode5 isa nullable TKwmodule
+                                       var pmodulenamenode6 = nodearraylist6
+                                       assert pmodulenamenode6 isa nullable AModuleName
+                                       var pannotationsnode7 = nodearraylist7
+                                       assert pannotationsnode7 isa nullable AAnnotations
                                        var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
                                                pdocnode2,
-                                               tkwmodulenode3,
-                                               pmodulenamenode4,
-                                               pannotationsnode5
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmodulenode5,
+                                               pmodulenamenode6,
+                                               pannotationsnode7
                                        )
                                        node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2948,6 +2933,77 @@ private class ReduceAction62
        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 pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4 = nodearraylist3
+                                       assert pvisibilitynode4 isa nullable AVisibility
+                                       var tkwnewnode5 = nodearraylist4
+                                       assert tkwnewnode5 isa nullable TKwnew
+                                       var psignaturenode7 = nodearraylist5
+                                       assert psignaturenode7 isa nullable ASignature
+                                       var ppropdefnode1: nullable AInternNewPropdef = new AInternNewPropdef.init_ainternnewpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwnewnode5,
+                                               null,
+                                               psignaturenode7
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction63
+       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
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       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 tkwnewnode5 = nodearraylist4
+                                       assert tkwnewnode5 isa nullable TKwnew
+                                       var pmethidnode6 = nodearraylist5
+                                       assert pmethidnode6 isa nullable AMethid
+                                       var psignaturenode7 = nodearraylist6
+                                       assert psignaturenode7 isa nullable ASignature
+                                       var ppropdefnode1: nullable AInternNewPropdef = new AInternNewPropdef.init_ainternnewpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwnewnode5,
+                                               pmethidnode6,
+                                               psignaturenode7
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction64
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
                                        var nodearraylist11 = p.pop
                                        var nodearraylist10 = p.pop
                                        var nodearraylist9 = p.pop
@@ -2971,12 +3027,12 @@ private class ReduceAction62
                                        assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist6
                                        assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist10
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist11
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
+                                       var tstringnode9 = nodearraylist9
+                                       assert tstringnode9 isa nullable TString
+                                       var pexterncallsnode10 = nodearraylist10
+                                       assert pexterncallsnode10 isa nullable AExternCalls
+                                       var pexterncodeblocknode11 = nodearraylist11
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
                                        var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -2984,15 +3040,16 @@ private class ReduceAction62
                                                tkwmethnode5,
                                                pmethidnode6,
                                                psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               null,
+                                               tstringnode9,
+                                               pexterncallsnode10,
+                                               pexterncodeblocknode11
                                        )
                                        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
@@ -3017,10 +3074,10 @@ private class ReduceAction63
                                        assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist6
                                        assert psignaturenode7 isa nullable ASignature
-                                       var pexterncallsnode9 = nodearraylist7
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
+                                       var pexterncallsnode10 = nodearraylist7
+                                       assert pexterncallsnode10 isa nullable AExternCalls
+                                       var pexterncodeblocknode11 = nodearraylist8
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
                                        var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -3029,14 +3086,63 @@ private class ReduceAction63
                                                pmethidnode6,
                                                psignaturenode7,
                                                null,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               null,
+                                               pexterncallsnode10,
+                                               pexterncodeblocknode11
                                        )
                                        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
+                                       var node_list: nullable Object = null
+                                       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 pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode3 = nodearraylist2
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4 = nodearraylist3
+                                       assert pvisibilitynode4 isa nullable AVisibility
+                                       var tkwmethnode5 = nodearraylist4
+                                       assert tkwmethnode5 isa nullable TKwmeth
+                                       var pmethidnode6 = nodearraylist5
+                                       assert pmethidnode6 isa nullable AMethid
+                                       var psignaturenode7 = nodearraylist6
+                                       assert psignaturenode7 isa nullable ASignature
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pexterncallsnode10 = nodearraylist8
+                                       assert pexterncallsnode10 isa nullable AExternCalls
+                                       var pexterncodeblocknode11 = nodearraylist9
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AExternMethPropdef = new AExternMethPropdef.init_aexternmethpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwmethnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               pannotationsnode8,
+                                               null,
+                                               pexterncallsnode10,
+                                               pexterncodeblocknode11
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction67
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3076,7 +3182,7 @@ private class ReduceAction64
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction65
+private class ReduceAction68
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3119,7 +3225,7 @@ private class ReduceAction65
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction66
+private class ReduceAction69
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3162,7 +3268,7 @@ private class ReduceAction66
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction67
+private class ReduceAction70
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3208,7 +3314,7 @@ private class ReduceAction67
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction68
+private class ReduceAction71
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3253,7 +3359,7 @@ private class ReduceAction68
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction69
+private class ReduceAction72
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3301,7 +3407,7 @@ private class ReduceAction69
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction70
+private class ReduceAction73
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3349,7 +3455,7 @@ private class ReduceAction70
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction71
+private class ReduceAction74
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3400,7 +3506,7 @@ private class ReduceAction71
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction72
+private class ReduceAction75
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3443,7 +3549,7 @@ private class ReduceAction72
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction73
+private class ReduceAction76
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3489,7 +3595,7 @@ private class ReduceAction73
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction74
+private class ReduceAction77
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3537,7 +3643,7 @@ private class ReduceAction74
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction75
+private class ReduceAction78
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3588,7 +3694,7 @@ private class ReduceAction75
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction76
+private class ReduceAction79
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3627,7 +3733,7 @@ private class ReduceAction76
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction77
+private class ReduceAction80
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3669,7 +3775,7 @@ private class ReduceAction77
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction78
+private class ReduceAction81
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3711,7 +3817,7 @@ private class ReduceAction78
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction79
+private class ReduceAction82
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3756,7 +3862,7 @@ private class ReduceAction79
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction80
+private class ReduceAction83
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3795,7 +3901,7 @@ private class ReduceAction80
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction81
+private class ReduceAction84
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3820,12 +3926,12 @@ private class ReduceAction81
                                        assert tkwnewnode5 isa nullable TKwnew
                                        var psignaturenode7 = nodearraylist5
                                        assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist8
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist9
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist10
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
+                                       var tstringnode9 = nodearraylist8
+                                       assert tstringnode9 isa nullable TString
+                                       var pexterncallsnode10 = nodearraylist9
+                                       assert pexterncallsnode10 isa nullable AExternCalls
+                                       var pexterncodeblocknode11 = nodearraylist10
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
                                        var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -3833,15 +3939,16 @@ private class ReduceAction81
                                                tkwnewnode5,
                                                null,
                                                psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               null,
+                                               tstringnode9,
+                                               pexterncallsnode10,
+                                               pexterncodeblocknode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction82
+private class ReduceAction85
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -3869,12 +3976,12 @@ private class ReduceAction82
                                        assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist6
                                        assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist9
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist10
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist11
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
+                                       var tstringnode9 = nodearraylist9
+                                       assert tstringnode9 isa nullable TString
+                                       var pexterncallsnode10 = nodearraylist10
+                                       assert pexterncallsnode10 isa nullable AExternCalls
+                                       var pexterncodeblocknode11 = nodearraylist11
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
                                        var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -3882,20 +3989,20 @@ private class ReduceAction82
                                                tkwnewnode5,
                                                pmethidnode6,
                                                psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               null,
+                                               tstringnode9,
+                                               pexterncallsnode10,
+                                               pexterncodeblocknode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction83
+private class ReduceAction86
        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
@@ -3913,12 +4020,10 @@ private class ReduceAction83
                                        assert tkwnewnode5 isa nullable TKwnew
                                        var psignaturenode7 = nodearraylist5
                                        assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist6
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist7
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist8
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
+                                       var pexterncallsnode10 = nodearraylist6
+                                       assert pexterncallsnode10 isa nullable AExternCalls
+                                       var pexterncodeblocknode11 = nodearraylist7
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
                                        var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -3926,20 +4031,20 @@ private class ReduceAction83
                                                tkwnewnode5,
                                                null,
                                                psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               null,
+                                               null,
+                                               pexterncallsnode10,
+                                               pexterncodeblocknode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction84
+private class ReduceAction87
        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
@@ -3960,12 +4065,10 @@ private class ReduceAction84
                                        assert pmethidnode6 isa nullable AMethid
                                        var psignaturenode7 = nodearraylist6
                                        assert psignaturenode7 isa nullable ASignature
-                                       var tstringnode8 = nodearraylist7
-                                       assert tstringnode8 isa nullable TString
-                                       var pexterncallsnode9 = nodearraylist8
-                                       assert pexterncallsnode9 isa nullable AExternCalls
-                                       var pexterncodeblocknode10 = nodearraylist9
-                                       assert pexterncodeblocknode10 isa nullable AExternCodeBlock
+                                       var pexterncallsnode10 = nodearraylist7
+                                       assert pexterncallsnode10 isa nullable AExternCalls
+                                       var pexterncodeblocknode11 = nodearraylist8
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
                                        var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
                                                pdocnode2,
                                                tkwredefnode3,
@@ -3973,37 +4076,57 @@ private class ReduceAction84
                                                tkwnewnode5,
                                                pmethidnode6,
                                                psignaturenode7,
-                                               tstringnode8,
-                                               pexterncallsnode9,
-                                               pexterncodeblocknode10
+                                               null,
+                                               null,
+                                               pexterncallsnode10,
+                                               pexterncodeblocknode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction85
-       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
-                                       node_list = pannotationsnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction86
+private class ReduceAction88
        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
                                        var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pannotationsnode1 = nodearraylist3
-                                       node_list = pannotationsnode1
+                                       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 tkwnewnode5 = nodearraylist4
+                                       assert tkwnewnode5 isa nullable TKwnew
+                                       var psignaturenode7 = nodearraylist5
+                                       assert psignaturenode7 isa nullable ASignature
+                                       var pannotationsnode8 = nodearraylist6
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pexterncallsnode10 = nodearraylist7
+                                       assert pexterncallsnode10 isa nullable AExternCalls
+                                       var pexterncodeblocknode11 = nodearraylist8
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwnewnode5,
+                                               null,
+                                               psignaturenode7,
+                                               pannotationsnode8,
+                                               null,
+                                               pexterncallsnode10,
+                                               pexterncodeblocknode11
+                                       )
+                                       node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
@@ -4012,24 +4135,98 @@ private class ReduceAction89
        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
+                                       var nodearraylist5 = p.pop
+                                       var nodearraylist4 = p.pop
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pannotationsnode1 = nodearraylist3
-                                       node_list = pannotationsnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction90
-       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 tkwredefnode2 = nodearraylist1
-                                       assert tkwredefnode2 isa nullable TKwredef
+                                       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 tkwnewnode5 = nodearraylist4
+                                       assert tkwnewnode5 isa nullable TKwnew
+                                       var pmethidnode6 = nodearraylist5
+                                       assert pmethidnode6 isa nullable AMethid
+                                       var psignaturenode7 = nodearraylist6
+                                       assert psignaturenode7 isa nullable ASignature
+                                       var pannotationsnode8 = nodearraylist7
+                                       assert pannotationsnode8 isa nullable AAnnotations
+                                       var pexterncallsnode10 = nodearraylist8
+                                       assert pexterncallsnode10 isa nullable AExternCalls
+                                       var pexterncodeblocknode11 = nodearraylist9
+                                       assert pexterncodeblocknode11 isa nullable AExternCodeBlock
+                                       var ppropdefnode1: nullable AExternInitPropdef = new AExternInitPropdef.init_aexterninitpropdef(
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               tkwnewnode5,
+                                               pmethidnode6,
+                                               psignaturenode7,
+                                               pannotationsnode8,
+                                               null,
+                                               pexterncallsnode10,
+                                               pexterncodeblocknode11
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction90
+       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
+                                       node_list = pannotationsnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction91
+       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 pannotationsnode1 = nodearraylist3
+                                       node_list = pannotationsnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction94
+       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 pannotationsnode1 = nodearraylist3
+                                       node_list = pannotationsnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction95
+       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 tkwredefnode2 = nodearraylist1
+                                       assert tkwredefnode2 isa nullable TKwredef
                                        var tkwreadablenode3 = nodearraylist3
                                        assert tkwreadablenode3 isa nullable TKwreadable
                                        var pablenode1: nullable AReadAble = new AReadAble.init_areadable(
@@ -4040,7 +4237,7 @@ private class ReduceAction90
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction91
+private class ReduceAction96
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4063,17 +4260,35 @@ private class ReduceAction91
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction92
+private class ReduceAction97
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var pvisibilitynode1: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               null
+                                       )
+                                       node_list = pvisibilitynode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction98
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var pvisibilitynode1: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var tkwpublicnode2 = nodearraylist1
+                                       assert tkwpublicnode2 isa nullable TKwpublic
+                                       var pvisibilitynode1: nullable APublicVisibility = new APublicVisibility.init_apublicvisibility(
+                                               tkwpublicnode2
+                                       )
                                        node_list = pvisibilitynode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction93
+private class ReduceAction99
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4089,7 +4304,7 @@ private class ReduceAction93
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction94
+private class ReduceAction100
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4105,7 +4320,7 @@ private class ReduceAction94
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction95
+private class ReduceAction101
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4121,7 +4336,7 @@ private class ReduceAction95
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction96
+private class ReduceAction102
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4136,7 +4351,7 @@ private class ReduceAction96
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction97
+private class ReduceAction103
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4151,7 +4366,7 @@ private class ReduceAction97
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction98
+private class ReduceAction104
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4166,7 +4381,7 @@ private class ReduceAction98
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction99
+private class ReduceAction105
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4181,7 +4396,7 @@ private class ReduceAction99
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction100
+private class ReduceAction106
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4196,7 +4411,7 @@ private class ReduceAction100
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction101
+private class ReduceAction107
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4211,7 +4426,7 @@ private class ReduceAction101
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction102
+private class ReduceAction108
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4226,7 +4441,7 @@ private class ReduceAction102
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction103
+private class ReduceAction109
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4241,7 +4456,7 @@ private class ReduceAction103
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction104
+private class ReduceAction110
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4256,7 +4471,7 @@ private class ReduceAction104
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction105
+private class ReduceAction111
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4271,7 +4486,7 @@ private class ReduceAction105
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction106
+private class ReduceAction112
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4286,7 +4501,7 @@ private class ReduceAction106
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction107
+private class ReduceAction113
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4301,7 +4516,7 @@ private class ReduceAction107
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction108
+private class ReduceAction114
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4316,7 +4531,7 @@ private class ReduceAction108
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction109
+private class ReduceAction115
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4331,7 +4546,7 @@ private class ReduceAction109
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction110
+private class ReduceAction116
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4350,7 +4565,7 @@ private class ReduceAction110
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction111
+private class ReduceAction117
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4365,7 +4580,7 @@ private class ReduceAction111
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction112
+private class ReduceAction118
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4384,7 +4599,7 @@ private class ReduceAction112
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction113
+private class ReduceAction119
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4407,7 +4622,7 @@ private class ReduceAction113
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction114
+private class ReduceAction120
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4438,7 +4653,7 @@ private class ReduceAction114
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction115
+private class ReduceAction121
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4466,7 +4681,7 @@ private class ReduceAction115
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction116
+private class ReduceAction122
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4486,7 +4701,7 @@ private class ReduceAction116
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction117
+private class ReduceAction123
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4503,7 +4718,7 @@ private class ReduceAction117
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction118
+private class ReduceAction124
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4519,7 +4734,7 @@ private class ReduceAction118
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction119
+private class ReduceAction125
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4539,7 +4754,7 @@ private class ReduceAction119
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction121
+private class ReduceAction127
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4552,7 +4767,7 @@ private class ReduceAction121
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction122
+private class ReduceAction128
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4573,7 +4788,7 @@ private class ReduceAction122
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction123
+private class ReduceAction129
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4594,7 +4809,7 @@ private class ReduceAction123
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction124
+private class ReduceAction130
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4618,7 +4833,7 @@ private class ReduceAction124
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction125
+private class ReduceAction131
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4642,7 +4857,7 @@ private class ReduceAction125
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction126
+private class ReduceAction132
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4669,7 +4884,7 @@ private class ReduceAction126
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction127
+private class ReduceAction133
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4693,7 +4908,7 @@ private class ReduceAction127
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction128
+private class ReduceAction134
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4721,7 +4936,7 @@ private class ReduceAction128
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction130
+private class ReduceAction136
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4734,7 +4949,7 @@ private class ReduceAction130
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction131
+private class ReduceAction137
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4745,7 +4960,7 @@ private class ReduceAction131
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction133
+private class ReduceAction139
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4760,7 +4975,7 @@ private class ReduceAction133
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction134
+private class ReduceAction140
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4775,7 +4990,7 @@ private class ReduceAction134
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction135
+private class ReduceAction141
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4798,7 +5013,7 @@ private class ReduceAction135
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction136
+private class ReduceAction142
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4813,7 +5028,7 @@ private class ReduceAction136
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction137
+private class ReduceAction143
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4845,7 +5060,7 @@ private class ReduceAction137
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction138
+private class ReduceAction144
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4873,7 +5088,7 @@ private class ReduceAction138
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction139
+private class ReduceAction145
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4902,7 +5117,7 @@ private class ReduceAction139
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction140
+private class ReduceAction146
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4927,7 +5142,7 @@ private class ReduceAction140
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction141
+private class ReduceAction147
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4961,7 +5176,7 @@ private class ReduceAction141
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction142
+private class ReduceAction148
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -4991,7 +5206,7 @@ private class ReduceAction142
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction144
+private class ReduceAction150
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5002,16 +5217,18 @@ private class ReduceAction144
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction145
+private class ReduceAction151
        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 tkwinnode2 = nodearraylist1
                                        assert tkwinnode2 isa nullable TKwin
-                                       var tstringnode3 = nodearraylist2
+                                       var tstringnode3 = nodearraylist3
                                        assert tstringnode3 isa nullable TString
                                        var pinlanguagenode1: nullable AInLanguage = new AInLanguage.init_ainlanguage(
                                                tkwinnode2,
@@ -5021,7 +5238,7 @@ private class ReduceAction145
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction146
+private class ReduceAction152
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5037,7 +5254,7 @@ private class ReduceAction146
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction147
+private class ReduceAction153
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5056,7 +5273,7 @@ private class ReduceAction147
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction148
+private class ReduceAction154
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5067,7 +5284,7 @@ private class ReduceAction148
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction150
+private class ReduceAction156
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5079,7 +5296,7 @@ private class ReduceAction150
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction151
+private class ReduceAction157
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5101,7 +5318,7 @@ private class ReduceAction151
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction152
+private class ReduceAction158
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5126,7 +5343,7 @@ private class ReduceAction152
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction153
+private class ReduceAction159
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5156,7 +5373,7 @@ private class ReduceAction153
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction154
+private class ReduceAction160
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5189,7 +5406,7 @@ private class ReduceAction154
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction155
+private class ReduceAction161
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5204,7 +5421,7 @@ private class ReduceAction155
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction156
+private class ReduceAction162
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5223,7 +5440,7 @@ private class ReduceAction156
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction157
+private class ReduceAction163
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5236,7 +5453,7 @@ private class ReduceAction157
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction161
+private class ReduceAction167
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5248,7 +5465,7 @@ private class ReduceAction161
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction162
+private class ReduceAction168
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5266,7 +5483,7 @@ private class ReduceAction162
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction163
+private class ReduceAction169
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5283,7 +5500,7 @@ private class ReduceAction163
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction164
+private class ReduceAction170
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5294,7 +5511,7 @@ private class ReduceAction164
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction165
+private class ReduceAction171
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5314,7 +5531,7 @@ private class ReduceAction165
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction166
+private class ReduceAction172
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5338,7 +5555,7 @@ private class ReduceAction166
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction167
+private class ReduceAction173
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5359,7 +5576,7 @@ private class ReduceAction167
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction168
+private class ReduceAction174
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5384,7 +5601,7 @@ private class ReduceAction168
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction169
+private class ReduceAction175
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5408,7 +5625,7 @@ private class ReduceAction169
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction170
+private class ReduceAction176
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5436,7 +5653,7 @@ private class ReduceAction170
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction174
+private class ReduceAction180
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5452,7 +5669,7 @@ private class ReduceAction174
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction175
+private class ReduceAction181
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5471,7 +5688,7 @@ private class ReduceAction175
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction176
+private class ReduceAction182
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5481,14 +5698,13 @@ private class ReduceAction176
                                        assert tkwbreaknode2 isa nullable TKwbreak
                                        var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
                                                tkwbreaknode2,
-                                               null,
                                                null
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction177
+private class ReduceAction183
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5501,152 +5717,63 @@ private class ReduceAction177
                                        assert plabelnode3 isa nullable ALabel
                                        var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
                                                tkwbreaknode2,
-                                               plabelnode3,
-                                               null
+                                               plabelnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction178
+private class ReduceAction184
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa nullable TKwbreak
-                                       var pexprnode4 = nodearraylist2
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
-                                               tkwbreaknode2,
-                                               null,
-                                               pexprnode4
+                                       var tkwabortnode2 = nodearraylist1
+                                       assert tkwabortnode2 isa nullable TKwabort
+                                       var pexprnode1: nullable AAbortExpr = new AAbortExpr.init_aabortexpr(
+                                               tkwabortnode2
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction179
+private class ReduceAction185
        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 tkwbreaknode2 = nodearraylist1
-                                       assert tkwbreaknode2 isa nullable TKwbreak
-                                       var plabelnode3 = nodearraylist2
-                                       assert plabelnode3 isa nullable ALabel
-                                       var pexprnode4 = nodearraylist3
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable ABreakExpr = new ABreakExpr.init_abreakexpr(
-                                               tkwbreaknode2,
-                                               plabelnode3,
-                                               pexprnode4
+                                       var tkwcontinuenode2 = nodearraylist1
+                                       assert tkwcontinuenode2 isa nullable TKwcontinue
+                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
+                                               tkwcontinuenode2,
+                                               null
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction180
+private class ReduceAction186
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwabortnode2 = nodearraylist1
-                                       assert tkwabortnode2 isa nullable TKwabort
-                                       var pexprnode1: nullable AAbortExpr = new AAbortExpr.init_aabortexpr(
-                                               tkwabortnode2
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction181
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwcontinuenode2 = nodearraylist1
-                                       assert tkwcontinuenode2 isa nullable TKwcontinue
-                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
-                                               tkwcontinuenode2,
-                                               null,
-                                               null
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction182
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var tkwcontinuenode2 = nodearraylist1
-                                       assert tkwcontinuenode2 isa nullable TKwcontinue
-                                       var plabelnode3 = nodearraylist2
-                                       assert plabelnode3 isa nullable ALabel
-                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
-                                               tkwcontinuenode2,
-                                               plabelnode3,
-                                               null
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction183
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
-                                       var nodearraylist1 = p.pop
-                                       var tkwcontinuenode2 = nodearraylist1
-                                       assert tkwcontinuenode2 isa nullable TKwcontinue
-                                       var pexprnode4 = nodearraylist2
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
-                                               tkwcontinuenode2,
-                                               null,
-                                               pexprnode4
-                                       )
-                                       node_list = pexprnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction184
-       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 tkwcontinuenode2 = nodearraylist1
                                        assert tkwcontinuenode2 isa nullable TKwcontinue
                                        var plabelnode3 = nodearraylist2
                                        assert plabelnode3 isa nullable ALabel
-                                       var pexprnode4 = nodearraylist3
-                                       assert pexprnode4 isa nullable AExpr
                                        var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
                                                tkwcontinuenode2,
-                                               plabelnode3,
-                                               pexprnode4
+                                               plabelnode3
                                        )
                                        node_list = pexprnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction191
+private class ReduceAction193
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5671,7 +5798,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
@@ -5692,7 +5819,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
@@ -5715,7 +5842,7 @@ private class ReduceAction193
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction194
+private class ReduceAction196
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5740,7 +5867,7 @@ private class ReduceAction194
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction195
+private class ReduceAction197
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5761,7 +5888,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
@@ -5787,7 +5914,7 @@ private class ReduceAction196
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction197
+private class ReduceAction199
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5814,7 +5941,7 @@ private class ReduceAction197
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction199
+private class ReduceAction201
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5836,7 +5963,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
@@ -5859,7 +5986,7 @@ private class ReduceAction200
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction202
+private class ReduceAction204
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5887,43 +6014,42 @@ 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
                                        var node_list: nullable Object = null
-                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
                                        var tkwlabelnode2 = nodearraylist1
                                        assert tkwlabelnode2 isa nullable TKwlabel
-                                       var tidnode3 = nodearraylist2
-                                       assert tidnode3 isa nullable TId
                                        var plabelnode1: nullable ALabel = new ALabel.init_alabel(
                                                tkwlabelnode2,
-                                               tidnode3
+                                               null
                                        )
                                        node_list = plabelnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction204
+private class ReduceAction206
        super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var pexprnode4 = nodearraylist1
-                                       assert pexprnode4 isa nullable AExpr
-                                       var pexprnode1: nullable AContinueExpr = new AContinueExpr.init_acontinueexpr(
-                                               null,
-                                               null,
-                                               pexprnode4
+                                       var tkwlabelnode2 = nodearraylist1
+                                       assert tkwlabelnode2 isa nullable TKwlabel
+                                       var tidnode3 = nodearraylist2
+                                       assert tidnode3 isa nullable TId
+                                       var plabelnode1: nullable ALabel = new ALabel.init_alabel(
+                                               tkwlabelnode2,
+                                               tidnode3
                                        )
-                                       node_list = pexprnode1
+                                       node_list = plabelnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction205
+private class ReduceAction207
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -5949,7 +6075,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
@@ -5978,7 +6104,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
@@ -6011,7 +6137,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
@@ -6047,7 +6173,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
@@ -6077,7 +6203,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
@@ -6103,7 +6229,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
@@ -6136,7 +6262,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
@@ -6165,7 +6291,7 @@ private class ReduceAction212
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction213
+private class ReduceAction215
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6192,7 +6318,7 @@ private class ReduceAction213
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction214
+private class ReduceAction216
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6222,7 +6348,7 @@ private class ReduceAction214
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction215
+private class ReduceAction217
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6248,7 +6374,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
@@ -6281,7 +6407,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
@@ -6310,7 +6436,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
@@ -6337,7 +6463,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
@@ -6352,7 +6478,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
@@ -6367,7 +6493,7 @@ private class ReduceAction220
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction221
+private class ReduceAction223
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6390,7 +6516,7 @@ private class ReduceAction221
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction222
+private class ReduceAction224
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6410,7 +6536,7 @@ private class ReduceAction222
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction223
+private class ReduceAction225
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6441,7 +6567,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
@@ -6468,7 +6594,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
@@ -6499,7 +6625,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
@@ -6526,7 +6652,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
@@ -6554,7 +6680,7 @@ private class ReduceAction227
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction230
+private class ReduceAction232
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6577,7 +6703,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
@@ -6597,7 +6723,7 @@ private class ReduceAction231
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction232
+private class ReduceAction234
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6630,7 +6756,7 @@ private class ReduceAction232
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction233
+private class ReduceAction235
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6660,7 +6786,7 @@ private class ReduceAction233
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction234
+private class ReduceAction236
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6706,7 +6832,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
@@ -6748,7 +6874,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
@@ -6791,7 +6917,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
@@ -6830,7 +6956,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
@@ -6855,7 +6981,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
@@ -6883,7 +7009,7 @@ private class ReduceAction239
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction240
+private class ReduceAction242
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6904,7 +7030,7 @@ private class ReduceAction240
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction241
+private class ReduceAction243
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6928,7 +7054,7 @@ private class ReduceAction241
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction242
+private class ReduceAction244
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6940,7 +7066,7 @@ private class ReduceAction242
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction245
+private class ReduceAction247
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -6980,7 +7106,7 @@ private class ReduceAction245
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction247
+private class ReduceAction249
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7001,7 +7127,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
@@ -7022,7 +7148,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
@@ -7044,7 +7170,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
@@ -7065,7 +7191,7 @@ private class ReduceAction250
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction252
+private class ReduceAction254
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7085,7 +7211,7 @@ private class ReduceAction252
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction254
+private class ReduceAction256
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7106,7 +7232,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
@@ -7127,7 +7253,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
@@ -7148,7 +7274,7 @@ private class ReduceAction256
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction257
+private class ReduceAction259
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7169,7 +7295,7 @@ private class ReduceAction257
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction258
+private class ReduceAction260
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7190,7 +7316,7 @@ private class ReduceAction258
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction259
+private class ReduceAction261
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7211,7 +7337,7 @@ private class ReduceAction259
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction260
+private class ReduceAction262
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7232,7 +7358,7 @@ private class ReduceAction260
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction261
+private class ReduceAction263
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7253,7 +7379,7 @@ private class ReduceAction261
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction262
+private class ReduceAction264
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7274,7 +7400,7 @@ private class ReduceAction262
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction263
+private class ReduceAction265
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7295,7 +7421,7 @@ private class ReduceAction263
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction265
+private class ReduceAction267
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7316,7 +7442,7 @@ private class ReduceAction265
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction266
+private class ReduceAction268
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7337,7 +7463,7 @@ private class ReduceAction266
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction268
+private class ReduceAction270
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7358,7 +7484,7 @@ private class ReduceAction268
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction269
+private class ReduceAction271
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7379,7 +7505,7 @@ private class ReduceAction269
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction270
+private class ReduceAction272
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7400,7 +7526,7 @@ private class ReduceAction270
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction272
+private class ReduceAction274
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7420,7 +7546,7 @@ private class ReduceAction272
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction273
+private class ReduceAction275
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7440,7 +7566,7 @@ private class ReduceAction273
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction275
+private class ReduceAction277
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7465,7 +7591,7 @@ private class ReduceAction275
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction276
+private class ReduceAction278
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7491,7 +7617,7 @@ private class ReduceAction276
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction277
+private class ReduceAction279
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7513,7 +7639,7 @@ private class ReduceAction277
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction278
+private class ReduceAction280
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7535,7 +7661,7 @@ private class ReduceAction278
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction279
+private class ReduceAction281
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7553,7 +7679,7 @@ private class ReduceAction279
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction285
+private class ReduceAction287
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7572,7 +7698,7 @@ private class ReduceAction285
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction286
+private class ReduceAction288
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7602,7 +7728,7 @@ private class ReduceAction286
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction287
+private class ReduceAction289
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7638,7 +7764,7 @@ private class ReduceAction287
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction288
+private class ReduceAction290
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7674,7 +7800,7 @@ private class ReduceAction288
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction289
+private class ReduceAction291
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7693,7 +7819,7 @@ private class ReduceAction289
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction290
+private class ReduceAction292
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7712,7 +7838,7 @@ private class ReduceAction290
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction291
+private class ReduceAction293
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7731,7 +7857,7 @@ private class ReduceAction291
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction292
+private class ReduceAction294
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7750,7 +7876,7 @@ private class ReduceAction292
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction293
+private class ReduceAction295
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7769,7 +7895,7 @@ private class ReduceAction293
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction294
+private class ReduceAction296
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7788,7 +7914,7 @@ private class ReduceAction294
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction295
+private class ReduceAction297
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7807,7 +7933,7 @@ private class ReduceAction295
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction296
+private class ReduceAction298
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7826,7 +7952,7 @@ private class ReduceAction296
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction297
+private class ReduceAction299
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7845,7 +7971,7 @@ private class ReduceAction297
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction298
+private class ReduceAction300
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7864,7 +7990,7 @@ private class ReduceAction298
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction300
+private class ReduceAction302
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7893,7 +8019,7 @@ private class ReduceAction300
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction301
+private class ReduceAction303
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7929,7 +8055,7 @@ private class ReduceAction301
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction302
+private class ReduceAction304
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -7970,7 +8096,7 @@ private class ReduceAction302
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction303
+private class ReduceAction305
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8003,17 +8129,36 @@ private class ReduceAction303
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction304
+private class ReduceAction306
        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 listnode4 = new Array[Object]
-                                       var listnode2 = nodearraylist1
-                                       assert listnode2 isa Array[Object]
+                                       var pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var tdotdotdotnode3 = nodearraylist2
+                                       assert tdotdotdotnode3 isa nullable TDotdotdot
+                                       var pexprnode1: nullable AVarargExpr = new AVarargExpr.init_avarargexpr(
+                                               pexprnode2,
+                                               tdotdotdotnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction307
+       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 listnode4 = new Array[Object]
+                                       var listnode2 = nodearraylist1
+                                       assert listnode2 isa Array[Object]
                                        var pexprnode3 = nodearraylist2
                                        assert pexprnode3 isa nullable AExpr
                                        listnode4 = concat(listnode4, listnode2)
@@ -8030,7 +8175,7 @@ private class ReduceAction304
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction305
+private class ReduceAction308
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8061,7 +8206,7 @@ private class ReduceAction305
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction306
+private class ReduceAction309
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8083,7 +8228,7 @@ private class ReduceAction306
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction307
+private class ReduceAction310
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8099,7 +8244,7 @@ private class ReduceAction307
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction308
+private class ReduceAction311
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8114,7 +8259,7 @@ private class ReduceAction308
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction311
+private class ReduceAction314
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8129,7 +8274,7 @@ private class ReduceAction311
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction312
+private class ReduceAction315
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8144,7 +8289,7 @@ private class ReduceAction312
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction313
+private class ReduceAction316
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8169,7 +8314,7 @@ private class ReduceAction313
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction314
+private class ReduceAction317
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8200,7 +8345,7 @@ private class ReduceAction314
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction315
+private class ReduceAction318
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8211,34 +8356,45 @@ private class ReduceAction315
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction317
+private class ReduceAction320
        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 listnode4 = new Array[Object]
-                                       var patidnode2 = nodearraylist1
-                                       assert patidnode2 isa nullable AAtid
-                                       var pannotationsnode6 = nodearraylist2
-                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var listnode7 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4 = nodearraylist2
+                                       assert pvisibilitynode4 isa nullable AVisibility
+                                       var patidnode5 = nodearraylist3
+                                       assert patidnode5 isa nullable AAtid
+                                       var pannotationsnode9 = nodearraylist4
+                                       assert pannotationsnode9 isa nullable AAnnotations
                                        var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
                                                null,
-                                               listnode4,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode5,
                                                null,
-                                               pannotationsnode6
+                                               listnode7,
+                                               null,
+                                               pannotationsnode9
                                        )
                                        node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction318
+private class ReduceAction321
        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
                                        var nodearraylist5 = p.pop
@@ -8246,30 +8402,37 @@ private class ReduceAction318
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var patidnode2 = nodearraylist1
-                                       assert patidnode2 isa nullable AAtid
-                                       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 pannotationsnode7 = nodearraylist7
-                                       assert pannotationsnode7 isa nullable AAnnotations
+                                       var listnode8 = new Array[Object]
+                                       var tkwredefnode3 = nodearraylist1
+                                       assert tkwredefnode3 isa nullable TKwredef
+                                       var pvisibilitynode4 = nodearraylist2
+                                       assert pvisibilitynode4 isa nullable AVisibility
+                                       var patidnode5 = nodearraylist3
+                                       assert patidnode5 isa nullable AAtid
+                                       var toparnode6 = nodearraylist4
+                                       assert toparnode6 isa nullable TOpar
+                                       var listnode7 = nodearraylist6
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tcparnode9 = nodearraylist8
+                                       assert tcparnode9 isa nullable TCpar
+                                       var pannotationsnode10 = nodearraylist9
+                                       assert pannotationsnode10 isa nullable AAnnotations
                                        var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               toparnode3,
-                                               listnode5,
-                                               tcparnode6,
-                                               pannotationsnode7
+                                               null,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode5,
+                                               toparnode6,
+                                               listnode8,
+                                               tcparnode9,
+                                               pannotationsnode10
                                        )
                                        node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction319
+private class ReduceAction322
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8289,7 +8452,7 @@ private class ReduceAction319
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction320
+private class ReduceAction323
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8304,7 +8467,7 @@ private class ReduceAction320
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction321
+private class ReduceAction324
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8323,21 +8486,32 @@ private class ReduceAction321
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction323
+private class ReduceAction326
        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 listnode4 = new Array[Object]
-                                       var patidnode2 = nodearraylist2
-                                       assert patidnode2 isa nullable AAtid
+                                       var listnode7 = 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 patidnode5 = nodearraylist4
+                                       assert patidnode5 isa nullable AAtid
                                        var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode5,
                                                null,
-                                               listnode4,
+                                               listnode7,
                                                null,
                                                null
                                        )
@@ -8345,36 +8519,49 @@ private class ReduceAction323
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction324
+private class ReduceAction327
        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 listnode4 = new Array[Object]
-                                       var patidnode2 = nodearraylist2
-                                       assert patidnode2 isa nullable AAtid
-                                       var pannotationsnode6 = nodearraylist3
-                                       assert pannotationsnode6 isa nullable AAnnotations
+                                       var listnode7 = 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 patidnode5 = nodearraylist4
+                                       assert patidnode5 isa nullable AAtid
+                                       var pannotationsnode9 = nodearraylist5
+                                       assert pannotationsnode9 isa nullable AAnnotations
                                        var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode5,
                                                null,
-                                               listnode4,
+                                               listnode7,
                                                null,
-                                               pannotationsnode6
+                                               pannotationsnode9
                                        )
                                        node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction325
+private class ReduceAction328
        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
                                        var nodearraylist5 = p.pop
@@ -8382,32 +8569,43 @@ private class ReduceAction325
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var patidnode2 = nodearraylist2
-                                       assert patidnode2 isa nullable AAtid
-                                       var toparnode3 = nodearraylist3
-                                       assert toparnode3 isa nullable TOpar
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tcparnode6 = nodearraylist6
-                                       assert tcparnode6 isa nullable TCpar
+                                       var listnode8 = 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 patidnode5 = nodearraylist4
+                                       assert patidnode5 isa nullable AAtid
+                                       var toparnode6 = nodearraylist5
+                                       assert toparnode6 isa nullable TOpar
+                                       var listnode7 = nodearraylist7
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tcparnode9 = nodearraylist8
+                                       assert tcparnode9 isa nullable TCpar
                                        var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               toparnode3,
-                                               listnode5,
-                                               tcparnode6,
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode5,
+                                               toparnode6,
+                                               listnode8,
+                                               tcparnode9,
                                                null
                                        )
                                        node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction326
+private class ReduceAction329
        super ReduceAction
        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
                                        var nodearraylist6 = p.pop
@@ -8416,48 +8614,68 @@ private class ReduceAction326
                                        var nodearraylist3 = p.pop
                                        var nodearraylist2 = p.pop
                                        var nodearraylist1 = p.pop
-                                       var listnode5 = new Array[Object]
-                                       var patidnode2 = nodearraylist2
-                                       assert patidnode2 isa nullable AAtid
-                                       var toparnode3 = nodearraylist3
-                                       assert toparnode3 isa nullable TOpar
-                                       var listnode4 = nodearraylist5
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
-                                       var tcparnode6 = nodearraylist6
-                                       assert tcparnode6 isa nullable TCpar
-                                       var pannotationsnode7 = nodearraylist7
-                                       assert pannotationsnode7 isa nullable AAnnotations
+                                       var listnode8 = 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 patidnode5 = nodearraylist4
+                                       assert patidnode5 isa nullable AAtid
+                                       var toparnode6 = nodearraylist5
+                                       assert toparnode6 isa nullable TOpar
+                                       var listnode7 = nodearraylist7
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tcparnode9 = nodearraylist8
+                                       assert tcparnode9 isa nullable TCpar
+                                       var pannotationsnode10 = nodearraylist9
+                                       assert pannotationsnode10 isa nullable AAnnotations
                                        var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
-                                               toparnode3,
-                                               listnode5,
-                                               tcparnode6,
-                                               pannotationsnode7
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode5,
+                                               toparnode6,
+                                               listnode8,
+                                               tcparnode9,
+                                               pannotationsnode10
                                        )
                                        node_list = pannotationnode1
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction327
+private class ReduceAction330
        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 listnode5 = new Array[Object]
-                                       var patidnode2 = nodearraylist2
-                                       assert patidnode2 isa nullable AAtid
-                                       var listnode4 = nodearraylist3
-                                       assert listnode4 isa Array[Object]
-                                       listnode5 = concat(listnode5, listnode4)
+                                       var listnode8 = 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 patidnode5 = nodearraylist4
+                                       assert patidnode5 isa nullable AAtid
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
                                        var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
-                                               patidnode2,
+                                               pdocnode2,
+                                               tkwredefnode3,
+                                               pvisibilitynode4,
+                                               patidnode5,
                                                null,
-                                               listnode5,
+                                               listnode8,
                                                null,
                                                null
                                        )
@@ -8465,7 +8683,174 @@ private class ReduceAction327
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction328
+private class ReduceAction331
+       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 listnode7 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var patidnode5 = nodearraylist2
+                                       assert patidnode5 isa nullable AAtid
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               patidnode5,
+                                               null,
+                                               listnode7,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction332
+       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 listnode7 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var patidnode5 = nodearraylist2
+                                       assert patidnode5 isa nullable AAtid
+                                       var pannotationsnode9 = nodearraylist3
+                                       assert pannotationsnode9 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               patidnode5,
+                                               null,
+                                               listnode7,
+                                               null,
+                                               pannotationsnode9
+                                       )
+                                       node_list = pannotationnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction333
+       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 listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var patidnode5 = nodearraylist2
+                                       assert patidnode5 isa nullable AAtid
+                                       var toparnode6 = nodearraylist3
+                                       assert toparnode6 isa nullable TOpar
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tcparnode9 = nodearraylist6
+                                       assert tcparnode9 isa nullable TCpar
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               patidnode5,
+                                               toparnode6,
+                                               listnode8,
+                                               tcparnode9,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction334
+       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
+                                       var nodearraylist4 = p.pop
+                                       var nodearraylist3 = p.pop
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var patidnode5 = nodearraylist2
+                                       assert patidnode5 isa nullable AAtid
+                                       var toparnode6 = nodearraylist3
+                                       assert toparnode6 isa nullable TOpar
+                                       var listnode7 = nodearraylist5
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var tcparnode9 = nodearraylist6
+                                       assert tcparnode9 isa nullable TCpar
+                                       var pannotationsnode10 = nodearraylist7
+                                       assert pannotationsnode10 isa nullable AAnnotations
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               patidnode5,
+                                               toparnode6,
+                                               listnode8,
+                                               tcparnode9,
+                                               pannotationsnode10
+                                       )
+                                       node_list = pannotationnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction335
+       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 listnode8 = new Array[Object]
+                                       var pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var patidnode5 = nodearraylist2
+                                       assert patidnode5 isa nullable AAtid
+                                       var listnode7 = nodearraylist3
+                                       assert listnode7 isa Array[Object]
+                                       listnode8 = concat(listnode8, listnode7)
+                                       var pannotationnode1: nullable AAnnotation = new AAnnotation.init_aannotation(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               patidnode5,
+                                               null,
+                                               listnode8,
+                                               null,
+                                               null
+                                       )
+                                       node_list = pannotationnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+end
+private class ReduceAction336
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8478,7 +8863,7 @@ private class ReduceAction328
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction329
+private class ReduceAction337
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8493,7 +8878,7 @@ private class ReduceAction329
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction330
+private class ReduceAction338
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8512,7 +8897,7 @@ private class ReduceAction330
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction331
+private class ReduceAction339
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8525,7 +8910,7 @@ private class ReduceAction331
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction332
+private class ReduceAction340
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8540,7 +8925,7 @@ private class ReduceAction332
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction333
+private class ReduceAction341
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8555,7 +8940,7 @@ private class ReduceAction333
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction335
+private class ReduceAction343
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8570,7 +8955,7 @@ private class ReduceAction335
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction336
+private class ReduceAction344
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8585,7 +8970,7 @@ private class ReduceAction336
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction337
+private class ReduceAction345
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8600,7 +8985,7 @@ private class ReduceAction337
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction338
+private class ReduceAction346
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8615,22 +9000,7 @@ private class ReduceAction338
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction339
-       super ReduceAction
-       redef fun action(p: Parser)
-       do
-                                       var node_list: nullable Object = null
-                                       var nodearraylist1 = p.pop
-                                       var tkwimportnode2 = nodearraylist1
-                                       assert tkwimportnode2 isa nullable TKwimport
-                                       var patidnode1: nullable AKwimportAtid = new AKwimportAtid.init_akwimportatid(
-                                               tkwimportnode2
-                                       )
-                                       node_list = patidnode1
-                                       p.push(p.go_to(_goto), node_list)
-       end
-end
-private class ReduceAction340
+private class ReduceAction347
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8656,7 +9026,7 @@ private class ReduceAction340
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction341
+private class ReduceAction348
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8678,7 +9048,7 @@ private class ReduceAction341
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction342
+private class ReduceAction349
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8691,7 +9061,7 @@ private class ReduceAction342
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction344
+private class ReduceAction351
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8710,7 +9080,7 @@ private class ReduceAction344
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction347
+private class ReduceAction354
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8736,7 +9106,7 @@ private class ReduceAction347
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction349
+private class ReduceAction356
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8756,7 +9126,7 @@ private class ReduceAction349
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction350
+private class ReduceAction357
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8770,7 +9140,7 @@ private class ReduceAction350
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction351
+private class ReduceAction358
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8785,7 +9155,7 @@ private class ReduceAction351
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction352
+private class ReduceAction359
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8807,7 +9177,7 @@ private class ReduceAction352
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction353
+private class ReduceAction360
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8825,7 +9195,7 @@ private class ReduceAction353
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction354
+private class ReduceAction361
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8847,7 +9217,7 @@ private class ReduceAction354
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction355
+private class ReduceAction362
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8869,7 +9239,7 @@ private class ReduceAction355
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction356
+private class ReduceAction363
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8895,7 +9265,7 @@ private class ReduceAction356
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction357
+private class ReduceAction364
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8912,7 +9282,7 @@ private class ReduceAction357
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction358
+private class ReduceAction365
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8933,7 +9303,7 @@ private class ReduceAction358
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction359
+private class ReduceAction366
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8951,7 +9321,7 @@ private class ReduceAction359
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction361
+private class ReduceAction368
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8962,7 +9332,7 @@ private class ReduceAction361
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction362
+private class ReduceAction369
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8974,7 +9344,7 @@ private class ReduceAction362
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction363
+private class ReduceAction370
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8987,7 +9357,7 @@ private class ReduceAction363
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction365
+private class ReduceAction372
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -8998,7 +9368,7 @@ private class ReduceAction365
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction366
+private class ReduceAction373
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9010,7 +9380,7 @@ private class ReduceAction366
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction367
+private class ReduceAction374
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9023,7 +9393,7 @@ private class ReduceAction367
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction369
+private class ReduceAction376
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9036,7 +9406,7 @@ private class ReduceAction369
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction370
+private class ReduceAction377
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9049,7 +9419,7 @@ private class ReduceAction370
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction372
+private class ReduceAction379
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9060,7 +9430,7 @@ private class ReduceAction372
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction373
+private class ReduceAction380
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9069,7 +9439,7 @@ private class ReduceAction373
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction375
+private class ReduceAction382
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9086,7 +9456,7 @@ private class ReduceAction375
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction376
+private class ReduceAction383
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9104,7 +9474,7 @@ private class ReduceAction376
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction379
+private class ReduceAction386
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9115,7 +9485,7 @@ private class ReduceAction379
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction380
+private class ReduceAction387
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9125,7 +9495,7 @@ private class ReduceAction380
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction381
+private class ReduceAction388
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9136,7 +9506,7 @@ private class ReduceAction381
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction597
+private class ReduceAction604
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9160,7 +9530,7 @@ private class ReduceAction597
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction598
+private class ReduceAction605
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9180,7 +9550,7 @@ private class ReduceAction598
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction599
+private class ReduceAction606
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9203,7 +9573,7 @@ private class ReduceAction599
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction601
+private class ReduceAction608
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9226,7 +9596,7 @@ private class ReduceAction601
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction616
+private class ReduceAction624
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9239,7 +9609,7 @@ private class ReduceAction616
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction617
+private class ReduceAction625
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9249,7 +9619,7 @@ private class ReduceAction617
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction815
+private class ReduceAction792
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9264,7 +9634,7 @@ private class ReduceAction815
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction816
+private class ReduceAction793
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9283,7 +9653,7 @@ private class ReduceAction816
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction817
+private class ReduceAction794
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9298,7 +9668,7 @@ private class ReduceAction817
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction818
+private class ReduceAction795
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9317,7 +9687,7 @@ private class ReduceAction818
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction819
+private class ReduceAction796
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9332,7 +9702,7 @@ private class ReduceAction819
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction820
+private class ReduceAction797
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9351,7 +9721,7 @@ private class ReduceAction820
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction821
+private class ReduceAction798
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9366,7 +9736,7 @@ private class ReduceAction821
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction822
+private class ReduceAction799
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9385,7 +9755,7 @@ private class ReduceAction822
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction823
+private class ReduceAction800
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9400,7 +9770,7 @@ private class ReduceAction823
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction824
+private class ReduceAction801
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9419,7 +9789,7 @@ private class ReduceAction824
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction825
+private class ReduceAction802
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9434,7 +9804,7 @@ private class ReduceAction825
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction826
+private class ReduceAction803
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9453,7 +9823,7 @@ private class ReduceAction826
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction827
+private class ReduceAction804
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9468,7 +9838,7 @@ private class ReduceAction827
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction828
+private class ReduceAction805
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9487,7 +9857,7 @@ private class ReduceAction828
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction829
+private class ReduceAction806
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9502,7 +9872,7 @@ private class ReduceAction829
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction830
+private class ReduceAction807
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9521,7 +9891,7 @@ private class ReduceAction830
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction832
+private class ReduceAction809
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9540,7 +9910,7 @@ private class ReduceAction832
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction833
+private class ReduceAction810
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9555,7 +9925,7 @@ private class ReduceAction833
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction834
+private class ReduceAction811
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9574,7 +9944,7 @@ private class ReduceAction834
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction835
+private class ReduceAction812
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9588,7 +9958,7 @@ private class ReduceAction835
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction836
+private class ReduceAction813
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9606,7 +9976,7 @@ private class ReduceAction836
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction838
+private class ReduceAction815
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9625,7 +9995,7 @@ private class ReduceAction838
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction842
+private class ReduceAction821
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9644,7 +10014,7 @@ private class ReduceAction842
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction846
+private class ReduceAction825
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9663,7 +10033,7 @@ private class ReduceAction846
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction847
+private class ReduceAction826
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9678,7 +10048,7 @@ private class ReduceAction847
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction848
+private class ReduceAction827
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9697,7 +10067,7 @@ private class ReduceAction848
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction849
+private class ReduceAction828
        super ReduceAction
        redef fun action(p: Parser)
        do
@@ -9712,7 +10082,7 @@ private class ReduceAction849
                                        p.push(p.go_to(_goto), node_list)
        end
 end
-private class ReduceAction850
+private class ReduceAction829
        super ReduceAction
        redef fun action(p: Parser)
        do