metamodel: rename 'universal' to 'enum'
[nit.git] / src / parser / parser.nit
index 9d2ae82..3a6986f 100644 (file)
@@ -20,7 +20,7 @@ private class State
 end
 
 class Parser
-special TablesCapable
+       super TablesCapable
        # Associated lexer
        var _lexer: Lexer
 
@@ -275,548 +275,576 @@ special TablesCapable
                        new ReduceAction120(12),
                        new ReduceAction121(12),
                        new ReduceAction122(12),
-                       new ReduceAction123(13),
-                       new ReduceAction124(13),
-                       new ReduceAction125(14),
-                       new ReduceAction126(14),
-                       new ReduceAction127(15),
-                       new ReduceAction128(15),
-                       new ReduceAction129(15),
-                       new ReduceAction130(15),
-                       new ReduceAction131(16),
-                       new ReduceAction132(16),
-                       new ReduceAction133(16),
-                       new ReduceAction134(16),
-                       new ReduceAction135(16),
-                       new ReduceAction136(16),
-                       new ReduceAction137(16),
-                       new ReduceAction138(16),
-                       new ReduceAction139(16),
-                       new ReduceAction140(16),
-                       new ReduceAction141(16),
-                       new ReduceAction142(16),
-                       new ReduceAction143(16),
-                       new ReduceAction144(16),
+                       new ReduceAction123(12),
+                       new ReduceAction124(12),
+                       new ReduceAction125(12),
+                       new ReduceAction126(12),
+                       new ReduceAction127(12),
+                       new ReduceAction128(12),
+                       new ReduceAction129(12),
+                       new ReduceAction130(12),
+                       new ReduceAction131(12),
+                       new ReduceAction132(12),
+                       new ReduceAction133(12),
+                       new ReduceAction134(12),
+                       new ReduceAction135(12),
+                       new ReduceAction136(12),
+                       new ReduceAction137(12),
+                       new ReduceAction138(12),
+                       new ReduceAction139(13),
+                       new ReduceAction140(13),
+                       new ReduceAction141(14),
+                       new ReduceAction142(14),
+                       new ReduceAction143(15),
+                       new ReduceAction144(15),
                        new ReduceAction145(16),
                        new ReduceAction146(16),
-                       new ReduceAction147(17),
-                       new ReduceAction148(17),
+                       new ReduceAction147(16),
+                       new ReduceAction148(16),
                        new ReduceAction149(17),
                        new ReduceAction150(17),
                        new ReduceAction151(17),
                        new ReduceAction152(17),
                        new ReduceAction153(17),
                        new ReduceAction154(17),
-                       new ReduceAction155(18),
-                       new ReduceAction156(18),
-                       new ReduceAction157(18),
-                       new ReduceAction158(18),
-                       new ReduceAction159(19),
-                       new ReduceAction160(19),
-                       new ReduceAction161(19),
-                       new ReduceAction162(20),
-                       new ReduceAction163(21),
-                       new ReduceAction164(21),
-                       new ReduceAction165(21),
-                       new ReduceAction166(22),
-                       new ReduceAction167(23),
-                       new ReduceAction168(23),
-                       new ReduceAction169(23),
-                       new ReduceAction170(23),
-                       new ReduceAction171(23),
-                       new ReduceAction172(23),
-                       new ReduceAction173(24),
-                       new ReduceAction174(25),
-                       new ReduceAction175(25),
-                       new ReduceAction176(25),
-                       new ReduceAction177(25),
-                       new ReduceAction178(26),
-                       new ReduceAction179(26),
-                       new ReduceAction180(27),
-                       new ReduceAction180(28),
-                       new ReduceAction182(29),
-                       new ReduceAction183(29),
-                       new ReduceAction184(29),
-                       new ReduceAction185(29),
-                       new ReduceAction186(30),
-                       new ReduceAction187(30),
-                       new ReduceAction188(31),
-                       new ReduceAction189(31),
-                       new ReduceAction190(32),
-                       new ReduceAction185(33),
-                       new ReduceAction185(33),
-                       new ReduceAction193(33),
-                       new ReduceAction194(33),
-                       new ReduceAction195(33),
-                       new ReduceAction196(33),
-                       new ReduceAction197(33),
-                       new ReduceAction198(33),
-                       new ReduceAction199(33),
-                       new ReduceAction200(33),
-                       new ReduceAction201(33),
-                       new ReduceAction202(33),
-                       new ReduceAction203(33),
-                       new ReduceAction185(33),
-                       new ReduceAction185(33),
-                       new ReduceAction185(33),
-                       new ReduceAction185(33),
-                       new ReduceAction185(33),
-                       new ReduceAction185(33),
+                       new ReduceAction155(17),
+                       new ReduceAction156(17),
+                       new ReduceAction157(17),
+                       new ReduceAction158(17),
+                       new ReduceAction159(17),
+                       new ReduceAction160(17),
+                       new ReduceAction161(17),
+                       new ReduceAction162(17),
+                       new ReduceAction163(17),
+                       new ReduceAction164(17),
+                       new ReduceAction165(17),
+                       new ReduceAction166(17),
+                       new ReduceAction167(18),
+                       new ReduceAction168(18),
+                       new ReduceAction169(18),
+                       new ReduceAction170(18),
+                       new ReduceAction171(18),
+                       new ReduceAction172(18),
+                       new ReduceAction173(18),
+                       new ReduceAction174(18),
+                       new ReduceAction175(19),
+                       new ReduceAction176(19),
+                       new ReduceAction177(19),
+                       new ReduceAction178(19),
+                       new ReduceAction179(20),
+                       new ReduceAction180(20),
+                       new ReduceAction181(20),
+                       new ReduceAction182(21),
+                       new ReduceAction183(22),
+                       new ReduceAction184(22),
+                       new ReduceAction185(22),
+                       new ReduceAction186(23),
+                       new ReduceAction187(24),
+                       new ReduceAction188(24),
+                       new ReduceAction189(24),
+                       new ReduceAction190(24),
+                       new ReduceAction191(24),
+                       new ReduceAction192(24),
+                       new ReduceAction193(25),
+                       new ReduceAction194(26),
+                       new ReduceAction195(26),
+                       new ReduceAction196(26),
+                       new ReduceAction197(26),
+                       new ReduceAction198(27),
+                       new ReduceAction199(27),
+                       new ReduceAction200(28),
+                       new ReduceAction200(29),
+                       new ReduceAction202(30),
+                       new ReduceAction203(30),
+                       new ReduceAction204(30),
+                       new ReduceAction205(30),
+                       new ReduceAction206(31),
+                       new ReduceAction207(31),
+                       new ReduceAction208(32),
+                       new ReduceAction209(32),
                        new ReduceAction210(33),
-                       new ReduceAction211(33),
-                       new ReduceAction212(33),
-                       new ReduceAction213(33),
-                       new ReduceAction214(33),
-                       new ReduceAction215(33),
-                       new ReduceAction216(33),
-                       new ReduceAction217(33),
+                       new ReduceAction205(34),
+                       new ReduceAction205(34),
+                       new ReduceAction213(34),
+                       new ReduceAction214(34),
+                       new ReduceAction215(34),
+                       new ReduceAction216(34),
+                       new ReduceAction217(34),
                        new ReduceAction218(34),
-                       new ReduceAction219(35),
-                       new ReduceAction220(35),
-                       new ReduceAction221(36),
-                       new ReduceAction222(36),
-                       new ReduceAction223(36),
-                       new ReduceAction224(36),
-                       new ReduceAction225(36),
-                       new ReduceAction226(36),
-                       new ReduceAction227(37),
-                       new ReduceAction228(37),
-                       new ReduceAction229(37),
-                       new ReduceAction230(37),
-                       new ReduceAction231(38),
-                       new ReduceAction232(38),
-                       new ReduceAction233(39),
-                       new ReduceAction234(40),
-                       new ReduceAction235(40),
-                       new ReduceAction236(40),
-                       new ReduceAction237(40),
-                       new ReduceAction238(41),
-                       new ReduceAction239(41),
-                       new ReduceAction240(41),
-                       new ReduceAction241(41),
-                       new ReduceAction242(41),
-                       new ReduceAction243(41),
-                       new ReduceAction244(41),
-                       new ReduceAction245(41),
-                       new ReduceAction246(41),
-                       new ReduceAction247(41),
-                       new ReduceAction248(42),
-                       new ReduceAction249(42),
-                       new ReduceAction250(43),
-                       new ReduceAction251(43),
-                       new ReduceAction252(44),
-                       new ReduceAction253(44),
-                       new ReduceAction254(44),
-                       new ReduceAction255(44),
-                       new ReduceAction256(44),
-                       new ReduceAction190(45),
-                       new ReduceAction36(45),
-                       new ReduceAction259(46),
-                       new ReduceAction260(46),
-                       new ReduceAction261(47),
-                       new ReduceAction262(47),
-                       new ReduceAction263(48),
-                       new ReduceAction264(48),
-                       new ReduceAction265(49),
-                       new ReduceAction266(49),
-                       new ReduceAction267(49),
-                       new ReduceAction268(49),
-                       new ReduceAction269(50),
-                       new ReduceAction185(51),
-                       new ReduceAction212(51),
-                       new ReduceAction213(51),
-                       new ReduceAction273(51),
-                       new ReduceAction185(52),
-                       new ReduceAction275(52),
-                       new ReduceAction185(53),
-                       new ReduceAction277(53),
-                       new ReduceAction278(53),
-                       new ReduceAction279(53),
-                       new ReduceAction185(54),
-                       new ReduceAction281(54),
-                       new ReduceAction185(55),
-                       new ReduceAction283(55),
-                       new ReduceAction284(55),
-                       new ReduceAction285(55),
-                       new ReduceAction286(55),
-                       new ReduceAction287(55),
-                       new ReduceAction288(55),
-                       new ReduceAction289(55),
-                       new ReduceAction290(55),
-                       new ReduceAction291(55),
-                       new ReduceAction185(56),
-                       new ReduceAction293(56),
-                       new ReduceAction294(56),
-                       new ReduceAction185(57),
-                       new ReduceAction296(57),
-                       new ReduceAction297(57),
-                       new ReduceAction298(57),
-                       new ReduceAction185(58),
-                       new ReduceAction300(58),
-                       new ReduceAction301(58),
-                       new ReduceAction185(59),
-                       new ReduceAction303(59),
-                       new ReduceAction304(59),
-                       new ReduceAction305(59),
-                       new ReduceAction306(60),
-                       new ReduceAction307(60),
-                       new ReduceAction210(60),
-                       new ReduceAction211(60),
-                       new ReduceAction214(60),
-                       new ReduceAction215(60),
-                       new ReduceAction216(60),
-                       new ReduceAction217(60),
-                       new ReduceAction314(60),
-                       new ReduceAction315(60),
-                       new ReduceAction316(60),
-                       new ReduceAction317(60),
-                       new ReduceAction318(60),
-                       new ReduceAction319(60),
-                       new ReduceAction320(60),
-                       new ReduceAction321(60),
-                       new ReduceAction322(60),
-                       new ReduceAction323(60),
-                       new ReduceAction324(60),
+                       new ReduceAction219(34),
+                       new ReduceAction220(34),
+                       new ReduceAction221(34),
+                       new ReduceAction222(34),
+                       new ReduceAction223(34),
+                       new ReduceAction205(34),
+                       new ReduceAction205(34),
+                       new ReduceAction205(34),
+                       new ReduceAction205(34),
+                       new ReduceAction205(34),
+                       new ReduceAction205(34),
+                       new ReduceAction230(34),
+                       new ReduceAction231(34),
+                       new ReduceAction232(34),
+                       new ReduceAction233(34),
+                       new ReduceAction234(34),
+                       new ReduceAction235(34),
+                       new ReduceAction236(34),
+                       new ReduceAction237(34),
+                       new ReduceAction238(35),
+                       new ReduceAction239(36),
+                       new ReduceAction240(36),
+                       new ReduceAction241(37),
+                       new ReduceAction242(37),
+                       new ReduceAction243(37),
+                       new ReduceAction244(37),
+                       new ReduceAction245(37),
+                       new ReduceAction246(37),
+                       new ReduceAction247(38),
+                       new ReduceAction248(38),
+                       new ReduceAction249(38),
+                       new ReduceAction250(38),
+                       new ReduceAction251(39),
+                       new ReduceAction252(39),
+                       new ReduceAction253(40),
+                       new ReduceAction254(41),
+                       new ReduceAction255(41),
+                       new ReduceAction256(41),
+                       new ReduceAction257(41),
+                       new ReduceAction258(42),
+                       new ReduceAction259(42),
+                       new ReduceAction260(42),
+                       new ReduceAction261(42),
+                       new ReduceAction262(42),
+                       new ReduceAction263(42),
+                       new ReduceAction264(42),
+                       new ReduceAction265(42),
+                       new ReduceAction266(42),
+                       new ReduceAction267(42),
+                       new ReduceAction268(43),
+                       new ReduceAction269(43),
+                       new ReduceAction270(44),
+                       new ReduceAction271(44),
+                       new ReduceAction272(45),
+                       new ReduceAction273(45),
+                       new ReduceAction274(45),
+                       new ReduceAction275(45),
+                       new ReduceAction276(45),
+                       new ReduceAction210(46),
+                       new ReduceAction36(46),
+                       new ReduceAction279(47),
+                       new ReduceAction280(47),
+                       new ReduceAction281(48),
+                       new ReduceAction282(48),
+                       new ReduceAction283(49),
+                       new ReduceAction284(49),
+                       new ReduceAction285(50),
+                       new ReduceAction286(50),
+                       new ReduceAction287(50),
+                       new ReduceAction288(50),
+                       new ReduceAction289(51),
+                       new ReduceAction205(52),
+                       new ReduceAction232(52),
+                       new ReduceAction233(52),
+                       new ReduceAction293(52),
+                       new ReduceAction205(53),
+                       new ReduceAction295(53),
+                       new ReduceAction205(54),
+                       new ReduceAction297(54),
+                       new ReduceAction298(54),
+                       new ReduceAction299(54),
+                       new ReduceAction205(55),
+                       new ReduceAction301(55),
+                       new ReduceAction205(56),
+                       new ReduceAction303(56),
+                       new ReduceAction304(56),
+                       new ReduceAction305(56),
+                       new ReduceAction306(56),
+                       new ReduceAction307(56),
+                       new ReduceAction308(56),
+                       new ReduceAction309(56),
+                       new ReduceAction310(56),
+                       new ReduceAction311(56),
+                       new ReduceAction312(56),
+                       new ReduceAction313(56),
+                       new ReduceAction205(57),
+                       new ReduceAction315(57),
+                       new ReduceAction316(57),
+                       new ReduceAction205(58),
+                       new ReduceAction318(58),
+                       new ReduceAction319(58),
+                       new ReduceAction320(58),
+                       new ReduceAction205(59),
+                       new ReduceAction322(59),
+                       new ReduceAction323(59),
+                       new ReduceAction205(60),
                        new ReduceAction325(60),
                        new ReduceAction326(60),
-                       new ReduceAction185(60),
-                       new ReduceAction182(60),
-                       new ReduceAction329(60),
-                       new ReduceAction330(60),
-                       new ReduceAction331(61),
-                       new ReduceAction332(61),
-                       new ReduceAction333(62),
-                       new ReduceAction334(63),
-                       new ReduceAction333(64),
-                       new ReduceAction336(65),
-                       new ReduceAction337(66),
-                       new ReduceAction338(67),
-                       new ReduceAction339(67),
-                       new ReduceAction161(67),
-                       new ReduceAction341(67),
-                       new ReduceAction338(68),
-                       new ReduceAction339(68),
-                       new ReduceAction344(68),
-                       new ReduceAction161(68),
-                       new ReduceAction341(68),
-                       new ReduceAction338(69),
-                       new ReduceAction339(69),
-                       new ReduceAction349(70),
-                       new ReduceAction350(71),
-                       new ReduceAction351(71),
-                       new ReduceAction352(72),
-                       new ReduceAction353(72),
-                       new ReduceAction354(73),
-                       new ReduceAction355(73),
-                       new ReduceAction356(73),
-                       new ReduceAction357(74),
-                       new ReduceAction358(75),
-                       new ReduceAction359(76),
-                       new ReduceAction359(76),
-                       new ReduceAction361(77),
-                       new ReduceAction362(77),
-                       new ReduceAction36(77),
-                       new ReduceAction364(78),
-                       new ReduceAction365(78),
-                       new ReduceAction366(79),
-                       new ReduceAction367(79),
-                       new ReduceAction359(79),
-                       new ReduceAction66(80),
-                       new ReduceAction67(81),
-                       new ReduceAction68(81),
-                       new ReduceAction69(81),
-                       new ReduceAction70(81),
-                       new ReduceAction71(81),
-                       new ReduceAction72(81),
-                       new ReduceAction77(81),
-                       new ReduceAction78(81),
-                       new ReduceAction79(81),
-                       new ReduceAction80(81),
-                       new ReduceAction147(82),
-                       new ReduceAction148(82),
-                       new ReduceAction149(82),
-                       new ReduceAction150(82),
-                       new ReduceAction174(83),
-                       new ReduceAction175(83),
-                       new ReduceAction185(84),
-                       new ReduceAction212(84),
-                       new ReduceAction213(84),
-                       new ReduceAction185(85),
-                       new ReduceAction275(85),
-                       new ReduceAction185(86),
-                       new ReduceAction277(86),
-                       new ReduceAction278(86),
-                       new ReduceAction279(86),
-                       new ReduceAction185(87),
-                       new ReduceAction281(87),
-                       new ReduceAction185(88),
-                       new ReduceAction283(88),
-                       new ReduceAction284(88),
-                       new ReduceAction285(88),
-                       new ReduceAction286(88),
-                       new ReduceAction287(88),
-                       new ReduceAction288(88),
-                       new ReduceAction289(88),
-                       new ReduceAction290(88),
-                       new ReduceAction291(88),
-                       new ReduceAction185(89),
-                       new ReduceAction293(89),
-                       new ReduceAction294(89),
-                       new ReduceAction185(90),
-                       new ReduceAction296(90),
-                       new ReduceAction297(90),
-                       new ReduceAction298(90),
-                       new ReduceAction185(91),
-                       new ReduceAction300(91),
-                       new ReduceAction301(91),
-                       new ReduceAction185(92),
-                       new ReduceAction303(92),
-                       new ReduceAction304(92),
-                       new ReduceAction305(92),
-                       new ReduceAction306(93),
-                       new ReduceAction307(93),
-                       new ReduceAction210(93),
-                       new ReduceAction211(93),
-                       new ReduceAction214(93),
-                       new ReduceAction215(93),
-                       new ReduceAction216(93),
-                       new ReduceAction217(93),
-                       new ReduceAction315(93),
-                       new ReduceAction319(93),
-                       new ReduceAction320(93),
-                       new ReduceAction321(93),
-                       new ReduceAction322(93),
-                       new ReduceAction323(93),
-                       new ReduceAction324(93),
+                       new ReduceAction327(60),
+                       new ReduceAction328(61),
+                       new ReduceAction329(61),
+                       new ReduceAction230(61),
+                       new ReduceAction231(61),
+                       new ReduceAction234(61),
+                       new ReduceAction235(61),
+                       new ReduceAction236(61),
+                       new ReduceAction237(61),
+                       new ReduceAction336(61),
+                       new ReduceAction337(61),
+                       new ReduceAction338(61),
+                       new ReduceAction339(61),
+                       new ReduceAction340(61),
+                       new ReduceAction341(61),
+                       new ReduceAction342(61),
+                       new ReduceAction343(61),
+                       new ReduceAction344(61),
+                       new ReduceAction345(61),
+                       new ReduceAction346(61),
+                       new ReduceAction347(61),
+                       new ReduceAction348(61),
+                       new ReduceAction205(61),
+                       new ReduceAction202(61),
+                       new ReduceAction351(61),
+                       new ReduceAction352(61),
+                       new ReduceAction353(62),
+                       new ReduceAction354(62),
+                       new ReduceAction355(63),
+                       new ReduceAction356(64),
+                       new ReduceAction355(65),
+                       new ReduceAction358(66),
+                       new ReduceAction359(67),
+                       new ReduceAction360(68),
+                       new ReduceAction361(68),
+                       new ReduceAction181(68),
+                       new ReduceAction363(68),
+                       new ReduceAction360(69),
+                       new ReduceAction361(69),
+                       new ReduceAction366(69),
+                       new ReduceAction181(69),
+                       new ReduceAction363(69),
+                       new ReduceAction360(70),
+                       new ReduceAction361(70),
+                       new ReduceAction371(71),
+                       new ReduceAction372(72),
+                       new ReduceAction373(72),
+                       new ReduceAction374(73),
+                       new ReduceAction375(73),
+                       new ReduceAction376(74),
+                       new ReduceAction377(74),
+                       new ReduceAction378(74),
+                       new ReduceAction379(75),
+                       new ReduceAction380(76),
+                       new ReduceAction381(77),
+                       new ReduceAction381(77),
+                       new ReduceAction383(78),
+                       new ReduceAction384(78),
+                       new ReduceAction36(78),
+                       new ReduceAction386(79),
+                       new ReduceAction387(79),
+                       new ReduceAction388(80),
+                       new ReduceAction389(80),
+                       new ReduceAction381(80),
+                       new ReduceAction66(81),
+                       new ReduceAction67(82),
+                       new ReduceAction68(82),
+                       new ReduceAction69(82),
+                       new ReduceAction70(82),
+                       new ReduceAction71(82),
+                       new ReduceAction72(82),
+                       new ReduceAction77(82),
+                       new ReduceAction78(82),
+                       new ReduceAction79(82),
+                       new ReduceAction80(82),
+                       new ReduceAction167(83),
+                       new ReduceAction168(83),
+                       new ReduceAction169(83),
+                       new ReduceAction170(83),
+                       new ReduceAction194(84),
+                       new ReduceAction195(84),
+                       new ReduceAction205(85),
+                       new ReduceAction232(85),
+                       new ReduceAction233(85),
+                       new ReduceAction205(86),
+                       new ReduceAction295(86),
+                       new ReduceAction205(87),
+                       new ReduceAction297(87),
+                       new ReduceAction298(87),
+                       new ReduceAction299(87),
+                       new ReduceAction205(88),
+                       new ReduceAction301(88),
+                       new ReduceAction205(89),
+                       new ReduceAction303(89),
+                       new ReduceAction304(89),
+                       new ReduceAction305(89),
+                       new ReduceAction306(89),
+                       new ReduceAction307(89),
+                       new ReduceAction308(89),
+                       new ReduceAction309(89),
+                       new ReduceAction310(89),
+                       new ReduceAction311(89),
+                       new ReduceAction312(89),
+                       new ReduceAction313(89),
+                       new ReduceAction205(90),
+                       new ReduceAction315(90),
+                       new ReduceAction316(90),
+                       new ReduceAction205(91),
+                       new ReduceAction318(91),
+                       new ReduceAction319(91),
+                       new ReduceAction320(91),
+                       new ReduceAction205(92),
+                       new ReduceAction322(92),
+                       new ReduceAction323(92),
+                       new ReduceAction205(93),
                        new ReduceAction325(93),
                        new ReduceAction326(93),
-                       new ReduceAction185(93),
-                       new ReduceAction182(93),
-                       new ReduceAction329(93),
-                       new ReduceAction330(93),
-                       new ReduceAction182(94),
-                       new ReduceAction183(94),
-                       new ReduceAction184(94),
-                       new ReduceAction185(94),
-                       new ReduceAction185(95),
-                       new ReduceAction185(95),
-                       new ReduceAction193(95),
-                       new ReduceAction194(95),
-                       new ReduceAction195(95),
-                       new ReduceAction196(95),
-                       new ReduceAction197(95),
-                       new ReduceAction198(95),
-                       new ReduceAction199(95),
-                       new ReduceAction200(95),
-                       new ReduceAction201(95),
+                       new ReduceAction327(93),
+                       new ReduceAction328(94),
+                       new ReduceAction329(94),
+                       new ReduceAction230(94),
+                       new ReduceAction231(94),
+                       new ReduceAction234(94),
+                       new ReduceAction235(94),
+                       new ReduceAction236(94),
+                       new ReduceAction237(94),
+                       new ReduceAction337(94),
+                       new ReduceAction341(94),
+                       new ReduceAction342(94),
+                       new ReduceAction343(94),
+                       new ReduceAction344(94),
+                       new ReduceAction345(94),
+                       new ReduceAction346(94),
+                       new ReduceAction347(94),
+                       new ReduceAction348(94),
+                       new ReduceAction205(94),
+                       new ReduceAction202(94),
+                       new ReduceAction351(94),
+                       new ReduceAction352(94),
                        new ReduceAction202(95),
                        new ReduceAction203(95),
-                       new ReduceAction185(95),
-                       new ReduceAction185(95),
-                       new ReduceAction185(95),
-                       new ReduceAction185(95),
-                       new ReduceAction185(95),
-                       new ReduceAction185(95),
-                       new ReduceAction210(95),
-                       new ReduceAction211(95),
-                       new ReduceAction212(95),
-                       new ReduceAction213(95),
-                       new ReduceAction214(95),
-                       new ReduceAction215(95),
-                       new ReduceAction216(95),
-                       new ReduceAction217(95),
+                       new ReduceAction204(95),
+                       new ReduceAction205(95),
+                       new ReduceAction205(96),
+                       new ReduceAction205(96),
+                       new ReduceAction213(96),
+                       new ReduceAction214(96),
+                       new ReduceAction215(96),
+                       new ReduceAction216(96),
+                       new ReduceAction217(96),
+                       new ReduceAction218(96),
                        new ReduceAction219(96),
                        new ReduceAction220(96),
-                       new ReduceAction221(97),
-                       new ReduceAction222(97),
-                       new ReduceAction223(97),
-                       new ReduceAction224(97),
-                       new ReduceAction225(97),
-                       new ReduceAction226(97),
-                       new ReduceAction233(98),
-                       new ReduceAction234(99),
-                       new ReduceAction235(99),
-                       new ReduceAction236(99),
-                       new ReduceAction237(99),
-                       new ReduceAction238(100),
-                       new ReduceAction239(100),
-                       new ReduceAction240(100),
-                       new ReduceAction241(100),
-                       new ReduceAction242(100),
-                       new ReduceAction243(100),
-                       new ReduceAction244(100),
-                       new ReduceAction245(100),
-                       new ReduceAction246(100),
-                       new ReduceAction247(100),
-                       new ReduceAction250(101),
-                       new ReduceAction251(101),
-                       new ReduceAction252(102),
-                       new ReduceAction259(103),
-                       new ReduceAction260(103),
-                       new ReduceAction261(104),
-                       new ReduceAction262(104),
-                       new ReduceAction263(105),
-                       new ReduceAction264(105),
-                       new ReduceAction265(106),
-                       new ReduceAction266(106),
-                       new ReduceAction185(107),
-                       new ReduceAction212(107),
-                       new ReduceAction213(107),
-                       new ReduceAction273(107),
-                       new ReduceAction185(108),
-                       new ReduceAction212(108),
-                       new ReduceAction213(108),
-                       new ReduceAction182(109),
-                       new ReduceAction183(109),
-                       new ReduceAction184(109),
-                       new ReduceAction182(110),
-                       new ReduceAction183(110),
-                       new ReduceAction184(110),
-                       new ReduceAction185(111),
-                       new ReduceAction212(111),
-                       new ReduceAction213(111),
-                       new ReduceAction185(112),
-                       new ReduceAction275(112),
-                       new ReduceAction185(113),
-                       new ReduceAction277(113),
-                       new ReduceAction278(113),
-                       new ReduceAction279(113),
-                       new ReduceAction185(114),
-                       new ReduceAction281(114),
-                       new ReduceAction185(115),
-                       new ReduceAction283(115),
-                       new ReduceAction284(115),
-                       new ReduceAction285(115),
-                       new ReduceAction286(115),
-                       new ReduceAction287(115),
-                       new ReduceAction288(115),
-                       new ReduceAction289(115),
-                       new ReduceAction290(115),
-                       new ReduceAction291(115),
-                       new ReduceAction185(116),
-                       new ReduceAction293(116),
-                       new ReduceAction294(116),
-                       new ReduceAction185(117),
-                       new ReduceAction296(117),
-                       new ReduceAction297(117),
-                       new ReduceAction298(117),
-                       new ReduceAction185(118),
-                       new ReduceAction300(118),
-                       new ReduceAction301(118),
-                       new ReduceAction185(119),
-                       new ReduceAction303(119),
-                       new ReduceAction304(119),
-                       new ReduceAction305(119),
-                       new ReduceAction306(120),
-                       new ReduceAction307(120),
-                       new ReduceAction210(120),
-                       new ReduceAction211(120),
-                       new ReduceAction214(120),
-                       new ReduceAction215(120),
-                       new ReduceAction216(120),
-                       new ReduceAction217(120),
-                       new ReduceAction314(120),
-                       new ReduceAction315(120),
-                       new ReduceAction319(120),
-                       new ReduceAction320(120),
-                       new ReduceAction321(120),
-                       new ReduceAction322(120),
-                       new ReduceAction323(120),
-                       new ReduceAction324(120),
+                       new ReduceAction221(96),
+                       new ReduceAction222(96),
+                       new ReduceAction223(96),
+                       new ReduceAction205(96),
+                       new ReduceAction205(96),
+                       new ReduceAction205(96),
+                       new ReduceAction205(96),
+                       new ReduceAction205(96),
+                       new ReduceAction205(96),
+                       new ReduceAction230(96),
+                       new ReduceAction231(96),
+                       new ReduceAction232(96),
+                       new ReduceAction233(96),
+                       new ReduceAction234(96),
+                       new ReduceAction235(96),
+                       new ReduceAction236(96),
+                       new ReduceAction237(96),
+                       new ReduceAction239(97),
+                       new ReduceAction240(97),
+                       new ReduceAction241(98),
+                       new ReduceAction242(98),
+                       new ReduceAction243(98),
+                       new ReduceAction244(98),
+                       new ReduceAction245(98),
+                       new ReduceAction246(98),
+                       new ReduceAction253(99),
+                       new ReduceAction254(100),
+                       new ReduceAction255(100),
+                       new ReduceAction256(100),
+                       new ReduceAction257(100),
+                       new ReduceAction258(101),
+                       new ReduceAction259(101),
+                       new ReduceAction260(101),
+                       new ReduceAction261(101),
+                       new ReduceAction262(101),
+                       new ReduceAction263(101),
+                       new ReduceAction264(101),
+                       new ReduceAction265(101),
+                       new ReduceAction266(101),
+                       new ReduceAction267(101),
+                       new ReduceAction270(102),
+                       new ReduceAction271(102),
+                       new ReduceAction272(103),
+                       new ReduceAction279(104),
+                       new ReduceAction280(104),
+                       new ReduceAction281(105),
+                       new ReduceAction282(105),
+                       new ReduceAction283(106),
+                       new ReduceAction284(106),
+                       new ReduceAction285(107),
+                       new ReduceAction286(107),
+                       new ReduceAction205(108),
+                       new ReduceAction232(108),
+                       new ReduceAction233(108),
+                       new ReduceAction293(108),
+                       new ReduceAction205(109),
+                       new ReduceAction232(109),
+                       new ReduceAction233(109),
+                       new ReduceAction202(110),
+                       new ReduceAction203(110),
+                       new ReduceAction204(110),
+                       new ReduceAction202(111),
+                       new ReduceAction203(111),
+                       new ReduceAction204(111),
+                       new ReduceAction205(112),
+                       new ReduceAction232(112),
+                       new ReduceAction233(112),
+                       new ReduceAction205(113),
+                       new ReduceAction295(113),
+                       new ReduceAction205(114),
+                       new ReduceAction297(114),
+                       new ReduceAction298(114),
+                       new ReduceAction299(114),
+                       new ReduceAction205(115),
+                       new ReduceAction301(115),
+                       new ReduceAction205(116),
+                       new ReduceAction303(116),
+                       new ReduceAction304(116),
+                       new ReduceAction305(116),
+                       new ReduceAction306(116),
+                       new ReduceAction307(116),
+                       new ReduceAction308(116),
+                       new ReduceAction309(116),
+                       new ReduceAction310(116),
+                       new ReduceAction311(116),
+                       new ReduceAction312(116),
+                       new ReduceAction313(116),
+                       new ReduceAction205(117),
+                       new ReduceAction315(117),
+                       new ReduceAction316(117),
+                       new ReduceAction205(118),
+                       new ReduceAction318(118),
+                       new ReduceAction319(118),
+                       new ReduceAction320(118),
+                       new ReduceAction205(119),
+                       new ReduceAction322(119),
+                       new ReduceAction323(119),
+                       new ReduceAction205(120),
                        new ReduceAction325(120),
                        new ReduceAction326(120),
-                       new ReduceAction185(120),
-                       new ReduceAction329(120),
-                       new ReduceAction330(120),
-                       new ReduceAction185(121),
-                       new ReduceAction212(121),
-                       new ReduceAction213(121),
-                       new ReduceAction185(122),
-                       new ReduceAction275(122),
-                       new ReduceAction185(123),
-                       new ReduceAction277(123),
-                       new ReduceAction278(123),
-                       new ReduceAction279(123),
-                       new ReduceAction185(124),
-                       new ReduceAction281(124),
-                       new ReduceAction185(125),
-                       new ReduceAction283(125),
-                       new ReduceAction284(125),
-                       new ReduceAction285(125),
-                       new ReduceAction286(125),
-                       new ReduceAction287(125),
-                       new ReduceAction288(125),
-                       new ReduceAction289(125),
-                       new ReduceAction290(125),
-                       new ReduceAction291(125),
-                       new ReduceAction185(126),
-                       new ReduceAction293(126),
-                       new ReduceAction294(126),
-                       new ReduceAction185(127),
-                       new ReduceAction296(127),
-                       new ReduceAction297(127),
-                       new ReduceAction298(127),
-                       new ReduceAction185(128),
-                       new ReduceAction300(128),
-                       new ReduceAction301(128),
-                       new ReduceAction185(129),
-                       new ReduceAction303(129),
-                       new ReduceAction609(129),
-                       new ReduceAction610(130),
-                       new ReduceAction611(130),
-                       new ReduceAction214(130),
-                       new ReduceAction215(130),
-                       new ReduceAction614(130),
-                       new ReduceAction315(130),
-                       new ReduceAction319(130),
-                       new ReduceAction320(130),
-                       new ReduceAction321(130),
-                       new ReduceAction322(130),
-                       new ReduceAction323(130),
-                       new ReduceAction324(130),
+                       new ReduceAction327(120),
+                       new ReduceAction328(121),
+                       new ReduceAction329(121),
+                       new ReduceAction230(121),
+                       new ReduceAction231(121),
+                       new ReduceAction234(121),
+                       new ReduceAction235(121),
+                       new ReduceAction236(121),
+                       new ReduceAction237(121),
+                       new ReduceAction336(121),
+                       new ReduceAction337(121),
+                       new ReduceAction341(121),
+                       new ReduceAction342(121),
+                       new ReduceAction343(121),
+                       new ReduceAction344(121),
+                       new ReduceAction345(121),
+                       new ReduceAction346(121),
+                       new ReduceAction347(121),
+                       new ReduceAction348(121),
+                       new ReduceAction205(121),
+                       new ReduceAction351(121),
+                       new ReduceAction352(121),
+                       new ReduceAction205(122),
+                       new ReduceAction232(122),
+                       new ReduceAction233(122),
+                       new ReduceAction205(123),
+                       new ReduceAction295(123),
+                       new ReduceAction205(124),
+                       new ReduceAction297(124),
+                       new ReduceAction298(124),
+                       new ReduceAction299(124),
+                       new ReduceAction205(125),
+                       new ReduceAction301(125),
+                       new ReduceAction205(126),
+                       new ReduceAction303(126),
+                       new ReduceAction304(126),
+                       new ReduceAction305(126),
+                       new ReduceAction306(126),
+                       new ReduceAction307(126),
+                       new ReduceAction308(126),
+                       new ReduceAction309(126),
+                       new ReduceAction310(126),
+                       new ReduceAction311(126),
+                       new ReduceAction312(126),
+                       new ReduceAction313(126),
+                       new ReduceAction205(127),
+                       new ReduceAction315(127),
+                       new ReduceAction316(127),
+                       new ReduceAction205(128),
+                       new ReduceAction318(128),
+                       new ReduceAction319(128),
+                       new ReduceAction320(128),
+                       new ReduceAction205(129),
+                       new ReduceAction322(129),
+                       new ReduceAction323(129),
+                       new ReduceAction205(130),
                        new ReduceAction325(130),
-                       new ReduceAction326(130),
-                       new ReduceAction185(130),
-                       new ReduceAction329(130),
-                       new ReduceAction330(130),
-                       new ReduceAction627(131),
-                       new ReduceAction628(131),
-                       new ReduceAction185(132),
-                       new ReduceAction212(132),
-                       new ReduceAction213(132),
-                       new ReduceAction185(133),
-                       new ReduceAction212(133),
-                       new ReduceAction213(133),
-                       new ReduceAction635(134),
-                       new ReduceAction636(134),
-                       new ReduceAction637(135),
-                       new ReduceAction638(135),
-                       new ReduceAction639(136),
-                       new ReduceAction640(136),
-                       new ReduceAction641(137),
-                       new ReduceAction642(137),
-                       new ReduceAction639(138),
-                       new ReduceAction640(138),
-                       new ReduceAction645(139),
-                       new ReduceAction646(139),
-                       new ReduceAction647(140),
-                       new ReduceAction648(140),
-                       new ReduceAction649(141),
-                       new ReduceAction650(141),
-                       new ReduceAction178(142),
-                       new ReduceAction652(142),
-                       new ReduceAction344(143),
-                       new ReduceAction654(143),
-                       new ReduceAction351(144),
-                       new ReduceAction656(144),
-                       new ReduceAction344(145),
-                       new ReduceAction654(145),
-                       new ReduceAction352(146),
-                       new ReduceAction660(146),
-                       new ReduceAction661(147),
-                       new ReduceAction662(147),
-                       new ReduceAction663(148),
-                       new ReduceAction664(148)
+                       new ReduceAction637(130),
+                       new ReduceAction638(131),
+                       new ReduceAction639(131),
+                       new ReduceAction234(131),
+                       new ReduceAction235(131),
+                       new ReduceAction642(131),
+                       new ReduceAction337(131),
+                       new ReduceAction341(131),
+                       new ReduceAction342(131),
+                       new ReduceAction343(131),
+                       new ReduceAction344(131),
+                       new ReduceAction345(131),
+                       new ReduceAction346(131),
+                       new ReduceAction347(131),
+                       new ReduceAction348(131),
+                       new ReduceAction205(131),
+                       new ReduceAction351(131),
+                       new ReduceAction352(131),
+                       new ReduceAction655(132),
+                       new ReduceAction656(132),
+                       new ReduceAction205(133),
+                       new ReduceAction232(133),
+                       new ReduceAction233(133),
+                       new ReduceAction205(134),
+                       new ReduceAction232(134),
+                       new ReduceAction233(134),
+                       new ReduceAction663(135),
+                       new ReduceAction664(135),
+                       new ReduceAction665(136),
+                       new ReduceAction666(136),
+                       new ReduceAction667(137),
+                       new ReduceAction668(137),
+                       new ReduceAction669(138),
+                       new ReduceAction670(138),
+                       new ReduceAction667(139),
+                       new ReduceAction668(139),
+                       new ReduceAction673(140),
+                       new ReduceAction674(140),
+                       new ReduceAction675(141),
+                       new ReduceAction676(141),
+                       new ReduceAction677(142),
+                       new ReduceAction678(142),
+                       new ReduceAction198(143),
+                       new ReduceAction680(143),
+                       new ReduceAction366(144),
+                       new ReduceAction682(144),
+                       new ReduceAction373(145),
+                       new ReduceAction684(145),
+                       new ReduceAction366(146),
+                       new ReduceAction682(146),
+                       new ReduceAction374(147),
+                       new ReduceAction688(147),
+                       new ReduceAction689(148),
+                       new ReduceAction690(148),
+                       new ReduceAction691(149),
+                       new ReduceAction692(149)
                )
        end
 end
@@ -834,7 +862,7 @@ end
 # Find location of production nodes
 # Uses existing token locations to infer location of productions.
 private class ComputeProdLocationVisitor
-special Visitor
+       super Visitor
        # Currenlty visited productions that need a first token
        var _need_first_prods: Array[Prod] = new Array[Prod]
 
@@ -930,7 +958,7 @@ private abstract class ReduceAction
 end
 
 private class ReduceAction0
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -948,17 +976,17 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction1
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode4 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode3,
                                                listnode4
                                        )
@@ -969,7 +997,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction2
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -991,7 +1019,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction3
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -999,13 +1027,13 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode4,
                                                listnode5
                                        )
@@ -1016,7 +1044,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction4
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1038,7 +1066,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction5
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1046,13 +1074,13 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
                                        listnode5 = concat(listnode5, listnode4)
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode3,
                                                listnode5
                                        )
@@ -1063,7 +1091,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction6
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1089,7 +1117,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction7
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1098,8 +1126,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode6 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
@@ -1107,7 +1135,7 @@ special ReduceAction
                                        assert listnode5 isa Array[Object]
                                        listnode6 = concat(listnode6, listnode5)
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode4,
                                                listnode6
                                        )
@@ -1118,7 +1146,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction8
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1147,7 +1175,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction9
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1155,8 +1183,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode7 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode6 = new Array[Object]
                                        var listnode5 = nodearraylist2
                                        assert listnode5 isa Array[Object]
@@ -1168,7 +1196,7 @@ special ReduceAction
                                                listnode7.add(pclassdefnode4)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode3,
                                                listnode7
                                        )
@@ -1179,7 +1207,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction10
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1212,7 +1240,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction11
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1221,8 +1249,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode8 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
@@ -1237,7 +1265,7 @@ special ReduceAction
                                                listnode8.add(pclassdefnode5)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode4,
                                                listnode8
                                        )
@@ -1248,7 +1276,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction12
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1281,7 +1309,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction13
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1290,8 +1318,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode8 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
                                        var listnode7 = new Array[Object]
@@ -1306,7 +1334,7 @@ special ReduceAction
                                                listnode8.add(pclassdefnode5)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode3,
                                                listnode8
                                        )
@@ -1317,7 +1345,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction14
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1354,7 +1382,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction15
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1364,8 +1392,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode9 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
@@ -1383,7 +1411,7 @@ special ReduceAction
                                                listnode9.add(pclassdefnode6)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode4,
                                                listnode9
                                        )
@@ -1394,7 +1422,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction16
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1418,7 +1446,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction17
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1426,15 +1454,15 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode5 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var pclassdefnode4 = nodearraylist2
                                        assert pclassdefnode4 isa nullable AClassdef
                                        if pclassdefnode4 != null then
                                                listnode5.add(pclassdefnode4)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode3,
                                                listnode5
                                        )
@@ -1445,7 +1473,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction18
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1473,7 +1501,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction19
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1482,8 +1510,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode6 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
@@ -1493,7 +1521,7 @@ special ReduceAction
                                                listnode6.add(pclassdefnode5)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode4,
                                                listnode6
                                        )
@@ -1504,7 +1532,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction20
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1532,7 +1560,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction21
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1541,8 +1569,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode6 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
                                        var pclassdefnode5 = nodearraylist3
@@ -1552,7 +1580,7 @@ special ReduceAction
                                                listnode6.add(pclassdefnode5)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode3,
                                                listnode6
                                        )
@@ -1563,7 +1591,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction22
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1595,7 +1623,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction23
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1605,8 +1633,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode7 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
@@ -1619,7 +1647,7 @@ special ReduceAction
                                                listnode7.add(pclassdefnode6)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode4,
                                                listnode7
                                        )
@@ -1630,7 +1658,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction24
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1665,7 +1693,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction25
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1674,8 +1702,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode8 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode6 = new Array[Object]
                                        var listnode5 = nodearraylist2
                                        assert listnode5 isa Array[Object]
@@ -1692,7 +1720,7 @@ special ReduceAction
                                                listnode8.add(pclassdefnode7)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode3,
                                                listnode8
                                        )
@@ -1703,7 +1731,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction26
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1742,7 +1770,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction27
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1752,8 +1780,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode9 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
@@ -1773,7 +1801,7 @@ special ReduceAction
                                                listnode9.add(pclassdefnode8)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode4,
                                                listnode9
                                        )
@@ -1784,7 +1812,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction28
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1823,7 +1851,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction29
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1833,8 +1861,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode3 = new Array[Object]
                                        var listnode9 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode4 = nodearraylist2
                                        assert listnode4 isa Array[Object]
                                        var listnode7 = new Array[Object]
@@ -1854,7 +1882,7 @@ special ReduceAction
                                                listnode9.add(pclassdefnode8)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode3,
                                                listnode9
                                        )
@@ -1865,7 +1893,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction30
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1908,7 +1936,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction31
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1919,8 +1947,8 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var listnode4 = new Array[Object]
                                        var listnode10 = new Array[Object]
-                                       var ppackagedeclnode2 = nodearraylist1
-                                       assert ppackagedeclnode2 isa nullable APackagedecl
+                                       var pmoduledeclnode2 = nodearraylist1
+                                       assert pmoduledeclnode2 isa nullable AModuledecl
                                        var listnode3 = nodearraylist2
                                        assert listnode3 isa Array[Object]
                                        listnode4 = concat(listnode4, listnode3)
@@ -1943,7 +1971,7 @@ special ReduceAction
                                                listnode10.add(pclassdefnode9)
                                        end
                                        var pmodulenode1: nullable AModule = new AModule.init_amodule(
-                                               ppackagedeclnode2,
+                                               pmoduledeclnode2,
                                                listnode4,
                                                listnode10
                                        )
@@ -1954,7 +1982,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction32
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -1965,23 +1993,23 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var tkwpackagenode3 = nodearraylist2
-                                       assert tkwpackagenode3 isa nullable TKwpackage
+                                       var tkwmodulenode3 = nodearraylist2
+                                       assert tkwmodulenode3 isa nullable TKwmodule
                                        var tidnode4 = nodearraylist4
                                        assert tidnode4 isa nullable TId
-                                       var ppackagedeclnode1: nullable APackagedecl = new APackagedecl.init_apackagedecl(
+                                       var pmoduledeclnode1: nullable AModuledecl = new AModuledecl.init_amoduledecl(
                                                pdocnode2,
-                                               tkwpackagenode3,
+                                               tkwmodulenode3,
                                                tidnode4
                                        )
-                                       node_list = ppackagedeclnode1
+                                       node_list = pmoduledeclnode1
                                        p.push(p.go_to(_goto), node_list)
        end
        var _goto: Int
        init(g: Int) do _goto = g
 end
 private class ReduceAction33
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2009,7 +2037,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction34
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2037,7 +2065,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction35
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2058,7 +2086,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction36
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2070,7 +2098,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction37
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2089,7 +2117,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction39
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2128,7 +2156,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction40
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2170,7 +2198,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction41
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2213,7 +2241,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction42
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2259,7 +2287,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction43
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2302,7 +2330,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction44
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2348,7 +2376,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction45
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2395,7 +2423,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction46
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2445,7 +2473,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction47
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2488,7 +2516,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction48
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2534,7 +2562,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction49
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2581,7 +2609,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction50
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2631,7 +2659,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction51
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2678,7 +2706,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction52
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2728,7 +2756,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction53
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2779,7 +2807,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction54
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2833,7 +2861,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction55
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2850,7 +2878,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction56
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2871,7 +2899,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction57
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2888,15 +2916,15 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction58
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwuniversalnode2 = nodearraylist1
-                                       assert tkwuniversalnode2 isa nullable TKwuniversal
-                                       var pclasskindnode1: nullable AUniversalClasskind = new AUniversalClasskind.init_auniversalclasskind(
-                                               tkwuniversalnode2
+                                       var tkwenumnode2 = nodearraylist1
+                                       assert tkwenumnode2 isa nullable TKwenum
+                                       var pclasskindnode1: nullable AEnumClasskind = new AEnumClasskind.init_aenumclasskind(
+                                               tkwenumnode2
                                        )
                                        node_list = pclasskindnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -2905,7 +2933,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction59
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2926,7 +2954,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction60
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2951,7 +2979,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction61
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2966,7 +2994,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction62
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -2984,7 +3012,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction63
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3005,7 +3033,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction64
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3029,7 +3057,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction65
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3053,7 +3081,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction66
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3067,7 +3095,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction67
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3106,7 +3134,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction68
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3148,7 +3176,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction69
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3188,7 +3216,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction70
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3231,7 +3259,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction71
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3271,7 +3299,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction72
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3314,7 +3342,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction73
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3350,7 +3378,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction74
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3389,7 +3417,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction75
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3425,7 +3453,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction76
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3464,7 +3492,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction77
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3501,7 +3529,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction78
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3541,7 +3569,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction79
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3581,7 +3609,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction80
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3624,7 +3652,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction81
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3649,6 +3677,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3658,7 +3687,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction82
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3686,6 +3715,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3695,7 +3725,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction83
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3723,6 +3753,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3732,7 +3763,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction84
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3763,6 +3794,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3772,7 +3804,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction85
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3800,6 +3832,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3809,7 +3842,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction86
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3840,6 +3873,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3849,7 +3883,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction87
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3880,6 +3914,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3889,7 +3924,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction88
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3923,6 +3958,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3932,7 +3968,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction89
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3949,8 +3985,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist4
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist5
-                                       assert ptypenode9 isa nullable AType
+                                       var ptypenode10 = nodearraylist5
+                                       assert ptypenode10 isa nullable AType
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -3959,7 +3995,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3969,7 +4006,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction90
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -3989,8 +4026,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist5
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist6
-                                       assert ptypenode9 isa nullable AType
+                                       var ptypenode10 = nodearraylist6
+                                       assert ptypenode10 isa nullable AType
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -3999,7 +4036,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4009,7 +4047,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction91
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4029,8 +4067,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist5
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist6
-                                       assert ptypenode9 isa nullable AType
+                                       var ptypenode10 = nodearraylist6
+                                       assert ptypenode10 isa nullable AType
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
@@ -4039,7 +4077,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4049,7 +4088,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction92
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4072,8 +4111,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist6
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist7
-                                       assert ptypenode9 isa nullable AType
+                                       var ptypenode10 = nodearraylist7
+                                       assert ptypenode10 isa nullable AType
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
@@ -4082,7 +4121,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4092,7 +4132,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction93
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4112,8 +4152,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist5
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist6
-                                       assert ptypenode9 isa nullable AType
+                                       var ptypenode10 = nodearraylist6
+                                       assert ptypenode10 isa nullable AType
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -4122,7 +4162,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4132,7 +4173,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction94
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4155,8 +4196,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist6
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist7
-                                       assert ptypenode9 isa nullable AType
+                                       var ptypenode10 = nodearraylist7
+                                       assert ptypenode10 isa nullable AType
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -4165,7 +4206,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4175,7 +4217,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction95
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4198,8 +4240,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist6
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist7
-                                       assert ptypenode9 isa nullable AType
+                                       var ptypenode10 = nodearraylist7
+                                       assert ptypenode10 isa nullable AType
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
@@ -4208,7 +4250,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4218,7 +4261,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction96
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4244,8 +4287,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist7
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist8
-                                       assert ptypenode9 isa nullable AType
+                                       var ptypenode10 = nodearraylist8
+                                       assert ptypenode10 isa nullable AType
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
@@ -4254,7 +4297,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4264,7 +4308,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction97
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4283,8 +4327,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist4
                                        assert tattridnode8 isa nullable TAttrid
-                                       var pexprnode10 = nodearraylist7
-                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode11 = nodearraylist7
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -4294,7 +4338,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4303,7 +4348,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction98
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4325,8 +4370,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist5
                                        assert tattridnode8 isa nullable TAttrid
-                                       var pexprnode10 = nodearraylist8
-                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode11 = nodearraylist8
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -4336,7 +4381,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4345,7 +4391,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction99
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4367,8 +4413,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist5
                                        assert tattridnode8 isa nullable TAttrid
-                                       var pexprnode10 = nodearraylist8
-                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode11 = nodearraylist8
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
@@ -4378,7 +4424,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4387,7 +4434,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction100
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4412,8 +4459,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist6
                                        assert tattridnode8 isa nullable TAttrid
-                                       var pexprnode10 = nodearraylist9
-                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode11 = nodearraylist9
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
@@ -4423,7 +4470,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4432,7 +4480,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction101
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4454,8 +4502,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist5
                                        assert tattridnode8 isa nullable TAttrid
-                                       var pexprnode10 = nodearraylist8
-                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode11 = nodearraylist8
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -4465,7 +4513,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4474,7 +4523,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction102
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4499,8 +4548,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist6
                                        assert tattridnode8 isa nullable TAttrid
-                                       var pexprnode10 = nodearraylist9
-                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode11 = nodearraylist9
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -4510,7 +4559,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4519,7 +4569,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction103
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4544,8 +4594,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist6
                                        assert tattridnode8 isa nullable TAttrid
-                                       var pexprnode10 = nodearraylist9
-                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode11 = nodearraylist9
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
@@ -4555,7 +4605,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4564,7 +4615,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction104
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4592,8 +4643,8 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist7
                                        assert tattridnode8 isa nullable TAttrid
-                                       var pexprnode10 = nodearraylist10
-                                       assert pexprnode10 isa nullable AExpr
+                                       var pexprnode11 = nodearraylist10
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
@@ -4603,7 +4654,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4612,7 +4664,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction105
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4632,10 +4684,10 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist4
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist5
-                                       assert ptypenode9 isa nullable AType
-                                       var pexprnode10 = nodearraylist8
-                                       assert pexprnode10 isa nullable AExpr
+                                       var ptypenode10 = nodearraylist5
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist8
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -4644,8 +4696,9 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               ptypenode10,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4654,7 +4707,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction106
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4677,10 +4730,10 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist5
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist6
-                                       assert ptypenode9 isa nullable AType
-                                       var pexprnode10 = nodearraylist9
-                                       assert pexprnode10 isa nullable AExpr
+                                       var ptypenode10 = nodearraylist6
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist9
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -4689,8 +4742,9 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               ptypenode10,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4699,7 +4753,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction107
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4722,10 +4776,10 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist5
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist6
-                                       assert ptypenode9 isa nullable AType
-                                       var pexprnode10 = nodearraylist9
-                                       assert pexprnode10 isa nullable AExpr
+                                       var ptypenode10 = nodearraylist6
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist9
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
@@ -4734,8 +4788,9 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               ptypenode10,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4744,7 +4799,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction108
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4770,10 +4825,10 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist6
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist7
-                                       assert ptypenode9 isa nullable AType
-                                       var pexprnode10 = nodearraylist10
-                                       assert pexprnode10 isa nullable AExpr
+                                       var ptypenode10 = nodearraylist7
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist10
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                pablenode3,
@@ -4782,8 +4837,9 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               ptypenode10,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4792,7 +4848,7 @@ special ReduceAction
        init(g: Int) do _goto = g
 end
 private class ReduceAction109
-special ReduceAction
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -4815,10 +4871,691 @@ special ReduceAction
                                        assert tkwvarnode7 isa nullable TKwvar
                                        var tattridnode8 = nodearraylist5
                                        assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist6
-                                       assert ptypenode9 isa nullable AType
-                                       var pexprnode10 = nodearraylist9
-                                       assert pexprnode10 isa nullable AExpr
+                                       var ptypenode10 = nodearraylist6
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist9
+                                       assert pexprnode11 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pablenode4,
+                                               null,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               tattridnode8,
+                                               null,
+                                               ptypenode10,
+                                               pexprnode11
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction110
+       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
+                                       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 pablenode4 = nodearraylist2
+                                       assert pablenode4 isa nullable AAble
+                                       var tkwredefnode5 = nodearraylist3
+                                       assert tkwredefnode5 isa nullable TKwredef
+                                       var pvisibilitynode6 = nodearraylist4
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist5
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tattridnode8 = nodearraylist6
+                                       assert tattridnode8 isa nullable TAttrid
+                                       var ptypenode10 = nodearraylist7
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist10
+                                       assert pexprnode11 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pablenode4,
+                                               tkwredefnode5,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               tattridnode8,
+                                               null,
+                                               ptypenode10,
+                                               pexprnode11
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction111
+       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
+                                       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 pablenode3 = nodearraylist2
+                                       assert pablenode3 isa nullable AAble
+                                       var pablenode4 = nodearraylist3
+                                       assert pablenode4 isa nullable AAble
+                                       var pvisibilitynode6 = nodearraylist4
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist5
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tattridnode8 = nodearraylist6
+                                       assert tattridnode8 isa nullable TAttrid
+                                       var ptypenode10 = nodearraylist7
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist10
+                                       assert pexprnode11 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               pablenode3,
+                                               pablenode4,
+                                               null,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               tattridnode8,
+                                               null,
+                                               ptypenode10,
+                                               pexprnode11
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction112
+       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
+                                       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 pablenode3 = nodearraylist2
+                                       assert pablenode3 isa nullable AAble
+                                       var pablenode4 = nodearraylist3
+                                       assert pablenode4 isa nullable AAble
+                                       var tkwredefnode5 = nodearraylist4
+                                       assert tkwredefnode5 isa nullable TKwredef
+                                       var pvisibilitynode6 = nodearraylist5
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist6
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tattridnode8 = nodearraylist7
+                                       assert tattridnode8 isa nullable TAttrid
+                                       var ptypenode10 = nodearraylist8
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist11
+                                       assert pexprnode11 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               pablenode3,
+                                               pablenode4,
+                                               tkwredefnode5,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               tattridnode8,
+                                               null,
+                                               ptypenode10,
+                                               pexprnode11
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction113
+       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 pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pvisibilitynode6 = nodearraylist2
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist3
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               null,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               null,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction114
+       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 pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode5 = nodearraylist2
+                                       assert tkwredefnode5 isa nullable TKwredef
+                                       var pvisibilitynode6 = nodearraylist3
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist4
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist5
+                                       assert tidnode9 isa nullable TId
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               tkwredefnode5,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               null,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction115
+       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 pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pvisibilitynode6 = nodearraylist2
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist3
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var ptypenode10 = nodearraylist5
+                                       assert ptypenode10 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               null,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               ptypenode10,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction116
+       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 pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var tkwredefnode5 = nodearraylist2
+                                       assert tkwredefnode5 isa nullable TKwredef
+                                       var pvisibilitynode6 = nodearraylist3
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist4
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist5
+                                       assert tidnode9 isa nullable TId
+                                       var ptypenode10 = nodearraylist6
+                                       assert ptypenode10 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               tkwredefnode5,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               ptypenode10,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction117
+       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 pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pablenode4 = nodearraylist5
+                                       assert pablenode4 isa nullable AAble
+                                       var pvisibilitynode6 = nodearraylist2
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist3
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pablenode4,
+                                               null,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               null,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction118
+       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 pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pablenode4 = nodearraylist6
+                                       assert pablenode4 isa nullable AAble
+                                       var tkwredefnode5 = nodearraylist2
+                                       assert tkwredefnode5 isa nullable TKwredef
+                                       var pvisibilitynode6 = nodearraylist3
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist4
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist5
+                                       assert tidnode9 isa nullable TId
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pablenode4,
+                                               tkwredefnode5,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               null,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction119
+       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 pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pablenode4 = nodearraylist6
+                                       assert pablenode4 isa nullable AAble
+                                       var pvisibilitynode6 = nodearraylist2
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist3
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var ptypenode10 = nodearraylist5
+                                       assert ptypenode10 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pablenode4,
+                                               null,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               ptypenode10,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction120
+       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 pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pablenode4 = nodearraylist7
+                                       assert pablenode4 isa nullable AAble
+                                       var tkwredefnode5 = nodearraylist2
+                                       assert tkwredefnode5 isa nullable TKwredef
+                                       var pvisibilitynode6 = nodearraylist3
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist4
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist5
+                                       assert tidnode9 isa nullable TId
+                                       var ptypenode10 = nodearraylist6
+                                       assert ptypenode10 isa nullable AType
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               pablenode4,
+                                               tkwredefnode5,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               ptypenode10,
+                                               null
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction121
+       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 pdocnode2 = nodearraylist1
+                                       assert pdocnode2 isa nullable ADoc
+                                       var pvisibilitynode6 = nodearraylist2
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist3
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var pexprnode11 = nodearraylist7
+                                       assert pexprnode11 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               null,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               null,
+                                               pexprnode11
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction122
+       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 tkwredefnode5 = nodearraylist2
+                                       assert tkwredefnode5 isa nullable TKwredef
+                                       var pvisibilitynode6 = nodearraylist3
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist4
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist5
+                                       assert tidnode9 isa nullable TId
+                                       var pexprnode11 = nodearraylist8
+                                       assert pexprnode11 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               tkwredefnode5,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               null,
+                                               pexprnode11
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction123
+       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 pvisibilitynode6 = nodearraylist2
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist3
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var ptypenode10 = nodearraylist5
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist8
+                                       assert pexprnode11 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               null,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               ptypenode10,
+                                               pexprnode11
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction124
+       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 tkwredefnode5 = nodearraylist2
+                                       assert tkwredefnode5 isa nullable TKwredef
+                                       var pvisibilitynode6 = nodearraylist3
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist4
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist5
+                                       assert tidnode9 isa nullable TId
+                                       var ptypenode10 = nodearraylist6
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist9
+                                       assert pexprnode11 isa nullable AExpr
+                                       var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
+                                               pdocnode2,
+                                               null,
+                                               null,
+                                               tkwredefnode5,
+                                               pvisibilitynode6,
+                                               tkwvarnode7,
+                                               null,
+                                               tidnode9,
+                                               ptypenode10,
+                                               pexprnode11
+                                       )
+                                       node_list = ppropdefnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction125
+       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 pablenode4 = nodearraylist5
+                                       assert pablenode4 isa nullable AAble
+                                       var pvisibilitynode6 = nodearraylist2
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist3
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var pexprnode11 = nodearraylist8
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -4826,9 +5563,10 @@ special ReduceAction
                                                null,
                                                pvisibilitynode6,
                                                tkwvarnode7,
-                                               tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               tidnode9,
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4836,12 +5574,11 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction110
-special ReduceAction
+private class ReduceAction126
+       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
@@ -4853,20 +5590,18 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pablenode4 = nodearraylist2
+                                       var pablenode4 = nodearraylist6
                                        assert pablenode4 isa nullable AAble
-                                       var tkwredefnode5 = nodearraylist3
+                                       var tkwredefnode5 = nodearraylist2
                                        assert tkwredefnode5 isa nullable TKwredef
-                                       var pvisibilitynode6 = nodearraylist4
+                                       var pvisibilitynode6 = nodearraylist3
                                        assert pvisibilitynode6 isa nullable AVisibility
-                                       var tkwvarnode7 = nodearraylist5
+                                       var tkwvarnode7 = nodearraylist4
                                        assert tkwvarnode7 isa nullable TKwvar
-                                       var tattridnode8 = nodearraylist6
-                                       assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist7
-                                       assert ptypenode9 isa nullable AType
-                                       var pexprnode10 = nodearraylist10
-                                       assert pexprnode10 isa nullable AExpr
+                                       var tidnode9 = nodearraylist5
+                                       assert tidnode9 isa nullable TId
+                                       var pexprnode11 = nodearraylist9
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
                                                null,
@@ -4874,9 +5609,10 @@ special ReduceAction
                                                tkwredefnode5,
                                                pvisibilitynode6,
                                                tkwvarnode7,
-                                               tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               tidnode9,
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4884,12 +5620,11 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction111
-special ReduceAction
+private class ReduceAction127
+       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
@@ -4901,30 +5636,29 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pablenode3 = nodearraylist2
-                                       assert pablenode3 isa nullable AAble
-                                       var pablenode4 = nodearraylist3
+                                       var pablenode4 = nodearraylist6
                                        assert pablenode4 isa nullable AAble
-                                       var pvisibilitynode6 = nodearraylist4
+                                       var pvisibilitynode6 = nodearraylist2
                                        assert pvisibilitynode6 isa nullable AVisibility
-                                       var tkwvarnode7 = nodearraylist5
+                                       var tkwvarnode7 = nodearraylist3
                                        assert tkwvarnode7 isa nullable TKwvar
-                                       var tattridnode8 = nodearraylist6
-                                       assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist7
-                                       assert ptypenode9 isa nullable AType
-                                       var pexprnode10 = nodearraylist10
-                                       assert pexprnode10 isa nullable AExpr
+                                       var tidnode9 = nodearraylist4
+                                       assert tidnode9 isa nullable TId
+                                       var ptypenode10 = nodearraylist5
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist9
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               pablenode3,
+                                               null,
                                                pablenode4,
                                                null,
                                                pvisibilitynode6,
                                                tkwvarnode7,
-                                               tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               tidnode9,
+                                               ptypenode10,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4932,12 +5666,11 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction112
-special ReduceAction
+private class ReduceAction128
+       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
                                        var nodearraylist8 = p.pop
@@ -4950,32 +5683,31 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pablenode3 = nodearraylist2
-                                       assert pablenode3 isa nullable AAble
-                                       var pablenode4 = nodearraylist3
+                                       var pablenode4 = nodearraylist7
                                        assert pablenode4 isa nullable AAble
-                                       var tkwredefnode5 = nodearraylist4
+                                       var tkwredefnode5 = nodearraylist2
                                        assert tkwredefnode5 isa nullable TKwredef
-                                       var pvisibilitynode6 = nodearraylist5
+                                       var pvisibilitynode6 = nodearraylist3
                                        assert pvisibilitynode6 isa nullable AVisibility
-                                       var tkwvarnode7 = nodearraylist6
+                                       var tkwvarnode7 = nodearraylist4
                                        assert tkwvarnode7 isa nullable TKwvar
-                                       var tattridnode8 = nodearraylist7
-                                       assert tattridnode8 isa nullable TAttrid
-                                       var ptypenode9 = nodearraylist8
-                                       assert ptypenode9 isa nullable AType
-                                       var pexprnode10 = nodearraylist11
-                                       assert pexprnode10 isa nullable AExpr
+                                       var tidnode9 = nodearraylist5
+                                       assert tidnode9 isa nullable TId
+                                       var ptypenode10 = nodearraylist6
+                                       assert ptypenode10 isa nullable AType
+                                       var pexprnode11 = nodearraylist10
+                                       assert pexprnode11 isa nullable AExpr
                                        var ppropdefnode1: nullable AAttrPropdef = new AAttrPropdef.init_aattrpropdef(
                                                pdocnode2,
-                                               pablenode3,
+                                               null,
                                                pablenode4,
                                                tkwredefnode5,
                                                pvisibilitynode6,
                                                tkwvarnode7,
-                                               tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               tidnode9,
+                                               ptypenode10,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4983,8 +5715,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction113
-special ReduceAction
+private class ReduceAction129
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5019,8 +5751,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction114
-special ReduceAction
+private class ReduceAction130
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5058,8 +5790,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction115
-special ReduceAction
+private class ReduceAction131
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5097,8 +5829,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction116
-special ReduceAction
+private class ReduceAction132
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5139,8 +5871,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction117
-special ReduceAction
+private class ReduceAction133
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5176,8 +5908,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction118
-special ReduceAction
+private class ReduceAction134
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5216,8 +5948,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction119
-special ReduceAction
+private class ReduceAction135
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5256,8 +5988,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction120
-special ReduceAction
+private class ReduceAction136
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5299,8 +6031,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction121
-special ReduceAction
+private class ReduceAction137
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5333,8 +6065,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction122
-special ReduceAction
+private class ReduceAction138
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5370,8 +6102,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction123
-special ReduceAction
+private class ReduceAction139
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5388,8 +6120,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction124
-special ReduceAction
+private class ReduceAction140
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5409,17 +6141,18 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction125
-special ReduceAction
+private class ReduceAction141
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
                                        var nodearraylist1 = p.pop
-                                       var tkwwritablenode3 = nodearraylist1
-                                       assert tkwwritablenode3 isa nullable TKwwritable
+                                       var tkwwritablenode4 = nodearraylist1
+                                       assert tkwwritablenode4 isa nullable TKwwritable
                                        var pablenode1: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                null,
-                                               tkwwritablenode3
+                                               null,
+                                               tkwwritablenode4
                                        )
                                        node_list = pablenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -5427,8 +6160,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction126
-special ReduceAction
+private class ReduceAction142
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5436,11 +6169,12 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var tkwredefnode2 = nodearraylist1
                                        assert tkwredefnode2 isa nullable TKwredef
-                                       var tkwwritablenode3 = nodearraylist2
-                                       assert tkwwritablenode3 isa nullable TKwwritable
+                                       var tkwwritablenode4 = nodearraylist2
+                                       assert tkwwritablenode4 isa nullable TKwwritable
                                        var pablenode1: nullable AWriteAble = new AWriteAble.init_awriteable(
                                                tkwredefnode2,
-                                               tkwwritablenode3
+                                               null,
+                                               tkwwritablenode4
                                        )
                                        node_list = pablenode1
                                        p.push(p.go_to(_goto), node_list)
@@ -5448,8 +6182,55 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction127
-special ReduceAction
+private class ReduceAction143
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist2 = p.pop
+                                       var nodearraylist1 = p.pop
+                                       var pvisibilitynode3 = nodearraylist1
+                                       assert pvisibilitynode3 isa nullable AVisibility
+                                       var tkwwritablenode4 = nodearraylist2
+                                       assert tkwwritablenode4 isa nullable TKwwritable
+                                       var pablenode1: nullable AWriteAble = new AWriteAble.init_awriteable(
+                                               null,
+                                               pvisibilitynode3,
+                                               tkwwritablenode4
+                                       )
+                                       node_list = pablenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction144
+       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 pvisibilitynode3 = nodearraylist2
+                                       assert pvisibilitynode3 isa nullable AVisibility
+                                       var tkwwritablenode4 = nodearraylist3
+                                       assert tkwwritablenode4 isa nullable TKwwritable
+                                       var pablenode1: nullable AWriteAble = new AWriteAble.init_awriteable(
+                                               tkwredefnode2,
+                                               pvisibilitynode3,
+                                               tkwwritablenode4
+                                       )
+                                       node_list = pablenode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction145
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5461,8 +6242,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction128
-special ReduceAction
+private class ReduceAction146
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5479,8 +6260,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction129
-special ReduceAction
+private class ReduceAction147
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5497,8 +6278,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction130
-special ReduceAction
+private class ReduceAction148
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5515,8 +6296,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction131
-special ReduceAction
+private class ReduceAction149
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5532,8 +6313,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction132
-special ReduceAction
+private class ReduceAction150
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5549,8 +6330,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction133
-special ReduceAction
+private class ReduceAction151
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5566,8 +6347,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction134
-special ReduceAction
+private class ReduceAction152
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5583,8 +6364,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction135
-special ReduceAction
+private class ReduceAction153
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5600,8 +6381,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction136
-special ReduceAction
+private class ReduceAction154
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5617,8 +6398,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction137
-special ReduceAction
+private class ReduceAction155
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5634,8 +6415,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction138
-special ReduceAction
+private class ReduceAction156
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5651,8 +6432,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction139
-special ReduceAction
+private class ReduceAction157
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5668,8 +6449,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction140
-special ReduceAction
+private class ReduceAction158
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5685,8 +6466,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction141
-special ReduceAction
+private class ReduceAction159
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5702,8 +6483,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction142
-special ReduceAction
+private class ReduceAction160
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5719,8 +6500,42 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction143
-special ReduceAction
+private class ReduceAction161
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tllnode2 = nodearraylist1
+                                       assert tllnode2 isa nullable TLl
+                                       var pmethidnode1: nullable ALlMethid = new ALlMethid.init_allmethid(
+                                               tllnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction162
+       super ReduceAction
+       redef fun action(p: Parser)
+       do
+                                       var node_list: nullable Object = null
+                                       var nodearraylist1 = p.pop
+                                       var tggnode2 = nodearraylist1
+                                       assert tggnode2 isa nullable TGg
+                                       var pmethidnode1: nullable AGgMethid = new AGgMethid.init_aggmethid(
+                                               tggnode2
+                                       )
+                                       node_list = pmethidnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction163
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5740,8 +6555,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction144
-special ReduceAction
+private class ReduceAction164
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5757,8 +6572,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction145
-special ReduceAction
+private class ReduceAction165
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5778,8 +6593,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction146
-special ReduceAction
+private class ReduceAction166
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5803,8 +6618,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction147
-special ReduceAction
+private class ReduceAction167
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5828,8 +6643,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction148
-special ReduceAction
+private class ReduceAction168
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5857,8 +6672,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction149
-special ReduceAction
+private class ReduceAction169
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5879,8 +6694,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction150
-special ReduceAction
+private class ReduceAction170
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5905,8 +6720,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction151
-special ReduceAction
+private class ReduceAction171
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5927,8 +6742,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction152
-special ReduceAction
+private class ReduceAction172
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5953,8 +6768,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction153
-special ReduceAction
+private class ReduceAction173
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5972,8 +6787,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction154
-special ReduceAction
+private class ReduceAction174
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -5995,8 +6810,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction155
-special ReduceAction
+private class ReduceAction175
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6013,8 +6828,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction156
-special ReduceAction
+private class ReduceAction176
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6035,8 +6850,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction157
-special ReduceAction
+private class ReduceAction177
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6056,8 +6871,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction158
-special ReduceAction
+private class ReduceAction178
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6081,8 +6896,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction159
-special ReduceAction
+private class ReduceAction179
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6102,8 +6917,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction160
-special ReduceAction
+private class ReduceAction180
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6127,8 +6942,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction161
-special ReduceAction
+private class ReduceAction181
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6142,8 +6957,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction162
-special ReduceAction
+private class ReduceAction182
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6157,8 +6972,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction163
-special ReduceAction
+private class ReduceAction183
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6176,8 +6991,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction164
-special ReduceAction
+private class ReduceAction184
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6198,8 +7013,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction165
-special ReduceAction
+private class ReduceAction185
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6223,8 +7038,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction166
-special ReduceAction
+private class ReduceAction186
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6240,8 +7055,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction167
-special ReduceAction
+private class ReduceAction187
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6268,8 +7083,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction168
-special ReduceAction
+private class ReduceAction188
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6299,8 +7114,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction169
-special ReduceAction
+private class ReduceAction189
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6331,8 +7146,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction170
-special ReduceAction
+private class ReduceAction190
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6366,8 +7181,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction171
-special ReduceAction
+private class ReduceAction191
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6399,8 +7214,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction172
-special ReduceAction
+private class ReduceAction192
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6435,8 +7250,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction173
-special ReduceAction
+private class ReduceAction193
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6453,8 +7268,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction174
-special ReduceAction
+private class ReduceAction194
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6473,8 +7288,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction175
-special ReduceAction
+private class ReduceAction195
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6496,8 +7311,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction176
-special ReduceAction
+private class ReduceAction196
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6524,8 +7339,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction177
-special ReduceAction
+private class ReduceAction197
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6555,8 +7370,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction178
-special ReduceAction
+private class ReduceAction198
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6572,8 +7387,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction179
-special ReduceAction
+private class ReduceAction199
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6593,8 +7408,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction180
-special ReduceAction
+private class ReduceAction200
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6608,8 +7423,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction182
-special ReduceAction
+private class ReduceAction202
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6623,8 +7438,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction183
-special ReduceAction
+private class ReduceAction203
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6640,8 +7455,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction184
-special ReduceAction
+private class ReduceAction204
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6656,8 +7471,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction185
-special ReduceAction
+private class ReduceAction205
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6669,8 +7484,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction186
-special ReduceAction
+private class ReduceAction206
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6690,8 +7505,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction187
-special ReduceAction
+private class ReduceAction207
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6715,8 +7530,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction188
-special ReduceAction
+private class ReduceAction208
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6737,8 +7552,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction189
-special ReduceAction
+private class ReduceAction209
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6763,8 +7578,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction190
-special ReduceAction
+private class ReduceAction210
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6777,8 +7592,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction193
-special ReduceAction
+private class ReduceAction213
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6795,8 +7610,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction194
-special ReduceAction
+private class ReduceAction214
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6816,8 +7631,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction195
-special ReduceAction
+private class ReduceAction215
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6835,8 +7650,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction196
-special ReduceAction
+private class ReduceAction216
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6857,8 +7672,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction197
-special ReduceAction
+private class ReduceAction217
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6879,8 +7694,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction198
-special ReduceAction
+private class ReduceAction218
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6904,8 +7719,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction199
-special ReduceAction
+private class ReduceAction219
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6921,8 +7736,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction200
-special ReduceAction
+private class ReduceAction220
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6940,8 +7755,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction201
-special ReduceAction
+private class ReduceAction221
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6962,8 +7777,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction202
-special ReduceAction
+private class ReduceAction222
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -6984,8 +7799,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction203
-special ReduceAction
+private class ReduceAction223
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7009,8 +7824,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction210
-special ReduceAction
+private class ReduceAction230
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7040,8 +7855,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction211
-special ReduceAction
+private class ReduceAction231
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7068,8 +7883,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction212
-special ReduceAction
+private class ReduceAction232
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7103,8 +7918,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction213
-special ReduceAction
+private class ReduceAction233
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7135,8 +7950,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction214
-special ReduceAction
+private class ReduceAction234
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7159,8 +7974,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction215
-special ReduceAction
+private class ReduceAction235
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7186,8 +8001,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction216
-special ReduceAction
+private class ReduceAction236
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7215,8 +8030,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction217
-special ReduceAction
+private class ReduceAction237
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7241,8 +8056,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction218
-special ReduceAction
+private class ReduceAction238
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7262,8 +8077,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction219
-special ReduceAction
+private class ReduceAction239
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7279,8 +8094,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction220
-special ReduceAction
+private class ReduceAction240
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7300,8 +8115,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction221
-special ReduceAction
+private class ReduceAction241
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7335,8 +8150,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction222
-special ReduceAction
+private class ReduceAction242
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7374,8 +8189,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction223
-special ReduceAction
+private class ReduceAction243
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7406,8 +8221,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction224
-special ReduceAction
+private class ReduceAction244
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7442,8 +8257,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction225
-special ReduceAction
+private class ReduceAction245
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7473,8 +8288,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction226
-special ReduceAction
+private class ReduceAction246
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7508,8 +8323,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction227
-special ReduceAction
+private class ReduceAction247
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7541,8 +8356,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction228
-special ReduceAction
+private class ReduceAction248
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7578,8 +8393,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction229
-special ReduceAction
+private class ReduceAction249
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7608,8 +8423,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction230
-special ReduceAction
+private class ReduceAction250
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7642,8 +8457,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction231
-special ReduceAction
+private class ReduceAction251
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7659,8 +8474,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction232
-special ReduceAction
+private class ReduceAction252
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7676,8 +8491,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction233
-special ReduceAction
+private class ReduceAction253
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7695,8 +8510,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction234
-special ReduceAction
+private class ReduceAction254
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7719,8 +8534,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction235
-special ReduceAction
+private class ReduceAction255
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7746,8 +8561,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction236
-special ReduceAction
+private class ReduceAction256
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7777,8 +8592,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction237
-special ReduceAction
+private class ReduceAction257
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7811,8 +8626,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction238
-special ReduceAction
+private class ReduceAction258
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7842,8 +8657,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction239
-special ReduceAction
+private class ReduceAction259
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7870,8 +8685,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction240
-special ReduceAction
+private class ReduceAction260
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7907,8 +8722,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction241
-special ReduceAction
+private class ReduceAction261
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7941,8 +8756,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction242
-special ReduceAction
+private class ReduceAction262
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -7972,8 +8787,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction243
-special ReduceAction
+private class ReduceAction263
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8003,8 +8818,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction244
-special ReduceAction
+private class ReduceAction264
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8031,8 +8846,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction245
-special ReduceAction
+private class ReduceAction265
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8068,8 +8883,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction246
-special ReduceAction
+private class ReduceAction266
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8102,8 +8917,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction247
-special ReduceAction
+private class ReduceAction267
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8133,8 +8948,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction248
-special ReduceAction
+private class ReduceAction268
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8150,8 +8965,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction249
-special ReduceAction
+private class ReduceAction269
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8167,8 +8982,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction250
-special ReduceAction
+private class ReduceAction270
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8192,8 +9007,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction251
-special ReduceAction
+private class ReduceAction271
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8214,8 +9029,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction252
-special ReduceAction
+private class ReduceAction272
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8247,8 +9062,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction253
-special ReduceAction
+private class ReduceAction273
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8276,8 +9091,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction254
-special ReduceAction
+private class ReduceAction274
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8309,8 +9124,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction255
-special ReduceAction
+private class ReduceAction275
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8338,8 +9153,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction256
-special ReduceAction
+private class ReduceAction276
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8368,8 +9183,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction259
-special ReduceAction
+private class ReduceAction279
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8393,8 +9208,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction260
-special ReduceAction
+private class ReduceAction280
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8415,8 +9230,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction261
-special ReduceAction
+private class ReduceAction281
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8450,8 +9265,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction262
-special ReduceAction
+private class ReduceAction282
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8482,8 +9297,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction263
-special ReduceAction
+private class ReduceAction283
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8524,8 +9339,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction264
-special ReduceAction
+private class ReduceAction284
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8563,8 +9378,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction265
-special ReduceAction
+private class ReduceAction285
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8590,8 +9405,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction266
-special ReduceAction
+private class ReduceAction286
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8620,8 +9435,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction267
-special ReduceAction
+private class ReduceAction287
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8643,8 +9458,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction268
-special ReduceAction
+private class ReduceAction288
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8669,8 +9484,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction269
-special ReduceAction
+private class ReduceAction289
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8683,8 +9498,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction273
-special ReduceAction
+private class ReduceAction293
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8712,8 +9527,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction275
-special ReduceAction
+private class ReduceAction295
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8754,8 +9569,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction277
-special ReduceAction
+private class ReduceAction297
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8777,8 +9592,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction278
-special ReduceAction
+private class ReduceAction298
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8800,8 +9615,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction279
-special ReduceAction
+private class ReduceAction299
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8824,8 +9639,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction281
-special ReduceAction
+private class ReduceAction301
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8846,8 +9661,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction283
-special ReduceAction
+private class ReduceAction303
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8869,8 +9684,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction284
-special ReduceAction
+private class ReduceAction304
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8892,8 +9707,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction285
-special ReduceAction
+private class ReduceAction305
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8915,8 +9730,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction286
-special ReduceAction
+private class ReduceAction306
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8938,8 +9753,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction287
-special ReduceAction
+private class ReduceAction307
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8961,8 +9776,31 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction288
-special ReduceAction
+private class ReduceAction308
+       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 pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pexprnode3 = nodearraylist4
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable ALlExpr = new ALlExpr.init_allexpr(
+                                               pexprnode2,
+                                               pexprnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction309
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -8984,8 +9822,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction289
-special ReduceAction
+private class ReduceAction310
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9007,8 +9845,31 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction290
-special ReduceAction
+private class ReduceAction311
+       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 pexprnode2 = nodearraylist1
+                                       assert pexprnode2 isa nullable AExpr
+                                       var pexprnode3 = nodearraylist4
+                                       assert pexprnode3 isa nullable AExpr
+                                       var pexprnode1: nullable AGgExpr = new AGgExpr.init_aggexpr(
+                                               pexprnode2,
+                                               pexprnode3
+                                       )
+                                       node_list = pexprnode1
+                                       p.push(p.go_to(_goto), node_list)
+       end
+       var _goto: Int
+       init(g: Int) do _goto = g
+end
+private class ReduceAction312
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9030,8 +9891,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction291
-special ReduceAction
+private class ReduceAction313
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9053,8 +9914,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction293
-special ReduceAction
+private class ReduceAction315
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9076,8 +9937,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction294
-special ReduceAction
+private class ReduceAction316
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9099,8 +9960,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction296
-special ReduceAction
+private class ReduceAction318
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9122,8 +9983,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction297
-special ReduceAction
+private class ReduceAction319
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9145,8 +10006,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction298
-special ReduceAction
+private class ReduceAction320
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9168,8 +10029,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction300
-special ReduceAction
+private class ReduceAction322
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9190,8 +10051,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction301
-special ReduceAction
+private class ReduceAction323
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9212,8 +10073,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction303
-special ReduceAction
+private class ReduceAction325
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9241,8 +10102,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction304
-special ReduceAction
+private class ReduceAction326
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9268,8 +10129,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction305
-special ReduceAction
+private class ReduceAction327
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9292,8 +10153,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction306
-special ReduceAction
+private class ReduceAction328
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9315,8 +10176,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction307
-special ReduceAction
+private class ReduceAction329
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9335,8 +10196,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction314
-special ReduceAction
+private class ReduceAction336
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9360,8 +10221,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction315
-special ReduceAction
+private class ReduceAction337
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9394,8 +10255,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction316
-special ReduceAction
+private class ReduceAction338
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9422,8 +10283,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction317
-special ReduceAction
+private class ReduceAction339
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9450,8 +10311,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction318
-special ReduceAction
+private class ReduceAction340
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9469,8 +10330,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction319
-special ReduceAction
+private class ReduceAction341
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9486,8 +10347,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction320
-special ReduceAction
+private class ReduceAction342
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9503,8 +10364,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction321
-special ReduceAction
+private class ReduceAction343
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9520,8 +10381,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction322
-special ReduceAction
+private class ReduceAction344
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9537,8 +10398,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction323
-special ReduceAction
+private class ReduceAction345
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9554,8 +10415,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction324
-special ReduceAction
+private class ReduceAction346
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9571,8 +10432,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction325
-special ReduceAction
+private class ReduceAction347
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9588,8 +10449,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction326
-special ReduceAction
+private class ReduceAction348
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9605,8 +10466,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction329
-special ReduceAction
+private class ReduceAction351
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9637,8 +10498,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction330
-special ReduceAction
+private class ReduceAction352
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9674,8 +10535,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction331
-special ReduceAction
+private class ReduceAction353
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9699,8 +10560,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction332
-special ReduceAction
+private class ReduceAction354
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9728,8 +10589,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction333
-special ReduceAction
+private class ReduceAction355
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9752,8 +10613,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction334
-special ReduceAction
+private class ReduceAction356
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9769,8 +10630,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction336
-special ReduceAction
+private class ReduceAction358
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9786,8 +10647,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction337
-special ReduceAction
+private class ReduceAction359
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9803,8 +10664,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction338
-special ReduceAction
+private class ReduceAction360
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9824,8 +10685,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction339
-special ReduceAction
+private class ReduceAction361
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9849,8 +10710,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction341
-special ReduceAction
+private class ReduceAction363
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9861,8 +10722,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction344
-special ReduceAction
+private class ReduceAction366
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9878,8 +10739,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction349
-special ReduceAction
+private class ReduceAction371
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9894,8 +10755,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction350
-special ReduceAction
+private class ReduceAction372
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9912,8 +10773,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction351
-special ReduceAction
+private class ReduceAction373
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9928,8 +10789,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction352
-special ReduceAction
+private class ReduceAction374
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9945,8 +10806,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction353
-special ReduceAction
+private class ReduceAction375
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9969,8 +10830,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction354
-special ReduceAction
+private class ReduceAction376
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -9988,8 +10849,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction355
-special ReduceAction
+private class ReduceAction377
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10011,8 +10872,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction356
-special ReduceAction
+private class ReduceAction378
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10031,8 +10892,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction357
-special ReduceAction
+private class ReduceAction379
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10046,8 +10907,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction358
-special ReduceAction
+private class ReduceAction380
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10061,8 +10922,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction359
-special ReduceAction
+private class ReduceAction381
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10072,8 +10933,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction361
-special ReduceAction
+private class ReduceAction383
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10091,8 +10952,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction362
-special ReduceAction
+private class ReduceAction384
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10111,8 +10972,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction364
-special ReduceAction
+private class ReduceAction386
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10122,8 +10983,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction365
-special ReduceAction
+private class ReduceAction387
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10135,8 +10996,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction366
-special ReduceAction
+private class ReduceAction388
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10147,8 +11008,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction367
-special ReduceAction
+private class ReduceAction389
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10160,8 +11021,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction609
-special ReduceAction
+private class ReduceAction637
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10185,8 +11046,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction610
-special ReduceAction
+private class ReduceAction638
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10206,8 +11067,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction611
-special ReduceAction
+private class ReduceAction639
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10235,8 +11096,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction614
-special ReduceAction
+private class ReduceAction642
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10262,8 +11123,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction627
-special ReduceAction
+private class ReduceAction655
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10277,8 +11138,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction628
-special ReduceAction
+private class ReduceAction656
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10290,8 +11151,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction635
-special ReduceAction
+private class ReduceAction663
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10307,8 +11168,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction636
-special ReduceAction
+private class ReduceAction664
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10328,8 +11189,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction637
-special ReduceAction
+private class ReduceAction665
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10345,8 +11206,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction638
-special ReduceAction
+private class ReduceAction666
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10366,8 +11227,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction639
-special ReduceAction
+private class ReduceAction667
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10383,8 +11244,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction640
-special ReduceAction
+private class ReduceAction668
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10404,8 +11265,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction641
-special ReduceAction
+private class ReduceAction669
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10421,8 +11282,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction642
-special ReduceAction
+private class ReduceAction670
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10442,8 +11303,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction645
-special ReduceAction
+private class ReduceAction673
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10459,8 +11320,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction646
-special ReduceAction
+private class ReduceAction674
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10480,8 +11341,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction647
-special ReduceAction
+private class ReduceAction675
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10497,8 +11358,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction648
-special ReduceAction
+private class ReduceAction676
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10518,8 +11379,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction649
-special ReduceAction
+private class ReduceAction677
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10535,8 +11396,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction650
-special ReduceAction
+private class ReduceAction678
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10556,8 +11417,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction652
-special ReduceAction
+private class ReduceAction680
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10577,8 +11438,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction654
-special ReduceAction
+private class ReduceAction682
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10598,8 +11459,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction656
-special ReduceAction
+private class ReduceAction684
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10618,8 +11479,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction660
-special ReduceAction
+private class ReduceAction688
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10639,8 +11500,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction661
-special ReduceAction
+private class ReduceAction689
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10656,8 +11517,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction662
-special ReduceAction
+private class ReduceAction690
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10677,8 +11538,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction663
-special ReduceAction
+private class ReduceAction691
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null
@@ -10694,8 +11555,8 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction664
-special ReduceAction
+private class ReduceAction692
+       super ReduceAction
        redef fun action(p: Parser)
        do
                                        var node_list: nullable Object = null