Merge remote branch 'pu/new-style_attributes' into wip
authorJean Privat <jean@pryen.org>
Tue, 25 Jan 2011 01:07:30 +0000 (20:07 -0500)
committerJean Privat <jean@pryen.org>
Tue, 25 Jan 2011 01:07:30 +0000 (20:07 -0500)
Conflicts:
src/parser/parser_tables.nit
src/parser/table_nit.c

42 files changed:
src/metamodel/inheritance.nit
src/parser/nit.sablecc3xx
src/parser/parser.nit
src/parser/parser_abs.nit
src/parser/parser_nodes.nit
src/parser/parser_prod.nit
src/parser/tables_nit.c
src/syntax/mmbuilder.nit
tests/base_attr2.nit [new file with mode: 0644]
tests/base_attr3.nit [new file with mode: 0644]
tests/base_attr4.nit [new file with mode: 0644]
tests/base_attr5.nit [new file with mode: 0644]
tests/base_attr6.nit [new file with mode: 0644]
tests/sav/base_attr2.sav [new file with mode: 0644]
tests/sav/base_attr3.sav [new file with mode: 0644]
tests/sav/base_attr3_alt1.sav [new file with mode: 0644]
tests/sav/base_attr3_alt2.sav [new file with mode: 0644]
tests/sav/base_attr3_alt3.sav [new file with mode: 0644]
tests/sav/base_attr3_alt4.sav [new file with mode: 0644]
tests/sav/base_attr4.sav [new file with mode: 0644]
tests/sav/base_attr4_alt1.sav [new file with mode: 0644]
tests/sav/base_attr4_alt2.sav [new file with mode: 0644]
tests/sav/base_attr5.sav [new file with mode: 0644]
tests/sav/base_attr5_alt1.sav [new file with mode: 0644]
tests/sav/base_attr5_alt11.sav [new file with mode: 0644]
tests/sav/base_attr5_alt12.sav [new file with mode: 0644]
tests/sav/base_attr5_alt13.sav [new file with mode: 0644]
tests/sav/base_attr5_alt14.sav [new file with mode: 0644]
tests/sav/base_attr5_alt15.sav [new file with mode: 0644]
tests/sav/base_attr5_alt16.sav [new file with mode: 0644]
tests/sav/base_attr5_alt2.sav [new file with mode: 0644]
tests/sav/base_attr5_alt21.sav [new file with mode: 0644]
tests/sav/base_attr5_alt22.sav [new file with mode: 0644]
tests/sav/base_attr5_alt23.sav [new file with mode: 0644]
tests/sav/base_attr5_alt24.sav [new file with mode: 0644]
tests/sav/base_attr5_alt25.sav [new file with mode: 0644]
tests/sav/base_attr5_alt26.sav [new file with mode: 0644]
tests/sav/base_attr5_alt3.sav [new file with mode: 0644]
tests/sav/base_attr5_alt4.sav [new file with mode: 0644]
tests/sav/base_attr5_alt5.sav [new file with mode: 0644]
tests/sav/base_attr5_alt6.sav [new file with mode: 0644]
tests/sav/base_attr6.sav [new file with mode: 0644]

index 196ef85..ebc15fe 100644 (file)
@@ -129,6 +129,9 @@ redef class MMLocalClass
                                        continue
                                end
 
+                               # Do not inherit new style attributes
+                               if glob.intro.name.to_s[0] == '@' then continue
+
                                make_visible_an_inherited_global_property(glob)
                        end
                end
@@ -184,6 +187,7 @@ redef class MMLocalClass
                                var g = c.get_property_by_name(n)
                                if not set.has(g) then set.add(g)
                                if g.is_init and g.intro.local_class.global != global then continue
+                               if g.intro.name.to_s.first == '@' then continue # inherited new style attibutes are invisible
                                if nset.has(g) then continue
                                nset.add(g)
                        end
index 5628f0b..bcfb303 100644 (file)
@@ -214,8 +214,10 @@ propdef~toplevel {-> propdef}
 !toplevel| {deferred} [doc]:no redef visibility kwmeth methid signature kwis kwabstract {-> New propdef.deferred_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature)}
 !toplevel| {intern} [doc]:no redef visibility kwmeth methid signature kwis kwintern {-> New propdef.intern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature)}
        | {extern} [doc]:no redef visibility kwmeth methid signature kwis kwextern string? {-> New propdef.extern_meth(doc.doc, redef.kwredef, visibility, kwmeth, methid, signature.signature, string)}
-!toplevel| {var} [doc]:no readable? writable? redef visibility kwvar attrid typing? {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwvar, attrid, typing.type, Null)}
-!toplevel| {var2} [doc]:no readable? writable? redef visibility kwvar attrid typing? assign [n2]:no expr {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwvar, attrid, typing.type, expr)}
+!toplevel| {var} [doc]:no readable? writable? redef visibility kwvar attrid typing? {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwvar, attrid, Null, typing.type, Null)}
+!toplevel| {var2} [doc]:no readable? writable? redef visibility kwvar attrid typing? assign [n2]:no expr {-> New propdef.attr(doc.doc, readable.able, writable.able, redef.kwredef, visibility, kwvar, attrid, Null, typing.type, expr)}
+!toplevel| {var3} [doc]:no redef visibility kwvar id typing? writable2? {-> New propdef.attr(doc.doc, Null, writable2.able, redef.kwredef, visibility, kwvar, Null, id, typing.type, Null)}
+!toplevel| {var4} [doc]:no redef visibility kwvar id typing? writable2? assign [n2]:no expr {-> New propdef.attr(doc.doc, Null, writable2.able, redef.kwredef, visibility, kwvar, Null, id, typing.type, expr)}
 !toplevel| {init} [doc]:no redef visibility kwinit methid? signature kwdo stmtso kwend? {-> New propdef.concrete_init(doc.doc, redef.kwredef, visibility, kwinit, methid, signature, stmtso.expr)}
 !toplevel| {type} [doc]:no redef visibility kwtype classid typing {-> New propdef.type(doc.doc, redef.kwredef, visibility, kwtype, classid, typing.type)}
        ;
@@ -223,7 +225,10 @@ readable {-> able}
        = redef kwreadable {-> New able.read(redef.kwredef, kwreadable)}
        ;
 writable {-> able}
-       = redef kwwritable {-> New able.write(redef.kwredef, kwwritable)}
+       = redef kwwritable {-> New able.write(redef.kwredef, Null, kwwritable)}
+       ;
+writable2 {-> able}
+       = redef visibility kwwritable {-> New able.write(redef.kwredef, visibility, kwwritable)}
        ;
 
 visibility
@@ -600,7 +605,7 @@ formaldef = [id]:classid type?;
 superclass = kwspecial? kwsuper? type;
 
 
-propdef = {attr} doc? [readable]:able? [writable]:able? kwredef? visibility kwvar [id]:attrid type? expr?
+propdef = {attr} doc? [readable]:able? [writable]:able? kwredef? visibility kwvar [id]:attrid? [id2]:id? type? expr?
        | {meth} doc? kwredef? visibility methid signature 
        | {deferred_meth} doc? kwredef? visibility kwmeth methid signature 
        | {intern_meth} doc? kwredef? visibility kwmeth methid signature 
@@ -612,7 +617,7 @@ propdef = {attr} doc? [readable]:able? [writable]:able? kwredef? visibility kwva
        ;
 
 able   = {read} kwredef? kwreadable
-       | {write} kwredef? kwwritable
+       | {write} kwredef? visibility? kwwritable
        ;
 
 methid = {id} id | {plus} plus | {minus} minus | {star} star | {slash} slash | {percent} percent | {eq} eq | {ne} ne | {le} le | {ge} ge | {lt} lt | {gt} gt | {bra} obra cbra | {starship} starship | {assign} id assign | {braassign} obra cbra assign;
index 9d2ae82..3588c23 100644 (file)
@@ -275,548 +275,566 @@ 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 ReduceAction210(33),
-                       new ReduceAction211(33),
-                       new ReduceAction212(33),
-                       new ReduceAction213(33),
-                       new ReduceAction214(33),
-                       new ReduceAction215(33),
-                       new ReduceAction216(33),
-                       new ReduceAction217(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(18),
+                       new ReduceAction166(18),
+                       new ReduceAction167(18),
+                       new ReduceAction168(18),
+                       new ReduceAction169(18),
+                       new ReduceAction170(18),
+                       new ReduceAction171(18),
+                       new ReduceAction172(18),
+                       new ReduceAction173(19),
+                       new ReduceAction174(19),
+                       new ReduceAction175(19),
+                       new ReduceAction176(19),
+                       new ReduceAction177(20),
+                       new ReduceAction178(20),
+                       new ReduceAction179(20),
+                       new ReduceAction180(21),
+                       new ReduceAction181(22),
+                       new ReduceAction182(22),
+                       new ReduceAction183(22),
+                       new ReduceAction184(23),
+                       new ReduceAction185(24),
+                       new ReduceAction186(24),
+                       new ReduceAction187(24),
+                       new ReduceAction188(24),
+                       new ReduceAction189(24),
+                       new ReduceAction190(24),
+                       new ReduceAction191(25),
+                       new ReduceAction192(26),
+                       new ReduceAction193(26),
+                       new ReduceAction194(26),
+                       new ReduceAction195(26),
+                       new ReduceAction196(27),
+                       new ReduceAction197(27),
+                       new ReduceAction198(28),
+                       new ReduceAction198(29),
+                       new ReduceAction200(30),
+                       new ReduceAction201(30),
+                       new ReduceAction202(30),
+                       new ReduceAction203(30),
+                       new ReduceAction204(31),
+                       new ReduceAction205(31),
+                       new ReduceAction206(32),
+                       new ReduceAction207(32),
+                       new ReduceAction208(33),
+                       new ReduceAction203(34),
+                       new ReduceAction203(34),
+                       new ReduceAction211(34),
+                       new ReduceAction212(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 ReduceAction219(34),
+                       new ReduceAction220(34),
+                       new ReduceAction221(34),
+                       new ReduceAction203(34),
+                       new ReduceAction203(34),
+                       new ReduceAction203(34),
+                       new ReduceAction203(34),
+                       new ReduceAction203(34),
+                       new ReduceAction203(34),
+                       new ReduceAction228(34),
+                       new ReduceAction229(34),
+                       new ReduceAction230(34),
+                       new ReduceAction231(34),
+                       new ReduceAction232(34),
+                       new ReduceAction233(34),
+                       new ReduceAction234(34),
+                       new ReduceAction235(34),
+                       new ReduceAction236(35),
+                       new ReduceAction237(36),
+                       new ReduceAction238(36),
+                       new ReduceAction239(37),
+                       new ReduceAction240(37),
+                       new ReduceAction241(37),
+                       new ReduceAction242(37),
+                       new ReduceAction243(37),
+                       new ReduceAction244(37),
+                       new ReduceAction245(38),
+                       new ReduceAction246(38),
+                       new ReduceAction247(38),
+                       new ReduceAction248(38),
+                       new ReduceAction249(39),
+                       new ReduceAction250(39),
+                       new ReduceAction251(40),
+                       new ReduceAction252(41),
+                       new ReduceAction253(41),
+                       new ReduceAction254(41),
+                       new ReduceAction255(41),
+                       new ReduceAction256(42),
+                       new ReduceAction257(42),
+                       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(43),
+                       new ReduceAction267(43),
+                       new ReduceAction268(44),
+                       new ReduceAction269(44),
+                       new ReduceAction270(45),
+                       new ReduceAction271(45),
+                       new ReduceAction272(45),
+                       new ReduceAction273(45),
+                       new ReduceAction274(45),
+                       new ReduceAction208(46),
+                       new ReduceAction36(46),
+                       new ReduceAction277(47),
+                       new ReduceAction278(47),
+                       new ReduceAction279(48),
+                       new ReduceAction280(48),
+                       new ReduceAction281(49),
+                       new ReduceAction282(49),
+                       new ReduceAction283(50),
+                       new ReduceAction284(50),
+                       new ReduceAction285(50),
+                       new ReduceAction286(50),
+                       new ReduceAction287(51),
+                       new ReduceAction203(52),
+                       new ReduceAction230(52),
+                       new ReduceAction231(52),
+                       new ReduceAction291(52),
+                       new ReduceAction203(53),
+                       new ReduceAction293(53),
+                       new ReduceAction203(54),
+                       new ReduceAction295(54),
+                       new ReduceAction296(54),
+                       new ReduceAction297(54),
+                       new ReduceAction203(55),
+                       new ReduceAction299(55),
+                       new ReduceAction203(56),
+                       new ReduceAction301(56),
+                       new ReduceAction302(56),
+                       new ReduceAction303(56),
+                       new ReduceAction304(56),
+                       new ReduceAction305(56),
+                       new ReduceAction306(56),
+                       new ReduceAction307(56),
+                       new ReduceAction308(56),
+                       new ReduceAction309(56),
+                       new ReduceAction203(57),
+                       new ReduceAction311(57),
+                       new ReduceAction312(57),
+                       new ReduceAction203(58),
+                       new ReduceAction314(58),
+                       new ReduceAction315(58),
+                       new ReduceAction316(58),
+                       new ReduceAction203(59),
+                       new ReduceAction318(59),
+                       new ReduceAction319(59),
+                       new ReduceAction203(60),
                        new ReduceAction321(60),
                        new ReduceAction322(60),
                        new ReduceAction323(60),
-                       new ReduceAction324(60),
-                       new ReduceAction325(60),
-                       new ReduceAction326(60),
-                       new ReduceAction185(60),
-                       new ReduceAction182(60),
-                       new ReduceAction329(60),
-                       new ReduceAction330(60),
-                       new ReduceAction331(61),
+                       new ReduceAction324(61),
+                       new ReduceAction325(61),
+                       new ReduceAction228(61),
+                       new ReduceAction229(61),
+                       new ReduceAction232(61),
+                       new ReduceAction233(61),
+                       new ReduceAction234(61),
+                       new ReduceAction235(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 ReduceAction333(61),
+                       new ReduceAction334(61),
+                       new ReduceAction335(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 ReduceAction203(61),
+                       new ReduceAction200(61),
+                       new ReduceAction347(61),
+                       new ReduceAction348(61),
+                       new ReduceAction349(62),
+                       new ReduceAction350(62),
+                       new ReduceAction351(63),
+                       new ReduceAction352(64),
+                       new ReduceAction351(65),
+                       new ReduceAction354(66),
+                       new ReduceAction355(67),
+                       new ReduceAction356(68),
+                       new ReduceAction357(68),
+                       new ReduceAction179(68),
+                       new ReduceAction359(68),
+                       new ReduceAction356(69),
+                       new ReduceAction357(69),
+                       new ReduceAction362(69),
+                       new ReduceAction179(69),
+                       new ReduceAction359(69),
+                       new ReduceAction356(70),
+                       new ReduceAction357(70),
+                       new ReduceAction367(71),
+                       new ReduceAction368(72),
+                       new ReduceAction369(72),
+                       new ReduceAction370(73),
+                       new ReduceAction371(73),
+                       new ReduceAction372(74),
+                       new ReduceAction373(74),
+                       new ReduceAction374(74),
+                       new ReduceAction375(75),
+                       new ReduceAction376(76),
+                       new ReduceAction377(77),
+                       new ReduceAction377(77),
+                       new ReduceAction379(78),
+                       new ReduceAction380(78),
+                       new ReduceAction36(78),
+                       new ReduceAction382(79),
+                       new ReduceAction383(79),
+                       new ReduceAction384(80),
+                       new ReduceAction385(80),
+                       new ReduceAction377(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 ReduceAction165(83),
+                       new ReduceAction166(83),
+                       new ReduceAction167(83),
+                       new ReduceAction168(83),
+                       new ReduceAction192(84),
+                       new ReduceAction193(84),
+                       new ReduceAction203(85),
+                       new ReduceAction230(85),
+                       new ReduceAction231(85),
+                       new ReduceAction203(86),
+                       new ReduceAction293(86),
+                       new ReduceAction203(87),
+                       new ReduceAction295(87),
+                       new ReduceAction296(87),
+                       new ReduceAction297(87),
+                       new ReduceAction203(88),
+                       new ReduceAction299(88),
+                       new ReduceAction203(89),
+                       new ReduceAction301(89),
+                       new ReduceAction302(89),
+                       new ReduceAction303(89),
+                       new ReduceAction304(89),
+                       new ReduceAction305(89),
+                       new ReduceAction306(89),
+                       new ReduceAction307(89),
+                       new ReduceAction308(89),
+                       new ReduceAction309(89),
+                       new ReduceAction203(90),
+                       new ReduceAction311(90),
+                       new ReduceAction312(90),
+                       new ReduceAction203(91),
+                       new ReduceAction314(91),
+                       new ReduceAction315(91),
+                       new ReduceAction316(91),
+                       new ReduceAction203(92),
+                       new ReduceAction318(92),
+                       new ReduceAction319(92),
+                       new ReduceAction203(93),
                        new ReduceAction321(93),
                        new ReduceAction322(93),
                        new ReduceAction323(93),
-                       new ReduceAction324(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 ReduceAction324(94),
+                       new ReduceAction325(94),
+                       new ReduceAction228(94),
+                       new ReduceAction229(94),
+                       new ReduceAction232(94),
+                       new ReduceAction233(94),
+                       new ReduceAction234(94),
+                       new ReduceAction235(94),
+                       new ReduceAction333(94),
+                       new ReduceAction337(94),
+                       new ReduceAction338(94),
+                       new ReduceAction339(94),
+                       new ReduceAction340(94),
+                       new ReduceAction341(94),
+                       new ReduceAction342(94),
+                       new ReduceAction343(94),
+                       new ReduceAction344(94),
+                       new ReduceAction203(94),
+                       new ReduceAction200(94),
+                       new ReduceAction347(94),
+                       new ReduceAction348(94),
                        new ReduceAction200(95),
                        new ReduceAction201(95),
                        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 ReduceAction203(96),
+                       new ReduceAction203(96),
+                       new ReduceAction211(96),
+                       new ReduceAction212(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 ReduceAction221(96),
+                       new ReduceAction203(96),
+                       new ReduceAction203(96),
+                       new ReduceAction203(96),
+                       new ReduceAction203(96),
+                       new ReduceAction203(96),
+                       new ReduceAction203(96),
+                       new ReduceAction228(96),
+                       new ReduceAction229(96),
+                       new ReduceAction230(96),
+                       new ReduceAction231(96),
+                       new ReduceAction232(96),
+                       new ReduceAction233(96),
+                       new ReduceAction234(96),
+                       new ReduceAction235(96),
+                       new ReduceAction237(97),
+                       new ReduceAction238(97),
+                       new ReduceAction239(98),
+                       new ReduceAction240(98),
+                       new ReduceAction241(98),
+                       new ReduceAction242(98),
+                       new ReduceAction243(98),
+                       new ReduceAction244(98),
+                       new ReduceAction251(99),
+                       new ReduceAction252(100),
+                       new ReduceAction253(100),
+                       new ReduceAction254(100),
+                       new ReduceAction255(100),
+                       new ReduceAction256(101),
+                       new ReduceAction257(101),
+                       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 ReduceAction268(102),
+                       new ReduceAction269(102),
+                       new ReduceAction270(103),
+                       new ReduceAction277(104),
+                       new ReduceAction278(104),
+                       new ReduceAction279(105),
+                       new ReduceAction280(105),
+                       new ReduceAction281(106),
+                       new ReduceAction282(106),
+                       new ReduceAction283(107),
+                       new ReduceAction284(107),
+                       new ReduceAction203(108),
+                       new ReduceAction230(108),
+                       new ReduceAction231(108),
+                       new ReduceAction291(108),
+                       new ReduceAction203(109),
+                       new ReduceAction230(109),
+                       new ReduceAction231(109),
+                       new ReduceAction200(110),
+                       new ReduceAction201(110),
+                       new ReduceAction202(110),
+                       new ReduceAction200(111),
+                       new ReduceAction201(111),
+                       new ReduceAction202(111),
+                       new ReduceAction203(112),
+                       new ReduceAction230(112),
+                       new ReduceAction231(112),
+                       new ReduceAction203(113),
+                       new ReduceAction293(113),
+                       new ReduceAction203(114),
+                       new ReduceAction295(114),
+                       new ReduceAction296(114),
+                       new ReduceAction297(114),
+                       new ReduceAction203(115),
+                       new ReduceAction299(115),
+                       new ReduceAction203(116),
+                       new ReduceAction301(116),
+                       new ReduceAction302(116),
+                       new ReduceAction303(116),
+                       new ReduceAction304(116),
+                       new ReduceAction305(116),
+                       new ReduceAction306(116),
+                       new ReduceAction307(116),
+                       new ReduceAction308(116),
+                       new ReduceAction309(116),
+                       new ReduceAction203(117),
+                       new ReduceAction311(117),
+                       new ReduceAction312(117),
+                       new ReduceAction203(118),
+                       new ReduceAction314(118),
+                       new ReduceAction315(118),
+                       new ReduceAction316(118),
+                       new ReduceAction203(119),
+                       new ReduceAction318(119),
+                       new ReduceAction319(119),
+                       new ReduceAction203(120),
                        new ReduceAction321(120),
                        new ReduceAction322(120),
                        new ReduceAction323(120),
-                       new ReduceAction324(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 ReduceAction324(121),
+                       new ReduceAction325(121),
+                       new ReduceAction228(121),
+                       new ReduceAction229(121),
+                       new ReduceAction232(121),
+                       new ReduceAction233(121),
+                       new ReduceAction234(121),
+                       new ReduceAction235(121),
+                       new ReduceAction332(121),
+                       new ReduceAction333(121),
+                       new ReduceAction337(121),
+                       new ReduceAction338(121),
+                       new ReduceAction339(121),
+                       new ReduceAction340(121),
+                       new ReduceAction341(121),
+                       new ReduceAction342(121),
+                       new ReduceAction343(121),
+                       new ReduceAction344(121),
+                       new ReduceAction203(121),
+                       new ReduceAction347(121),
+                       new ReduceAction348(121),
+                       new ReduceAction203(122),
+                       new ReduceAction230(122),
+                       new ReduceAction231(122),
+                       new ReduceAction203(123),
+                       new ReduceAction293(123),
+                       new ReduceAction203(124),
+                       new ReduceAction295(124),
+                       new ReduceAction296(124),
+                       new ReduceAction297(124),
+                       new ReduceAction203(125),
+                       new ReduceAction299(125),
+                       new ReduceAction203(126),
+                       new ReduceAction301(126),
+                       new ReduceAction302(126),
+                       new ReduceAction303(126),
+                       new ReduceAction304(126),
+                       new ReduceAction305(126),
+                       new ReduceAction306(126),
+                       new ReduceAction307(126),
+                       new ReduceAction308(126),
+                       new ReduceAction309(126),
+                       new ReduceAction203(127),
+                       new ReduceAction311(127),
+                       new ReduceAction312(127),
+                       new ReduceAction203(128),
+                       new ReduceAction314(128),
+                       new ReduceAction315(128),
+                       new ReduceAction316(128),
+                       new ReduceAction203(129),
+                       new ReduceAction318(129),
+                       new ReduceAction319(129),
+                       new ReduceAction203(130),
                        new ReduceAction321(130),
-                       new ReduceAction322(130),
-                       new ReduceAction323(130),
-                       new ReduceAction324(130),
-                       new ReduceAction325(130),
-                       new ReduceAction326(130),
-                       new ReduceAction185(130),
-                       new ReduceAction329(130),
-                       new ReduceAction330(130),
-                       new ReduceAction627(131),
+                       new ReduceAction627(130),
                        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 ReduceAction629(131),
+                       new ReduceAction232(131),
+                       new ReduceAction233(131),
+                       new ReduceAction632(131),
+                       new ReduceAction333(131),
+                       new ReduceAction337(131),
+                       new ReduceAction338(131),
+                       new ReduceAction339(131),
+                       new ReduceAction340(131),
+                       new ReduceAction341(131),
+                       new ReduceAction342(131),
+                       new ReduceAction343(131),
+                       new ReduceAction344(131),
+                       new ReduceAction203(131),
+                       new ReduceAction347(131),
+                       new ReduceAction348(131),
+                       new ReduceAction645(132),
+                       new ReduceAction646(132),
+                       new ReduceAction203(133),
+                       new ReduceAction230(133),
+                       new ReduceAction231(133),
+                       new ReduceAction203(134),
+                       new ReduceAction230(134),
+                       new ReduceAction231(134),
+                       new ReduceAction653(135),
+                       new ReduceAction654(135),
+                       new ReduceAction655(136),
+                       new ReduceAction656(136),
+                       new ReduceAction657(137),
+                       new ReduceAction658(137),
+                       new ReduceAction659(138),
+                       new ReduceAction660(138),
+                       new ReduceAction657(139),
+                       new ReduceAction658(139),
+                       new ReduceAction663(140),
+                       new ReduceAction664(140),
+                       new ReduceAction665(141),
+                       new ReduceAction666(141),
+                       new ReduceAction667(142),
+                       new ReduceAction668(142),
+                       new ReduceAction196(143),
+                       new ReduceAction670(143),
+                       new ReduceAction362(144),
+                       new ReduceAction672(144),
+                       new ReduceAction369(145),
+                       new ReduceAction674(145),
+                       new ReduceAction362(146),
+                       new ReduceAction672(146),
+                       new ReduceAction370(147),
+                       new ReduceAction678(147),
+                       new ReduceAction679(148),
+                       new ReduceAction680(148),
+                       new ReduceAction681(149),
+                       new ReduceAction682(149)
                )
        end
 end
@@ -3649,6 +3667,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3686,6 +3705,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3723,6 +3743,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3763,6 +3784,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3800,6 +3822,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3840,6 +3863,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3880,6 +3904,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3923,6 +3948,7 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
+                                               null,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3949,8 +3975,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 +3985,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -3989,8 +4016,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 +4026,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4029,8 +4057,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 +4067,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4072,8 +4101,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 +4111,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4112,8 +4142,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 +4152,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4155,8 +4186,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 +4196,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4198,8 +4230,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 +4240,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4244,8 +4277,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 +4287,8 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
+                                               null,
+                                               ptypenode10,
                                                null
                                        )
                                        node_list = ppropdefnode1
@@ -4283,8 +4317,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 +4328,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4325,8 +4360,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 +4371,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4367,8 +4403,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 +4414,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4412,8 +4449,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 +4460,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4454,8 +4492,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 +4503,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4499,8 +4538,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 +4549,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4544,8 +4584,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 +4595,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4592,8 +4633,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 +4644,8 @@ special ReduceAction
                                                tkwvarnode7,
                                                tattridnode8,
                                                null,
-                                               pexprnode10
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4632,10 +4674,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 +4686,9 @@ special ReduceAction
                                                pvisibilitynode6,
                                                tkwvarnode7,
                                                tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               ptypenode10,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4675,12 +4718,702 @@ special ReduceAction
                                        assert pvisibilitynode6 isa nullable AVisibility
                                        var tkwvarnode7 = nodearraylist4
                                        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 tattridnode8 = nodearraylist5
+                                       assert tattridnode8 isa nullable TAttrid
+                                       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,
+                                               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 ReduceAction107
+special 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 pablenode3 = nodearraylist2
+                                       assert pablenode3 isa nullable AAble
+                                       var pvisibilitynode6 = nodearraylist3
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist4
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tattridnode8 = nodearraylist5
+                                       assert tattridnode8 isa nullable TAttrid
+                                       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,
+                                               null,
+                                               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 ReduceAction108
+special 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 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,
+                                               pablenode3,
+                                               null,
+                                               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 ReduceAction109
+special 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 pablenode4 = nodearraylist2
+                                       assert pablenode4 isa nullable AAble
+                                       var pvisibilitynode6 = nodearraylist3
+                                       assert pvisibilitynode6 isa nullable AVisibility
+                                       var tkwvarnode7 = nodearraylist4
+                                       assert tkwvarnode7 isa nullable TKwvar
+                                       var tattridnode8 = nodearraylist5
+                                       assert tattridnode8 isa nullable TAttrid
+                                       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
+special 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
+special 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
+special 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
+special 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
+special 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
+special 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
+special 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
+special 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
+special 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
+special 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
+special 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
+special 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
+special 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,
@@ -4688,9 +5421,10 @@ special ReduceAction
                                                tkwredefnode5,
                                                pvisibilitynode6,
                                                tkwvarnode7,
-                                               tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               tidnode9,
+                                               null,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4698,12 +5432,11 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction107
+private class ReduceAction123
 special 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
@@ -4714,28 +5447,27 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pablenode3 = nodearraylist2
-                                       assert pablenode3 isa nullable AAble
-                                       var pvisibilitynode6 = nodearraylist3
+                                       var pvisibilitynode6 = nodearraylist2
                                        assert pvisibilitynode6 isa nullable AVisibility
-                                       var tkwvarnode7 = nodearraylist4
+                                       var tkwvarnode7 = nodearraylist3
                                        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 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,
-                                               pablenode3,
+                                               null,
                                                null,
                                                null,
                                                pvisibilitynode6,
                                                tkwvarnode7,
-                                               tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               tidnode9,
+                                               ptypenode10,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4743,12 +5475,11 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction108
+private class ReduceAction124
 special 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
@@ -4760,30 +5491,29 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pablenode3 = nodearraylist2
-                                       assert pablenode3 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 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,
+                                               null,
                                                null,
                                                tkwredefnode5,
                                                pvisibilitynode6,
                                                tkwvarnode7,
-                                               tattridnode8,
-                                               ptypenode9,
-                                               pexprnode10
+                                               null,
+                                               tidnode9,
+                                               ptypenode10,
+                                               pexprnode11
                                        )
                                        node_list = ppropdefnode1
                                        p.push(p.go_to(_goto), node_list)
@@ -4791,12 +5521,11 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction109
+private class ReduceAction125
 special 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
@@ -4807,18 +5536,16 @@ special ReduceAction
                                        var nodearraylist1 = p.pop
                                        var pdocnode2 = nodearraylist1
                                        assert pdocnode2 isa nullable ADoc
-                                       var pablenode4 = nodearraylist2
+                                       var pablenode4 = nodearraylist5
                                        assert pablenode4 isa nullable AAble
-                                       var pvisibilitynode6 = nodearraylist3
+                                       var pvisibilitynode6 = nodearraylist2
                                        assert pvisibilitynode6 isa nullable AVisibility
-                                       var tkwvarnode7 = nodearraylist4
+                                       var tkwvarnode7 = nodearraylist3
                                        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 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 +5553,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 +5564,11 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction110
+private class ReduceAction126
 special 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 +5580,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 +5599,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 +5610,11 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction111
+private class ReduceAction127
 special 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 +5626,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 +5656,11 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction112
+private class ReduceAction128
 special 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 +5673,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,7 +5705,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction113
+private class ReduceAction129
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5019,7 +5741,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction114
+private class ReduceAction130
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5058,7 +5780,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction115
+private class ReduceAction131
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5097,7 +5819,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction116
+private class ReduceAction132
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5139,7 +5861,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction117
+private class ReduceAction133
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5176,7 +5898,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction118
+private class ReduceAction134
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5216,7 +5938,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction119
+private class ReduceAction135
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5256,7 +5978,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction120
+private class ReduceAction136
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5299,7 +6021,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction121
+private class ReduceAction137
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5333,7 +6055,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction122
+private class ReduceAction138
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5370,7 +6092,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction123
+private class ReduceAction139
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5388,7 +6110,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction124
+private class ReduceAction140
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5409,17 +6131,18 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction125
+private class ReduceAction141
 special 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,7 +6150,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction126
+private class ReduceAction142
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5436,11 +6159,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,7 +6172,54 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction127
+private class ReduceAction143
+special 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
+special 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
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5461,7 +6232,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction128
+private class ReduceAction146
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5479,7 +6250,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction129
+private class ReduceAction147
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5497,7 +6268,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction130
+private class ReduceAction148
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5515,7 +6286,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction131
+private class ReduceAction149
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5532,7 +6303,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction132
+private class ReduceAction150
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5549,7 +6320,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction133
+private class ReduceAction151
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5566,7 +6337,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction134
+private class ReduceAction152
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5583,7 +6354,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction135
+private class ReduceAction153
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5600,7 +6371,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction136
+private class ReduceAction154
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5617,7 +6388,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction137
+private class ReduceAction155
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5634,7 +6405,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction138
+private class ReduceAction156
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5651,7 +6422,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction139
+private class ReduceAction157
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5668,7 +6439,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction140
+private class ReduceAction158
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5685,7 +6456,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction141
+private class ReduceAction159
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5702,7 +6473,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction142
+private class ReduceAction160
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5719,7 +6490,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction143
+private class ReduceAction161
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5740,7 +6511,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction144
+private class ReduceAction162
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5757,7 +6528,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction145
+private class ReduceAction163
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5778,7 +6549,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction146
+private class ReduceAction164
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5803,7 +6574,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction147
+private class ReduceAction165
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5828,7 +6599,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction148
+private class ReduceAction166
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5857,7 +6628,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction149
+private class ReduceAction167
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5879,7 +6650,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction150
+private class ReduceAction168
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5905,7 +6676,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction151
+private class ReduceAction169
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5927,7 +6698,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction152
+private class ReduceAction170
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5953,7 +6724,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction153
+private class ReduceAction171
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5972,7 +6743,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction154
+private class ReduceAction172
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -5995,7 +6766,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction155
+private class ReduceAction173
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6013,7 +6784,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction156
+private class ReduceAction174
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6035,7 +6806,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction157
+private class ReduceAction175
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6056,7 +6827,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction158
+private class ReduceAction176
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6081,7 +6852,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction159
+private class ReduceAction177
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6102,7 +6873,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction160
+private class ReduceAction178
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6127,7 +6898,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction161
+private class ReduceAction179
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6142,7 +6913,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction162
+private class ReduceAction180
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6157,7 +6928,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction163
+private class ReduceAction181
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6176,7 +6947,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction164
+private class ReduceAction182
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6198,7 +6969,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction165
+private class ReduceAction183
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6223,7 +6994,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction166
+private class ReduceAction184
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6240,7 +7011,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction167
+private class ReduceAction185
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6268,7 +7039,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction168
+private class ReduceAction186
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6299,7 +7070,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction169
+private class ReduceAction187
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6331,7 +7102,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction170
+private class ReduceAction188
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6366,7 +7137,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction171
+private class ReduceAction189
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6399,7 +7170,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction172
+private class ReduceAction190
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6435,7 +7206,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction173
+private class ReduceAction191
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6453,7 +7224,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction174
+private class ReduceAction192
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6473,7 +7244,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction175
+private class ReduceAction193
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6496,7 +7267,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction176
+private class ReduceAction194
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6524,7 +7295,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction177
+private class ReduceAction195
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6555,7 +7326,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction178
+private class ReduceAction196
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6572,7 +7343,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction179
+private class ReduceAction197
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6593,7 +7364,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction180
+private class ReduceAction198
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6608,7 +7379,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction182
+private class ReduceAction200
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6623,7 +7394,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction183
+private class ReduceAction201
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6640,7 +7411,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction184
+private class ReduceAction202
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6656,7 +7427,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction185
+private class ReduceAction203
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6669,7 +7440,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction186
+private class ReduceAction204
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6690,7 +7461,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction187
+private class ReduceAction205
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6715,7 +7486,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction188
+private class ReduceAction206
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6737,7 +7508,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction189
+private class ReduceAction207
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6763,7 +7534,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction190
+private class ReduceAction208
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6777,7 +7548,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction193
+private class ReduceAction211
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6795,7 +7566,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction194
+private class ReduceAction212
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6816,7 +7587,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction195
+private class ReduceAction213
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6835,7 +7606,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction196
+private class ReduceAction214
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6857,7 +7628,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction197
+private class ReduceAction215
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6879,7 +7650,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction198
+private class ReduceAction216
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6904,7 +7675,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction199
+private class ReduceAction217
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6921,7 +7692,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction200
+private class ReduceAction218
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6940,7 +7711,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction201
+private class ReduceAction219
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6962,7 +7733,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction202
+private class ReduceAction220
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -6984,7 +7755,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction203
+private class ReduceAction221
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7009,7 +7780,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction210
+private class ReduceAction228
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7040,7 +7811,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction211
+private class ReduceAction229
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7068,7 +7839,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction212
+private class ReduceAction230
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7103,7 +7874,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction213
+private class ReduceAction231
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7135,7 +7906,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction214
+private class ReduceAction232
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7159,7 +7930,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction215
+private class ReduceAction233
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7186,7 +7957,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction216
+private class ReduceAction234
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7215,7 +7986,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction217
+private class ReduceAction235
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7241,7 +8012,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction218
+private class ReduceAction236
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7262,7 +8033,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction219
+private class ReduceAction237
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7279,7 +8050,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction220
+private class ReduceAction238
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7300,7 +8071,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction221
+private class ReduceAction239
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7335,7 +8106,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction222
+private class ReduceAction240
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7374,7 +8145,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction223
+private class ReduceAction241
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7406,7 +8177,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction224
+private class ReduceAction242
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7442,7 +8213,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction225
+private class ReduceAction243
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7473,7 +8244,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction226
+private class ReduceAction244
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7508,7 +8279,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction227
+private class ReduceAction245
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7541,7 +8312,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction228
+private class ReduceAction246
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7578,7 +8349,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction229
+private class ReduceAction247
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7608,7 +8379,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction230
+private class ReduceAction248
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7642,7 +8413,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction231
+private class ReduceAction249
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7659,7 +8430,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction232
+private class ReduceAction250
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7676,7 +8447,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction233
+private class ReduceAction251
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7695,7 +8466,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction234
+private class ReduceAction252
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7719,7 +8490,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction235
+private class ReduceAction253
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7746,7 +8517,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction236
+private class ReduceAction254
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7777,7 +8548,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction237
+private class ReduceAction255
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7811,7 +8582,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction238
+private class ReduceAction256
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7842,7 +8613,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction239
+private class ReduceAction257
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7870,7 +8641,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction240
+private class ReduceAction258
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7907,7 +8678,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction241
+private class ReduceAction259
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7941,7 +8712,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction242
+private class ReduceAction260
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -7972,7 +8743,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction243
+private class ReduceAction261
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8003,7 +8774,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction244
+private class ReduceAction262
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8031,7 +8802,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction245
+private class ReduceAction263
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8068,7 +8839,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction246
+private class ReduceAction264
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8102,7 +8873,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction247
+private class ReduceAction265
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8133,7 +8904,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction248
+private class ReduceAction266
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8150,7 +8921,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction249
+private class ReduceAction267
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8167,7 +8938,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction250
+private class ReduceAction268
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8192,7 +8963,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction251
+private class ReduceAction269
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8214,7 +8985,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction252
+private class ReduceAction270
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8247,7 +9018,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction253
+private class ReduceAction271
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8276,7 +9047,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction254
+private class ReduceAction272
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8309,7 +9080,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction255
+private class ReduceAction273
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8338,7 +9109,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction256
+private class ReduceAction274
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8368,7 +9139,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction259
+private class ReduceAction277
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8393,7 +9164,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction260
+private class ReduceAction278
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8415,7 +9186,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction261
+private class ReduceAction279
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8450,7 +9221,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction262
+private class ReduceAction280
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8482,7 +9253,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction263
+private class ReduceAction281
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8524,7 +9295,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction264
+private class ReduceAction282
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8563,7 +9334,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction265
+private class ReduceAction283
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8590,7 +9361,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction266
+private class ReduceAction284
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8620,7 +9391,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction267
+private class ReduceAction285
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8643,7 +9414,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction268
+private class ReduceAction286
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8669,7 +9440,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction269
+private class ReduceAction287
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8683,7 +9454,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction273
+private class ReduceAction291
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8712,7 +9483,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction275
+private class ReduceAction293
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8754,7 +9525,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction277
+private class ReduceAction295
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8777,7 +9548,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction278
+private class ReduceAction296
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8800,7 +9571,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction279
+private class ReduceAction297
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8824,7 +9595,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction281
+private class ReduceAction299
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8846,7 +9617,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction283
+private class ReduceAction301
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8869,7 +9640,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction284
+private class ReduceAction302
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8892,7 +9663,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction285
+private class ReduceAction303
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8915,7 +9686,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction286
+private class ReduceAction304
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8938,7 +9709,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction287
+private class ReduceAction305
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8961,7 +9732,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction288
+private class ReduceAction306
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -8984,7 +9755,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction289
+private class ReduceAction307
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9007,7 +9778,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction290
+private class ReduceAction308
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9030,7 +9801,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction291
+private class ReduceAction309
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9053,7 +9824,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction293
+private class ReduceAction311
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9076,7 +9847,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction294
+private class ReduceAction312
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9099,7 +9870,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction296
+private class ReduceAction314
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9122,7 +9893,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction297
+private class ReduceAction315
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9145,7 +9916,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction298
+private class ReduceAction316
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9168,7 +9939,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction300
+private class ReduceAction318
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9190,7 +9961,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction301
+private class ReduceAction319
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9212,7 +9983,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction303
+private class ReduceAction321
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9241,7 +10012,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction304
+private class ReduceAction322
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9268,7 +10039,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction305
+private class ReduceAction323
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9292,7 +10063,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction306
+private class ReduceAction324
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9315,7 +10086,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction307
+private class ReduceAction325
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9335,7 +10106,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction314
+private class ReduceAction332
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9360,7 +10131,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction315
+private class ReduceAction333
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9394,7 +10165,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction316
+private class ReduceAction334
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9422,7 +10193,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction317
+private class ReduceAction335
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9450,7 +10221,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction318
+private class ReduceAction336
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9469,7 +10240,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction319
+private class ReduceAction337
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9486,7 +10257,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction320
+private class ReduceAction338
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9503,7 +10274,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction321
+private class ReduceAction339
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9520,7 +10291,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction322
+private class ReduceAction340
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9537,7 +10308,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction323
+private class ReduceAction341
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9554,7 +10325,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction324
+private class ReduceAction342
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9571,7 +10342,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction325
+private class ReduceAction343
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9588,7 +10359,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction326
+private class ReduceAction344
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9605,7 +10376,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction329
+private class ReduceAction347
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9637,7 +10408,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction330
+private class ReduceAction348
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9674,7 +10445,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction331
+private class ReduceAction349
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9699,7 +10470,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction332
+private class ReduceAction350
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9728,7 +10499,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction333
+private class ReduceAction351
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9752,7 +10523,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction334
+private class ReduceAction352
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9769,7 +10540,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction336
+private class ReduceAction354
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9786,7 +10557,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction337
+private class ReduceAction355
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9803,7 +10574,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction338
+private class ReduceAction356
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9824,7 +10595,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction339
+private class ReduceAction357
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9849,7 +10620,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction341
+private class ReduceAction359
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9861,7 +10632,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction344
+private class ReduceAction362
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9878,7 +10649,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction349
+private class ReduceAction367
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9894,7 +10665,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction350
+private class ReduceAction368
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9912,7 +10683,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction351
+private class ReduceAction369
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9928,7 +10699,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction352
+private class ReduceAction370
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9945,7 +10716,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction353
+private class ReduceAction371
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9969,7 +10740,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction354
+private class ReduceAction372
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -9988,7 +10759,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction355
+private class ReduceAction373
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10011,7 +10782,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction356
+private class ReduceAction374
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10031,7 +10802,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction357
+private class ReduceAction375
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10046,7 +10817,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction358
+private class ReduceAction376
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10061,7 +10832,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction359
+private class ReduceAction377
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10072,7 +10843,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction361
+private class ReduceAction379
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10091,7 +10862,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction362
+private class ReduceAction380
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10111,7 +10882,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction364
+private class ReduceAction382
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10122,7 +10893,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction365
+private class ReduceAction383
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10135,7 +10906,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction366
+private class ReduceAction384
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10147,7 +10918,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction367
+private class ReduceAction385
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10160,7 +10931,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction609
+private class ReduceAction627
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10185,7 +10956,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction610
+private class ReduceAction628
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10206,7 +10977,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction611
+private class ReduceAction629
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10235,7 +11006,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction614
+private class ReduceAction632
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10262,7 +11033,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction627
+private class ReduceAction645
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10277,7 +11048,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction628
+private class ReduceAction646
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10290,7 +11061,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction635
+private class ReduceAction653
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10307,7 +11078,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction636
+private class ReduceAction654
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10328,7 +11099,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction637
+private class ReduceAction655
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10345,7 +11116,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction638
+private class ReduceAction656
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10366,7 +11137,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction639
+private class ReduceAction657
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10383,7 +11154,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction640
+private class ReduceAction658
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10404,7 +11175,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction641
+private class ReduceAction659
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10421,7 +11192,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction642
+private class ReduceAction660
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10442,7 +11213,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction645
+private class ReduceAction663
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10459,7 +11230,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction646
+private class ReduceAction664
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10480,7 +11251,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction647
+private class ReduceAction665
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10497,7 +11268,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction648
+private class ReduceAction666
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10518,7 +11289,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction649
+private class ReduceAction667
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10535,7 +11306,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction650
+private class ReduceAction668
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10556,7 +11327,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction652
+private class ReduceAction670
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10577,7 +11348,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction654
+private class ReduceAction672
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10598,7 +11369,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction656
+private class ReduceAction674
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10618,7 +11389,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction660
+private class ReduceAction678
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10639,7 +11410,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction661
+private class ReduceAction679
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10656,7 +11427,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction662
+private class ReduceAction680
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10677,7 +11448,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction663
+private class ReduceAction681
 special ReduceAction
        redef fun action(p: Parser)
        do
@@ -10694,7 +11465,7 @@ special ReduceAction
        var _goto: Int
        init(g: Int) do _goto = g
 end
-private class ReduceAction664
+private class ReduceAction682
 special ReduceAction
        redef fun action(p: Parser)
        do
index 1ad257c..fa19279 100644 (file)
@@ -410,7 +410,8 @@ special APropdef
     readable var _n_kwredef: nullable TKwredef = null
     readable var _n_visibility: AVisibility
     readable var _n_kwvar: TKwvar
-    readable var _n_id: TAttrid
+    readable var _n_id: nullable TAttrid = null
+    readable var _n_id2: nullable TId = null
     readable var _n_type: nullable AType = null
     readable var _n_expr: nullable AExpr = null
 end
@@ -492,6 +493,7 @@ end
 class AWriteAble
 special AAble
     readable var _n_kwredef: nullable TKwredef = null
+    readable var _n_visibility: nullable AVisibility = null
     readable var _n_kwwritable: TKwwritable
 end
 class AIdMethid
index b0faf45..777bddb 100644 (file)
@@ -407,7 +407,8 @@ special APropdef
     readable var _n_kwredef: nullable TKwredef = null
     readable var _n_visibility: AVisibility
     readable var _n_kwvar: TKwvar
-    readable var _n_id: TAttrid
+    readable var _n_id: nullable TAttrid
+    readable var _n_id2: nullable TId
     readable var _n_type: nullable AType = null
     readable var _n_readable: nullable AAble = null
     readable var _n_writable: nullable AAble = null
@@ -454,6 +455,7 @@ special APropdef
     readable var _n_type: AType
 end
 class AAble special Prod
+    readable var _n_visibility: nullable AVisibility = null
     readable var _n_kwredef: nullable TKwredef = null
 end
 class AReadAble
index a4fbac9..99107cc 100644 (file)
@@ -937,6 +937,7 @@ redef class AAttrPropdef
             n_visibility: nullable AVisibility,
             n_kwvar: nullable TKwvar,
             n_id: nullable TAttrid,
+            n_id2: nullable TId,
             n_type: nullable AType,
             n_expr: nullable AExpr
     )
@@ -962,8 +963,14 @@ redef class AAttrPropdef
        n_visibility.parent = self
         _n_kwvar = n_kwvar.as(not null)
        n_kwvar.parent = self
-        _n_id = n_id.as(not null)
-       n_id.parent = self
+        _n_id = n_id
+       if n_id != null then
+               n_id.parent = self
+       end
+        _n_id2 = n_id2
+       if n_id2 != null then
+               n_id2.parent = self
+       end
         _n_type = n_type
        if n_type != null then
                n_type.parent = self
@@ -1042,7 +1049,17 @@ redef class AAttrPropdef
                assert new_child isa TAttrid
                 _n_id = new_child
            else
-               abort
+               _n_id = null
+            end
+            return
+       end
+        if _n_id2 == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa TId
+                _n_id2 = new_child
+           else
+               _n_id2 = null
             end
             return
        end
@@ -1084,7 +1101,12 @@ redef class AAttrPropdef
         end
         v.enter_visit(_n_visibility)
         v.enter_visit(_n_kwvar)
-        v.enter_visit(_n_id)
+        if _n_id != null then
+            v.enter_visit(_n_id.as(not null))
+        end
+        if _n_id2 != null then
+            v.enter_visit(_n_id2.as(not null))
+        end
         if _n_type != null then
             v.enter_visit(_n_type.as(not null))
         end
@@ -2007,6 +2029,7 @@ redef class AWriteAble
 
     init init_awriteable (
             n_kwredef: nullable TKwredef,
+            n_visibility: nullable AVisibility,
             n_kwwritable: nullable TKwwritable
     )
     do
@@ -2015,6 +2038,10 @@ redef class AWriteAble
        if n_kwredef != null then
                n_kwredef.parent = self
        end
+        _n_visibility = n_visibility
+       if n_visibility != null then
+               n_visibility.parent = self
+       end
         _n_kwwritable = n_kwwritable.as(not null)
        n_kwwritable.parent = self
     end
@@ -2031,6 +2058,16 @@ redef class AWriteAble
             end
             return
        end
+        if _n_visibility == old_child then
+            if new_child != null then
+                new_child.parent = self
+               assert new_child isa AVisibility
+                _n_visibility = new_child
+           else
+               _n_visibility = null
+            end
+            return
+       end
         if _n_kwwritable == old_child then
             if new_child != null then
                 new_child.parent = self
@@ -2048,6 +2085,9 @@ redef class AWriteAble
         if _n_kwredef != null then
             v.enter_visit(_n_kwredef.as(not null))
         end
+        if _n_visibility != null then
+            v.enter_visit(_n_visibility.as(not null))
+        end
         v.enter_visit(_n_kwwritable)
     end
 end
index fd46a88..5e7aec7 100644 (file)
@@ -1683,18 +1683,18 @@ const int lexer_accept_table[] = {
 
 static int parser_action_row1[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 0
 };
 static int parser_action_row2[] = {
        1,
-       -1, 1, 663
+       -1, 1, 681
 };
 static int parser_action_row3[] = {
        1,
-       -1, 1, 661
+       -1, 1, 679
 };
 static int parser_action_row4[] = {
        2,
@@ -1703,14 +1703,14 @@ static int parser_action_row4[] = {
 };
 static int parser_action_row5[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 1
 };
 static int parser_action_row6[] = {
        1,
-       -1, 1, 635
+       -1, 1, 653
 };
 static int parser_action_row7[] = {
        1,
@@ -1722,16 +1722,16 @@ static int parser_action_row8[] = {
 };
 static int parser_action_row9[] = {
        1,
-       -1, 1, 637
+       -1, 1, 655
 };
 static int parser_action_row10[] = {
        2,
-       -1, 1, 365,
+       -1, 1, 383,
        87, 1, 36
 };
 static int parser_action_row11[] = {
        34,
-       -1, 1, 127,
+       -1, 1, 145,
        2, 0, 24,
        12, 0, 25,
        13, 0, 26,
@@ -1768,12 +1768,12 @@ static int parser_action_row11[] = {
 };
 static int parser_action_row12[] = {
        2,
-       -1, 1, 363,
+       -1, 1, 381,
        1, 0, 2
 };
 static int parser_action_row13[] = {
        1,
-       -1, 1, 639
+       -1, 1, 657
 };
 static int parser_action_row14[] = {
        3,
@@ -1783,34 +1783,34 @@ static int parser_action_row14[] = {
 };
 static int parser_action_row15[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 2
 };
 static int parser_action_row16[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 4
 };
 static int parser_action_row17[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 8
 };
 static int parser_action_row18[] = {
        3,
-       -1, 1, 361,
+       -1, 1, 379,
        0, 0, 1,
        1, 0, 93
 };
 static int parser_action_row19[] = {
        2,
-       -1, 1, 368,
+       -1, 1, 386,
        0, 0, 95
 };
 static int parser_action_row20[] = {
@@ -1819,7 +1819,7 @@ static int parser_action_row20[] = {
 };
 static int parser_action_row21[] = {
        33,
-       -1, 1, 127,
+       -1, 1, 145,
        12, 0, 25,
        13, 0, 26,
        15, 0, 27,
@@ -1855,34 +1855,34 @@ static int parser_action_row21[] = {
 };
 static int parser_action_row22[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 3
 };
 static int parser_action_row23[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 5
 };
 static int parser_action_row24[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 9
 };
 static int parser_action_row25[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row26[] = {
        24,
-       -1, 1, 346,
+       -1, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -1895,8 +1895,8 @@ static int parser_action_row26[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 341,
-       63, 1, 341,
+       53, 1, 359,
+       63, 1, 359,
        65, 0, 116,
        77, 0, 49,
        78, 0, 117,
@@ -1909,7 +1909,7 @@ static int parser_action_row26[] = {
 };
 static int parser_action_row27[] = {
        4,
-       -1, 1, 127,
+       -1, 1, 145,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
@@ -1956,31 +1956,31 @@ static int parser_action_row29[] = {
 };
 static int parser_action_row30[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row31[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row32[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row33[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row34[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -2021,13 +2021,13 @@ static int parser_action_row35[] = {
 };
 static int parser_action_row36[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row37[] = {
        23,
-       -1, 1, 193,
+       -1, 1, 211,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -2053,7 +2053,7 @@ static int parser_action_row37[] = {
 };
 static int parser_action_row38[] = {
        24,
-       -1, 1, 200,
+       -1, 1, 218,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -2080,7 +2080,7 @@ static int parser_action_row38[] = {
 };
 static int parser_action_row39[] = {
        24,
-       -1, 1, 195,
+       -1, 1, 213,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -2107,7 +2107,7 @@ static int parser_action_row39[] = {
 };
 static int parser_action_row40[] = {
        1,
-       -1, 1, 199
+       -1, 1, 217
 };
 static int parser_action_row41[] = {
        23,
@@ -2137,13 +2137,13 @@ static int parser_action_row41[] = {
 };
 static int parser_action_row42[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row43[] = {
        24,
-       -1, 1, 346,
+       -1, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -2156,8 +2156,8 @@ static int parser_action_row43[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 341,
-       63, 1, 341,
+       53, 1, 359,
+       63, 1, 359,
        65, 0, 116,
        77, 0, 49,
        78, 0, 117,
@@ -2170,19 +2170,19 @@ static int parser_action_row43[] = {
 };
 static int parser_action_row44[] = {
        1,
-       -1, 1, 319
+       -1, 1, 337
 };
 static int parser_action_row45[] = {
        1,
-       -1, 1, 320
+       -1, 1, 338
 };
 static int parser_action_row46[] = {
        1,
-       -1, 1, 321
+       -1, 1, 339
 };
 static int parser_action_row47[] = {
        1,
-       -1, 1, 322
+       -1, 1, 340
 };
 static int parser_action_row48[] = {
        23,
@@ -2212,7 +2212,7 @@ static int parser_action_row48[] = {
 };
 static int parser_action_row49[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -2223,10 +2223,10 @@ static int parser_action_row50[] = {
 };
 static int parser_action_row51[] = {
        28,
-       -1, 1, 341,
-       0, 1, 346,
-       1, 1, 346,
-       9, 1, 346,
+       -1, 1, 359,
+       0, 1, 364,
+       1, 1, 364,
+       9, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -2241,7 +2241,7 @@ static int parser_action_row51[] = {
        51, 0, 115,
        57, 0, 191,
        65, 0, 116,
-       76, 1, 346,
+       76, 1, 364,
        77, 0, 49,
        78, 0, 117,
        79, 0, 118,
@@ -2250,34 +2250,34 @@ static int parser_action_row51[] = {
        82, 0, 121,
        83, 0, 122,
        84, 0, 56,
-       87, 1, 346
+       87, 1, 364
 };
 static int parser_action_row52[] = {
        4,
-       -1, 1, 307,
+       -1, 1, 325,
        58, 0, 194,
        59, 0, 195,
        60, 0, 196
 };
 static int parser_action_row53[] = {
        1,
-       -1, 1, 323
+       -1, 1, 341
 };
 static int parser_action_row54[] = {
        1,
-       -1, 1, 324
+       -1, 1, 342
 };
 static int parser_action_row55[] = {
        1,
-       -1, 1, 325
+       -1, 1, 343
 };
 static int parser_action_row56[] = {
        1,
-       -1, 1, 326
+       -1, 1, 344
 };
 static int parser_action_row57[] = {
        1,
-       -1, 1, 334
+       -1, 1, 352
 };
 static int parser_action_row58[] = {
        7,
@@ -2299,41 +2299,41 @@ static int parser_action_row60[] = {
 };
 static int parser_action_row61[] = {
        3,
-       -1, 1, 186,
+       -1, 1, 204,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row62[] = {
        1,
-       -1, 1, 191
+       -1, 1, 209
 };
 static int parser_action_row63[] = {
        1,
-       -1, 1, 192
+       -1, 1, 210
 };
 static int parser_action_row64[] = {
        1,
-       -1, 1, 204
+       -1, 1, 222
 };
 static int parser_action_row65[] = {
        1,
-       -1, 1, 205
+       -1, 1, 223
 };
 static int parser_action_row66[] = {
        1,
-       -1, 1, 207
+       -1, 1, 225
 };
 static int parser_action_row67[] = {
        1,
-       -1, 1, 206
+       -1, 1, 224
 };
 static int parser_action_row68[] = {
        1,
-       -1, 1, 208
+       -1, 1, 226
 };
 static int parser_action_row69[] = {
        1,
-       -1, 1, 209
+       -1, 1, 227
 };
 static int parser_action_row70[] = {
        3,
@@ -2343,7 +2343,7 @@ static int parser_action_row70[] = {
 };
 static int parser_action_row71[] = {
        1,
-       -1, 1, 327
+       -1, 1, 345
 };
 static int parser_action_row72[] = {
        3,
@@ -2353,13 +2353,13 @@ static int parser_action_row72[] = {
 };
 static int parser_action_row73[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row74[] = {
        1,
-       -1, 1, 318
+       -1, 1, 336
 };
 static int parser_action_row75[] = {
        2,
@@ -2368,39 +2368,39 @@ static int parser_action_row75[] = {
 };
 static int parser_action_row76[] = {
        1,
-       -1, 1, 659
+       -1, 1, 677
 };
 static int parser_action_row77[] = {
        1,
-       -1, 1, 354
+       -1, 1, 372
 };
 static int parser_action_row78[] = {
        3,
-       -1, 1, 356,
+       -1, 1, 374,
        77, 0, 49,
        78, 0, 219
 };
 static int parser_action_row79[] = {
        3,
-       -1, 1, 362,
+       -1, 1, 380,
        0, 0, 1,
        1, 0, 93
 };
 static int parser_action_row80[] = {
        1,
-       -1, 1, 360
+       -1, 1, 378
 };
 static int parser_action_row81[] = {
        1,
-       -1, 1, 359
+       -1, 1, 377
 };
 static int parser_action_row82[] = {
        1,
-       -1, 1, 369
+       -1, 1, 387
 };
 static int parser_action_row83[] = {
        1,
-       -1, 1, 636
+       -1, 1, 654
 };
 static int parser_action_row84[] = {
        1,
@@ -2408,14 +2408,14 @@ static int parser_action_row84[] = {
 };
 static int parser_action_row85[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 6
 };
 static int parser_action_row86[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 10
@@ -2426,11 +2426,11 @@ static int parser_action_row87[] = {
 };
 static int parser_action_row88[] = {
        1,
-       -1, 1, 638
+       -1, 1, 656
 };
 static int parser_action_row89[] = {
        33,
-       -1, 1, 127,
+       -1, 1, 145,
        12, 0, 25,
        13, 0, 26,
        15, 0, 27,
@@ -2466,7 +2466,7 @@ static int parser_action_row89[] = {
 };
 static int parser_action_row90[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 12
@@ -2477,7 +2477,7 @@ static int parser_action_row91[] = {
 };
 static int parser_action_row92[] = {
        33,
-       -1, 1, 127,
+       -1, 1, 145,
        12, 0, 25,
        13, 0, 228,
        15, 0, 27,
@@ -2513,20 +2513,20 @@ static int parser_action_row92[] = {
 };
 static int parser_action_row93[] = {
        1,
-       -1, 1, 640
+       -1, 1, 658
 };
 static int parser_action_row94[] = {
        1,
-       -1, 1, 662
+       -1, 1, 680
 };
 static int parser_action_row95[] = {
        2,
-       -1, 1, 366,
+       -1, 1, 384,
        0, 0, 95
 };
 static int parser_action_row96[] = {
        1,
-       -1, 1, 664
+       -1, 1, 682
 };
 static int parser_action_row97[] = {
        1,
@@ -2534,14 +2534,14 @@ static int parser_action_row97[] = {
 };
 static int parser_action_row98[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 7
 };
 static int parser_action_row99[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 11
@@ -2552,7 +2552,7 @@ static int parser_action_row100[] = {
 };
 static int parser_action_row101[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 13
@@ -2563,7 +2563,7 @@ static int parser_action_row102[] = {
 };
 static int parser_action_row103[] = {
        1,
-       -1, 1, 365
+       -1, 1, 383
 };
 static int parser_action_row104[] = {
        2,
@@ -2572,53 +2572,53 @@ static int parser_action_row104[] = {
 };
 static int parser_action_row105[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row106[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row107[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row108[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row109[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row110[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row111[] = {
        1,
-       -1, 1, 565
+       -1, 1, 583
 };
 static int parser_action_row112[] = {
        1,
-       -1, 1, 566
+       -1, 1, 584
 };
 static int parser_action_row113[] = {
        1,
-       -1, 1, 567
+       -1, 1, 585
 };
 static int parser_action_row114[] = {
        1,
-       -1, 1, 568
+       -1, 1, 586
 };
 static int parser_action_row115[] = {
        16,
@@ -2641,53 +2641,53 @@ static int parser_action_row115[] = {
 };
 static int parser_action_row116[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row117[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row118[] = {
        3,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235,
        57, 0, 191
 };
 static int parser_action_row119[] = {
        1,
-       -1, 1, 556
+       -1, 1, 574
 };
 static int parser_action_row120[] = {
        1,
-       -1, 1, 569
+       -1, 1, 587
 };
 static int parser_action_row121[] = {
        1,
-       -1, 1, 570
+       -1, 1, 588
 };
 static int parser_action_row122[] = {
        1,
-       -1, 1, 571
+       -1, 1, 589
 };
 static int parser_action_row123[] = {
        1,
-       -1, 1, 572
+       -1, 1, 590
 };
 static int parser_action_row124[] = {
        1,
-       -1, 1, 573
+       -1, 1, 591
 };
 static int parser_action_row125[] = {
        1,
-       -1, 1, 313
+       -1, 1, 331
 };
 static int parser_action_row126[] = {
        1,
-       -1, 1, 217
+       -1, 1, 235
 };
 static int parser_action_row127[] = {
        2,
@@ -2696,25 +2696,25 @@ static int parser_action_row127[] = {
 };
 static int parser_action_row128[] = {
        1,
-       -1, 1, 344
+       -1, 1, 362
 };
 static int parser_action_row129[] = {
        3,
-       -1, 1, 523,
+       -1, 1, 541,
        31, 0, 249,
        32, 0, 250
 };
 static int parser_action_row130[] = {
        1,
-       -1, 1, 525
+       -1, 1, 543
 };
 static int parser_action_row131[] = {
        1,
-       -1, 1, 529
+       -1, 1, 547
 };
 static int parser_action_row132[] = {
        12,
-       -1, 1, 531,
+       -1, 1, 549,
        14, 0, 251,
        40, 0, 252,
        64, 0, 253,
@@ -2729,22 +2729,22 @@ static int parser_action_row132[] = {
 };
 static int parser_action_row133[] = {
        4,
-       -1, 1, 541,
+       -1, 1, 559,
        66, 0, 262,
        67, 0, 263,
        68, 0, 264
 };
 static int parser_action_row134[] = {
        1,
-       -1, 1, 544
+       -1, 1, 562
 };
 static int parser_action_row135[] = {
        1,
-       -1, 1, 548
+       -1, 1, 566
 };
 static int parser_action_row136[] = {
        3,
-       -1, 1, 551,
+       -1, 1, 569,
        53, 0, 208,
        63, 0, 265
 };
@@ -2759,16 +2759,16 @@ static int parser_action_row137[] = {
 };
 static int parser_action_row138[] = {
        2,
-       -1, 1, 184,
-       50, 1, 516
+       -1, 1, 202,
+       50, 1, 534
 };
 static int parser_action_row139[] = {
        1,
-       -1, 1, 251
+       -1, 1, 269
 };
 static int parser_action_row140[] = {
        1,
-       -1, 1, 185
+       -1, 1, 203
 };
 static int parser_action_row141[] = {
        30,
@@ -2810,21 +2810,21 @@ static int parser_action_row142[] = {
 };
 static int parser_action_row143[] = {
        3,
-       -1, 1, 234,
+       -1, 1, 252,
        56, 0, 273,
        58, 0, 274
 };
 static int parser_action_row144[] = {
        1,
-       -1, 1, 129
+       -1, 1, 147
 };
 static int parser_action_row145[] = {
        1,
-       -1, 1, 128
+       -1, 1, 146
 };
 static int parser_action_row146[] = {
        1,
-       -1, 1, 130
+       -1, 1, 148
 };
 static int parser_action_row147[] = {
        23,
@@ -2880,7 +2880,7 @@ static int parser_action_row148[] = {
 };
 static int parser_action_row149[] = {
        1,
-       -1, 1, 260
+       -1, 1, 278
 };
 static int parser_action_row150[] = {
        2,
@@ -2894,36 +2894,36 @@ static int parser_action_row151[] = {
 };
 static int parser_action_row152[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row153[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row154[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row155[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row156[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row157[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row158[] = {
@@ -2949,45 +2949,45 @@ static int parser_action_row158[] = {
 };
 static int parser_action_row159[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row160[] = {
        3,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235,
        57, 0, 191
 };
 static int parser_action_row161[] = {
        1,
-       -1, 1, 307
+       -1, 1, 325
 };
 static int parser_action_row162[] = {
        1,
-       -1, 1, 194
+       -1, 1, 212
 };
 static int parser_action_row163[] = {
        1,
-       -1, 1, 270
+       -1, 1, 288
 };
 static int parser_action_row164[] = {
        3,
-       -1, 1, 274,
+       -1, 1, 292,
        31, 0, 288,
        32, 0, 289
 };
 static int parser_action_row165[] = {
        1,
-       -1, 1, 276
+       -1, 1, 294
 };
 static int parser_action_row166[] = {
        1,
-       -1, 1, 280
+       -1, 1, 298
 };
 static int parser_action_row167[] = {
        12,
-       -1, 1, 282,
+       -1, 1, 300,
        14, 0, 290,
        40, 0, 291,
        64, 0, 292,
@@ -3002,22 +3002,22 @@ static int parser_action_row167[] = {
 };
 static int parser_action_row168[] = {
        4,
-       -1, 1, 292,
+       -1, 1, 310,
        66, 0, 301,
        67, 0, 302,
        68, 0, 303
 };
 static int parser_action_row169[] = {
        1,
-       -1, 1, 295
+       -1, 1, 313
 };
 static int parser_action_row170[] = {
        1,
-       -1, 1, 299
+       -1, 1, 317
 };
 static int parser_action_row171[] = {
        3,
-       -1, 1, 302,
+       -1, 1, 320,
        53, 0, 208,
        63, 0, 304
 };
@@ -3033,7 +3033,7 @@ static int parser_action_row173[] = {
 };
 static int parser_action_row174[] = {
        23,
-       -1, 1, 201,
+       -1, 1, 219,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -3059,11 +3059,11 @@ static int parser_action_row174[] = {
 };
 static int parser_action_row175[] = {
        1,
-       -1, 1, 202
+       -1, 1, 220
 };
 static int parser_action_row176[] = {
        23,
-       -1, 1, 196,
+       -1, 1, 214,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -3089,11 +3089,11 @@ static int parser_action_row176[] = {
 };
 static int parser_action_row177[] = {
        1,
-       -1, 1, 197
+       -1, 1, 215
 };
 static int parser_action_row178[] = {
        4,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235,
        56, 0, 310,
        57, 0, 191
@@ -3126,16 +3126,16 @@ static int parser_action_row179[] = {
 };
 static int parser_action_row180[] = {
        1,
-       -1, 1, 267
+       -1, 1, 285
 };
 static int parser_action_row181[] = {
        2,
-       -1, 1, 270,
-       26, 1, 507
+       -1, 1, 288,
+       26, 1, 525
 };
 static int parser_action_row182[] = {
        3,
-       -1, 1, 302,
+       -1, 1, 320,
        53, 0, 208,
        63, 0, 315
 };
@@ -3152,15 +3152,15 @@ static int parser_action_row184[] = {
 };
 static int parser_action_row185[] = {
        1,
-       -1, 1, 310
+       -1, 1, 328
 };
 static int parser_action_row186[] = {
        1,
-       -1, 1, 214
+       -1, 1, 232
 };
 static int parser_action_row187[] = {
        3,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235,
        57, 0, 191
 };
@@ -3171,7 +3171,7 @@ static int parser_action_row188[] = {
 };
 static int parser_action_row189[] = {
        3,
-       -1, 1, 302,
+       -1, 1, 320,
        53, 0, 208,
        63, 0, 323
 };
@@ -3203,26 +3203,26 @@ static int parser_action_row190[] = {
 };
 static int parser_action_row191[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row192[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row193[] = {
        4,
-       -1, 1, 309,
+       -1, 1, 327,
        58, 0, 328,
        59, 0, 195,
        60, 0, 196
 };
 static int parser_action_row194[] = {
        2,
-       -1, 1, 211,
+       -1, 1, 229,
        76, 0, 330
 };
 static int parser_action_row195[] = {
@@ -3253,11 +3253,11 @@ static int parser_action_row195[] = {
 };
 static int parser_action_row196[] = {
        1,
-       -1, 1, 248
+       -1, 1, 266
 };
 static int parser_action_row197[] = {
        1,
-       -1, 1, 249
+       -1, 1, 267
 };
 static int parser_action_row198[] = {
        23,
@@ -3287,7 +3287,7 @@ static int parser_action_row198[] = {
 };
 static int parser_action_row199[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -3328,17 +3328,17 @@ static int parser_action_row204[] = {
 };
 static int parser_action_row205[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row206[] = {
        1,
-       -1, 1, 653
+       -1, 1, 671
 };
 static int parser_action_row207[] = {
        29,
-       -1, 1, 188,
+       -1, 1, 206,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -3370,50 +3370,50 @@ static int parser_action_row207[] = {
 };
 static int parser_action_row208[] = {
        3,
-       -1, 1, 187,
+       -1, 1, 205,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row209[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row210[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row211[] = {
        4,
-       -1, 1, 314,
+       -1, 1, 332,
        58, 0, 359,
        59, 0, 195,
        60, 0, 196
 };
 static int parser_action_row212[] = {
        1,
-       -1, 1, 336
+       -1, 1, 354
 };
 static int parser_action_row213[] = {
        1,
-       -1, 1, 337
+       -1, 1, 355
 };
 static int parser_action_row214[] = {
        1,
-       -1, 1, 655
+       -1, 1, 673
 };
 static int parser_action_row215[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row216[] = {
        1,
-       -1, 1, 331
+       -1, 1, 349
 };
 static int parser_action_row217[] = {
        3,
@@ -3449,7 +3449,7 @@ static int parser_action_row218[] = {
 };
 static int parser_action_row219[] = {
        24,
-       -1, 1, 346,
+       -1, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -3462,8 +3462,8 @@ static int parser_action_row219[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 341,
-       63, 1, 341,
+       53, 1, 359,
+       63, 1, 359,
        65, 0, 116,
        77, 0, 49,
        78, 0, 117,
@@ -3481,15 +3481,15 @@ static int parser_action_row220[] = {
 };
 static int parser_action_row221[] = {
        1,
-       -1, 1, 660
+       -1, 1, 678
 };
 static int parser_action_row222[] = {
        1,
-       -1, 1, 355
+       -1, 1, 373
 };
 static int parser_action_row223[] = {
        2,
-       -1, 1, 367,
+       -1, 1, 385,
        0, 0, 95
 };
 static int parser_action_row224[] = {
@@ -3498,7 +3498,7 @@ static int parser_action_row224[] = {
 };
 static int parser_action_row225[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 14
@@ -3522,7 +3522,7 @@ static int parser_action_row228[] = {
 };
 static int parser_action_row229[] = {
        4,
-       -1, 1, 127,
+       -1, 1, 145,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
@@ -3538,7 +3538,7 @@ static int parser_action_row231[] = {
 };
 static int parser_action_row232[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        87, 1, 15
@@ -3559,13 +3559,13 @@ static int parser_action_row235[] = {
 };
 static int parser_action_row236[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row237[] = {
        1,
-       -1, 1, 562
+       -1, 1, 580
 };
 static int parser_action_row238[] = {
        23,
@@ -3646,19 +3646,19 @@ static int parser_action_row241[] = {
 };
 static int parser_action_row242[] = {
        1,
-       -1, 1, 559
+       -1, 1, 577
 };
 static int parser_action_row243[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row244[] = {
        3,
-       -1, 1, 554,
-       53, 1, 556,
-       63, 1, 556
+       -1, 1, 572,
+       53, 1, 574,
+       63, 1, 574
 };
 static int parser_action_row245[] = {
        3,
@@ -3717,119 +3717,119 @@ static int parser_action_row247[] = {
 };
 static int parser_action_row248[] = {
        1,
-       -1, 1, 558
+       -1, 1, 576
 };
 static int parser_action_row249[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row250[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row251[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        26, 0, 383
 };
 static int parser_action_row252[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row253[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row254[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row255[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row256[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row257[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row258[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row259[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row260[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row261[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row262[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row263[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row264[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row265[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row266[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row267[] = {
        1,
-       -1, 1, 563
+       -1, 1, 581
 };
 static int parser_action_row268[] = {
        15,
@@ -3851,14 +3851,14 @@ static int parser_action_row268[] = {
 };
 static int parser_action_row269[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row270[] = {
        2,
-       -1, 1, 183,
-       50, 1, 515
+       -1, 1, 201,
+       50, 1, 533
 };
 static int parser_action_row271[] = {
        2,
@@ -3873,44 +3873,44 @@ static int parser_action_row272[] = {
 };
 static int parser_action_row273[] = {
        1,
-       -1, 1, 250
+       -1, 1, 268
 };
 static int parser_action_row274[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row275[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row276[] = {
        2,
-       -1, 1, 235,
+       -1, 1, 253,
        58, 0, 406
 };
 static int parser_action_row277[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row278[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row279[] = {
        1,
-       -1, 1, 259
+       -1, 1, 277
 };
 static int parser_action_row280[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -3997,9 +3997,9 @@ static int parser_action_row284[] = {
 };
 static int parser_action_row285[] = {
        3,
-       -1, 1, 305,
-       53, 1, 307,
-       63, 1, 307
+       -1, 1, 323,
+       53, 1, 325,
+       63, 1, 325
 };
 static int parser_action_row286[] = {
        3,
@@ -4033,152 +4033,152 @@ static int parser_action_row287[] = {
 };
 static int parser_action_row288[] = {
        2,
-       -1, 1, 309,
+       -1, 1, 327,
        76, 0, 330
 };
 static int parser_action_row289[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row290[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        26, 0, 418
 };
 static int parser_action_row291[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row292[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row293[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row294[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row295[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row296[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row297[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row298[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row299[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row300[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row301[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row302[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row303[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row304[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row305[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row306[] = {
        2,
-       -1, 1, 314,
+       -1, 1, 332,
        76, 0, 330
 };
 static int parser_action_row307[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row308[] = {
        1,
-       -1, 1, 218
+       -1, 1, 236
 };
 static int parser_action_row309[] = {
        1,
-       -1, 1, 203
+       -1, 1, 221
 };
 static int parser_action_row310[] = {
        1,
-       -1, 1, 198
+       -1, 1, 216
 };
 static int parser_action_row311[] = {
        1,
-       -1, 1, 269
+       -1, 1, 287
 };
 static int parser_action_row312[] = {
        2,
-       -1, 1, 309,
+       -1, 1, 327,
        76, 0, 436
 };
 static int parser_action_row313[] = {
        3,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235,
        57, 0, 191
 };
 static int parser_action_row314[] = {
        1,
-       -1, 1, 268
+       -1, 1, 286
 };
 static int parser_action_row315[] = {
        2,
@@ -4187,13 +4187,13 @@ static int parser_action_row315[] = {
 };
 static int parser_action_row316[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row317[] = {
        2,
-       -1, 1, 314,
+       -1, 1, 332,
        76, 0, 436
 };
 static int parser_action_row318[] = {
@@ -4238,7 +4238,7 @@ static int parser_action_row319[] = {
 };
 static int parser_action_row320[] = {
        2,
-       -1, 1, 174,
+       -1, 1, 192,
        53, 0, 447
 };
 static int parser_action_row321[] = {
@@ -4248,35 +4248,35 @@ static int parser_action_row321[] = {
 };
 static int parser_action_row322[] = {
        1,
-       -1, 1, 309
+       -1, 1, 327
 };
 static int parser_action_row323[] = {
        1,
-       -1, 1, 328
+       -1, 1, 346
 };
 static int parser_action_row324[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row325[] = {
        1,
-       -1, 1, 314
+       -1, 1, 332
 };
 static int parser_action_row326[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row327[] = {
        1,
-       -1, 1, 358
+       -1, 1, 376
 };
 static int parser_action_row328[] = {
        1,
-       -1, 1, 357
+       -1, 1, 375
 };
 static int parser_action_row329[] = {
        23,
@@ -4338,11 +4338,11 @@ static int parser_action_row331[] = {
 };
 static int parser_action_row332[] = {
        1,
-       -1, 1, 213
+       -1, 1, 231
 };
 static int parser_action_row333[] = {
        1,
-       -1, 1, 219
+       -1, 1, 237
 };
 static int parser_action_row334[] = {
        2,
@@ -4351,11 +4351,11 @@ static int parser_action_row334[] = {
 };
 static int parser_action_row335[] = {
        1,
-       -1, 1, 239
+       -1, 1, 257
 };
 static int parser_action_row336[] = {
        1,
-       -1, 1, 244
+       -1, 1, 262
 };
 static int parser_action_row337[] = {
        3,
@@ -4374,60 +4374,60 @@ static int parser_action_row339[] = {
 };
 static int parser_action_row340[] = {
        1,
-       -1, 1, 132
+       -1, 1, 150
 };
 static int parser_action_row341[] = {
        1,
-       -1, 1, 133
+       -1, 1, 151
 };
 static int parser_action_row342[] = {
        1,
-       -1, 1, 134
+       -1, 1, 152
 };
 static int parser_action_row343[] = {
        1,
-       -1, 1, 135
+       -1, 1, 153
 };
 static int parser_action_row344[] = {
        1,
-       -1, 1, 136
+       -1, 1, 154
 };
 static int parser_action_row345[] = {
        1,
-       -1, 1, 137
+       -1, 1, 155
 };
 static int parser_action_row346[] = {
        1,
-       -1, 1, 138
+       -1, 1, 156
 };
 static int parser_action_row347[] = {
        1,
-       -1, 1, 141
+       -1, 1, 159
 };
 static int parser_action_row348[] = {
        1,
-       -1, 1, 139
+       -1, 1, 157
 };
 static int parser_action_row349[] = {
        1,
-       -1, 1, 142
+       -1, 1, 160
 };
 static int parser_action_row350[] = {
        1,
-       -1, 1, 140
+       -1, 1, 158
 };
 static int parser_action_row351[] = {
        1,
-       -1, 1, 144
+       -1, 1, 162
 };
 static int parser_action_row352[] = {
        2,
-       -1, 1, 131,
+       -1, 1, 149,
        58, 0, 460
 };
 static int parser_action_row353[] = {
        5,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        51, 0, 461,
@@ -4440,15 +4440,15 @@ static int parser_action_row354[] = {
 };
 static int parser_action_row355[] = {
        1,
-       -1, 1, 190
+       -1, 1, 208
 };
 static int parser_action_row356[] = {
        1,
-       -1, 1, 654
+       -1, 1, 672
 };
 static int parser_action_row357[] = {
        29,
-       -1, 1, 189,
+       -1, 1, 207,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -4592,25 +4592,25 @@ static int parser_action_row362[] = {
 };
 static int parser_action_row363[] = {
        1,
-       -1, 1, 656
+       -1, 1, 674
 };
 static int parser_action_row364[] = {
        1,
-       -1, 1, 332
+       -1, 1, 350
 };
 static int parser_action_row365[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row366[] = {
        1,
-       -1, 1, 311
+       -1, 1, 329
 };
 static int parser_action_row367[] = {
        1,
-       -1, 1, 215
+       -1, 1, 233
 };
 static int parser_action_row368[] = {
        1,
@@ -4658,23 +4658,23 @@ static int parser_action_row372[] = {
 };
 static int parser_action_row373[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row374[] = {
        1,
-       -1, 1, 530
+       -1, 1, 548
 };
 static int parser_action_row375[] = {
        3,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235,
        63, 0, 481
 };
 static int parser_action_row376[] = {
        1,
-       -1, 1, 550
+       -1, 1, 568
 };
 static int parser_action_row377[] = {
        3,
@@ -4684,32 +4684,32 @@ static int parser_action_row377[] = {
 };
 static int parser_action_row378[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row379[] = {
        6,
-       -1, 1, 345,
-       53, 1, 340,
-       58, 1, 340,
-       59, 1, 340,
-       60, 1, 340,
-       63, 1, 340
+       -1, 1, 363,
+       53, 1, 358,
+       58, 1, 358,
+       59, 1, 358,
+       60, 1, 358,
+       63, 1, 358
 };
 static int parser_action_row380[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row381[] = {
        1,
-       -1, 1, 549
+       -1, 1, 567
 };
 static int parser_action_row382[] = {
        1,
-       -1, 1, 560
+       -1, 1, 578
 };
 static int parser_action_row383[] = {
        20,
@@ -4736,7 +4736,7 @@ static int parser_action_row383[] = {
 };
 static int parser_action_row384[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -5065,7 +5065,7 @@ static int parser_action_row400[] = {
 };
 static int parser_action_row401[] = {
        5,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        51, 0, 461,
@@ -5078,8 +5078,8 @@ static int parser_action_row402[] = {
 };
 static int parser_action_row403[] = {
        2,
-       -1, 1, 182,
-       50, 1, 514
+       -1, 1, 200,
+       50, 1, 532
 };
 static int parser_action_row404[] = {
        3,
@@ -5121,7 +5121,7 @@ static int parser_action_row406[] = {
 };
 static int parser_action_row407[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -5142,37 +5142,37 @@ static int parser_action_row410[] = {
 };
 static int parser_action_row411[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row412[] = {
        1,
-       -1, 1, 281
+       -1, 1, 299
 };
 static int parser_action_row413[] = {
        3,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235,
        63, 0, 448
 };
 static int parser_action_row414[] = {
        1,
-       -1, 1, 301
+       -1, 1, 319
 };
 static int parser_action_row415[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row416[] = {
        1,
-       -1, 1, 300
+       -1, 1, 318
 };
 static int parser_action_row417[] = {
        1,
-       -1, 1, 272
+       -1, 1, 290
 };
 static int parser_action_row418[] = {
        22,
@@ -5201,7 +5201,7 @@ static int parser_action_row418[] = {
 };
 static int parser_action_row419[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -5558,7 +5558,7 @@ static int parser_action_row435[] = {
 };
 static int parser_action_row436[] = {
        1,
-       -1, 1, 273
+       -1, 1, 291
 };
 static int parser_action_row437[] = {
        3,
@@ -5573,11 +5573,11 @@ static int parser_action_row438[] = {
 };
 static int parser_action_row439[] = {
        1,
-       -1, 1, 509
+       -1, 1, 527
 };
 static int parser_action_row440[] = {
        1,
-       -1, 1, 473
+       -1, 1, 491
 };
 static int parser_action_row441[] = {
        32,
@@ -5624,15 +5624,15 @@ static int parser_action_row442[] = {
 };
 static int parser_action_row443[] = {
        1,
-       -1, 1, 510
+       -1, 1, 528
 };
 static int parser_action_row444[] = {
        1,
-       -1, 1, 184
+       -1, 1, 202
 };
 static int parser_action_row445[] = {
        1,
-       -1, 1, 265
+       -1, 1, 283
 };
 static int parser_action_row446[] = {
        30,
@@ -5669,18 +5669,18 @@ static int parser_action_row446[] = {
 };
 static int parser_action_row447[] = {
        2,
-       -1, 1, 175,
+       -1, 1, 193,
        53, 0, 545
 };
 static int parser_action_row448[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row449[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -5701,19 +5701,19 @@ static int parser_action_row451[] = {
 };
 static int parser_action_row452[] = {
        1,
-       -1, 1, 241
+       -1, 1, 259
 };
 static int parser_action_row453[] = {
        1,
-       -1, 1, 246
+       -1, 1, 264
 };
 static int parser_action_row454[] = {
        1,
-       -1, 1, 232
+       -1, 1, 250
 };
 static int parser_action_row455[] = {
        1,
-       -1, 1, 231
+       -1, 1, 249
 };
 static int parser_action_row456[] = {
        5,
@@ -5725,7 +5725,7 @@ static int parser_action_row456[] = {
 };
 static int parser_action_row457[] = {
        1,
-       -1, 1, 220
+       -1, 1, 238
 };
 static int parser_action_row458[] = {
        3,
@@ -5741,16 +5741,16 @@ static int parser_action_row459[] = {
 };
 static int parser_action_row460[] = {
        2,
-       -1, 1, 143,
+       -1, 1, 161,
        58, 0, 562
 };
 static int parser_action_row461[] = {
        1,
-       -1, 1, 145
+       -1, 1, 163
 };
 static int parser_action_row462[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -5762,24 +5762,24 @@ static int parser_action_row463[] = {
 };
 static int parser_action_row464[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        56, 0, 273
 };
 static int parser_action_row465[] = {
        1,
-       -1, 1, 151
+       -1, 1, 169
 };
 static int parser_action_row466[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row467[] = {
        3,
-       -1, 1, 153,
+       -1, 1, 171,
        36, 0, 571,
        76, 0, 572
 };
@@ -5790,20 +5790,20 @@ static int parser_action_row468[] = {
 };
 static int parser_action_row469[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        53, 0, 576
 };
 static int parser_action_row470[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row471[] = {
        24,
-       -1, 1, 346,
+       -1, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -5816,8 +5816,8 @@ static int parser_action_row471[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 341,
-       63, 1, 341,
+       53, 1, 359,
+       63, 1, 359,
        65, 0, 116,
        77, 0, 49,
        78, 0, 117,
@@ -5830,16 +5830,16 @@ static int parser_action_row471[] = {
 };
 static int parser_action_row472[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row473[] = {
        27,
-       -1, 1, 341,
-       0, 1, 346,
-       1, 1, 346,
-       9, 1, 346,
+       -1, 1, 359,
+       0, 1, 364,
+       1, 1, 364,
+       9, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -5853,7 +5853,7 @@ static int parser_action_row473[] = {
        49, 0, 114,
        51, 0, 115,
        65, 0, 116,
-       76, 1, 346,
+       76, 1, 364,
        77, 0, 49,
        78, 0, 117,
        79, 0, 118,
@@ -5862,40 +5862,40 @@ static int parser_action_row473[] = {
        82, 0, 121,
        83, 0, 122,
        84, 0, 56,
-       87, 1, 346
+       87, 1, 364
 };
 static int parser_action_row474[] = {
        4,
-       -1, 1, 306,
+       -1, 1, 324,
        58, 0, 590,
        59, 0, 195,
        60, 0, 196
 };
 static int parser_action_row475[] = {
        1,
-       -1, 1, 242
+       -1, 1, 260
 };
 static int parser_action_row476[] = {
        1,
-       -1, 1, 247
+       -1, 1, 265
 };
 static int parser_action_row477[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row478[] = {
        1,
-       -1, 1, 333
+       -1, 1, 351
 };
 static int parser_action_row479[] = {
        1,
-       -1, 1, 340
+       -1, 1, 358
 };
 static int parser_action_row480[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -5906,13 +5906,13 @@ static int parser_action_row481[] = {
 };
 static int parser_action_row482[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row483[] = {
        1,
-       -1, 1, 552
+       -1, 1, 570
 };
 static int parser_action_row484[] = {
        2,
@@ -5935,7 +5935,7 @@ static int parser_action_row486[] = {
 };
 static int parser_action_row487[] = {
        1,
-       -1, 1, 527
+       -1, 1, 545
 };
 static int parser_action_row488[] = {
        20,
@@ -5962,105 +5962,105 @@ static int parser_action_row488[] = {
 };
 static int parser_action_row489[] = {
        1,
-       -1, 1, 526
+       -1, 1, 544
 };
 static int parser_action_row490[] = {
        3,
-       -1, 1, 533,
+       -1, 1, 551,
        64, 0, 253,
        65, 0, 254
 };
 static int parser_action_row491[] = {
        1,
-       -1, 1, 540
+       -1, 1, 558
 };
 static int parser_action_row492[] = {
        4,
-       -1, 1, 542,
+       -1, 1, 560,
        66, 0, 262,
        67, 0, 263,
        68, 0, 264
 };
 static int parser_action_row493[] = {
        4,
-       -1, 1, 543,
+       -1, 1, 561,
        66, 0, 262,
        67, 0, 263,
        68, 0, 264
 };
 static int parser_action_row494[] = {
        3,
-       -1, 1, 532,
+       -1, 1, 550,
        64, 0, 253,
        65, 0, 254
 };
 static int parser_action_row495[] = {
        3,
-       -1, 1, 534,
+       -1, 1, 552,
        64, 0, 253,
        65, 0, 254
 };
 static int parser_action_row496[] = {
        3,
-       -1, 1, 535,
+       -1, 1, 553,
        64, 0, 253,
        65, 0, 254
 };
 static int parser_action_row497[] = {
        3,
-       -1, 1, 536,
+       -1, 1, 554,
        64, 0, 253,
        65, 0, 254
 };
 static int parser_action_row498[] = {
        3,
-       -1, 1, 537,
+       -1, 1, 555,
        64, 0, 253,
        65, 0, 254
 };
 static int parser_action_row499[] = {
        3,
-       -1, 1, 538,
+       -1, 1, 556,
        64, 0, 253,
        65, 0, 254
 };
 static int parser_action_row500[] = {
        3,
-       -1, 1, 539,
+       -1, 1, 557,
        64, 0, 253,
        65, 0, 254
 };
 static int parser_action_row501[] = {
        1,
-       -1, 1, 545
+       -1, 1, 563
 };
 static int parser_action_row502[] = {
        1,
-       -1, 1, 546
+       -1, 1, 564
 };
 static int parser_action_row503[] = {
        1,
-       -1, 1, 547
+       -1, 1, 565
 };
 static int parser_action_row504[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row505[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row506[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row507[] = {
        1,
-       -1, 1, 555
+       -1, 1, 573
 };
 static int parser_action_row508[] = {
        3,
@@ -6075,18 +6075,18 @@ static int parser_action_row509[] = {
 };
 static int parser_action_row510[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        53, 0, 576
 };
 static int parser_action_row511[] = {
        1,
-       -1, 1, 181
+       -1, 1, 199
 };
 static int parser_action_row512[] = {
        1,
-       -1, 1, 236
+       -1, 1, 254
 };
 static int parser_action_row513[] = {
        23,
@@ -6187,7 +6187,7 @@ static int parser_action_row515[] = {
 };
 static int parser_action_row516[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -6198,7 +6198,7 @@ static int parser_action_row517[] = {
 };
 static int parser_action_row518[] = {
        1,
-       -1, 1, 303
+       -1, 1, 321
 };
 static int parser_action_row519[] = {
        5,
@@ -6210,7 +6210,7 @@ static int parser_action_row519[] = {
 };
 static int parser_action_row520[] = {
        1,
-       -1, 1, 278
+       -1, 1, 296
 };
 static int parser_action_row521[] = {
        22,
@@ -6239,99 +6239,99 @@ static int parser_action_row521[] = {
 };
 static int parser_action_row522[] = {
        1,
-       -1, 1, 277
+       -1, 1, 295
 };
 static int parser_action_row523[] = {
        3,
-       -1, 1, 284,
+       -1, 1, 302,
        64, 0, 292,
        65, 0, 293
 };
 static int parser_action_row524[] = {
        1,
-       -1, 1, 291
+       -1, 1, 309
 };
 static int parser_action_row525[] = {
        4,
-       -1, 1, 293,
+       -1, 1, 311,
        66, 0, 301,
        67, 0, 302,
        68, 0, 303
 };
 static int parser_action_row526[] = {
        4,
-       -1, 1, 294,
+       -1, 1, 312,
        66, 0, 301,
        67, 0, 302,
        68, 0, 303
 };
 static int parser_action_row527[] = {
        3,
-       -1, 1, 283,
+       -1, 1, 301,
        64, 0, 292,
        65, 0, 293
 };
 static int parser_action_row528[] = {
        3,
-       -1, 1, 285,
+       -1, 1, 303,
        64, 0, 292,
        65, 0, 293
 };
 static int parser_action_row529[] = {
        3,
-       -1, 1, 286,
+       -1, 1, 304,
        64, 0, 292,
        65, 0, 293
 };
 static int parser_action_row530[] = {
        3,
-       -1, 1, 287,
+       -1, 1, 305,
        64, 0, 292,
        65, 0, 293
 };
 static int parser_action_row531[] = {
        3,
-       -1, 1, 288,
+       -1, 1, 306,
        64, 0, 292,
        65, 0, 293
 };
 static int parser_action_row532[] = {
        3,
-       -1, 1, 289,
+       -1, 1, 307,
        64, 0, 292,
        65, 0, 293
 };
 static int parser_action_row533[] = {
        3,
-       -1, 1, 290,
+       -1, 1, 308,
        64, 0, 292,
        65, 0, 293
 };
 static int parser_action_row534[] = {
        1,
-       -1, 1, 296
+       -1, 1, 314
 };
 static int parser_action_row535[] = {
        1,
-       -1, 1, 297
+       -1, 1, 315
 };
 static int parser_action_row536[] = {
        1,
-       -1, 1, 298
+       -1, 1, 316
 };
 static int parser_action_row537[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row538[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row539[] = {
        1,
-       -1, 1, 306
+       -1, 1, 324
 };
 static int parser_action_row540[] = {
        5,
@@ -6343,20 +6343,20 @@ static int parser_action_row540[] = {
 };
 static int parser_action_row541[] = {
        1,
-       -1, 1, 474
+       -1, 1, 492
 };
 static int parser_action_row542[] = {
        1,
-       -1, 1, 266
+       -1, 1, 284
 };
 static int parser_action_row543[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row544[] = {
        1,
-       -1, 1, 183
+       -1, 1, 201
 };
 static int parser_action_row545[] = {
        2,
@@ -6365,7 +6365,7 @@ static int parser_action_row545[] = {
 };
 static int parser_action_row546[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -6382,28 +6382,28 @@ static int parser_action_row548[] = {
 };
 static int parser_action_row549[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row550[] = {
        1,
-       -1, 1, 347
+       -1, 1, 365
 };
 static int parser_action_row551[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row552[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row553[] = {
        1,
-       -1, 1, 657
+       -1, 1, 675
 };
 static int parser_action_row554[] = {
        3,
@@ -6453,13 +6453,13 @@ static int parser_action_row556[] = {
 };
 static int parser_action_row557[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row558[] = {
        1,
-       -1, 1, 352
+       -1, 1, 370
 };
 static int parser_action_row559[] = {
        3,
@@ -6469,10 +6469,10 @@ static int parser_action_row559[] = {
 };
 static int parser_action_row560[] = {
        4,
-       -1, 1, 351,
+       -1, 1, 369,
        0, 0, 1,
        1, 0, 2,
-       55, 1, 364
+       55, 1, 382
 };
 static int parser_action_row561[] = {
        1,
@@ -6484,7 +6484,7 @@ static int parser_action_row562[] = {
 };
 static int parser_action_row563[] = {
        1,
-       -1, 1, 146
+       -1, 1, 164
 };
 static int parser_action_row564[] = {
        3,
@@ -6534,30 +6534,30 @@ static int parser_action_row566[] = {
 };
 static int parser_action_row567[] = {
        1,
-       -1, 1, 152
+       -1, 1, 170
 };
 static int parser_action_row568[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row569[] = {
        3,
-       -1, 1, 154,
+       -1, 1, 172,
        36, 0, 571,
        76, 0, 572
 };
 static int parser_action_row570[] = {
        2,
-       -1, 1, 147,
-       58, 1, 380
+       -1, 1, 165,
+       58, 1, 398
 };
 static int parser_action_row571[] = {
        4,
-       -1, 1, 149,
+       -1, 1, 167,
        36, 0, 571,
-       58, 1, 382,
+       58, 1, 400,
        76, 0, 572
 };
 static int parser_action_row572[] = {
@@ -6572,39 +6572,39 @@ static int parser_action_row573[] = {
 };
 static int parser_action_row574[] = {
        1,
-       -1, 1, 649
+       -1, 1, 667
 };
 static int parser_action_row575[] = {
        3,
-       -1, 1, 166,
+       -1, 1, 184,
        36, 0, 571,
        76, 0, 572
 };
 static int parser_action_row576[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row577[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row578[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row579[] = {
        1,
-       -1, 1, 641
+       -1, 1, 659
 };
 static int parser_action_row580[] = {
        1,
-       -1, 1, 643
+       -1, 1, 661
 };
 static int parser_action_row581[] = {
        3,
@@ -6614,7 +6614,7 @@ static int parser_action_row581[] = {
 };
 static int parser_action_row582[] = {
        10,
-       -1, 1, 127,
+       -1, 1, 145,
        8, 0, 687,
        9, 0, 688,
        13, 0, 689,
@@ -6627,13 +6627,13 @@ static int parser_action_row582[] = {
 };
 static int parser_action_row583[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row584[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -6645,11 +6645,11 @@ static int parser_action_row585[] = {
 };
 static int parser_action_row586[] = {
        1,
-       -1, 1, 312
+       -1, 1, 330
 };
 static int parser_action_row587[] = {
        1,
-       -1, 1, 216
+       -1, 1, 234
 };
 static int parser_action_row588[] = {
        2,
@@ -6658,14 +6658,14 @@ static int parser_action_row588[] = {
 };
 static int parser_action_row589[] = {
        4,
-       -1, 1, 308,
+       -1, 1, 326,
        58, 0, 702,
        59, 0, 195,
        60, 0, 196
 };
 static int parser_action_row590[] = {
        2,
-       -1, 1, 210,
+       -1, 1, 228,
        76, 0, 330
 };
 static int parser_action_row591[] = {
@@ -6722,7 +6722,7 @@ static int parser_action_row592[] = {
 };
 static int parser_action_row593[] = {
        1,
-       -1, 1, 335
+       -1, 1, 353
 };
 static int parser_action_row594[] = {
        3,
@@ -6732,7 +6732,7 @@ static int parser_action_row594[] = {
 };
 static int parser_action_row595[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -6743,18 +6743,18 @@ static int parser_action_row596[] = {
 };
 static int parser_action_row597[] = {
        3,
-       -1, 1, 553,
-       53, 1, 555,
-       63, 1, 555
+       -1, 1, 571,
+       53, 1, 573,
+       63, 1, 573
 };
 static int parser_action_row598[] = {
        6,
-       -1, 1, 342,
-       53, 1, 338,
-       58, 1, 338,
-       59, 1, 338,
-       60, 1, 338,
-       63, 1, 338
+       -1, 1, 360,
+       53, 1, 356,
+       58, 1, 356,
+       59, 1, 356,
+       60, 1, 356,
+       63, 1, 356
 };
 static int parser_action_row599[] = {
        3,
@@ -6764,11 +6764,11 @@ static int parser_action_row599[] = {
 };
 static int parser_action_row600[] = {
        1,
-       -1, 1, 528
+       -1, 1, 546
 };
 static int parser_action_row601[] = {
        1,
-       -1, 1, 561
+       -1, 1, 579
 };
 static int parser_action_row602[] = {
        2,
@@ -6777,7 +6777,7 @@ static int parser_action_row602[] = {
 };
 static int parser_action_row603[] = {
        1,
-       -1, 1, 557
+       -1, 1, 575
 };
 static int parser_action_row604[] = {
        2,
@@ -6821,19 +6821,19 @@ static int parser_action_row605[] = {
 };
 static int parser_action_row606[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row607[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row608[] = {
        10,
-       -1, 1, 127,
+       -1, 1, 145,
        8, 0, 687,
        9, 0, 719,
        13, 0, 689,
@@ -6846,27 +6846,27 @@ static int parser_action_row608[] = {
 };
 static int parser_action_row609[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row610[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row611[] = {
        1,
-       -1, 1, 237
+       -1, 1, 255
 };
 static int parser_action_row612[] = {
        1,
-       -1, 1, 258
+       -1, 1, 276
 };
 static int parser_action_row613[] = {
        24,
-       -1, 1, 346,
+       -1, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -6879,8 +6879,8 @@ static int parser_action_row613[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 341,
-       63, 1, 341,
+       53, 1, 359,
+       63, 1, 359,
        65, 0, 116,
        77, 0, 49,
        78, 0, 117,
@@ -6933,7 +6933,7 @@ static int parser_action_row615[] = {
 };
 static int parser_action_row616[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -6974,7 +6974,7 @@ static int parser_action_row617[] = {
 };
 static int parser_action_row618[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -7015,16 +7015,16 @@ static int parser_action_row619[] = {
 };
 static int parser_action_row620[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row621[] = {
        24,
-       -1, 1, 193,
+       -1, 1, 211,
        12, 0, 151,
        24, 0, 152,
-       26, 1, 448,
+       26, 1, 466,
        33, 0, 153,
        39, 0, 154,
        41, 0, 155,
@@ -7048,10 +7048,10 @@ static int parser_action_row621[] = {
 };
 static int parser_action_row622[] = {
        25,
-       -1, 1, 200,
+       -1, 1, 218,
        12, 0, 151,
        24, 0, 152,
-       26, 1, 455,
+       26, 1, 473,
        33, 0, 153,
        39, 0, 154,
        41, 0, 155,
@@ -7076,10 +7076,10 @@ static int parser_action_row622[] = {
 };
 static int parser_action_row623[] = {
        25,
-       -1, 1, 195,
+       -1, 1, 213,
        12, 0, 151,
        24, 0, 152,
-       26, 1, 450,
+       26, 1, 468,
        33, 0, 153,
        39, 0, 154,
        41, 0, 155,
@@ -7104,8 +7104,8 @@ static int parser_action_row623[] = {
 };
 static int parser_action_row624[] = {
        2,
-       -1, 1, 199,
-       26, 1, 454
+       -1, 1, 217,
+       26, 1, 472
 };
 static int parser_action_row625[] = {
        23,
@@ -7135,7 +7135,7 @@ static int parser_action_row625[] = {
 };
 static int parser_action_row626[] = {
        24,
-       -1, 1, 346,
+       -1, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -7148,8 +7148,8 @@ static int parser_action_row626[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 341,
-       63, 1, 341,
+       53, 1, 359,
+       63, 1, 359,
        65, 0, 116,
        77, 0, 49,
        78, 0, 117,
@@ -7162,7 +7162,7 @@ static int parser_action_row626[] = {
 };
 static int parser_action_row627[] = {
        28,
-       -1, 1, 346,
+       -1, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -7175,12 +7175,12 @@ static int parser_action_row627[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 341,
+       53, 1, 359,
        57, 0, 191,
-       58, 1, 341,
-       59, 1, 341,
-       60, 1, 341,
-       63, 1, 341,
+       58, 1, 359,
+       59, 1, 359,
+       60, 1, 359,
+       63, 1, 359,
        65, 0, 116,
        77, 0, 49,
        78, 0, 117,
@@ -7193,18 +7193,18 @@ static int parser_action_row627[] = {
 };
 static int parser_action_row628[] = {
        4,
-       -1, 1, 307,
+       -1, 1, 325,
        58, 0, 746,
        59, 0, 195,
        60, 0, 196
 };
 static int parser_action_row629[] = {
        1,
-       -1, 1, 253
+       -1, 1, 271
 };
 static int parser_action_row630[] = {
        1,
-       -1, 1, 255
+       -1, 1, 273
 };
 static int parser_action_row631[] = {
        3,
@@ -7258,39 +7258,39 @@ static int parser_action_row634[] = {
 };
 static int parser_action_row635[] = {
        1,
-       -1, 1, 446
+       -1, 1, 464
 };
 static int parser_action_row636[] = {
        1,
-       -1, 1, 447
+       -1, 1, 465
 };
 static int parser_action_row637[] = {
        1,
-       -1, 1, 459
+       -1, 1, 477
 };
 static int parser_action_row638[] = {
        1,
-       -1, 1, 460
+       -1, 1, 478
 };
 static int parser_action_row639[] = {
        1,
-       -1, 1, 462
+       -1, 1, 480
 };
 static int parser_action_row640[] = {
        1,
-       -1, 1, 461
+       -1, 1, 479
 };
 static int parser_action_row641[] = {
        1,
-       -1, 1, 463
+       -1, 1, 481
 };
 static int parser_action_row642[] = {
        1,
-       -1, 1, 464
+       -1, 1, 482
 };
 static int parser_action_row643[] = {
        1,
-       -1, 1, 262
+       -1, 1, 280
 };
 static int parser_action_row644[] = {
        2,
@@ -7325,23 +7325,23 @@ static int parser_action_row645[] = {
 };
 static int parser_action_row646[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row647[] = {
        3,
-       -1, 1, 304,
-       53, 1, 306,
-       63, 1, 306
+       -1, 1, 322,
+       53, 1, 324,
+       63, 1, 324
 };
 static int parser_action_row648[] = {
        1,
-       -1, 1, 279
+       -1, 1, 297
 };
 static int parser_action_row649[] = {
        2,
-       -1, 1, 308,
+       -1, 1, 326,
        76, 0, 330
 };
 static int parser_action_row650[] = {
@@ -7381,7 +7381,7 @@ static int parser_action_row650[] = {
 };
 static int parser_action_row651[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -7393,12 +7393,12 @@ static int parser_action_row652[] = {
 };
 static int parser_action_row653[] = {
        2,
-       -1, 1, 308,
+       -1, 1, 326,
        76, 0, 436
 };
 static int parser_action_row654[] = {
        1,
-       -1, 1, 182
+       -1, 1, 200
 };
 static int parser_action_row655[] = {
        3,
@@ -7408,23 +7408,23 @@ static int parser_action_row655[] = {
 };
 static int parser_action_row656[] = {
        2,
-       -1, 1, 178,
+       -1, 1, 196,
        55, 0, 766
 };
 static int parser_action_row657[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row658[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row659[] = {
        1,
-       -1, 1, 308
+       -1, 1, 326
 };
 static int parser_action_row660[] = {
        23,
@@ -7479,19 +7479,19 @@ static int parser_action_row661[] = {
 };
 static int parser_action_row662[] = {
        1,
-       -1, 1, 348
+       -1, 1, 366
 };
 static int parser_action_row663[] = {
        1,
-       -1, 1, 658
+       -1, 1, 676
 };
 static int parser_action_row664[] = {
        1,
-       -1, 1, 223
+       -1, 1, 241
 };
 static int parser_action_row665[] = {
        30,
-       -1, 1, 229,
+       -1, 1, 247,
        9, 0, 269,
        12, 0, 25,
        15, 0, 27,
@@ -7529,7 +7529,7 @@ static int parser_action_row666[] = {
 };
 static int parser_action_row667[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        52, 0, 804
@@ -7597,7 +7597,7 @@ static int parser_action_row669[] = {
 };
 static int parser_action_row670[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -7608,40 +7608,40 @@ static int parser_action_row671[] = {
 };
 static int parser_action_row672[] = {
        1,
-       -1, 1, 161
+       -1, 1, 179
 };
 static int parser_action_row673[] = {
        2,
-       -1, 1, 163,
+       -1, 1, 181,
        56, 0, 273
 };
 static int parser_action_row674[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        55, 0, 813
 };
 static int parser_action_row675[] = {
        2,
-       -1, 1, 376,
+       -1, 1, 394,
        83, 0, 817
 };
 static int parser_action_row676[] = {
        2,
-       -1, 1, 370,
+       -1, 1, 388,
        9, 0, 818
 };
 static int parser_action_row677[] = {
        2,
-       -1, 1, 148,
-       58, 1, 381
+       -1, 1, 166,
+       58, 1, 399
 };
 static int parser_action_row678[] = {
        4,
-       -1, 1, 150,
+       -1, 1, 168,
        36, 0, 571,
-       58, 1, 383,
+       58, 1, 401,
        76, 0, 572
 };
 static int parser_action_row679[] = {
@@ -7651,13 +7651,13 @@ static int parser_action_row679[] = {
 };
 static int parser_action_row680[] = {
        3,
-       -1, 1, 155,
+       -1, 1, 173,
        51, 0, 461,
        56, 0, 273
 };
 static int parser_action_row681[] = {
        1,
-       -1, 1, 650
+       -1, 1, 668
 };
 static int parser_action_row682[] = {
        23,
@@ -7692,7 +7692,7 @@ static int parser_action_row683[] = {
 };
 static int parser_action_row684[] = {
        10,
-       -1, 1, 127,
+       -1, 1, 145,
        8, 0, 687,
        9, 0, 827,
        13, 0, 689,
@@ -7705,13 +7705,13 @@ static int parser_action_row684[] = {
 };
 static int parser_action_row685[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row686[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -7721,7 +7721,7 @@ static int parser_action_row687[] = {
 };
 static int parser_action_row688[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -7731,7 +7731,7 @@ static int parser_action_row689[] = {
 };
 static int parser_action_row690[] = {
        6,
-       -1, 1, 127,
+       -1, 1, 145,
        16, 0, 832,
        17, 0, 833,
        21, 0, 29,
@@ -7740,21 +7740,21 @@ static int parser_action_row690[] = {
 };
 static int parser_action_row691[] = {
        1,
-       -1, 1, 123
+       -1, 1, 139
 };
 static int parser_action_row692[] = {
        1,
-       -1, 1, 125
+       -1, 1, 141
 };
 static int parser_action_row693[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row694[] = {
        6,
-       -1, 1, 127,
+       -1, 1, 145,
        13, 0, 836,
        17, 0, 691,
        21, 0, 29,
@@ -7763,7 +7763,7 @@ static int parser_action_row694[] = {
 };
 static int parser_action_row695[] = {
        5,
-       -1, 1, 127,
+       -1, 1, 145,
        13, 0, 839,
        21, 0, 29,
        22, 0, 30,
@@ -7779,11 +7779,11 @@ static int parser_action_row696[] = {
 };
 static int parser_action_row697[] = {
        1,
-       -1, 1, 642
+       -1, 1, 660
 };
 static int parser_action_row698[] = {
        10,
-       -1, 1, 127,
+       -1, 1, 145,
        8, 0, 687,
        9, 0, 845,
        13, 0, 689,
@@ -7796,17 +7796,17 @@ static int parser_action_row698[] = {
 };
 static int parser_action_row699[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row700[] = {
        1,
-       -1, 1, 644
+       -1, 1, 662
 };
 static int parser_action_row701[] = {
        8,
-       -1, 1, 127,
+       -1, 1, 145,
        9, 0, 847,
        13, 0, 689,
        16, 0, 690,
@@ -7817,7 +7817,7 @@ static int parser_action_row701[] = {
 };
 static int parser_action_row702[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -7875,19 +7875,19 @@ static int parser_action_row704[] = {
 };
 static int parser_action_row705[] = {
        1,
-       -1, 1, 212
+       -1, 1, 230
 };
 static int parser_action_row706[] = {
        1,
-       -1, 1, 238
+       -1, 1, 256
 };
 static int parser_action_row707[] = {
        1,
-       -1, 1, 243
+       -1, 1, 261
 };
 static int parser_action_row708[] = {
        1,
-       -1, 1, 338
+       -1, 1, 356
 };
 static int parser_action_row709[] = {
        3,
@@ -7923,32 +7923,32 @@ static int parser_action_row710[] = {
 };
 static int parser_action_row711[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row712[] = {
        6,
-       -1, 1, 343,
-       53, 1, 339,
-       58, 1, 339,
-       59, 1, 339,
-       60, 1, 339,
-       63, 1, 339
+       -1, 1, 361,
+       53, 1, 357,
+       58, 1, 357,
+       59, 1, 357,
+       60, 1, 357,
+       63, 1, 357
 };
 static int parser_action_row713[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row714[] = {
        2,
-       -1, 1, 377,
+       -1, 1, 395,
        83, 0, 855
 };
 static int parser_action_row715[] = {
        2,
-       -1, 1, 371,
+       -1, 1, 389,
        9, 0, 856
 };
 static int parser_action_row716[] = {
@@ -7979,7 +7979,7 @@ static int parser_action_row716[] = {
 };
 static int parser_action_row717[] = {
        10,
-       -1, 1, 127,
+       -1, 1, 145,
        8, 0, 687,
        9, 0, 858,
        13, 0, 689,
@@ -7992,13 +7992,13 @@ static int parser_action_row717[] = {
 };
 static int parser_action_row718[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row719[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -8008,7 +8008,7 @@ static int parser_action_row720[] = {
 };
 static int parser_action_row721[] = {
        10,
-       -1, 1, 127,
+       -1, 1, 145,
        8, 0, 687,
        9, 0, 862,
        13, 0, 689,
@@ -8021,13 +8021,13 @@ static int parser_action_row721[] = {
 };
 static int parser_action_row722[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row723[] = {
        8,
-       -1, 1, 127,
+       -1, 1, 145,
        9, 0, 864,
        13, 0, 689,
        16, 0, 690,
@@ -8038,14 +8038,14 @@ static int parser_action_row723[] = {
 };
 static int parser_action_row724[] = {
        2,
-       -1, 1, 217,
-       26, 1, 472
+       -1, 1, 235,
+       26, 1, 490
 };
 static int parser_action_row725[] = {
        3,
-       -1, 1, 184,
-       26, 1, 444,
-       50, 1, 516
+       -1, 1, 202,
+       26, 1, 462,
+       50, 1, 534
 };
 static int parser_action_row726[] = {
        30,
@@ -8082,11 +8082,11 @@ static int parser_action_row726[] = {
 };
 static int parser_action_row727[] = {
        1,
-       -1, 1, 497
+       -1, 1, 515
 };
 static int parser_action_row728[] = {
        1,
-       -1, 1, 445
+       -1, 1, 463
 };
 static int parser_action_row729[] = {
        2,
@@ -8095,8 +8095,8 @@ static int parser_action_row729[] = {
 };
 static int parser_action_row730[] = {
        4,
-       -1, 1, 234,
-       26, 1, 482,
+       -1, 1, 252,
+       26, 1, 500,
        56, 0, 273,
        58, 0, 868
 };
@@ -8128,7 +8128,7 @@ static int parser_action_row731[] = {
 };
 static int parser_action_row732[] = {
        1,
-       -1, 1, 257
+       -1, 1, 275
 };
 static int parser_action_row733[] = {
        23,
@@ -8158,7 +8158,7 @@ static int parser_action_row733[] = {
 };
 static int parser_action_row734[] = {
        1,
-       -1, 1, 500
+       -1, 1, 518
 };
 static int parser_action_row735[] = {
        2,
@@ -8172,14 +8172,14 @@ static int parser_action_row736[] = {
 };
 static int parser_action_row737[] = {
        1,
-       -1, 1, 449
+       -1, 1, 467
 };
 static int parser_action_row738[] = {
        24,
-       -1, 1, 201,
+       -1, 1, 219,
        12, 0, 151,
        24, 0, 152,
-       26, 1, 456,
+       26, 1, 474,
        33, 0, 153,
        39, 0, 154,
        41, 0, 155,
@@ -8203,14 +8203,14 @@ static int parser_action_row738[] = {
 };
 static int parser_action_row739[] = {
        1,
-       -1, 1, 457
+       -1, 1, 475
 };
 static int parser_action_row740[] = {
        24,
-       -1, 1, 196,
+       -1, 1, 214,
        12, 0, 151,
        24, 0, 152,
-       26, 1, 451,
+       26, 1, 469,
        33, 0, 153,
        39, 0, 154,
        41, 0, 155,
@@ -8234,7 +8234,7 @@ static int parser_action_row740[] = {
 };
 static int parser_action_row741[] = {
        1,
-       -1, 1, 452
+       -1, 1, 470
 };
 static int parser_action_row742[] = {
        23,
@@ -8269,20 +8269,20 @@ static int parser_action_row743[] = {
 };
 static int parser_action_row744[] = {
        2,
-       -1, 1, 214,
-       26, 1, 469
+       -1, 1, 232,
+       26, 1, 487
 };
 static int parser_action_row745[] = {
        4,
-       -1, 1, 309,
+       -1, 1, 327,
        58, 0, 878,
        59, 0, 195,
        60, 0, 196
 };
 static int parser_action_row746[] = {
        3,
-       -1, 1, 211,
-       26, 1, 466,
+       -1, 1, 229,
+       26, 1, 484,
        76, 0, 436
 };
 static int parser_action_row747[] = {
@@ -8339,20 +8339,20 @@ static int parser_action_row748[] = {
 };
 static int parser_action_row749[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row750[] = {
        4,
-       -1, 1, 314,
+       -1, 1, 332,
        58, 0, 884,
        59, 0, 195,
        60, 0, 196
 };
 static int parser_action_row751[] = {
        24,
-       -1, 1, 346,
+       -1, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -8365,8 +8365,8 @@ static int parser_action_row751[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 341,
-       63, 1, 341,
+       53, 1, 359,
+       63, 1, 359,
        65, 0, 116,
        77, 0, 49,
        78, 0, 117,
@@ -8385,7 +8385,7 @@ static int parser_action_row752[] = {
 };
 static int parser_action_row753[] = {
        1,
-       -1, 1, 256
+       -1, 1, 274
 };
 static int parser_action_row754[] = {
        32,
@@ -8424,11 +8424,11 @@ static int parser_action_row754[] = {
 };
 static int parser_action_row755[] = {
        1,
-       -1, 1, 261
+       -1, 1, 279
 };
 static int parser_action_row756[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
@@ -8460,11 +8460,11 @@ static int parser_action_row757[] = {
 };
 static int parser_action_row758[] = {
        1,
-       -1, 1, 271
+       -1, 1, 289
 };
 static int parser_action_row759[] = {
        30,
-       -1, 1, 229,
+       -1, 1, 247,
        9, 0, 865,
        12, 0, 25,
        15, 0, 27,
@@ -8497,7 +8497,7 @@ static int parser_action_row759[] = {
 };
 static int parser_action_row760[] = {
        1,
-       -1, 1, 477
+       -1, 1, 495
 };
 static int parser_action_row761[] = {
        2,
@@ -8567,33 +8567,33 @@ static int parser_action_row763[] = {
 };
 static int parser_action_row764[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row765[] = {
        1,
-       -1, 1, 508
+       -1, 1, 526
 };
 static int parser_action_row766[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row767[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row768[] = {
        1,
-       -1, 1, 651
+       -1, 1, 669
 };
 static int parser_action_row769[] = {
        2,
-       -1, 1, 179,
+       -1, 1, 197,
        55, 0, 766
 };
 static int parser_action_row770[] = {
@@ -8603,63 +8603,63 @@ static int parser_action_row770[] = {
 };
 static int parser_action_row771[] = {
        1,
-       -1, 1, 315
+       -1, 1, 333
 };
 static int parser_action_row772[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row773[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row774[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row775[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row776[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row777[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row778[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row779[] = {
        1,
-       -1, 1, 430
+       -1, 1, 448
 };
 static int parser_action_row780[] = {
        1,
-       -1, 1, 431
+       -1, 1, 449
 };
 static int parser_action_row781[] = {
        1,
-       -1, 1, 432
+       -1, 1, 450
 };
 static int parser_action_row782[] = {
        1,
-       -1, 1, 433
+       -1, 1, 451
 };
 static int parser_action_row783[] = {
        17,
@@ -8709,39 +8709,39 @@ static int parser_action_row784[] = {
 };
 static int parser_action_row785[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row786[] = {
        3,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235,
        57, 0, 191
 };
 static int parser_action_row787[] = {
        1,
-       -1, 1, 422
+       -1, 1, 440
 };
 static int parser_action_row788[] = {
        1,
-       -1, 1, 434
+       -1, 1, 452
 };
 static int parser_action_row789[] = {
        1,
-       -1, 1, 435
+       -1, 1, 453
 };
 static int parser_action_row790[] = {
        1,
-       -1, 1, 436
+       -1, 1, 454
 };
 static int parser_action_row791[] = {
        1,
-       -1, 1, 437
+       -1, 1, 455
 };
 static int parser_action_row792[] = {
        1,
-       -1, 1, 438
+       -1, 1, 456
 };
 static int parser_action_row793[] = {
        2,
@@ -8750,27 +8750,27 @@ static int parser_action_row793[] = {
 };
 static int parser_action_row794[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row795[] = {
        3,
-       -1, 1, 389,
+       -1, 1, 407,
        31, 0, 918,
        32, 0, 919
 };
 static int parser_action_row796[] = {
        1,
-       -1, 1, 391
+       -1, 1, 409
 };
 static int parser_action_row797[] = {
        1,
-       -1, 1, 395
+       -1, 1, 413
 };
 static int parser_action_row798[] = {
        12,
-       -1, 1, 397,
+       -1, 1, 415,
        14, 0, 920,
        40, 0, 921,
        64, 0, 922,
@@ -8785,52 +8785,52 @@ static int parser_action_row798[] = {
 };
 static int parser_action_row799[] = {
        4,
-       -1, 1, 407,
+       -1, 1, 425,
        66, 0, 931,
        67, 0, 932,
        68, 0, 933
 };
 static int parser_action_row800[] = {
        1,
-       -1, 1, 410
+       -1, 1, 428
 };
 static int parser_action_row801[] = {
        1,
-       -1, 1, 414
+       -1, 1, 432
 };
 static int parser_action_row802[] = {
        2,
-       -1, 1, 417,
+       -1, 1, 435,
        63, 0, 934
 };
 static int parser_action_row803[] = {
        2,
-       -1, 1, 227,
+       -1, 1, 245,
        9, 0, 402
 };
 static int parser_action_row804[] = {
        1,
-       -1, 1, 221
+       -1, 1, 239
 };
 static int parser_action_row805[] = {
        1,
-       -1, 1, 350
+       -1, 1, 368
 };
 static int parser_action_row806[] = {
        1,
-       -1, 1, 225
+       -1, 1, 243
 };
 static int parser_action_row807[] = {
        1,
-       -1, 1, 233
+       -1, 1, 251
 };
 static int parser_action_row808[] = {
        1,
-       -1, 1, 224
+       -1, 1, 242
 };
 static int parser_action_row809[] = {
        30,
-       -1, 1, 230,
+       -1, 1, 248,
        9, 0, 269,
        12, 0, 25,
        15, 0, 27,
@@ -8894,24 +8894,24 @@ static int parser_action_row811[] = {
 };
 static int parser_action_row812[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row813[] = {
        2,
-       -1, 1, 164,
+       -1, 1, 182,
        61, 0, 939
 };
 static int parser_action_row814[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row815[] = {
        1,
-       -1, 1, 647
+       -1, 1, 665
 };
 static int parser_action_row816[] = {
        2,
@@ -8920,22 +8920,22 @@ static int parser_action_row816[] = {
 };
 static int parser_action_row817[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        55, 0, 813
 };
 static int parser_action_row818[] = {
        1,
-       -1, 1, 378
+       -1, 1, 396
 };
 static int parser_action_row819[] = {
        1,
-       -1, 1, 372
+       -1, 1, 390
 };
 static int parser_action_row820[] = {
        3,
-       -1, 1, 155,
+       -1, 1, 173,
        51, 0, 461,
        56, 0, 273
 };
@@ -8949,20 +8949,20 @@ static int parser_action_row821[] = {
 };
 static int parser_action_row822[] = {
        2,
-       -1, 1, 156,
+       -1, 1, 174,
        56, 0, 273
 };
 static int parser_action_row823[] = {
        1,
-       -1, 1, 157
+       -1, 1, 175
 };
 static int parser_action_row824[] = {
        1,
-       -1, 1, 374
+       -1, 1, 392
 };
 static int parser_action_row825[] = {
        1,
-       -1, 1, 173
+       -1, 1, 191
 };
 static int parser_action_row826[] = {
        2,
@@ -8971,7 +8971,7 @@ static int parser_action_row826[] = {
 };
 static int parser_action_row827[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        55, 0, 950
@@ -8982,7 +8982,7 @@ static int parser_action_row828[] = {
 };
 static int parser_action_row829[] = {
        10,
-       -1, 1, 127,
+       -1, 1, 145,
        8, 0, 687,
        9, 0, 954,
        13, 0, 689,
@@ -8995,13 +8995,13 @@ static int parser_action_row829[] = {
 };
 static int parser_action_row830[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row831[] = {
        8,
-       -1, 1, 127,
+       -1, 1, 145,
        9, 0, 956,
        13, 0, 689,
        16, 0, 690,
@@ -9018,11 +9018,11 @@ static int parser_action_row832[] = {
 };
 static int parser_action_row833[] = {
        1,
-       -1, 1, 124
+       -1, 1, 140
 };
 static int parser_action_row834[] = {
        1,
-       -1, 1, 126
+       -1, 1, 142
 };
 static int parser_action_row835[] = {
        5,
@@ -9040,7 +9040,7 @@ static int parser_action_row836[] = {
 };
 static int parser_action_row837[] = {
        5,
-       -1, 1, 127,
+       -1, 1, 145,
        17, 0, 833,
        21, 0, 29,
        22, 0, 30,
@@ -9048,7 +9048,7 @@ static int parser_action_row837[] = {
 };
 static int parser_action_row838[] = {
        5,
-       -1, 1, 127,
+       -1, 1, 145,
        13, 0, 964,
        21, 0, 29,
        22, 0, 30,
@@ -9061,7 +9061,7 @@ static int parser_action_row839[] = {
 };
 static int parser_action_row840[] = {
        4,
-       -1, 1, 127,
+       -1, 1, 145,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
@@ -9096,7 +9096,7 @@ static int parser_action_row843[] = {
 };
 static int parser_action_row844[] = {
        19,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        51, 0, 461,
@@ -9117,9 +9117,10 @@ static int parser_action_row844[] = {
        78, 0, 351
 };
 static int parser_action_row845[] = {
-       2,
+       3,
        -1, 3, 844,
-       79, 0, 975
+       78, 0, 975,
+       79, 0, 976
 };
 static int parser_action_row846[] = {
        1,
@@ -9127,8 +9128,8 @@ static int parser_action_row846[] = {
 };
 static int parser_action_row847[] = {
        8,
-       -1, 1, 127,
-       9, 0, 976,
+       -1, 1, 145,
+       9, 0, 977,
        13, 0, 689,
        16, 0, 690,
        17, 0, 691,
@@ -9143,50 +9144,50 @@ static int parser_action_row848[] = {
 static int parser_action_row849[] = {
        4,
        -1, 3, 848,
-       33, 0, 977,
+       33, 0, 978,
        48, 0, 318,
        77, 0, 319
 };
 static int parser_action_row850[] = {
        1,
-       -1, 1, 240
+       -1, 1, 258
 };
 static int parser_action_row851[] = {
        1,
-       -1, 1, 245
+       -1, 1, 263
 };
 static int parser_action_row852[] = {
        1,
-       -1, 1, 339
+       -1, 1, 357
 };
 static int parser_action_row853[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row854[] = {
        1,
-       -1, 1, 564
+       -1, 1, 582
 };
 static int parser_action_row855[] = {
        4,
        -1, 3, 854,
-       33, 0, 980,
+       33, 0, 981,
        48, 0, 318,
        77, 0, 319
 };
 static int parser_action_row856[] = {
        1,
-       -1, 1, 379
+       -1, 1, 397
 };
 static int parser_action_row857[] = {
        1,
-       -1, 1, 373
+       -1, 1, 391
 };
 static int parser_action_row858[] = {
        1,
-       -1, 1, 375
+       -1, 1, 393
 };
 static int parser_action_row859[] = {
        1,
@@ -9194,9 +9195,9 @@ static int parser_action_row859[] = {
 };
 static int parser_action_row860[] = {
        10,
-       -1, 1, 127,
+       -1, 1, 145,
        8, 0, 687,
-       9, 0, 982,
+       9, 0, 983,
        13, 0, 689,
        16, 0, 690,
        17, 0, 691,
@@ -9207,14 +9208,14 @@ static int parser_action_row860[] = {
 };
 static int parser_action_row861[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row862[] = {
        8,
-       -1, 1, 127,
-       9, 0, 984,
+       -1, 1, 145,
+       9, 0, 985,
        13, 0, 689,
        16, 0, 690,
        17, 0, 691,
@@ -9228,8 +9229,8 @@ static int parser_action_row863[] = {
 };
 static int parser_action_row864[] = {
        8,
-       -1, 1, 127,
-       9, 0, 985,
+       -1, 1, 145,
+       9, 0, 986,
        13, 0, 689,
        16, 0, 690,
        17, 0, 691,
@@ -9243,74 +9244,74 @@ static int parser_action_row865[] = {
 };
 static int parser_action_row866[] = {
        3,
-       -1, 1, 183,
-       26, 1, 443,
-       50, 1, 515
+       -1, 1, 201,
+       26, 1, 461,
+       50, 1, 533
 };
 static int parser_action_row867[] = {
        2,
        -1, 3, 866,
-       9, 0, 986
+       9, 0, 987
 };
 static int parser_action_row868[] = {
        2,
-       -1, 1, 250,
-       26, 1, 496
+       -1, 1, 268,
+       26, 1, 514
 };
 static int parser_action_row869[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row870[] = {
        3,
-       -1, 1, 235,
-       26, 1, 483,
-       58, 0, 988
+       -1, 1, 253,
+       26, 1, 501,
+       58, 0, 989
 };
 static int parser_action_row871[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row872[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row873[] = {
        2,
-       -1, 1, 259,
-       26, 1, 499
+       -1, 1, 277,
+       26, 1, 517
 };
 static int parser_action_row874[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row875[] = {
        1,
-       -1, 1, 458
+       -1, 1, 476
 };
 static int parser_action_row876[] = {
        1,
-       -1, 1, 453
+       -1, 1, 471
 };
 static int parser_action_row877[] = {
        2,
        -1, 3, 876,
-       26, 0, 992
+       26, 0, 993
 };
 static int parser_action_row878[] = {
        32,
        -1, 3, 877,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 993,
+       9, 0, 994,
        12, 0, 612,
        15, 0, 613,
        18, 0, 614,
@@ -9394,23 +9395,23 @@ static int parser_action_row880[] = {
 };
 static int parser_action_row881[] = {
        1,
-       -1, 1, 468
+       -1, 1, 486
 };
 static int parser_action_row882[] = {
        1,
-       -1, 1, 487
+       -1, 1, 505
 };
 static int parser_action_row883[] = {
        1,
-       -1, 1, 492
+       -1, 1, 510
 };
 static int parser_action_row884[] = {
        5,
        -1, 3, 883,
-       12, 0, 998,
+       12, 0, 999,
        47, 0, 471,
-       78, 0, 999,
-       79, 0, 1000
+       78, 0, 1000,
+       79, 0, 1001
 };
 static int parser_action_row885[] = {
        23,
@@ -9466,49 +9467,49 @@ static int parser_action_row886[] = {
 };
 static int parser_action_row887[] = {
        2,
-       -1, 1, 215,
-       26, 1, 470
+       -1, 1, 233,
+       26, 1, 488
 };
 static int parser_action_row888[] = {
        1,
-       -1, 1, 254
+       -1, 1, 272
 };
 static int parser_action_row889[] = {
        1,
-       -1, 1, 252
+       -1, 1, 270
 };
 static int parser_action_row890[] = {
        2,
        -1, 3, 889,
-       15, 0, 1003
+       15, 0, 1004
 };
 static int parser_action_row891[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row892[] = {
        2,
-       -1, 1, 227,
-       9, 0, 986
+       -1, 1, 245,
+       9, 0, 987
 };
 static int parser_action_row893[] = {
        2,
-       -1, 1, 221,
-       26, 1, 475
+       -1, 1, 239,
+       26, 1, 493
 };
 static int parser_action_row894[] = {
        1,
-       -1, 1, 479
+       -1, 1, 497
 };
 static int parser_action_row895[] = {
        1,
-       -1, 1, 481
+       -1, 1, 499
 };
 static int parser_action_row896[] = {
        30,
-       -1, 1, 230,
+       -1, 1, 248,
        9, 0, 865,
        12, 0, 25,
        15, 0, 27,
@@ -9541,7 +9542,7 @@ static int parser_action_row896[] = {
 };
 static int parser_action_row897[] = {
        1,
-       -1, 1, 478
+       -1, 1, 496
 };
 static int parser_action_row898[] = {
        2,
@@ -9577,7 +9578,7 @@ static int parser_action_row899[] = {
 static int parser_action_row900[] = {
        2,
        -1, 3, 899,
-       54, 0, 1008
+       54, 0, 1009
 };
 static int parser_action_row901[] = {
        3,
@@ -9587,19 +9588,19 @@ static int parser_action_row901[] = {
 };
 static int parser_action_row902[] = {
        1,
-       -1, 1, 652
+       -1, 1, 670
 };
 static int parser_action_row903[] = {
        1,
-       -1, 1, 176
+       -1, 1, 194
 };
 static int parser_action_row904[] = {
        1,
-       -1, 1, 349
+       -1, 1, 367
 };
 static int parser_action_row905[] = {
        1,
-       -1, 1, 428
+       -1, 1, 446
 };
 static int parser_action_row906[] = {
        23,
@@ -9654,8 +9655,8 @@ static int parser_action_row907[] = {
 static int parser_action_row908[] = {
        3,
        -1, 3, 907,
-       48, 0, 1012,
-       77, 0, 1013
+       48, 0, 1013,
+       77, 0, 1014
 };
 static int parser_action_row909[] = {
        20,
@@ -9682,28 +9683,28 @@ static int parser_action_row909[] = {
 };
 static int parser_action_row910[] = {
        1,
-       -1, 1, 425
+       -1, 1, 443
 };
 static int parser_action_row911[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row912[] = {
        2,
-       -1, 1, 420,
-       63, 1, 422
+       -1, 1, 438,
+       63, 1, 440
 };
 static int parser_action_row913[] = {
        2,
        -1, 3, 912,
-       63, 0, 1017
+       63, 0, 1018
 };
 static int parser_action_row914[] = {
        2,
        -1, 3, 913,
-       52, 0, 1018
+       52, 0, 1019
 };
 static int parser_action_row915[] = {
        20,
@@ -9730,143 +9731,143 @@ static int parser_action_row915[] = {
 };
 static int parser_action_row916[] = {
        1,
-       -1, 1, 424
+       -1, 1, 442
 };
 static int parser_action_row917[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
 static int parser_action_row918[] = {
        3,
        -1, 3, 917,
-       53, 0, 1021,
-       54, 0, 1022
+       53, 0, 1022,
+       54, 0, 1023
 };
 static int parser_action_row919[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row920[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
-       26, 0, 1024
+       26, 0, 1025
 };
 static int parser_action_row921[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row922[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row923[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row924[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row925[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row926[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row927[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row928[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row929[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row930[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row931[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row932[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row933[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row934[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row935[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row936[] = {
        2,
-       -1, 1, 228,
+       -1, 1, 246,
        9, 0, 402
 };
 static int parser_action_row937[] = {
        1,
-       -1, 1, 222
+       -1, 1, 240
 };
 static int parser_action_row938[] = {
        1,
-       -1, 1, 226
+       -1, 1, 244
 };
 static int parser_action_row939[] = {
        2,
        -1, 3, 938,
-       78, 0, 1041
+       78, 0, 1042
 };
 static int parser_action_row940[] = {
        1,
-       -1, 1, 165
+       -1, 1, 183
 };
 static int parser_action_row941[] = {
        2,
@@ -9875,24 +9876,24 @@ static int parser_action_row941[] = {
 };
 static int parser_action_row942[] = {
        1,
-       -1, 1, 159
+       -1, 1, 177
 };
 static int parser_action_row943[] = {
        1,
-       -1, 1, 648
+       -1, 1, 666
 };
 static int parser_action_row944[] = {
        2,
        -1, 3, 943,
-       52, 0, 1043
+       52, 0, 1044
 };
 static int parser_action_row945[] = {
        5,
        -1, 3, 944,
        0, 0, 1,
        1, 0, 2,
-       15, 0, 1044,
-       58, 0, 1045
+       15, 0, 1045,
+       58, 0, 1046
 };
 static int parser_action_row946[] = {
        32,
@@ -9931,17 +9932,17 @@ static int parser_action_row946[] = {
 };
 static int parser_action_row947[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row948[] = {
        1,
-       -1, 1, 167
+       -1, 1, 185
 };
 static int parser_action_row949[] = {
        1,
-       -1, 1, 158
+       -1, 1, 176
 };
 static int parser_action_row950[] = {
        1,
@@ -9949,22 +9950,22 @@ static int parser_action_row950[] = {
 };
 static int parser_action_row951[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row952[] = {
        1,
-       -1, 1, 645
+       -1, 1, 663
 };
 static int parser_action_row953[] = {
        2,
        -1, 3, 952,
-       54, 0, 1050
+       54, 0, 1051
 };
 static int parser_action_row954[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        55, 0, 950
@@ -9975,8 +9976,8 @@ static int parser_action_row955[] = {
 };
 static int parser_action_row956[] = {
        8,
-       -1, 1, 127,
-       9, 0, 1053,
+       -1, 1, 145,
+       9, 0, 1054,
        13, 0, 689,
        16, 0, 690,
        17, 0, 691,
@@ -10013,11 +10014,11 @@ static int parser_action_row959[] = {
 static int parser_action_row960[] = {
        2,
        -1, 3, 959,
-       77, 0, 1055
+       77, 0, 1056
 };
 static int parser_action_row961[] = {
        19,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        51, 0, 461,
@@ -10038,9 +10039,10 @@ static int parser_action_row961[] = {
        78, 0, 351
 };
 static int parser_action_row962[] = {
-       2,
+       3,
        -1, 3, 961,
-       79, 0, 1058
+       78, 0, 1059,
+       79, 0, 1060
 };
 static int parser_action_row963[] = {
        1,
@@ -10049,11 +10051,11 @@ static int parser_action_row963[] = {
 static int parser_action_row964[] = {
        2,
        -1, 3, 963,
-       18, 0, 1059
+       18, 0, 1061
 };
 static int parser_action_row965[] = {
        4,
-       -1, 1, 127,
+       -1, 1, 145,
        21, 0, 29,
        22, 0, 30,
        23, 0, 31
@@ -10061,26 +10063,26 @@ static int parser_action_row965[] = {
 static int parser_action_row966[] = {
        2,
        -1, 3, 965,
-       18, 0, 1061
+       18, 0, 1063
 };
 static int parser_action_row967[] = {
        2,
        -1, 3, 966,
-       79, 0, 1062
+       79, 0, 1064
 };
 static int parser_action_row968[] = {
        2,
        -1, 3, 967,
-       18, 0, 1063
+       18, 0, 1065
 };
 static int parser_action_row969[] = {
        2,
        -1, 3, 968,
-       79, 0, 1064
+       79, 0, 1066
 };
 static int parser_action_row970[] = {
        5,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        51, 0, 461,
@@ -10093,7 +10095,7 @@ static int parser_action_row971[] = {
 };
 static int parser_action_row972[] = {
        5,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        51, 0, 461,
@@ -10102,68 +10104,79 @@ static int parser_action_row972[] = {
 static int parser_action_row973[] = {
        2,
        -1, 3, 972,
-       15, 0, 1069
+       15, 0, 1071
 };
 static int parser_action_row974[] = {
        4,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        56, 0, 273
 };
 static int parser_action_row975[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
 static int parser_action_row976[] = {
+       8,
+       -1, 1, 113,
+       13, 0, 1075,
+       17, 1, 145,
+       21, 0, 29,
+       22, 0, 30,
+       23, 0, 31,
+       56, 0, 273,
+       58, 0, 1076
+};
+static int parser_action_row977[] = {
        3,
        -1, 1, 81,
        56, 0, 273,
-       58, 0, 1073
+       58, 0, 1080
 };
-static int parser_action_row977[] = {
+static int parser_action_row978[] = {
        1,
        -1, 1, 51
 };
-static int parser_action_row978[] = {
+static int parser_action_row979[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row979[] = {
+static int parser_action_row980[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row980[] = {
+static int parser_action_row981[] = {
        2,
-       -1, 3, 979,
-       26, 0, 1077
+       -1, 3, 980,
+       26, 0, 1084
 };
-static int parser_action_row981[] = {
+static int parser_action_row982[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row982[] = {
+static int parser_action_row983[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row983[] = {
+static int parser_action_row984[] = {
        1,
        -1, 1, 46
 };
-static int parser_action_row984[] = {
+static int parser_action_row985[] = {
        8,
-       -1, 1, 127,
-       9, 0, 1080,
+       -1, 1, 145,
+       9, 0, 1087,
        13, 0, 689,
        16, 0, 690,
        17, 0, 691,
@@ -10171,23 +10184,23 @@ static int parser_action_row984[] = {
        22, 0, 30,
        23, 0, 31
 };
-static int parser_action_row985[] = {
+static int parser_action_row986[] = {
        1,
        -1, 1, 50
 };
-static int parser_action_row986[] = {
+static int parser_action_row987[] = {
        1,
        -1, 1, 52
 };
-static int parser_action_row987[] = {
+static int parser_action_row988[] = {
        3,
-       -1, 1, 182,
-       26, 1, 442,
-       50, 1, 514
+       -1, 1, 200,
+       26, 1, 460,
+       50, 1, 532
 };
-static int parser_action_row988[] = {
+static int parser_action_row989[] = {
        23,
-       -1, 3, 987,
+       -1, 3, 988,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -10211,33 +10224,33 @@ static int parser_action_row988[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row989[] = {
+static int parser_action_row990[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row990[] = {
-       2,
-       -1, 3, 989,
-       25, 0, 1083
-};
 static int parser_action_row991[] = {
        2,
        -1, 3, 990,
-       15, 0, 1084
+       25, 0, 1090
 };
 static int parser_action_row992[] = {
        2,
        -1, 3, 991,
-       30, 0, 1085
+       15, 0, 1091
 };
 static int parser_action_row993[] = {
-       32,
+       2,
        -1, 3, 992,
+       30, 0, 1092
+};
+static int parser_action_row994[] = {
+       32,
+       -1, 3, 993,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 993,
+       9, 0, 994,
        12, 0, 612,
        15, 0, 613,
        18, 0, 614,
@@ -10267,15 +10280,15 @@ static int parser_action_row993[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row994[] = {
+static int parser_action_row995[] = {
        2,
-       -1, 1, 184,
-       26, 1, 444
+       -1, 1, 202,
+       26, 1, 462
 };
-static int parser_action_row995[] = {
+static int parser_action_row996[] = {
        30,
-       -1, 3, 994,
-       9, 0, 1087,
+       -1, 3, 995,
+       9, 0, 1094,
        12, 0, 25,
        15, 0, 27,
        18, 0, 28,
@@ -10305,21 +10318,21 @@ static int parser_action_row995[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row996[] = {
-       1,
-       -1, 1, 505
-};
 static int parser_action_row997[] = {
        1,
-       -1, 1, 489
+       -1, 1, 523
 };
 static int parser_action_row998[] = {
        1,
-       -1, 1, 494
+       -1, 1, 507
 };
 static int parser_action_row999[] = {
+       1,
+       -1, 1, 512
+};
+static int parser_action_row1000[] = {
        24,
-       -1, 1, 346,
+       -1, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -10332,8 +10345,8 @@ static int parser_action_row999[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 341,
-       63, 1, 341,
+       53, 1, 359,
+       63, 1, 359,
        65, 0, 116,
        77, 0, 49,
        78, 0, 117,
@@ -10344,9 +10357,9 @@ static int parser_action_row999[] = {
        83, 0, 122,
        84, 0, 56
 };
-static int parser_action_row1000[] = {
+static int parser_action_row1001[] = {
        27,
-       -1, 1, 346,
+       -1, 1, 364,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -10359,11 +10372,11 @@ static int parser_action_row1000[] = {
        46, 0, 113,
        49, 0, 114,
        51, 0, 115,
-       53, 1, 341,
-       58, 1, 341,
-       59, 1, 341,
-       60, 1, 341,
-       63, 1, 341,
+       53, 1, 359,
+       58, 1, 359,
+       59, 1, 359,
+       60, 1, 359,
+       63, 1, 359,
        65, 0, 116,
        77, 0, 49,
        78, 0, 117,
@@ -10374,24 +10387,24 @@ static int parser_action_row1000[] = {
        83, 0, 122,
        84, 0, 56
 };
-static int parser_action_row1001[] = {
+static int parser_action_row1002[] = {
        4,
-       -1, 1, 306,
-       58, 0, 1092,
+       -1, 1, 324,
+       58, 0, 1099,
        59, 0, 195,
        60, 0, 196
 };
-static int parser_action_row1002[] = {
-       1,
-       -1, 1, 490
-};
 static int parser_action_row1003[] = {
        1,
-       -1, 1, 495
+       -1, 1, 508
 };
 static int parser_action_row1004[] = {
+       1,
+       -1, 1, 513
+};
+static int parser_action_row1005[] = {
        32,
-       -1, 3, 1003,
+       -1, 3, 1004,
        0, 0, 1,
        1, 0, 2,
        9, 0, 137,
@@ -10424,97 +10437,97 @@ static int parser_action_row1004[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1005[] = {
-       2,
-       -1, 3, 1004,
-       26, 0, 1096
-};
 static int parser_action_row1006[] = {
        2,
-       -1, 1, 228,
-       9, 0, 986
+       -1, 3, 1005,
+       26, 0, 1103
 };
 static int parser_action_row1007[] = {
        2,
-       -1, 1, 222,
-       26, 1, 476
+       -1, 1, 246,
+       9, 0, 987
 };
 static int parser_action_row1008[] = {
-       1,
-       -1, 1, 480
+       2,
+       -1, 1, 240,
+       26, 1, 494
 };
 static int parser_action_row1009[] = {
        1,
-       -1, 1, 177
+       -1, 1, 498
 };
 static int parser_action_row1010[] = {
        1,
-       -1, 1, 180
+       -1, 1, 195
 };
 static int parser_action_row1011[] = {
+       1,
+       -1, 1, 198
+};
+static int parser_action_row1012[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1012[] = {
+static int parser_action_row1013[] = {
        1,
-       -1, 1, 396
+       -1, 1, 414
 };
-static int parser_action_row1013[] = {
+static int parser_action_row1014[] = {
        2,
-       -1, 3, 1012,
-       77, 0, 1098
+       -1, 3, 1013,
+       77, 0, 1105
 };
-static int parser_action_row1014[] = {
+static int parser_action_row1015[] = {
        1,
-       -1, 1, 384
+       -1, 1, 402
 };
-static int parser_action_row1015[] = {
+static int parser_action_row1016[] = {
        3,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235,
-       63, 0, 1099
+       63, 0, 1106
 };
-static int parser_action_row1016[] = {
+static int parser_action_row1017[] = {
        1,
-       -1, 1, 416
+       -1, 1, 434
 };
-static int parser_action_row1017[] = {
+static int parser_action_row1018[] = {
        3,
-       -1, 3, 1016,
-       48, 0, 1012,
-       77, 0, 1013
+       -1, 3, 1017,
+       48, 0, 1013,
+       77, 0, 1014
 };
-static int parser_action_row1018[] = {
+static int parser_action_row1019[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1019[] = {
-       1,
-       -1, 1, 439
-};
 static int parser_action_row1020[] = {
        1,
-       -1, 1, 415
+       -1, 1, 457
 };
 static int parser_action_row1021[] = {
        1,
-       -1, 1, 426
+       -1, 1, 433
 };
 static int parser_action_row1022[] = {
        1,
-       -1, 1, 317
+       -1, 1, 444
 };
 static int parser_action_row1023[] = {
        1,
-       -1, 1, 316
+       -1, 1, 335
 };
 static int parser_action_row1024[] = {
+       1,
+       -1, 1, 334
+};
+static int parser_action_row1025[] = {
        21,
-       -1, 3, 1023,
+       -1, 3, 1024,
        12, 0, 772,
        33, 0, 774,
        39, 0, 775,
@@ -10536,15 +10549,15 @@ static int parser_action_row1024[] = {
        83, 0, 790,
        84, 0, 56
 };
-static int parser_action_row1025[] = {
+static int parser_action_row1026[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1026[] = {
+static int parser_action_row1027[] = {
        21,
-       -1, 3, 1025,
+       -1, 3, 1026,
        12, 0, 772,
        33, 0, 774,
        39, 0, 775,
@@ -10566,9 +10579,9 @@ static int parser_action_row1026[] = {
        83, 0, 790,
        84, 0, 56
 };
-static int parser_action_row1027[] = {
+static int parser_action_row1028[] = {
        20,
-       -1, 3, 1026,
+       -1, 3, 1027,
        12, 0, 772,
        39, 0, 775,
        41, 0, 776,
@@ -10589,34 +10602,11 @@ static int parser_action_row1027[] = {
        83, 0, 790,
        84, 0, 56
 };
-static int parser_action_row1028[] = {
-       3,
-       -1, 3, 1027,
-       48, 0, 1012,
-       77, 0, 1013
-};
 static int parser_action_row1029[] = {
-       20,
+       3,
        -1, 3, 1028,
-       12, 0, 772,
-       39, 0, 775,
-       41, 0, 776,
-       42, 0, 777,
-       43, 0, 778,
-       44, 0, 779,
-       45, 0, 780,
-       46, 0, 781,
-       49, 0, 782,
-       51, 0, 783,
-       65, 0, 784,
-       77, 0, 49,
-       78, 0, 785,
-       79, 0, 786,
-       80, 0, 787,
-       81, 0, 788,
-       82, 0, 789,
-       83, 0, 790,
-       84, 0, 56
+       48, 0, 1013,
+       77, 0, 1014
 };
 static int parser_action_row1030[] = {
        20,
@@ -10872,28 +10862,51 @@ static int parser_action_row1040[] = {
        84, 0, 56
 };
 static int parser_action_row1041[] = {
-       5,
+       20,
        -1, 3, 1040,
-       12, 0, 1120,
-       47, 0, 1121,
-       78, 0, 1122,
-       79, 0, 1123
+       12, 0, 772,
+       39, 0, 775,
+       41, 0, 776,
+       42, 0, 777,
+       43, 0, 778,
+       44, 0, 779,
+       45, 0, 780,
+       46, 0, 781,
+       49, 0, 782,
+       51, 0, 783,
+       65, 0, 784,
+       77, 0, 49,
+       78, 0, 785,
+       79, 0, 786,
+       80, 0, 787,
+       81, 0, 788,
+       82, 0, 789,
+       83, 0, 790,
+       84, 0, 56
 };
 static int parser_action_row1042[] = {
-       1,
-       -1, 1, 353
+       5,
+       -1, 3, 1041,
+       12, 0, 1127,
+       47, 0, 1128,
+       78, 0, 1129,
+       79, 0, 1130
 };
 static int parser_action_row1043[] = {
        1,
-       -1, 1, 162
+       -1, 1, 371
 };
 static int parser_action_row1044[] = {
        1,
-       -1, 1, 160
+       -1, 1, 180
 };
 static int parser_action_row1045[] = {
+       1,
+       -1, 1, 178
+};
+static int parser_action_row1046[] = {
        32,
-       -1, 3, 1044,
+       -1, 3, 1045,
        0, 0, 1,
        1, 0, 2,
        9, 0, 443,
@@ -10926,25 +10939,25 @@ static int parser_action_row1045[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1046[] = {
+static int parser_action_row1047[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1047[] = {
+static int parser_action_row1048[] = {
        1,
-       -1, 1, 168
+       -1, 1, 186
 };
-static int parser_action_row1048[] = {
+static int parser_action_row1049[] = {
        3,
-       -1, 3, 1047,
+       -1, 3, 1048,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1049[] = {
+static int parser_action_row1050[] = {
        23,
-       -1, 3, 1048,
+       -1, 3, 1049,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -10968,115 +10981,126 @@ static int parser_action_row1049[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1050[] = {
+static int parser_action_row1051[] = {
        2,
-       -1, 3, 1049,
+       -1, 3, 1050,
        77, 0, 825
 };
-static int parser_action_row1051[] = {
+static int parser_action_row1052[] = {
        1,
        -1, 1, 59
 };
-static int parser_action_row1052[] = {
+static int parser_action_row1053[] = {
        1,
-       -1, 1, 646
+       -1, 1, 664
 };
-static int parser_action_row1053[] = {
+static int parser_action_row1054[] = {
        2,
-       -1, 3, 1052,
-       54, 0, 1129
+       -1, 3, 1053,
+       54, 0, 1136
 };
-static int parser_action_row1054[] = {
+static int parser_action_row1055[] = {
        1,
        -1, 1, 53
 };
-static int parser_action_row1055[] = {
+static int parser_action_row1056[] = {
        5,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        51, 0, 461,
        56, 0, 273
 };
-static int parser_action_row1056[] = {
+static int parser_action_row1057[] = {
        2,
-       -1, 3, 1055,
+       -1, 3, 1056,
        56, 0, 273
 };
-static int parser_action_row1057[] = {
+static int parser_action_row1058[] = {
        5,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2,
        51, 0, 461,
        56, 0, 273
 };
-static int parser_action_row1058[] = {
-       2,
-       -1, 3, 1057,
-       15, 0, 1134
-};
 static int parser_action_row1059[] = {
-       3,
-       -1, 1, 82,
-       56, 0, 273,
-       58, 0, 1135
+       2,
+       -1, 3, 1058,
+       15, 0, 1141
 };
 static int parser_action_row1060[] = {
-       2,
-       -1, 3, 1059,
-       79, 0, 1137
+       8,
+       -1, 1, 114,
+       13, 0, 1075,
+       17, 1, 145,
+       21, 0, 29,
+       22, 0, 30,
+       23, 0, 31,
+       56, 0, 273,
+       58, 0, 1142
 };
 static int parser_action_row1061[] = {
-       2,
-       -1, 3, 1060,
-       18, 0, 1138
+       3,
+       -1, 1, 82,
+       56, 0, 273,
+       58, 0, 1145
 };
 static int parser_action_row1062[] = {
        2,
        -1, 3, 1061,
-       79, 0, 1139
+       79, 0, 1147
 };
 static int parser_action_row1063[] = {
-       3,
-       -1, 1, 83,
-       56, 0, 273,
-       58, 0, 1140
+       2,
+       -1, 3, 1062,
+       18, 0, 1148
 };
 static int parser_action_row1064[] = {
        2,
        -1, 3, 1063,
-       79, 0, 1142
+       79, 0, 1149
 };
 static int parser_action_row1065[] = {
        3,
-       -1, 1, 85,
+       -1, 1, 83,
        56, 0, 273,
-       58, 0, 1143
+       58, 0, 1150
 };
 static int parser_action_row1066[] = {
-       3,
+       2,
        -1, 3, 1065,
-       14, 0, 1145,
-       15, 0, 1146
+       79, 0, 1152
 };
 static int parser_action_row1067[] = {
-       2,
-       -1, 3, 1066,
-       58, 0, 1147
+       3,
+       -1, 1, 85,
+       56, 0, 273,
+       58, 0, 1153
 };
 static int parser_action_row1068[] = {
-       1,
-       -1, 1, 121
+       3,
+       -1, 3, 1067,
+       14, 0, 1155,
+       15, 0, 1156
 };
 static int parser_action_row1069[] = {
        2,
        -1, 3, 1068,
-       15, 0, 1148
+       58, 0, 1157
 };
 static int parser_action_row1070[] = {
+       1,
+       -1, 1, 137
+};
+static int parser_action_row1071[] = {
+       2,
+       -1, 3, 1070,
+       15, 0, 1158
+};
+static int parser_action_row1072[] = {
        32,
-       -1, 3, 1069,
+       -1, 3, 1071,
        0, 0, 1,
        1, 0, 2,
        9, 0, 443,
@@ -11109,70 +11133,103 @@ static int parser_action_row1070[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1071[] = {
+static int parser_action_row1073[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1072[] = {
+static int parser_action_row1074[] = {
        1,
-       -1, 1, 147
+       -1, 1, 165
 };
-static int parser_action_row1073[] = {
+static int parser_action_row1075[] = {
        3,
-       -1, 1, 149,
+       -1, 1, 167,
        36, 0, 571,
        76, 0, 572
 };
-static int parser_action_row1074[] = {
+static int parser_action_row1076[] = {
+       4,
+       -1, 1, 145,
+       21, 0, 29,
+       22, 0, 30,
+       23, 0, 31
+};
+static int parser_action_row1077[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1075[] = {
+static int parser_action_row1078[] = {
+       2,
+       -1, 1, 117,
+       58, 0, 1164
+};
+static int parser_action_row1079[] = {
+       2,
+       -1, 3, 1078,
+       17, 0, 1165
+};
+static int parser_action_row1080[] = {
+       7,
+       -1, 1, 115,
+       13, 0, 1075,
+       17, 1, 145,
+       21, 0, 29,
+       22, 0, 30,
+       23, 0, 31,
+       58, 0, 1166
+};
+static int parser_action_row1081[] = {
+       3,
+       -1, 1, 382,
+       0, 0, 1,
+       1, 0, 2
+};
+static int parser_action_row1082[] = {
        2,
        -1, 1, 89,
-       58, 0, 1153
+       58, 0, 1169
 };
-static int parser_action_row1076[] = {
+static int parser_action_row1083[] = {
        2,
-       -1, 3, 1075,
-       46, 0, 1154
+       -1, 3, 1082,
+       46, 0, 1170
 };
-static int parser_action_row1077[] = {
+static int parser_action_row1084[] = {
        2,
-       -1, 3, 1076,
-       52, 0, 1155
+       -1, 3, 1083,
+       52, 0, 1171
 };
-static int parser_action_row1078[] = {
+static int parser_action_row1085[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1079[] = {
+static int parser_action_row1086[] = {
        2,
-       -1, 3, 1078,
-       46, 0, 1157
+       -1, 3, 1085,
+       46, 0, 1173
 };
-static int parser_action_row1080[] = {
+static int parser_action_row1087[] = {
        2,
-       -1, 3, 1079,
-       52, 0, 1158
+       -1, 3, 1086,
+       52, 0, 1174
 };
-static int parser_action_row1081[] = {
+static int parser_action_row1088[] = {
        1,
        -1, 1, 54
 };
-static int parser_action_row1082[] = {
+static int parser_action_row1089[] = {
        1,
-       -1, 1, 484
+       -1, 1, 502
 };
-static int parser_action_row1083[] = {
+static int parser_action_row1090[] = {
        23,
-       -1, 3, 1082,
+       -1, 3, 1089,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -11196,9 +11253,9 @@ static int parser_action_row1083[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1084[] = {
+static int parser_action_row1091[] = {
        33,
-       -1, 3, 1083,
+       -1, 3, 1090,
        0, 0, 1,
        1, 0, 2,
        9, 0, 611,
@@ -11232,9 +11289,9 @@ static int parser_action_row1084[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1085[] = {
+static int parser_action_row1092[] = {
        32,
-       -1, 3, 1084,
+       -1, 3, 1091,
        0, 0, 1,
        1, 0, 2,
        9, 0, 724,
@@ -11267,47 +11324,47 @@ static int parser_action_row1085[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1086[] = {
+static int parser_action_row1093[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1087[] = {
+static int parser_action_row1094[] = {
        1,
-       -1, 1, 506
+       -1, 1, 524
 };
-static int parser_action_row1088[] = {
+static int parser_action_row1095[] = {
        2,
-       -1, 1, 183,
-       26, 1, 443
+       -1, 1, 201,
+       26, 1, 461
 };
-static int parser_action_row1089[] = {
+static int parser_action_row1096[] = {
        2,
-       -1, 3, 1088,
-       9, 0, 1164
+       -1, 3, 1095,
+       9, 0, 1180
 };
-static int parser_action_row1090[] = {
+static int parser_action_row1097[] = {
        2,
-       -1, 1, 216,
-       26, 1, 471
+       -1, 1, 234,
+       26, 1, 489
 };
-static int parser_action_row1091[] = {
+static int parser_action_row1098[] = {
        4,
-       -1, 1, 308,
-       58, 0, 1165,
+       -1, 1, 326,
+       58, 0, 1181,
        59, 0, 195,
        60, 0, 196
 };
-static int parser_action_row1092[] = {
+static int parser_action_row1099[] = {
        3,
-       -1, 1, 210,
-       26, 1, 465,
+       -1, 1, 228,
+       26, 1, 483,
        76, 0, 436
 };
-static int parser_action_row1093[] = {
+static int parser_action_row1100[] = {
        23,
-       -1, 3, 1092,
+       -1, 3, 1099,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -11331,9 +11388,9 @@ static int parser_action_row1093[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1094[] = {
+static int parser_action_row1101[] = {
        23,
-       -1, 3, 1093,
+       -1, 3, 1100,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -11357,60 +11414,60 @@ static int parser_action_row1094[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1095[] = {
+static int parser_action_row1102[] = {
        1,
-       -1, 1, 264
+       -1, 1, 282
 };
-static int parser_action_row1096[] = {
+static int parser_action_row1103[] = {
        2,
-       -1, 3, 1095,
+       -1, 3, 1102,
        50, 0, 172
 };
-static int parser_action_row1097[] = {
+static int parser_action_row1104[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1098[] = {
+static int parser_action_row1105[] = {
        2,
-       -1, 3, 1097,
-       25, 0, 1172
+       -1, 3, 1104,
+       25, 0, 1188
 };
-static int parser_action_row1099[] = {
+static int parser_action_row1106[] = {
        1,
-       -1, 1, 385
+       -1, 1, 403
 };
-static int parser_action_row1100[] = {
+static int parser_action_row1107[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1101[] = {
+static int parser_action_row1108[] = {
        1,
-       -1, 1, 418
+       -1, 1, 436
 };
-static int parser_action_row1102[] = {
+static int parser_action_row1109[] = {
        2,
-       -1, 3, 1101,
-       63, 0, 1099
+       -1, 3, 1108,
+       63, 0, 1106
 };
-static int parser_action_row1103[] = {
+static int parser_action_row1110[] = {
        5,
-       -1, 3, 1102,
-       12, 0, 1120,
-       47, 0, 1121,
-       78, 0, 1122,
-       79, 0, 1174
+       -1, 3, 1109,
+       12, 0, 1127,
+       47, 0, 1128,
+       78, 0, 1129,
+       79, 0, 1190
 };
-static int parser_action_row1104[] = {
+static int parser_action_row1111[] = {
        1,
-       -1, 1, 393
+       -1, 1, 411
 };
-static int parser_action_row1105[] = {
+static int parser_action_row1112[] = {
        21,
-       -1, 3, 1104,
+       -1, 3, 1111,
        12, 0, 772,
        33, 0, 774,
        39, 0, 775,
@@ -11432,117 +11489,117 @@ static int parser_action_row1105[] = {
        83, 0, 790,
        84, 0, 56
 };
-static int parser_action_row1106[] = {
+static int parser_action_row1113[] = {
        1,
-       -1, 1, 392
+       -1, 1, 410
 };
-static int parser_action_row1107[] = {
+static int parser_action_row1114[] = {
        3,
-       -1, 1, 399,
+       -1, 1, 417,
        64, 0, 922,
        65, 0, 923
 };
-static int parser_action_row1108[] = {
+static int parser_action_row1115[] = {
        1,
-       -1, 1, 406
+       -1, 1, 424
 };
-static int parser_action_row1109[] = {
+static int parser_action_row1116[] = {
        4,
-       -1, 1, 408,
+       -1, 1, 426,
        66, 0, 931,
        67, 0, 932,
        68, 0, 933
 };
-static int parser_action_row1110[] = {
+static int parser_action_row1117[] = {
        4,
-       -1, 1, 409,
+       -1, 1, 427,
        66, 0, 931,
        67, 0, 932,
        68, 0, 933
 };
-static int parser_action_row1111[] = {
+static int parser_action_row1118[] = {
        3,
-       -1, 1, 398,
+       -1, 1, 416,
        64, 0, 922,
        65, 0, 923
 };
-static int parser_action_row1112[] = {
+static int parser_action_row1119[] = {
        3,
-       -1, 1, 400,
+       -1, 1, 418,
        64, 0, 922,
        65, 0, 923
 };
-static int parser_action_row1113[] = {
+static int parser_action_row1120[] = {
        3,
-       -1, 1, 401,
+       -1, 1, 419,
        64, 0, 922,
        65, 0, 923
 };
-static int parser_action_row1114[] = {
+static int parser_action_row1121[] = {
        3,
-       -1, 1, 402,
+       -1, 1, 420,
        64, 0, 922,
        65, 0, 923
 };
-static int parser_action_row1115[] = {
+static int parser_action_row1122[] = {
        3,
-       -1, 1, 403,
+       -1, 1, 421,
        64, 0, 922,
        65, 0, 923
 };
-static int parser_action_row1116[] = {
+static int parser_action_row1123[] = {
        3,
-       -1, 1, 404,
+       -1, 1, 422,
        64, 0, 922,
        65, 0, 923
 };
-static int parser_action_row1117[] = {
+static int parser_action_row1124[] = {
        3,
-       -1, 1, 405,
+       -1, 1, 423,
        64, 0, 922,
        65, 0, 923
 };
-static int parser_action_row1118[] = {
+static int parser_action_row1125[] = {
        1,
-       -1, 1, 411
+       -1, 1, 429
 };
-static int parser_action_row1119[] = {
+static int parser_action_row1126[] = {
        1,
-       -1, 1, 412
+       -1, 1, 430
 };
-static int parser_action_row1120[] = {
+static int parser_action_row1127[] = {
        1,
-       -1, 1, 413
+       -1, 1, 431
 };
-static int parser_action_row1121[] = {
+static int parser_action_row1128[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
-static int parser_action_row1122[] = {
+static int parser_action_row1129[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1123[] = {
+static int parser_action_row1130[] = {
        2,
-       -1, 1, 341,
+       -1, 1, 359,
        51, 0, 235
 };
-static int parser_action_row1124[] = {
+static int parser_action_row1131[] = {
        1,
-       -1, 1, 421
+       -1, 1, 439
 };
-static int parser_action_row1125[] = {
+static int parser_action_row1132[] = {
        3,
-       -1, 3, 1124,
+       -1, 3, 1131,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1126[] = {
+static int parser_action_row1133[] = {
        23,
-       -1, 3, 1125,
+       -1, 3, 1132,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -11566,47 +11623,47 @@ static int parser_action_row1126[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1127[] = {
+static int parser_action_row1134[] = {
        1,
-       -1, 1, 169
+       -1, 1, 187
 };
-static int parser_action_row1128[] = {
+static int parser_action_row1135[] = {
        3,
-       -1, 3, 1127,
+       -1, 3, 1134,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1129[] = {
+static int parser_action_row1136[] = {
        1,
        -1, 1, 61
 };
-static int parser_action_row1130[] = {
+static int parser_action_row1137[] = {
        1,
        -1, 1, 60
 };
-static int parser_action_row1131[] = {
+static int parser_action_row1138[] = {
        3,
-       -1, 3, 1130,
-       14, 0, 1182,
-       15, 0, 1183
+       -1, 3, 1137,
+       14, 0, 1198,
+       15, 0, 1199
 };
-static int parser_action_row1132[] = {
+static int parser_action_row1139[] = {
        2,
-       -1, 3, 1131,
-       58, 0, 1184
+       -1, 3, 1138,
+       58, 0, 1200
 };
-static int parser_action_row1133[] = {
+static int parser_action_row1140[] = {
        1,
-       -1, 1, 122
+       -1, 1, 138
 };
-static int parser_action_row1134[] = {
+static int parser_action_row1141[] = {
        2,
-       -1, 3, 1133,
-       15, 0, 1185
+       -1, 3, 1140,
+       15, 0, 1201
 };
-static int parser_action_row1135[] = {
+static int parser_action_row1142[] = {
        32,
-       -1, 3, 1134,
+       -1, 3, 1141,
        0, 0, 1,
        1, 0, 2,
        9, 0, 443,
@@ -11639,72 +11696,93 @@ static int parser_action_row1135[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1136[] = {
+static int parser_action_row1143[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1137[] = {
+static int parser_action_row1144[] = {
+       2,
+       -1, 1, 118,
+       58, 0, 1204
+};
+static int parser_action_row1145[] = {
+       7,
+       -1, 1, 116,
+       13, 0, 1075,
+       17, 1, 145,
+       21, 0, 29,
+       22, 0, 30,
+       23, 0, 31,
+       58, 0, 1205
+};
+static int parser_action_row1146[] = {
+       3,
+       -1, 1, 382,
+       0, 0, 1,
+       1, 0, 2
+};
+static int parser_action_row1147[] = {
        2,
        -1, 1, 90,
-       58, 0, 1188
+       58, 0, 1208
 };
-static int parser_action_row1138[] = {
+static int parser_action_row1148[] = {
        3,
        -1, 1, 84,
        56, 0, 273,
-       58, 0, 1189
+       58, 0, 1209
 };
-static int parser_action_row1139[] = {
+static int parser_action_row1149[] = {
        2,
-       -1, 3, 1138,
-       79, 0, 1191
+       -1, 3, 1148,
+       79, 0, 1211
 };
-static int parser_action_row1140[] = {
+static int parser_action_row1150[] = {
        3,
        -1, 1, 87,
        56, 0, 273,
-       58, 0, 1192
+       58, 0, 1212
 };
-static int parser_action_row1141[] = {
+static int parser_action_row1151[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1142[] = {
+static int parser_action_row1152[] = {
        2,
        -1, 1, 91,
-       58, 0, 1195
+       58, 0, 1215
 };
-static int parser_action_row1143[] = {
+static int parser_action_row1153[] = {
        3,
        -1, 1, 86,
        56, 0, 273,
-       58, 0, 1196
+       58, 0, 1216
 };
-static int parser_action_row1144[] = {
+static int parser_action_row1154[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1145[] = {
+static int parser_action_row1155[] = {
        2,
        -1, 1, 93,
-       58, 0, 1199
+       58, 0, 1219
 };
-static int parser_action_row1146[] = {
+static int parser_action_row1156[] = {
        4,
-       -1, 3, 1145,
-       5, 0, 1200,
-       19, 0, 1201,
-       20, 0, 1202
+       -1, 3, 1155,
+       5, 0, 1220,
+       19, 0, 1221,
+       20, 0, 1222
 };
-static int parser_action_row1147[] = {
+static int parser_action_row1157[] = {
        32,
-       -1, 3, 1146,
+       -1, 3, 1156,
        0, 0, 1,
        1, 0, 2,
        9, 0, 443,
@@ -11737,15 +11815,15 @@ static int parser_action_row1147[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1148[] = {
+static int parser_action_row1158[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1149[] = {
+static int parser_action_row1159[] = {
        32,
-       -1, 3, 1148,
+       -1, 3, 1158,
        0, 0, 1,
        1, 0, 2,
        9, 0, 443,
@@ -11778,24 +11856,29 @@ static int parser_action_row1149[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1150[] = {
+static int parser_action_row1160[] = {
        2,
-       -1, 1, 113,
-       9, 0, 1206
+       -1, 1, 129,
+       9, 0, 1226
 };
-static int parser_action_row1151[] = {
+static int parser_action_row1161[] = {
        1,
-       -1, 1, 148
+       -1, 1, 166
 };
-static int parser_action_row1152[] = {
+static int parser_action_row1162[] = {
        3,
-       -1, 1, 150,
+       -1, 1, 168,
        36, 0, 571,
        76, 0, 572
 };
-static int parser_action_row1153[] = {
+static int parser_action_row1163[] = {
+       2,
+       -1, 3, 1162,
+       17, 0, 1227
+};
+static int parser_action_row1164[] = {
        23,
-       -1, 3, 1152,
+       -1, 3, 1163,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -11819,25 +11902,72 @@ static int parser_action_row1153[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1154[] = {
+static int parser_action_row1165[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1155[] = {
+static int parser_action_row1166[] = {
+       1,
+       -1, 1, 143
+};
+static int parser_action_row1167[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1156[] = {
+static int parser_action_row1168[] = {
+       2,
+       -1, 1, 119,
+       58, 0, 1231
+};
+static int parser_action_row1169[] = {
+       23,
+       -1, 3, 1168,
+       12, 0, 151,
+       24, 0, 152,
+       33, 0, 153,
+       39, 0, 154,
+       41, 0, 155,
+       42, 0, 156,
+       43, 0, 43,
+       44, 0, 44,
+       45, 0, 45,
+       46, 0, 46,
+       49, 0, 157,
+       51, 0, 47,
+       53, 0, 48,
+       65, 0, 158,
+       77, 0, 49,
+       78, 0, 186,
+       79, 0, 160,
+       80, 0, 52,
+       81, 0, 53,
+       82, 0, 54,
+       83, 0, 55,
+       84, 0, 56
+};
+static int parser_action_row1170[] = {
+       3,
+       -1, 1, 382,
+       0, 0, 1,
+       1, 0, 2
+};
+static int parser_action_row1171[] = {
+       3,
+       -1, 1, 382,
+       0, 0, 1,
+       1, 0, 2
+};
+static int parser_action_row1172[] = {
        1,
-       -1, 1, 329
+       -1, 1, 347
 };
-static int parser_action_row1157[] = {
+static int parser_action_row1173[] = {
        21,
-       -1, 3, 1156,
+       -1, 3, 1172,
        12, 0, 104,
        24, 0, 105,
        33, 0, 106,
@@ -11859,37 +11989,37 @@ static int parser_action_row1157[] = {
        83, 0, 122,
        84, 0, 56
 };
-static int parser_action_row1158[] = {
+static int parser_action_row1174[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1159[] = {
+static int parser_action_row1175[] = {
        1,
-       -1, 1, 574
+       -1, 1, 592
 };
-static int parser_action_row1160[] = {
+static int parser_action_row1176[] = {
        1,
-       -1, 1, 485
+       -1, 1, 503
 };
-static int parser_action_row1161[] = {
+static int parser_action_row1177[] = {
        2,
-       -1, 3, 1160,
-       26, 0, 1212
+       -1, 3, 1176,
+       26, 0, 1237
 };
-static int parser_action_row1162[] = {
+static int parser_action_row1178[] = {
        1,
-       -1, 1, 502
+       -1, 1, 520
 };
-static int parser_action_row1163[] = {
+static int parser_action_row1179[] = {
        2,
-       -1, 3, 1162,
+       -1, 3, 1178,
        50, 0, 172
 };
-static int parser_action_row1164[] = {
+static int parser_action_row1180[] = {
        23,
-       -1, 3, 1163,
+       -1, 3, 1179,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -11913,14 +12043,14 @@ static int parser_action_row1164[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1165[] = {
+static int parser_action_row1181[] = {
        2,
-       -1, 1, 182,
-       26, 1, 442
+       -1, 1, 200,
+       26, 1, 460
 };
-static int parser_action_row1166[] = {
+static int parser_action_row1182[] = {
        23,
-       -1, 3, 1165,
+       -1, 3, 1181,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -11944,9 +12074,9 @@ static int parser_action_row1166[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1167[] = {
+static int parser_action_row1183[] = {
        23,
-       -1, 3, 1166,
+       -1, 3, 1182,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -11970,25 +12100,25 @@ static int parser_action_row1167[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1168[] = {
+static int parser_action_row1184[] = {
        1,
-       -1, 1, 467
+       -1, 1, 485
 };
-static int parser_action_row1169[] = {
+static int parser_action_row1185[] = {
        1,
-       -1, 1, 486
+       -1, 1, 504
 };
-static int parser_action_row1170[] = {
+static int parser_action_row1186[] = {
        1,
-       -1, 1, 491
+       -1, 1, 509
 };
-static int parser_action_row1171[] = {
+static int parser_action_row1187[] = {
        1,
-       -1, 1, 263
+       -1, 1, 281
 };
-static int parser_action_row1172[] = {
+static int parser_action_row1188[] = {
        23,
-       -1, 3, 1171,
+       -1, 3, 1187,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12012,63 +12142,63 @@ static int parser_action_row1172[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1173[] = {
+static int parser_action_row1189[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1174[] = {
+static int parser_action_row1190[] = {
        2,
-       -1, 3, 1173,
-       78, 0, 1219
+       -1, 3, 1189,
+       78, 0, 1244
 };
-static int parser_action_row1175[] = {
+static int parser_action_row1191[] = {
        2,
-       -1, 1, 419,
-       63, 1, 421
+       -1, 1, 437,
+       63, 1, 439
 };
-static int parser_action_row1176[] = {
+static int parser_action_row1192[] = {
        1,
-       -1, 1, 394
+       -1, 1, 412
 };
-static int parser_action_row1177[] = {
+static int parser_action_row1193[] = {
        1,
-       -1, 1, 427
+       -1, 1, 445
 };
-static int parser_action_row1178[] = {
+static int parser_action_row1194[] = {
        2,
-       -1, 3, 1177,
-       51, 0, 1220
+       -1, 3, 1193,
+       51, 0, 1245
 };
-static int parser_action_row1179[] = {
+static int parser_action_row1195[] = {
        1,
-       -1, 1, 423
+       -1, 1, 441
 };
-static int parser_action_row1180[] = {
+static int parser_action_row1196[] = {
        1,
-       -1, 1, 170
+       -1, 1, 188
 };
-static int parser_action_row1181[] = {
+static int parser_action_row1197[] = {
        3,
-       -1, 3, 1180,
+       -1, 3, 1196,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1182[] = {
+static int parser_action_row1198[] = {
        1,
-       -1, 1, 171
+       -1, 1, 189
 };
-static int parser_action_row1183[] = {
+static int parser_action_row1199[] = {
        4,
-       -1, 3, 1182,
-       5, 0, 1222,
-       19, 0, 1223,
-       20, 0, 1224
+       -1, 3, 1198,
+       5, 0, 1247,
+       19, 0, 1248,
+       20, 0, 1249
 };
-static int parser_action_row1184[] = {
+static int parser_action_row1200[] = {
        32,
-       -1, 3, 1183,
+       -1, 3, 1199,
        0, 0, 1,
        1, 0, 2,
        9, 0, 443,
@@ -12101,15 +12231,15 @@ static int parser_action_row1184[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1185[] = {
+static int parser_action_row1201[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1186[] = {
+static int parser_action_row1202[] = {
        32,
-       -1, 3, 1185,
+       -1, 3, 1201,
        0, 0, 1,
        1, 0, 2,
        9, 0, 443,
@@ -12142,14 +12272,14 @@ static int parser_action_row1186[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1187[] = {
+static int parser_action_row1203[] = {
        2,
-       -1, 1, 114,
-       9, 0, 1228
+       -1, 1, 130,
+       9, 0, 1253
 };
-static int parser_action_row1188[] = {
+static int parser_action_row1204[] = {
        23,
-       -1, 3, 1187,
+       -1, 3, 1203,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12173,43 +12303,86 @@ static int parser_action_row1188[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1189[] = {
+static int parser_action_row1205[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1190[] = {
+static int parser_action_row1206[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1191[] = {
+static int parser_action_row1207[] = {
+       2,
+       -1, 1, 120,
+       58, 0, 1257
+};
+static int parser_action_row1208[] = {
+       23,
+       -1, 3, 1207,
+       12, 0, 151,
+       24, 0, 152,
+       33, 0, 153,
+       39, 0, 154,
+       41, 0, 155,
+       42, 0, 156,
+       43, 0, 43,
+       44, 0, 44,
+       45, 0, 45,
+       46, 0, 46,
+       49, 0, 157,
+       51, 0, 47,
+       53, 0, 48,
+       65, 0, 158,
+       77, 0, 49,
+       78, 0, 186,
+       79, 0, 160,
+       80, 0, 52,
+       81, 0, 53,
+       82, 0, 54,
+       83, 0, 55,
+       84, 0, 56
+};
+static int parser_action_row1209[] = {
+       3,
+       -1, 1, 382,
+       0, 0, 1,
+       1, 0, 2
+};
+static int parser_action_row1210[] = {
+       3,
+       -1, 1, 382,
+       0, 0, 1,
+       1, 0, 2
+};
+static int parser_action_row1211[] = {
        2,
        -1, 1, 92,
-       58, 0, 1232
+       58, 0, 1261
 };
-static int parser_action_row1192[] = {
+static int parser_action_row1212[] = {
        3,
        -1, 1, 88,
        56, 0, 273,
-       58, 0, 1233
+       58, 0, 1262
 };
-static int parser_action_row1193[] = {
+static int parser_action_row1213[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1194[] = {
+static int parser_action_row1214[] = {
        2,
        -1, 1, 95,
-       58, 0, 1236
+       58, 0, 1265
 };
-static int parser_action_row1195[] = {
+static int parser_action_row1215[] = {
        23,
-       -1, 3, 1194,
+       -1, 3, 1214,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12233,26 +12406,26 @@ static int parser_action_row1195[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1196[] = {
+static int parser_action_row1216[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1197[] = {
+static int parser_action_row1217[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1198[] = {
+static int parser_action_row1218[] = {
        2,
        -1, 1, 94,
-       58, 0, 1240
+       58, 0, 1269
 };
-static int parser_action_row1199[] = {
+static int parser_action_row1219[] = {
        23,
-       -1, 3, 1198,
+       -1, 3, 1218,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12276,33 +12449,33 @@ static int parser_action_row1199[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1200[] = {
+static int parser_action_row1220[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1201[] = {
+static int parser_action_row1221[] = {
        1,
        -1, 1, 73
 };
-static int parser_action_row1202[] = {
+static int parser_action_row1222[] = {
        1,
        -1, 1, 75
 };
-static int parser_action_row1203[] = {
+static int parser_action_row1223[] = {
        2,
        -1, 1, 77,
-       83, 0, 1243
+       83, 0, 1272
 };
-static int parser_action_row1204[] = {
+static int parser_action_row1224[] = {
        2,
        -1, 1, 67,
-       9, 0, 1244
+       9, 0, 1273
 };
-static int parser_action_row1205[] = {
+static int parser_action_row1225[] = {
        23,
-       -1, 3, 1204,
+       -1, 3, 1224,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12326,22 +12499,88 @@ static int parser_action_row1205[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1206[] = {
+static int parser_action_row1226[] = {
        2,
-       -1, 1, 115,
-       9, 0, 1246
+       -1, 1, 131,
+       9, 0, 1275
 };
-static int parser_action_row1207[] = {
+static int parser_action_row1227[] = {
        1,
-       -1, 1, 117
+       -1, 1, 133
 };
-static int parser_action_row1208[] = {
+static int parser_action_row1228[] = {
+       1,
+       -1, 1, 144
+};
+static int parser_action_row1229[] = {
+       1,
+       -1, 1, 121
+};
+static int parser_action_row1230[] = {
+       23,
+       -1, 3, 1229,
+       12, 0, 151,
+       24, 0, 152,
+       33, 0, 153,
+       39, 0, 154,
+       41, 0, 155,
+       42, 0, 156,
+       43, 0, 43,
+       44, 0, 44,
+       45, 0, 45,
+       46, 0, 46,
+       49, 0, 157,
+       51, 0, 47,
+       53, 0, 48,
+       65, 0, 158,
+       77, 0, 49,
+       78, 0, 186,
+       79, 0, 160,
+       80, 0, 52,
+       81, 0, 53,
+       82, 0, 54,
+       83, 0, 55,
+       84, 0, 56
+};
+static int parser_action_row1231[] = {
+       23,
+       -1, 3, 1230,
+       12, 0, 151,
+       24, 0, 152,
+       33, 0, 153,
+       39, 0, 154,
+       41, 0, 155,
+       42, 0, 156,
+       43, 0, 43,
+       44, 0, 44,
+       45, 0, 45,
+       46, 0, 46,
+       49, 0, 157,
+       51, 0, 47,
+       53, 0, 48,
+       65, 0, 158,
+       77, 0, 49,
+       78, 0, 186,
+       79, 0, 160,
+       80, 0, 52,
+       81, 0, 53,
+       82, 0, 54,
+       83, 0, 55,
+       84, 0, 56
+};
+static int parser_action_row1232[] = {
+       3,
+       -1, 1, 382,
+       0, 0, 1,
+       1, 0, 2
+};
+static int parser_action_row1233[] = {
        1,
        -1, 1, 97
 };
-static int parser_action_row1209[] = {
+static int parser_action_row1234[] = {
        23,
-       -1, 3, 1208,
+       -1, 3, 1233,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12365,26 +12604,26 @@ static int parser_action_row1209[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1210[] = {
+static int parser_action_row1235[] = {
        2,
-       -1, 3, 1209,
-       52, 0, 1248
+       -1, 3, 1234,
+       52, 0, 1280
 };
-static int parser_action_row1211[] = {
+static int parser_action_row1236[] = {
        1,
-       -1, 1, 524
+       -1, 1, 542
 };
-static int parser_action_row1212[] = {
+static int parser_action_row1237[] = {
        2,
-       -1, 3, 1211,
-       52, 0, 1249
+       -1, 3, 1236,
+       52, 0, 1281
 };
-static int parser_action_row1213[] = {
+static int parser_action_row1238[] = {
        32,
-       -1, 3, 1212,
+       -1, 3, 1237,
        0, 0, 1,
        1, 0, 2,
-       9, 0, 993,
+       9, 0, 994,
        12, 0, 612,
        15, 0, 613,
        18, 0, 614,
@@ -12414,32 +12653,130 @@ static int parser_action_row1213[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1214[] = {
+static int parser_action_row1239[] = {
        2,
-       -1, 1, 261,
-       26, 1, 501
+       -1, 1, 279,
+       26, 1, 519
 };
-static int parser_action_row1215[] = {
+static int parser_action_row1240[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1216[] = {
-       1,
-       -1, 1, 488
+static int parser_action_row1241[] = {
+       1,
+       -1, 1, 506
+};
+static int parser_action_row1242[] = {
+       1,
+       -1, 1, 511
+};
+static int parser_action_row1243[] = {
+       1,
+       -1, 1, 293
+};
+static int parser_action_row1244[] = {
+       23,
+       -1, 3, 1243,
+       12, 0, 151,
+       24, 0, 152,
+       33, 0, 153,
+       39, 0, 154,
+       41, 0, 155,
+       42, 0, 156,
+       43, 0, 43,
+       44, 0, 44,
+       45, 0, 45,
+       46, 0, 46,
+       49, 0, 157,
+       51, 0, 47,
+       53, 0, 48,
+       65, 0, 158,
+       77, 0, 49,
+       78, 0, 186,
+       79, 0, 160,
+       80, 0, 52,
+       81, 0, 53,
+       82, 0, 54,
+       83, 0, 55,
+       84, 0, 56
+};
+static int parser_action_row1245[] = {
+       2,
+       -1, 1, 359,
+       51, 0, 235
+};
+static int parser_action_row1246[] = {
+       3,
+       -1, 1, 382,
+       0, 0, 1,
+       1, 0, 2
+};
+static int parser_action_row1247[] = {
+       1,
+       -1, 1, 190
+};
+static int parser_action_row1248[] = {
+       1,
+       -1, 1, 74
+};
+static int parser_action_row1249[] = {
+       1,
+       -1, 1, 76
+};
+static int parser_action_row1250[] = {
+       2,
+       -1, 1, 78,
+       83, 0, 1287
+};
+static int parser_action_row1251[] = {
+       2,
+       -1, 1, 68,
+       9, 0, 1288
+};
+static int parser_action_row1252[] = {
+       23,
+       -1, 3, 1251,
+       12, 0, 151,
+       24, 0, 152,
+       33, 0, 153,
+       39, 0, 154,
+       41, 0, 155,
+       42, 0, 156,
+       43, 0, 43,
+       44, 0, 44,
+       45, 0, 45,
+       46, 0, 46,
+       49, 0, 157,
+       51, 0, 47,
+       53, 0, 48,
+       65, 0, 158,
+       77, 0, 49,
+       78, 0, 159,
+       79, 0, 160,
+       80, 0, 52,
+       81, 0, 53,
+       82, 0, 54,
+       83, 0, 55,
+       84, 0, 56
+};
+static int parser_action_row1253[] = {
+       2,
+       -1, 1, 132,
+       9, 0, 1290
 };
-static int parser_action_row1217[] = {
+static int parser_action_row1254[] = {
        1,
-       -1, 1, 493
+       -1, 1, 134
 };
-static int parser_action_row1218[] = {
+static int parser_action_row1255[] = {
        1,
-       -1, 1, 275
+       -1, 1, 122
 };
-static int parser_action_row1219[] = {
+static int parser_action_row1256[] = {
        23,
-       -1, 3, 1218,
+       -1, 3, 1255,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12463,42 +12800,9 @@ static int parser_action_row1219[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1220[] = {
-       2,
-       -1, 1, 341,
-       51, 0, 235
-};
-static int parser_action_row1221[] = {
-       3,
-       -1, 1, 364,
-       0, 0, 1,
-       1, 0, 2
-};
-static int parser_action_row1222[] = {
-       1,
-       -1, 1, 172
-};
-static int parser_action_row1223[] = {
-       1,
-       -1, 1, 74
-};
-static int parser_action_row1224[] = {
-       1,
-       -1, 1, 76
-};
-static int parser_action_row1225[] = {
-       2,
-       -1, 1, 78,
-       83, 0, 1255
-};
-static int parser_action_row1226[] = {
-       2,
-       -1, 1, 68,
-       9, 0, 1256
-};
-static int parser_action_row1227[] = {
+static int parser_action_row1257[] = {
        23,
-       -1, 3, 1226,
+       -1, 3, 1256,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12514,7 +12818,7 @@ static int parser_action_row1227[] = {
        53, 0, 48,
        65, 0, 158,
        77, 0, 49,
-       78, 0, 159,
+       78, 0, 186,
        79, 0, 160,
        80, 0, 52,
        81, 0, 53,
@@ -12522,22 +12826,19 @@ static int parser_action_row1227[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1228[] = {
-       2,
-       -1, 1, 116,
-       9, 0, 1258
-};
-static int parser_action_row1229[] = {
-       1,
-       -1, 1, 118
+static int parser_action_row1258[] = {
+       3,
+       -1, 1, 382,
+       0, 0, 1,
+       1, 0, 2
 };
-static int parser_action_row1230[] = {
+static int parser_action_row1259[] = {
        1,
        -1, 1, 98
 };
-static int parser_action_row1231[] = {
+static int parser_action_row1260[] = {
        23,
-       -1, 3, 1230,
+       -1, 3, 1259,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12561,9 +12862,9 @@ static int parser_action_row1231[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1232[] = {
+static int parser_action_row1261[] = {
        23,
-       -1, 3, 1231,
+       -1, 3, 1260,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12587,26 +12888,26 @@ static int parser_action_row1232[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1233[] = {
+static int parser_action_row1262[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1234[] = {
+static int parser_action_row1263[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1235[] = {
+static int parser_action_row1264[] = {
        2,
        -1, 1, 96,
-       58, 0, 1263
+       58, 0, 1298
 };
-static int parser_action_row1236[] = {
+static int parser_action_row1265[] = {
        23,
-       -1, 3, 1235,
+       -1, 3, 1264,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12630,19 +12931,19 @@ static int parser_action_row1236[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1237[] = {
+static int parser_action_row1266[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1238[] = {
+static int parser_action_row1267[] = {
        1,
        -1, 1, 99
 };
-static int parser_action_row1239[] = {
+static int parser_action_row1268[] = {
        23,
-       -1, 3, 1238,
+       -1, 3, 1267,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12666,9 +12967,9 @@ static int parser_action_row1239[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1240[] = {
+static int parser_action_row1269[] = {
        23,
-       -1, 3, 1239,
+       -1, 3, 1268,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12692,19 +12993,19 @@ static int parser_action_row1240[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1241[] = {
+static int parser_action_row1270[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1242[] = {
+static int parser_action_row1271[] = {
        1,
        -1, 1, 101
 };
-static int parser_action_row1243[] = {
+static int parser_action_row1272[] = {
        23,
-       -1, 3, 1242,
+       -1, 3, 1271,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12728,87 +13029,155 @@ static int parser_action_row1243[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1244[] = {
+static int parser_action_row1273[] = {
        1,
        -1, 1, 79
 };
-static int parser_action_row1245[] = {
+static int parser_action_row1274[] = {
        1,
        -1, 1, 69
 };
-static int parser_action_row1246[] = {
+static int parser_action_row1275[] = {
        1,
        -1, 1, 71
 };
-static int parser_action_row1247[] = {
+static int parser_action_row1276[] = {
        1,
-       -1, 1, 119
+       -1, 1, 135
 };
-static int parser_action_row1248[] = {
+static int parser_action_row1277[] = {
+       1,
+       -1, 1, 125
+};
+static int parser_action_row1278[] = {
+       1,
+       -1, 1, 123
+};
+static int parser_action_row1279[] = {
+       23,
+       -1, 3, 1278,
+       12, 0, 151,
+       24, 0, 152,
+       33, 0, 153,
+       39, 0, 154,
+       41, 0, 155,
+       42, 0, 156,
+       43, 0, 43,
+       44, 0, 44,
+       45, 0, 45,
+       46, 0, 46,
+       49, 0, 157,
+       51, 0, 47,
+       53, 0, 48,
+       65, 0, 158,
+       77, 0, 49,
+       78, 0, 186,
+       79, 0, 160,
+       80, 0, 52,
+       81, 0, 53,
+       82, 0, 54,
+       83, 0, 55,
+       84, 0, 56
+};
+static int parser_action_row1280[] = {
        1,
        -1, 1, 105
 };
-static int parser_action_row1249[] = {
+static int parser_action_row1281[] = {
        1,
-       -1, 1, 330
+       -1, 1, 348
 };
-static int parser_action_row1250[] = {
+static int parser_action_row1282[] = {
        1,
-       -1, 1, 575
+       -1, 1, 593
 };
-static int parser_action_row1251[] = {
+static int parser_action_row1283[] = {
        1,
-       -1, 1, 498
+       -1, 1, 516
 };
-static int parser_action_row1252[] = {
+static int parser_action_row1284[] = {
        2,
-       -1, 3, 1251,
-       15, 0, 1270
+       -1, 3, 1283,
+       15, 0, 1306
 };
-static int parser_action_row1253[] = {
+static int parser_action_row1285[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1254[] = {
+static int parser_action_row1286[] = {
        1,
-       -1, 1, 429
+       -1, 1, 447
 };
-static int parser_action_row1255[] = {
+static int parser_action_row1287[] = {
        4,
-       -1, 3, 1254,
-       33, 0, 1272,
+       -1, 3, 1286,
+       33, 0, 1308,
        48, 0, 318,
        77, 0, 319
 };
-static int parser_action_row1256[] = {
+static int parser_action_row1288[] = {
        1,
        -1, 1, 80
 };
-static int parser_action_row1257[] = {
+static int parser_action_row1289[] = {
        1,
        -1, 1, 70
 };
-static int parser_action_row1258[] = {
+static int parser_action_row1290[] = {
        1,
        -1, 1, 72
 };
-static int parser_action_row1259[] = {
+static int parser_action_row1291[] = {
        1,
-       -1, 1, 120
+       -1, 1, 136
 };
-static int parser_action_row1260[] = {
+static int parser_action_row1292[] = {
+       1,
+       -1, 1, 126
+};
+static int parser_action_row1293[] = {
+       1,
+       -1, 1, 124
+};
+static int parser_action_row1294[] = {
+       23,
+       -1, 3, 1293,
+       12, 0, 151,
+       24, 0, 152,
+       33, 0, 153,
+       39, 0, 154,
+       41, 0, 155,
+       42, 0, 156,
+       43, 0, 43,
+       44, 0, 44,
+       45, 0, 45,
+       46, 0, 46,
+       49, 0, 157,
+       51, 0, 47,
+       53, 0, 48,
+       65, 0, 158,
+       77, 0, 49,
+       78, 0, 186,
+       79, 0, 160,
+       80, 0, 52,
+       81, 0, 53,
+       82, 0, 54,
+       83, 0, 55,
+       84, 0, 56
+};
+static int parser_action_row1295[] = {
        1,
        -1, 1, 106
 };
-static int parser_action_row1261[] = {
+static int parser_action_row1296[] = {
        1,
        -1, 1, 100
 };
-static int parser_action_row1262[] = {
+static int parser_action_row1297[] = {
        23,
-       -1, 3, 1261,
+       -1, 3, 1296,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12832,9 +13201,9 @@ static int parser_action_row1262[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1263[] = {
+static int parser_action_row1298[] = {
        23,
-       -1, 3, 1262,
+       -1, 3, 1297,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12858,19 +13227,19 @@ static int parser_action_row1263[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1264[] = {
+static int parser_action_row1299[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1265[] = {
+static int parser_action_row1300[] = {
        1,
        -1, 1, 103
 };
-static int parser_action_row1266[] = {
+static int parser_action_row1301[] = {
        23,
-       -1, 3, 1265,
+       -1, 3, 1300,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12894,17 +13263,17 @@ static int parser_action_row1266[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1267[] = {
+static int parser_action_row1302[] = {
        1,
        -1, 1, 107
 };
-static int parser_action_row1268[] = {
+static int parser_action_row1303[] = {
        1,
        -1, 1, 102
 };
-static int parser_action_row1269[] = {
+static int parser_action_row1304[] = {
        23,
-       -1, 3, 1268,
+       -1, 3, 1303,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -12928,13 +13297,17 @@ static int parser_action_row1269[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1270[] = {
+static int parser_action_row1305[] = {
        1,
        -1, 1, 109
 };
-static int parser_action_row1271[] = {
+static int parser_action_row1306[] = {
+       1,
+       -1, 1, 127
+};
+static int parser_action_row1307[] = {
        32,
-       -1, 3, 1270,
+       -1, 3, 1306,
        0, 0, 1,
        1, 0, 2,
        9, 0, 724,
@@ -12967,34 +13340,38 @@ static int parser_action_row1271[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1272[] = {
+static int parser_action_row1308[] = {
        2,
-       -1, 3, 1271,
-       26, 0, 1281
+       -1, 3, 1307,
+       26, 0, 1318
 };
-static int parser_action_row1273[] = {
+static int parser_action_row1309[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1274[] = {
+static int parser_action_row1310[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1275[] = {
+static int parser_action_row1311[] = {
+       1,
+       -1, 1, 128
+};
+static int parser_action_row1312[] = {
        1,
        -1, 1, 108
 };
-static int parser_action_row1276[] = {
+static int parser_action_row1313[] = {
        1,
        -1, 1, 104
 };
-static int parser_action_row1277[] = {
+static int parser_action_row1314[] = {
        23,
-       -1, 3, 1276,
+       -1, 3, 1313,
        12, 0, 151,
        24, 0, 152,
        33, 0, 153,
@@ -13018,51 +13395,51 @@ static int parser_action_row1277[] = {
        83, 0, 55,
        84, 0, 56
 };
-static int parser_action_row1278[] = {
+static int parser_action_row1315[] = {
        1,
        -1, 1, 111
 };
-static int parser_action_row1279[] = {
+static int parser_action_row1316[] = {
        1,
        -1, 1, 110
 };
-static int parser_action_row1280[] = {
+static int parser_action_row1317[] = {
        1,
-       -1, 1, 504
+       -1, 1, 522
 };
-static int parser_action_row1281[] = {
+static int parser_action_row1318[] = {
        2,
-       -1, 3, 1280,
+       -1, 3, 1317,
        50, 0, 172
 };
-static int parser_action_row1282[] = {
+static int parser_action_row1319[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1283[] = {
+static int parser_action_row1320[] = {
        2,
-       -1, 3, 1282,
-       46, 0, 1287
+       -1, 3, 1319,
+       46, 0, 1324
 };
-static int parser_action_row1284[] = {
+static int parser_action_row1321[] = {
        2,
-       -1, 3, 1283,
-       52, 0, 1288
+       -1, 3, 1320,
+       52, 0, 1325
 };
-static int parser_action_row1285[] = {
+static int parser_action_row1322[] = {
        1,
        -1, 1, 112
 };
-static int parser_action_row1286[] = {
+static int parser_action_row1323[] = {
        2,
-       -1, 1, 263,
-       26, 1, 503
+       -1, 1, 281,
+       26, 1, 521
 };
-static int parser_action_row1287[] = {
+static int parser_action_row1324[] = {
        22,
-       -1, 3, 1286,
+       -1, 3, 1323,
        12, 0, 772,
        24, 0, 773,
        33, 0, 774,
@@ -13085,28 +13462,28 @@ static int parser_action_row1287[] = {
        83, 0, 790,
        84, 0, 56
 };
-static int parser_action_row1288[] = {
+static int parser_action_row1325[] = {
        3,
-       -1, 1, 364,
+       -1, 1, 382,
        0, 0, 1,
        1, 0, 2
 };
-static int parser_action_row1289[] = {
+static int parser_action_row1326[] = {
        1,
-       -1, 1, 440
+       -1, 1, 458
 };
-static int parser_action_row1290[] = {
+static int parser_action_row1327[] = {
        1,
-       -1, 1, 390
+       -1, 1, 408
 };
-static int parser_action_row1291[] = {
+static int parser_action_row1328[] = {
        2,
-       -1, 3, 1290,
-       52, 0, 1291
+       -1, 3, 1327,
+       52, 0, 1328
 };
-static int parser_action_row1292[] = {
+static int parser_action_row1329[] = {
        1,
-       -1, 1, 441
+       -1, 1, 459
 };
 
 const int* const parser_action_table[] = {
@@ -14401,7 +14778,44 @@ const int* const parser_action_table[] = {
        parser_action_row1289,
        parser_action_row1290,
        parser_action_row1291,
-       parser_action_row1292
+       parser_action_row1292,
+       parser_action_row1293,
+       parser_action_row1294,
+       parser_action_row1295,
+       parser_action_row1296,
+       parser_action_row1297,
+       parser_action_row1298,
+       parser_action_row1299,
+       parser_action_row1300,
+       parser_action_row1301,
+       parser_action_row1302,
+       parser_action_row1303,
+       parser_action_row1304,
+       parser_action_row1305,
+       parser_action_row1306,
+       parser_action_row1307,
+       parser_action_row1308,
+       parser_action_row1309,
+       parser_action_row1310,
+       parser_action_row1311,
+       parser_action_row1312,
+       parser_action_row1313,
+       parser_action_row1314,
+       parser_action_row1315,
+       parser_action_row1316,
+       parser_action_row1317,
+       parser_action_row1318,
+       parser_action_row1319,
+       parser_action_row1320,
+       parser_action_row1321,
+       parser_action_row1322,
+       parser_action_row1323,
+       parser_action_row1324,
+       parser_action_row1325,
+       parser_action_row1326,
+       parser_action_row1327,
+       parser_action_row1328,
+       parser_action_row1329
 };
 
 static int parser_goto_row1[] = {
@@ -14462,12 +14876,12 @@ static int parser_goto_row8[] = {
 static int parser_goto_row9[] = {
        2,
        -1, 951,
-       953, 1051
+       953, 1052
 };
 static int parser_goto_row10[] = {
        2,
        -1, 826,
-       1049, 1128
+       1050, 1135
 };
 static int parser_goto_row11[] = {
        5,
@@ -14503,7 +14917,14 @@ static int parser_goto_row15[] = {
        693, 837
 };
 static int parser_goto_row16[] = {
-       14,
+       4,
+       -1, 1077,
+       1059, 1143,
+       1079, 1167,
+       1144, 1206
+};
+static int parser_goto_row17[] = {
+       19,
        -1, 695,
        10, 57,
        20, 57,
@@ -14517,34 +14938,39 @@ static int parser_goto_row16[] = {
        836, 963,
        837, 965,
        839, 967,
-       964, 1060
+       964, 1062,
+       975, 1078,
+       1059, 1078,
+       1075, 1162,
+       1079, 1078,
+       1144, 1078
 };
-static int parser_goto_row17[] = {
+static int parser_goto_row18[] = {
        6,
        -1, 352,
        267, 400,
        841, 969,
        843, 971,
-       958, 1054,
-       960, 1056
+       958, 1055,
+       960, 1057
 };
-static int parser_goto_row18[] = {
+static int parser_goto_row19[] = {
        8,
        -1, 462,
        400, 507,
        843, 972,
-       960, 1057,
-       969, 1065,
-       971, 1068,
-       1054, 1130,
-       1056, 1133
+       960, 1058,
+       969, 1067,
+       971, 1070,
+       1055, 1137,
+       1057, 1140
 };
-static int parser_goto_row19[] = {
+static int parser_goto_row20[] = {
        2,
        -1, 820,
        819, 944
 };
-static int parser_goto_row20[] = {
+static int parser_goto_row21[] = {
        7,
        -1, 463,
        679, 821,
@@ -14552,41 +14978,41 @@ static int parser_goto_row20[] = {
        843, 973,
        960, 973,
        971, 973,
-       1056, 973
+       1057, 973
 };
-static int parser_goto_row21[] = {
+static int parser_goto_row22[] = {
        2,
        -1, 814,
        816, 942
 };
-static int parser_goto_row22[] = {
+static int parser_goto_row23[] = {
        2,
        -1, 673,
-       940, 1042
+       940, 1043
 };
-static int parser_goto_row23[] = {
+static int parser_goto_row24[] = {
        7,
        -1, 464,
        463, 566,
        465, 569,
        567, 676,
        973, 566,
-       974, 1071,
-       1070, 1150
+       974, 1073,
+       1072, 1160
 };
-static int parser_goto_row24[] = {
+static int parser_goto_row25[] = {
        2,
        -1, 573,
        574, 680
 };
-static int parser_goto_row25[] = {
+static int parser_goto_row26[] = {
        4,
        -1, 823,
        715, 857,
-       1204, 1245,
-       1226, 1257
+       1224, 1274,
+       1251, 1289
 };
-static int parser_goto_row26[] = {
+static int parser_goto_row27[] = {
        14,
        -1, 655,
        183, 320,
@@ -14598,23 +15024,23 @@ static int parser_goto_row26[] = {
        421, 523,
        831, 957,
        835, 962,
-       848, 978,
-       854, 981,
-       900, 1009,
-       1254, 1273
+       848, 979,
+       854, 982,
+       900, 1010,
+       1286, 1309
 };
-static int parser_goto_row27[] = {
+static int parser_goto_row28[] = {
        2,
        -1, 656,
        654, 765
 };
-static int parser_goto_row28[] = {
+static int parser_goto_row29[] = {
        2,
        -1, 767,
        768, 901
 };
-static int parser_goto_row29[] = {
-       24,
+static int parser_goto_row30[] = {
+       26,
        -1, 465,
        142, 275,
        463, 567,
@@ -14626,21 +15052,23 @@ static int parser_goto_row29[] = {
        825, 949,
        843, 974,
        960, 974,
-       970, 1067,
+       970, 1069,
        971, 974,
-       973, 1070,
-       975, 1074,
-       1055, 1132,
-       1056, 974,
-       1058, 1136,
-       1062, 1141,
-       1064, 1144,
-       1137, 1190,
-       1139, 1193,
-       1142, 1197,
-       1191, 1234
+       973, 1072,
+       975, 1079,
+       976, 1081,
+       1056, 1139,
+       1057, 974,
+       1059, 1144,
+       1060, 1146,
+       1064, 1151,
+       1066, 1154,
+       1147, 1210,
+       1149, 1213,
+       1152, 1217,
+       1211, 1263
 };
-static int parser_goto_row30[] = {
+static int parser_goto_row31[] = {
        28,
        -1, 138,
        34, 148,
@@ -14657,25 +15085,25 @@ static int parser_goto_row30[] = {
        753, 888,
        762, 807,
        877, 444,
-       945, 1047,
-       992, 541,
-       1003, 1094,
-       1044, 1124,
-       1069, 1149,
-       1084, 642,
-       1134, 1186,
-       1146, 1203,
-       1148, 1205,
-       1183, 1225,
-       1185, 1227,
-       1212, 888,
-       1270, 1094
+       945, 1048,
+       993, 541,
+       1004, 1101,
+       1045, 1131,
+       1071, 1159,
+       1091, 642,
+       1141, 1202,
+       1156, 1223,
+       1158, 1225,
+       1199, 1250,
+       1201, 1252,
+       1237, 888,
+       1306, 1101
 };
-static int parser_goto_row31[] = {
+static int parser_goto_row32[] = {
        1,
        -1, 58
 };
-static int parser_goto_row32[] = {
+static int parser_goto_row33[] = {
        10,
        -1, 59,
        140, 270,
@@ -14685,16 +15113,16 @@ static int parser_goto_row32[] = {
        725, 866,
        758, 891,
        808, 935,
-       895, 1005,
-       994, 1088
+       895, 1006,
+       995, 1095
 };
-static int parser_goto_row33[] = {
+static int parser_goto_row34[] = {
        3,
        -1, 205,
        207, 355,
        403, 355
 };
-static int parser_goto_row34[] = {
+static int parser_goto_row35[] = {
        18,
        -1, 139,
        10, 60,
@@ -14712,10 +15140,10 @@ static int parser_goto_row34[] = {
        758, 271,
        808, 271,
        895, 271,
-       994, 271,
-       1083, 628
+       995, 271,
+       1090, 628
 };
-static int parser_goto_row35[] = {
+static int parser_goto_row36[] = {
        16,
        -1, 173,
        38, 175,
@@ -14729,12 +15157,12 @@ static int parser_goto_row35[] = {
        734, 872,
        760, 892,
        809, 936,
-       897, 1006,
-       1095, 1170,
-       1162, 1213,
-       1280, 1285
+       897, 1007,
+       1102, 1186,
+       1178, 1238,
+       1317, 1322
 };
-static int parser_goto_row36[] = {
+static int parser_goto_row37[] = {
        11,
        -1, 416,
        193, 331,
@@ -14746,13 +15174,13 @@ static int parser_goto_row36[] = {
        648, 757,
        652, 757,
        745, 331,
-       1091, 704
+       1098, 704
 };
-static int parser_goto_row37[] = {
+static int parser_goto_row38[] = {
        1,
        -1, 332
 };
-static int parser_goto_row38[] = {
+static int parser_goto_row39[] = {
        7,
        -1, 333,
        311, 437,
@@ -14760,30 +15188,30 @@ static int parser_goto_row38[] = {
        437, 437,
        652, 437,
        745, 437,
-       1091, 437
+       1098, 437
 };
-static int parser_goto_row39[] = {
+static int parser_goto_row40[] = {
        2,
        -1, 455,
        436, 539
 };
-static int parser_goto_row40[] = {
+static int parser_goto_row41[] = {
        5,
        -1, 805,
        810, 937,
        898, 937,
-       1048, 1127,
-       1125, 1180
+       1049, 1134,
+       1132, 1196
 };
-static int parser_goto_row41[] = {
+static int parser_goto_row42[] = {
        1,
        -1, 61
 };
-static int parser_goto_row42[] = {
+static int parser_goto_row43[] = {
        1,
        -1, 62
 };
-static int parser_goto_row43[] = {
+static int parser_goto_row44[] = {
        10,
        -1, 197,
        192, 329,
@@ -14793,45 +15221,45 @@ static int parser_goto_row43[] = {
        627, 747,
        744, 879,
        749, 885,
-       1000, 1093,
-       1090, 1166
+       1001, 1100,
+       1097, 1182
 };
-static int parser_goto_row44[] = {
+static int parser_goto_row45[] = {
        1,
        -1, 63
 };
-static int parser_goto_row45[] = {
+static int parser_goto_row46[] = {
        1,
        -1, 64
 };
-static int parser_goto_row46[] = {
+static int parser_goto_row47[] = {
        3,
        -1, 629,
        632, 752,
        751, 887
 };
-static int parser_goto_row47[] = {
+static int parser_goto_row48[] = {
        1,
        -1, 65
 };
-static int parser_goto_row48[] = {
+static int parser_goto_row49[] = {
        1,
        -1, 66
 };
-static int parser_goto_row49[] = {
+static int parser_goto_row50[] = {
        1,
        -1, 67
 };
-static int parser_goto_row50[] = {
+static int parser_goto_row51[] = {
        1,
        -1, 68
 };
-static int parser_goto_row51[] = {
+static int parser_goto_row52[] = {
        2,
        -1, 178,
        624, 741
 };
-static int parser_goto_row52[] = {
+static int parser_goto_row53[] = {
        43,
        -1, 806,
        36, 161,
@@ -14868,17 +15296,17 @@ static int parser_goto_row52[] = {
        879, 452,
        884, 474,
        885, 475,
-       987, 511,
-       1082, 610,
-       1092, 705,
-       1093, 706,
-       1165, 849,
-       1166, 850,
-       1204, 824,
-       1226, 824
+       988, 511,
+       1089, 610,
+       1099, 705,
+       1100, 706,
+       1181, 849,
+       1182, 850,
+       1224, 824,
+       1251, 824
 };
-static int parser_goto_row53[] = {
-       62,
+static int parser_goto_row54[] = {
+       70,
        -1, 162,
        40, 180,
        47, 187,
@@ -14915,38 +15343,46 @@ static int parser_goto_row53[] = {
        884, 180,
        885, 180,
        898, 180,
-       905, 1010,
-       987, 180,
-       1082, 180,
-       1092, 180,
-       1093, 180,
-       1152, 1207,
-       1163, 1214,
-       1165, 180,
-       1166, 180,
-       1171, 1217,
-       1187, 1229,
-       1194, 1237,
-       1198, 1241,
-       1208, 1247,
-       1218, 1252,
-       1230, 1259,
-       1231, 1260,
-       1235, 1264,
-       1238, 1266,
-       1239, 1267,
-       1242, 1269,
-       1261, 1274,
-       1262, 1275,
-       1265, 1277,
-       1268, 1278,
-       1276, 1284
+       905, 1011,
+       988, 180,
+       1089, 180,
+       1099, 180,
+       1100, 180,
+       1163, 1228,
+       1168, 1232,
+       1179, 1239,
+       1181, 180,
+       1182, 180,
+       1187, 1242,
+       1203, 1254,
+       1207, 1258,
+       1214, 1266,
+       1218, 1270,
+       1229, 1276,
+       1230, 1277,
+       1233, 1279,
+       1243, 1284,
+       1255, 1291,
+       1256, 1292,
+       1259, 1294,
+       1260, 1295,
+       1264, 1299,
+       1267, 1301,
+       1268, 1302,
+       1271, 1304,
+       1278, 1305,
+       1293, 1310,
+       1296, 1311,
+       1297, 1312,
+       1300, 1314,
+       1303, 1315,
+       1313, 1321
 };
-static int parser_goto_row54[] = {
+static int parser_goto_row55[] = {
        1,
        -1, 163
 };
-static int parser_goto_row55[] = {
+static int parser_goto_row56[] = {
        5,
        -1, 164,
        281, 411,
@@ -14954,11 +15390,11 @@ static int parser_goto_row55[] = {
        419, 521,
        520, 647
 };
-static int parser_goto_row56[] = {
+static int parser_goto_row57[] = {
        1,
        -1, 165
 };
-static int parser_goto_row57[] = {
+static int parser_goto_row58[] = {
        9,
        -1, 166,
        420, 522,
@@ -14970,13 +15406,13 @@ static int parser_goto_row57[] = {
        429, 531,
        430, 532
 };
-static int parser_goto_row58[] = {
+static int parser_goto_row59[] = {
        3,
        -1, 167,
        422, 524,
        423, 525
 };
-static int parser_goto_row59[] = {
+static int parser_goto_row60[] = {
        6,
        -1, 168,
        283, 413,
@@ -14985,11 +15421,11 @@ static int parser_goto_row59[] = {
        432, 534,
        433, 535
 };
-static int parser_goto_row60[] = {
+static int parser_goto_row61[] = {
        1,
        -1, 169
 };
-static int parser_goto_row61[] = {
+static int parser_goto_row62[] = {
        96,
        -1, 188,
        10, 69,
@@ -15063,32 +15499,32 @@ static int parser_goto_row61[] = {
        895, 69,
        898, 181,
        945, 69,
-       987, 181,
-       992, 630,
-       994, 69,
-       1003, 69,
-       1044, 69,
-       1048, 170,
-       1069, 69,
-       1082, 181,
-       1083, 630,
-       1084, 630,
-       1092, 181,
-       1093, 181,
-       1125, 170,
-       1134, 69,
-       1146, 69,
-       1148, 69,
-       1165, 181,
-       1166, 181,
-       1183, 69,
-       1185, 69,
-       1204, 170,
-       1212, 630,
-       1226, 170,
-       1270, 630
+       988, 181,
+       993, 630,
+       995, 69,
+       1004, 69,
+       1045, 69,
+       1049, 170,
+       1071, 69,
+       1089, 181,
+       1090, 630,
+       1091, 630,
+       1099, 181,
+       1100, 181,
+       1132, 170,
+       1141, 69,
+       1156, 69,
+       1158, 69,
+       1181, 181,
+       1182, 181,
+       1199, 69,
+       1201, 69,
+       1224, 170,
+       1237, 630,
+       1251, 170,
+       1306, 630
 };
-static int parser_goto_row62[] = {
+static int parser_goto_row63[] = {
        56,
        -1, 70,
        25, 123,
@@ -15126,12 +15562,11 @@ static int parser_goto_row62[] = {
        906, 791,
        908, 791,
        914, 791,
-       998, 123,
        999, 123,
-       1023, 791,
-       1025, 791,
+       1000, 123,
+       1024, 791,
        1026, 791,
-       1028, 791,
+       1027, 791,
        1029, 791,
        1030, 791,
        1031, 791,
@@ -15143,33 +15578,34 @@ static int parser_goto_row62[] = {
        1037, 791,
        1038, 791,
        1039, 791,
-       1104, 791,
-       1156, 123,
-       1286, 791
+       1040, 791,
+       1111, 791,
+       1172, 123,
+       1323, 791
 };
-static int parser_goto_row63[] = {
+static int parser_goto_row64[] = {
        1,
        -1, 71
 };
-static int parser_goto_row64[] = {
+static int parser_goto_row65[] = {
        1,
        -1, 72
 };
-static int parser_goto_row65[] = {
+static int parser_goto_row66[] = {
        2,
        -1, 213,
        216, 362
 };
-static int parser_goto_row66[] = {
+static int parser_goto_row67[] = {
        1,
        -1, 214
 };
-static int parser_goto_row67[] = {
+static int parser_goto_row68[] = {
        2,
        -1, 215,
        216, 363
 };
-static int parser_goto_row68[] = {
+static int parser_goto_row69[] = {
        39,
        -1, 124,
        42, 184,
@@ -15203,15 +15639,15 @@ static int parser_goto_row68[] = {
        772, 904,
        777, 909,
        785, 915,
-       916, 1020,
-       998, 585,
-       999, 1090,
-       1014, 1100,
-       1120, 1176,
-       1122, 1178,
-       1219, 1253
+       916, 1021,
+       999, 585,
+       1000, 1097,
+       1015, 1107,
+       1127, 1192,
+       1129, 1194,
+       1244, 1285
 };
-static int parser_goto_row69[] = {
+static int parser_goto_row70[] = {
        12,
        -1, 125,
        42, 185,
@@ -15223,10 +15659,10 @@ static int parser_goto_row69[] = {
        625, 743,
        626, 745,
        750, 886,
-       998, 1089,
-       999, 1091
+       999, 1096,
+       1000, 1098
 };
-static int parser_goto_row70[] = {
+static int parser_goto_row71[] = {
        9,
        -1, 73,
        69, 210,
@@ -15238,24 +15674,24 @@ static int parser_goto_row70[] = {
        285, 324,
        630, 749
 };
-static int parser_goto_row71[] = {
+static int parser_goto_row72[] = {
        4,
        -1, 552,
        553, 662,
        598, 662,
        708, 662
 };
-static int parser_goto_row72[] = {
+static int parser_goto_row73[] = {
        2,
        -1, 558,
        539, 651
 };
-static int parser_goto_row73[] = {
+static int parser_goto_row74[] = {
        2,
        -1, 559,
        555, 666
 };
-static int parser_goto_row74[] = {
+static int parser_goto_row75[] = {
        102,
        -1, 171,
        10, 74,
@@ -15325,15 +15761,14 @@ static int parser_goto_row74[] = {
        908, 792,
        914, 792,
        945, 74,
-       992, 631,
-       994, 74,
-       998, 126,
+       993, 631,
+       995, 74,
        999, 126,
-       1003, 74,
-       1023, 792,
-       1025, 792,
+       1000, 126,
+       1004, 74,
+       1024, 792,
        1026, 792,
-       1028, 792,
+       1027, 792,
        1029, 792,
        1030, 792,
        1031, 792,
@@ -15345,32 +15780,33 @@ static int parser_goto_row74[] = {
        1037, 792,
        1038, 792,
        1039, 792,
-       1044, 74,
-       1069, 74,
-       1083, 631,
-       1084, 631,
-       1104, 792,
-       1134, 74,
-       1146, 74,
-       1148, 74,
-       1156, 126,
-       1183, 74,
-       1185, 74,
-       1212, 631,
-       1270, 631,
-       1286, 792
+       1040, 792,
+       1045, 74,
+       1071, 74,
+       1090, 631,
+       1091, 631,
+       1111, 792,
+       1141, 74,
+       1156, 74,
+       1158, 74,
+       1172, 126,
+       1199, 74,
+       1201, 74,
+       1237, 631,
+       1306, 631,
+       1323, 792
 };
-static int parser_goto_row75[] = {
+static int parser_goto_row76[] = {
        2,
        -1, 75,
        77, 220
 };
-static int parser_goto_row76[] = {
+static int parser_goto_row77[] = {
        2,
        -1, 76,
        77, 221
 };
-static int parser_goto_row77[] = {
+static int parser_goto_row78[] = {
        5,
        -1, 81,
        234, 370,
@@ -15378,7 +15814,7 @@ static int parser_goto_row77[] = {
        458, 561,
        580, 686
 };
-static int parser_goto_row78[] = {
+static int parser_goto_row79[] = {
        58,
        -1, 102,
        0, 9,
@@ -15418,29 +15854,29 @@ static int parser_goto_row78[] = {
        753, 445,
        762, 895,
        820, 947,
-       877, 994,
-       944, 1046,
+       877, 995,
+       944, 1047,
        945, 445,
-       992, 994,
-       1003, 140,
-       1044, 445,
-       1047, 1126,
-       1069, 445,
-       1083, 632,
-       1084, 725,
-       1124, 1179,
-       1127, 1181,
-       1134, 445,
-       1146, 445,
-       1148, 445,
-       1180, 1221,
-       1183, 445,
-       1185, 445,
-       1212, 994,
-       1270, 725
+       993, 995,
+       1004, 140,
+       1045, 445,
+       1048, 1133,
+       1071, 445,
+       1090, 632,
+       1091, 725,
+       1131, 1195,
+       1134, 1197,
+       1141, 445,
+       1156, 445,
+       1158, 445,
+       1196, 1246,
+       1199, 445,
+       1201, 445,
+       1237, 995,
+       1306, 725
 };
-static int parser_goto_row79[] = {
-       238,
+static int parser_goto_row80[] = {
+       246,
        -1, 91,
        0, 10,
        4, 20,
@@ -15601,90 +16037,98 @@ static int parser_goto_row79[] = {
        826, 952,
        829, 955,
        843, 466,
-       852, 979,
-       860, 983,
-       868, 987,
-       870, 989,
-       871, 990,
-       873, 991,
-       890, 1004,
-       910, 1016,
-       918, 1023,
-       919, 1025,
-       920, 1026,
-       921, 1027,
-       922, 1028,
-       923, 1029,
-       924, 1030,
-       925, 1031,
-       926, 1032,
-       927, 1033,
-       928, 1034,
-       929, 1035,
-       930, 1036,
-       931, 1037,
-       932, 1038,
-       933, 1039,
-       934, 1040,
-       946, 1048,
-       950, 1049,
-       953, 1052,
+       852, 980,
+       860, 984,
+       868, 988,
+       870, 990,
+       871, 991,
+       873, 992,
+       890, 1005,
+       910, 1017,
+       918, 1024,
+       919, 1026,
+       920, 1027,
+       921, 1028,
+       922, 1029,
+       923, 1030,
+       924, 1031,
+       925, 1032,
+       926, 1033,
+       927, 1034,
+       928, 1035,
+       929, 1036,
+       930, 1037,
+       931, 1038,
+       932, 1039,
+       933, 1040,
+       934, 1041,
+       946, 1049,
+       950, 1050,
+       953, 1053,
        960, 466,
        969, 466,
        971, 466,
        973, 568,
-       974, 1072,
-       977, 1075,
-       978, 1076,
-       980, 1078,
-       981, 1079,
-       988, 1082,
-       1010, 1097,
-       1017, 1102,
-       1024, 1104,
-       1045, 1125,
-       1054, 466,
-       1056, 466,
-       1070, 1151,
-       1073, 1152,
-       1077, 1156,
-       1085, 1163,
-       1096, 1171,
-       1099, 1173,
-       1121, 1177,
-       1135, 1187,
-       1140, 1194,
-       1143, 1198,
-       1147, 1204,
-       1153, 1208,
-       1154, 1209,
-       1157, 1211,
-       1172, 1218,
-       1184, 1226,
-       1188, 1230,
-       1189, 1231,
-       1192, 1235,
-       1195, 1238,
-       1196, 1239,
-       1199, 1242,
-       1214, 1251,
-       1220, 1254,
-       1232, 1261,
-       1233, 1262,
-       1236, 1265,
-       1240, 1268,
-       1252, 1271,
-       1263, 1276,
-       1272, 1282,
-       1273, 1283,
-       1281, 1286,
-       1287, 1290
+       974, 1074,
+       978, 1082,
+       979, 1083,
+       981, 1085,
+       982, 1086,
+       989, 1089,
+       1011, 1104,
+       1018, 1109,
+       1025, 1111,
+       1046, 1132,
+       1055, 466,
+       1057, 466,
+       1072, 1161,
+       1076, 1163,
+       1080, 1168,
+       1084, 1172,
+       1092, 1179,
+       1103, 1187,
+       1106, 1189,
+       1128, 1193,
+       1142, 1203,
+       1145, 1207,
+       1150, 1214,
+       1153, 1218,
+       1157, 1224,
+       1164, 1229,
+       1166, 1230,
+       1169, 1233,
+       1170, 1234,
+       1173, 1236,
+       1188, 1243,
+       1200, 1251,
+       1204, 1255,
+       1205, 1256,
+       1208, 1259,
+       1209, 1260,
+       1212, 1264,
+       1215, 1267,
+       1216, 1268,
+       1219, 1271,
+       1231, 1278,
+       1239, 1283,
+       1245, 1286,
+       1257, 1293,
+       1261, 1296,
+       1262, 1297,
+       1265, 1300,
+       1269, 1303,
+       1284, 1307,
+       1298, 1313,
+       1308, 1319,
+       1309, 1320,
+       1318, 1323,
+       1324, 1327
 };
-static int parser_goto_row80[] = {
+static int parser_goto_row81[] = {
        1,
        -1, 11
 };
-static int parser_goto_row81[] = {
+static int parser_goto_row82[] = {
        9,
        -1, 12,
        16, 92,
@@ -15696,153 +16140,153 @@ static int parser_goto_row81[] = {
        224, 92,
        231, 92
 };
-static int parser_goto_row82[] = {
+static int parser_goto_row83[] = {
        1,
        -1, 13
 };
-static int parser_goto_row83[] = {
+static int parser_goto_row84[] = {
        4,
        -1, 467,
        400, 508,
-       969, 1066,
-       1054, 1131
+       969, 1068,
+       1055, 1138
 };
-static int parser_goto_row84[] = {
+static int parser_goto_row85[] = {
        3,
-       -1, 1014,
-       1016, 1101,
-       1027, 1107
+       -1, 1015,
+       1017, 1108,
+       1028, 1114
 };
-static int parser_goto_row85[] = {
+static int parser_goto_row86[] = {
        1,
        -1, -1
 };
-static int parser_goto_row86[] = {
+static int parser_goto_row87[] = {
        2,
        -1, 793,
-       1286, 1289
+       1323, 1326
 };
-static int parser_goto_row87[] = {
+static int parser_goto_row88[] = {
        1,
        -1, 794
 };
-static int parser_goto_row88[] = {
+static int parser_goto_row89[] = {
        5,
        -1, 795,
-       906, 1011,
-       1023, 1103,
-       1025, 1105,
-       1104, 1175
+       906, 1012,
+       1024, 1110,
+       1026, 1112,
+       1111, 1191
 };
-static int parser_goto_row89[] = {
+static int parser_goto_row90[] = {
        1,
        -1, 796
 };
-static int parser_goto_row90[] = {
+static int parser_goto_row91[] = {
        9,
        -1, 797,
-       1026, 1106,
-       1030, 1110,
-       1031, 1111,
-       1032, 1112,
-       1033, 1113,
-       1034, 1114,
-       1035, 1115,
-       1036, 1116
+       1027, 1113,
+       1031, 1117,
+       1032, 1118,
+       1033, 1119,
+       1034, 1120,
+       1035, 1121,
+       1036, 1122,
+       1037, 1123
 };
-static int parser_goto_row91[] = {
+static int parser_goto_row92[] = {
        3,
        -1, 798,
-       1028, 1108,
-       1029, 1109
+       1029, 1115,
+       1030, 1116
 };
-static int parser_goto_row92[] = {
+static int parser_goto_row93[] = {
        6,
        -1, 799,
-       908, 1015,
-       914, 1019,
-       1037, 1117,
-       1038, 1118,
-       1039, 1119
+       908, 1016,
+       914, 1020,
+       1038, 1124,
+       1039, 1125,
+       1040, 1126
 };
-static int parser_goto_row93[] = {
+static int parser_goto_row94[] = {
        1,
        -1, 800
 };
-static int parser_goto_row94[] = {
+static int parser_goto_row95[] = {
        2,
        -1, 801,
        782, 912
 };
-static int parser_goto_row95[] = {
+static int parser_goto_row96[] = {
        9,
        -1, 726,
        618, 733,
        649, 759,
        762, 896,
-       877, 995,
-       992, 1086,
-       1084, 1161,
-       1212, 1250,
-       1270, 1279
+       877, 996,
+       993, 1093,
+       1091, 1177,
+       1237, 1282,
+       1306, 1316
 };
-static int parser_goto_row96[] = {
+static int parser_goto_row97[] = {
        3,
        -1, 727,
        513, 633,
-       1083, 1160
+       1090, 1176
 };
-static int parser_goto_row97[] = {
+static int parser_goto_row98[] = {
        6,
        -1, 438,
        316, 442,
        437, 540,
        652, 764,
        745, 880,
-       1091, 1167
+       1098, 1183
 };
-static int parser_goto_row98[] = {
+static int parser_goto_row99[] = {
        1,
        -1, 439
 };
-static int parser_goto_row99[] = {
+static int parser_goto_row100[] = {
        2,
        -1, 893,
-       898, 1007
+       898, 1008
 };
-static int parser_goto_row100[] = {
+static int parser_goto_row101[] = {
        1,
        -1, 634
 };
-static int parser_goto_row101[] = {
+static int parser_goto_row102[] = {
        1,
        -1, 635
 };
-static int parser_goto_row102[] = {
+static int parser_goto_row103[] = {
        1,
        -1, 636
 };
-static int parser_goto_row103[] = {
+static int parser_goto_row104[] = {
        1,
        -1, 637
 };
-static int parser_goto_row104[] = {
+static int parser_goto_row105[] = {
        1,
        -1, 638
 };
-static int parser_goto_row105[] = {
+static int parser_goto_row106[] = {
        1,
        -1, 639
 };
-static int parser_goto_row106[] = {
+static int parser_goto_row107[] = {
        1,
        -1, 640
 };
-static int parser_goto_row107[] = {
+static int parser_goto_row108[] = {
        1,
        -1, 641
 };
-static int parser_goto_row108[] = {
+static int parser_goto_row109[] = {
        22,
        -1, 894,
        40, 182,
@@ -15856,22 +16300,22 @@ static int parser_goto_row108[] = {
        741, 876,
        746, 881,
        747, 882,
-       878, 996,
-       879, 997,
-       884, 1001,
-       885, 1002,
-       987, 1081,
-       1082, 1159,
-       1092, 1168,
-       1093, 1169,
-       1165, 1215,
-       1166, 1216
+       878, 997,
+       879, 998,
+       884, 1002,
+       885, 1003,
+       988, 1088,
+       1089, 1175,
+       1099, 1184,
+       1100, 1185,
+       1181, 1240,
+       1182, 1241
 };
-static int parser_goto_row109[] = {
+static int parser_goto_row110[] = {
        1,
        -1, -1
 };
-static int parser_goto_row110[] = {
+static int parser_goto_row111[] = {
        12,
        -1, 141,
        34, 149,
@@ -15882,28 +16326,28 @@ static int parser_goto_row110[] = {
        649, 760,
        668, 809,
        762, 897,
-       1003, 1095,
-       1084, 1162,
-       1270, 1280
+       1004, 1102,
+       1091, 1178,
+       1306, 1317
 };
-static int parser_goto_row111[] = {
+static int parser_goto_row112[] = {
        1,
        -1, -1
 };
-static int parser_goto_row112[] = {
+static int parser_goto_row113[] = {
        1,
        -1, -1
 };
-static int parser_goto_row113[] = {
+static int parser_goto_row114[] = {
        2,
        -1, 127,
-       1156, 1210
+       1172, 1235
 };
-static int parser_goto_row114[] = {
+static int parser_goto_row115[] = {
        1,
        -1, 128
 };
-static int parser_goto_row115[] = {
+static int parser_goto_row116[] = {
        5,
        -1, 129,
        238, 373,
@@ -15911,11 +16355,11 @@ static int parser_goto_row115[] = {
        384, 488,
        487, 599
 };
-static int parser_goto_row116[] = {
+static int parser_goto_row117[] = {
        1,
        -1, 130
 };
-static int parser_goto_row117[] = {
+static int parser_goto_row118[] = {
        9,
        -1, 131,
        385, 489,
@@ -15927,13 +16371,13 @@ static int parser_goto_row117[] = {
        394, 498,
        395, 499
 };
-static int parser_goto_row118[] = {
+static int parser_goto_row119[] = {
        3,
        -1, 132,
        387, 491,
        388, 492
 };
-static int parser_goto_row119[] = {
+static int parser_goto_row120[] = {
        6,
        -1, 133,
        240, 375,
@@ -15942,19 +16386,15 @@ static int parser_goto_row119[] = {
        397, 501,
        398, 502
 };
-static int parser_goto_row120[] = {
+static int parser_goto_row121[] = {
        1,
        -1, 134
 };
-static int parser_goto_row121[] = {
+static int parser_goto_row122[] = {
        2,
        -1, 135,
        114, 244
 };
-static int parser_goto_row122[] = {
-       1,
-       -1, -1
-};
 static int parser_goto_row123[] = {
        1,
        -1, -1
@@ -16004,18 +16444,22 @@ static int parser_goto_row134[] = {
        -1, -1
 };
 static int parser_goto_row135[] = {
+       1,
+       -1, -1
+};
+static int parser_goto_row136[] = {
        2,
        -1, 14,
        4, 21
 };
-static int parser_goto_row136[] = {
+static int parser_goto_row137[] = {
        4,
        -1, 15,
        4, 22,
        14, 84,
        21, 97
 };
-static int parser_goto_row137[] = {
+static int parser_goto_row138[] = {
        8,
        -1, 16,
        4, 23,
@@ -16026,14 +16470,14 @@ static int parser_goto_row137[] = {
        84, 224,
        97, 231
 };
-static int parser_goto_row138[] = {
+static int parser_goto_row139[] = {
        4,
        -1, 582,
        509, 608,
        577, 684,
        606, 717
 };
-static int parser_goto_row139[] = {
+static int parser_goto_row140[] = {
        8,
        -1, 583,
        509, 609,
@@ -16044,47 +16488,47 @@ static int parser_goto_row139[] = {
        684, 829,
        717, 860
 };
-static int parser_goto_row140[] = {
+static int parser_goto_row141[] = {
        1,
        -1, 953
 };
-static int parser_goto_row141[] = {
+static int parser_goto_row142[] = {
        1,
        -1, 816
 };
-static int parser_goto_row142[] = {
+static int parser_goto_row143[] = {
        1,
        -1, 574
 };
-static int parser_goto_row143[] = {
+static int parser_goto_row144[] = {
        1,
        -1, 768
 };
-static int parser_goto_row144[] = {
+static int parser_goto_row145[] = {
        2,
        -1, 207,
        271, 403
 };
-static int parser_goto_row145[] = {
+static int parser_goto_row146[] = {
        1,
        -1, 216
 };
-static int parser_goto_row146[] = {
+static int parser_goto_row147[] = {
        3,
        -1, 553,
        485, 598,
        593, 708
 };
-static int parser_goto_row147[] = {
+static int parser_goto_row148[] = {
        1,
        -1, 77
 };
-static int parser_goto_row148[] = {
+static int parser_goto_row149[] = {
        2,
        -1, 17,
        11, 78
 };
-static int parser_goto_row149[] = {
+static int parser_goto_row150[] = {
        3,
        -1, 18,
        17, 94,
@@ -16240,5 +16684,6 @@ const int* const parser_goto_table[] = {
        parser_goto_row146,
        parser_goto_row147,
        parser_goto_row148,
-       parser_goto_row149
+       parser_goto_row149,
+       parser_goto_row150
 };
index 585c70c..a0ca58f 100644 (file)
@@ -921,20 +921,33 @@ redef class AAttrPropdef
        redef fun accept_property_builder(v)
        do
                super
-               var name = n_id.to_symbol
+               var name: Symbol
+               if n_id != null then
+                       name = n_id.to_symbol
+               else
+                       name = ("@" + n_id2.text).to_symbol
+               end
                var lc = v.local_class
                var prop = new MMSrcAttribute(name, lc, self)
                _prop = prop
                v.local_class.add_src_local_property(v, prop)
 
-               if n_readable != null then
-                       name = n_id.text.substring_from(1).to_symbol
+               if n_readable != null or n_id == null then
+                       if n_id != null then
+                               name = n_id.text.substring_from(1).to_symbol
+                       else
+                               name = n_id2.to_symbol
+                       end
                        var readmethod = new MMReadImplementationMethod(name, lc, self)
                        _readmethod = readmethod
                        v.local_class.add_src_local_property(v, readmethod)
                end
-               if n_writable != null then
-                       name = (n_id.text.substring_from(1) + "=").to_symbol
+               if n_writable != null or n_id == null then
+                       if n_id != null then
+                               name = (n_id.text.substring_from(1) + "=").to_symbol
+                       else
+                               name = (n_id2.text + "=").to_symbol
+                       end
                        var writemethod = new MMWriteImplementationMethod(name, lc, self)
                        _writemethod = writemethod
                        v.local_class.add_src_local_property(v, writemethod)
@@ -957,17 +970,21 @@ redef class AAttrPropdef
                var signature = new MMSignature(new Array[MMType], t, v.local_class.get_type)
                prop.signature = signature
                var visibility_level = n_visibility.level
-               process_and_check(v, prop, n_kwredef != null, visibility_level)
-               if n_readable != null then
+               process_and_check(v, prop, n_id != null and n_kwredef != null, visibility_level)
+               if n_readable != null or n_id == null then
                        var m = _readmethod.as(not null)
                        m.signature = signature
-                       process_and_check(v, m, n_readable.n_kwredef != null, visibility_level)
+                       process_and_check(v, m, (n_readable != null and n_readable.n_kwredef != null) or (n_id == null and n_kwredef != null), visibility_level)
                        n_type.check_visibility(v, m)
                end
-               if n_writable != null then
+               if n_writable != null or n_id == null then
                        var m = _writemethod.as(not null)
                        m.signature = new MMSignature(new Array[MMType].with_items(t), null, v.local_class.get_type)
-                       process_and_check(v, m, n_writable.n_kwredef != null, visibility_level)
+                       var vl = visibility_level
+                       if n_id == null then
+                               if n_writable == null then vl = 3 else vl = n_writable.n_visibility.level # write accessor has a specific visibility
+                       end
+                       process_and_check(v, m, n_writable != null and n_writable.n_kwredef != null, vl)
                        n_type.check_visibility(v, m)
                end
        end
diff --git a/tests/base_attr2.nit b/tests/base_attr2.nit
new file mode 100644 (file)
index 0000000..df439a1
--- /dev/null
@@ -0,0 +1,132 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import kernel
+
+class A
+       var a1: Object = self
+       protected var a2: Object = self
+       private var a3: Object = self
+
+       var a4: Object writable = self
+       protected var a5: Object writable = self
+       private var a6: Object writable = self
+
+       var a7: Object protected writable = self
+       protected var a8: Object protected writable = self
+       private var a9: Object protected writable = self
+
+       var a10: Object private writable = self
+       protected var a11: Object private writable = self
+       private var a12: Object private writable = self
+
+       var _cpt: Int = 0
+
+       redef fun output
+       do
+               _cpt += 1
+               _cpt.output
+       end
+
+       fun foo_a(a: A)
+       do
+               a1.output
+               a1 = a
+               a2.output
+               a2 = a
+               a3.output
+               a3 = a
+               a4.output
+               a4 = a
+               a5.output
+               a5 = a
+               a6.output
+               a6 = a
+               a7.output
+               a7 = a
+               a8.output
+               a8 = a
+               a9.output
+               a9 = a
+               a10.output
+               a10 = a
+               a11.output
+               a11 = a
+               a12.output
+               a12 = a
+
+               '\n'.output
+
+               a.a1.output
+               a.a1 = a
+               a.a2.output
+               a.a2 = a
+               a.a3.output
+               a.a3 = a
+               a.a4.output
+               a.a4 = a
+               a.a5.output
+               a.a5 = a
+               a.a6.output
+               a.a6 = a
+               a.a7.output
+               a.a7 = a
+               a.a8.output
+               a.a8 = a
+               a.a9.output
+               a.a9 = a
+               a.a10.output
+               a.a10 = a
+               a.a11.output
+               a.a11 = a
+               a.a12.output
+               a.a12 = a
+
+               '\n'.output
+       end
+end
+
+fun foo(a: A)
+do
+       a.a1.output
+       a.a1 = a
+       a.a2.output
+       a.a2 = a
+       a.a3.output
+       a.a3 = a
+       a.a4.output
+       a.a4 = a
+       a.a5.output
+       a.a5 = a
+       a.a6.output
+       a.a6 = a
+       a.a7.output
+       a.a7 = a
+       a.a8.output
+       a.a8 = a
+       a.a9.output
+       a.a9 = a
+       a.a10.output
+       a.a10 = a
+       a.a11.output
+       a.a11 = a
+       a.a12.output
+       a.a12 = a
+
+       '\n'.output
+end
+
+var a = new A
+a.foo_a(a)
+foo(a)
diff --git a/tests/base_attr3.nit b/tests/base_attr3.nit
new file mode 100644 (file)
index 0000000..8961423
--- /dev/null
@@ -0,0 +1,140 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import base_attr2
+
+class B
+special A
+       fun foo_b(a: A)
+       do
+               a1.output
+               #alt1#a1 = a
+               a2.output
+               #alt1#a2 = a
+               #alt1#a3.output
+               #alt1#a3 = a
+               a4.output
+               a4 = a
+               a5.output
+               a5 = a
+               #alt1#a6.output
+               a6 = a
+               a7.output
+               a7 = a
+               a8.output
+               a8 = a
+               #alt1#a9.output
+               a9 = a
+               a10.output
+               #alt1#a10 = a
+               a11.output
+               #alt1#a11 = a
+               #alt1#a12.output
+               #alt1#a12 = a
+
+               '\n'.output
+
+               a.a1.output
+               #alt2#a.a1 = a
+               #alt2#a.a2.output
+               #alt2#a.a2 = a
+               #alt2#a.a3.output
+               #alt2#a.a3 = a
+               a.a4.output
+               a.a4 = a
+               #alt2#a.a5.output
+               a.a5 = a
+               #alt2#a.a6.output
+               a.a6 = a
+               a.a7.output
+               #alt2#a.a7 = a
+               #alt2#a.a8.output
+               #alt2#a.a8 = a
+               #alt2#a.a9.output
+               #alt2#a.a9 = a
+               a.a10.output
+               #alt2#a.a10 = a
+               #alt2#a.a11.output
+               #alt2#a.a11 = a
+               #alt2#a.a12.output
+               #alt2#a.a12 = a
+
+               '\n'.output
+       end
+end
+
+fun foo2(a: A)
+do
+       a.a1.output
+       #alt3#a.a1 = a
+       #alt3#a.a2.output
+       #alt3#a.a2 = a
+       #alt3#a.a3.output
+       #alt3#a.a3 = a
+       a.a4.output
+       a.a4 = a
+       #alt3#a.a5.output
+       a.a5 = a
+       #alt3#a.a6.output
+       a.a6 = a
+       a.a7.output
+       #alt3#a.a7 = a
+       #alt3#a.a8.output
+       #alt3#a.a8 = a
+       #alt3#a.a9.output
+       #alt3#a.a9 = a
+       a.a10.output
+       #alt3#a.a10 = a
+       #alt3#a.a11.output
+       #alt3#a.a11 = a
+       #alt3#a.a12.output
+       #alt3#a.a12 = a
+
+       '\n'.output
+end
+
+fun foo3(a: B)
+do
+       a.a1.output
+       #alt4#a.a1 = a
+       #alt4#a.a2.output
+       #alt4#a.a2 = a
+       #alt4#a.a3.output
+       #alt4#a.a3 = a
+       a.a4.output
+       a.a4 = a
+       #alt4#a.a5.output
+       a.a5 = a
+       #alt4#a.a6.output
+       a.a6 = a
+       a.a7.output
+       #alt4#a.a7 = a
+       #alt4#a.a8.output
+       #alt4#a.a8 = a
+       #alt4#a.a9.output
+       #alt4#a.a9 = a
+       a.a10.output
+       #alt4#a.a10 = a
+       #alt4#a.a11.output
+       #alt4#a.a11 = a
+       #alt4#a.a12.output
+       #alt4#a.a12 = a
+
+       '\n'.output
+end
+
+var b = new B
+b.foo_b(b)
+foo2(b)
+foo3(b)
diff --git a/tests/base_attr4.nit b/tests/base_attr4.nit
new file mode 100644 (file)
index 0000000..7511824
--- /dev/null
@@ -0,0 +1,65 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import kernel
+
+class A
+       fun foo: Int do return 1
+       fun bar=(i: Int) do i.output
+       fun baz: Int do return 4
+       fun baz=(i: Int) do i.output
+end
+
+class B
+special A
+       redef var foo: Int = 20
+       var bar: Int redef writable = 30
+       redef var baz: Int redef writable = 40
+end
+
+class C
+special B
+       redef fun foo: Int do return 100
+       redef fun bar=(i: Int) do i.output
+       redef fun baz: Int do return 400
+       redef fun baz=(i: Int) do i.output
+end
+
+var a = new A
+#alt1#a.foo = 1
+a.foo.output
+a.bar = 2
+#alt2#a.bar.output
+a.baz = 3
+a.baz.output
+
+'\n'.output
+
+var b = new B
+b.foo = 10
+b.foo.output
+b.bar = 20
+b.bar.output
+b.baz = 30
+b.baz.output
+
+'\n'.output
+
+var c = new C
+c.foo = 100
+c.foo.output
+c.bar = 200
+c.bar.output
+c.baz = 300
+c.baz.output
diff --git a/tests/base_attr5.nit b/tests/base_attr5.nit
new file mode 100644 (file)
index 0000000..c20f718
--- /dev/null
@@ -0,0 +1,68 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import kernel
+
+class A
+       fun foo: Int do return 1
+       fun bar=(i: Int)
+       do
+               '#'.output
+               i.output
+       end
+       fun baz: Int do return 3
+       fun baz=(i: Int)
+       do
+               '#'.output
+               i.output
+       end
+end
+
+class B
+special A
+       #alt1#var foo: Int = 10
+       #alt2#redef var foo: Int = 10
+       #alt3#var foo: Int writable = 10
+       #alt4#redef var foo: Int writable = 10
+       #alt5#var foo: Int redef writable = 10
+       #alt6#redef var foo: Int redef writable = 10
+
+       #alt11#var bar: Int = 20
+       #alt12#redef var bar: Int = 20
+       #alt13#var bar: Int writable = 20
+       #alt14#redef var bar: Int writable = 20
+       #alt15#var bar: Int redef writable = 20
+       #alt16#redef var bar: Int redef writable = 20
+
+       #alt21#var baz: Int = 30
+       #alt22#redef var baz: Int = 30
+       #alt23#var baz: Int writable = 30
+       #alt24#redef var baz: Int writable = 30
+       #alt25#var baz: Int redef writable = 30
+       #alt26#redef var baz: Int redef writable = 30
+end
+
+var b = new B
+b.foo.output
+#alt2#b.foo = 100
+#alt4#b.foo = 100
+b.foo.output
+'\n'.output
+#alt15#b.bar.output
+b.bar = 200
+#alt15#b.bar.output
+'\n'.output
+b.baz.output
+b.baz = 300
+b.baz.output
diff --git a/tests/base_attr6.nit b/tests/base_attr6.nit
new file mode 100644 (file)
index 0000000..3945095
--- /dev/null
@@ -0,0 +1,58 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import kernel
+
+class A
+       var foo: Int = 1
+       var bar: Int = 2
+       var baz: Int = 3
+       var vaz: Int = 4
+end
+
+class B
+special A
+       redef fun foo: Int do return super + 10
+       redef fun bar=(i: Int)
+       do
+               '#'.output
+               i.output
+               super(i+20)
+       end
+       redef fun baz: Int do return super + 30
+       redef fun baz=(i: Int)
+       do
+               '#'.output
+               i.output
+               super(i+30)
+       end
+       redef var vaz: Int redef writable = 40
+end
+
+var b = new B
+b.foo.output
+b.foo = 100
+b.foo.output
+'\n'.output
+b.bar.output
+b.bar = 200
+b.bar.output
+'\n'.output
+b.baz.output
+b.baz = 300
+b.baz.output
+'\n'.output
+b.vaz.output
+b.vaz = 400
+b.vaz.output
diff --git a/tests/sav/base_attr2.sav b/tests/sav/base_attr2.sav
new file mode 100644 (file)
index 0000000..28e67f8
--- /dev/null
@@ -0,0 +1,39 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+
diff --git a/tests/sav/base_attr3.sav b/tests/sav/base_attr3.sav
new file mode 100644 (file)
index 0000000..735c963
--- /dev/null
@@ -0,0 +1,24 @@
+1
+2
+3
+4
+5
+6
+7
+8
+
+9
+10
+11
+12
+
+13
+14
+15
+16
+
+17
+18
+19
+20
+
diff --git a/tests/sav/base_attr3_alt1.sav b/tests/sav/base_attr3_alt1.sav
new file mode 100644 (file)
index 0000000..bc181e7
--- /dev/null
@@ -0,0 +1,10 @@
+alt/base_attr3_alt1.nit:22,3--8: Visibility error: Property base_attr2::A::a1= is private.
+alt/base_attr3_alt1.nit:24,3--8: Visibility error: Property base_attr2::A::a2= is private.
+alt/base_attr3_alt1.nit:25,3--4: Visibility error: Property base_attr2::A::a3 is private.
+alt/base_attr3_alt1.nit:26,3--8: Visibility error: Property base_attr2::A::a3= is private.
+alt/base_attr3_alt1.nit:31,3--4: Visibility error: Property base_attr2::A::a6 is private.
+alt/base_attr3_alt1.nit:37,3--4: Visibility error: Property base_attr2::A::a9 is private.
+alt/base_attr3_alt1.nit:40,3--9: Visibility error: Property base_attr2::A::a10= is private.
+alt/base_attr3_alt1.nit:42,3--9: Visibility error: Property base_attr2::A::a11= is private.
+alt/base_attr3_alt1.nit:43,3--5: Visibility error: Property base_attr2::A::a12 is private.
+alt/base_attr3_alt1.nit:44,3--9: Visibility error: Property base_attr2::A::a12= is private.
diff --git a/tests/sav/base_attr3_alt2.sav b/tests/sav/base_attr3_alt2.sav
new file mode 100644 (file)
index 0000000..0e3677f
--- /dev/null
@@ -0,0 +1,17 @@
+alt/base_attr3_alt2.nit:49,3--10: Visibility error: Property base_attr2::A::a1= is private.
+alt/base_attr3_alt2.nit:50,3--6: Visibility error: Property base_attr2::A::a2 is protected and can only acceded by self.
+alt/base_attr3_alt2.nit:51,3--10: Visibility error: Property base_attr2::A::a2= is private.
+alt/base_attr3_alt2.nit:52,3--6: Visibility error: Property base_attr2::A::a3 is private.
+alt/base_attr3_alt2.nit:53,3--10: Visibility error: Property base_attr2::A::a3= is private.
+alt/base_attr3_alt2.nit:56,3--6: Visibility error: Property base_attr2::A::a5 is protected and can only acceded by self.
+alt/base_attr3_alt2.nit:58,3--6: Visibility error: Property base_attr2::A::a6 is private.
+alt/base_attr3_alt2.nit:61,3--10: Visibility error: Property base_attr2::A::a7= is protected and can only acceded by self.
+alt/base_attr3_alt2.nit:62,3--6: Visibility error: Property base_attr2::A::a8 is protected and can only acceded by self.
+alt/base_attr3_alt2.nit:63,3--10: Visibility error: Property base_attr2::A::a8= is protected and can only acceded by self.
+alt/base_attr3_alt2.nit:64,3--6: Visibility error: Property base_attr2::A::a9 is private.
+alt/base_attr3_alt2.nit:65,3--10: Visibility error: Property base_attr2::A::a9= is protected and can only acceded by self.
+alt/base_attr3_alt2.nit:67,3--11: Visibility error: Property base_attr2::A::a10= is private.
+alt/base_attr3_alt2.nit:68,3--7: Visibility error: Property base_attr2::A::a11 is protected and can only acceded by self.
+alt/base_attr3_alt2.nit:69,3--11: Visibility error: Property base_attr2::A::a11= is private.
+alt/base_attr3_alt2.nit:70,3--7: Visibility error: Property base_attr2::A::a12 is private.
+alt/base_attr3_alt2.nit:71,3--11: Visibility error: Property base_attr2::A::a12= is private.
diff --git a/tests/sav/base_attr3_alt3.sav b/tests/sav/base_attr3_alt3.sav
new file mode 100644 (file)
index 0000000..7ad1598
--- /dev/null
@@ -0,0 +1,17 @@
+alt/base_attr3_alt3.nit:80,2--9: Visibility error: Property base_attr2::A::a1= is private.
+alt/base_attr3_alt3.nit:81,2--5: Visibility error: Property base_attr2::A::a2 is protected and can only acceded by self.
+alt/base_attr3_alt3.nit:82,2--9: Visibility error: Property base_attr2::A::a2= is private.
+alt/base_attr3_alt3.nit:83,2--5: Visibility error: Property base_attr2::A::a3 is private.
+alt/base_attr3_alt3.nit:84,2--9: Visibility error: Property base_attr2::A::a3= is private.
+alt/base_attr3_alt3.nit:87,2--5: Visibility error: Property base_attr2::A::a5 is protected and can only acceded by self.
+alt/base_attr3_alt3.nit:89,2--5: Visibility error: Property base_attr2::A::a6 is private.
+alt/base_attr3_alt3.nit:92,2--9: Visibility error: Property base_attr2::A::a7= is protected and can only acceded by self.
+alt/base_attr3_alt3.nit:93,2--5: Visibility error: Property base_attr2::A::a8 is protected and can only acceded by self.
+alt/base_attr3_alt3.nit:94,2--9: Visibility error: Property base_attr2::A::a8= is protected and can only acceded by self.
+alt/base_attr3_alt3.nit:95,2--5: Visibility error: Property base_attr2::A::a9 is private.
+alt/base_attr3_alt3.nit:96,2--9: Visibility error: Property base_attr2::A::a9= is protected and can only acceded by self.
+alt/base_attr3_alt3.nit:98,2--10: Visibility error: Property base_attr2::A::a10= is private.
+alt/base_attr3_alt3.nit:99,2--6: Visibility error: Property base_attr2::A::a11 is protected and can only acceded by self.
+alt/base_attr3_alt3.nit:100,2--10: Visibility error: Property base_attr2::A::a11= is private.
+alt/base_attr3_alt3.nit:101,2--6: Visibility error: Property base_attr2::A::a12 is private.
+alt/base_attr3_alt3.nit:102,2--10: Visibility error: Property base_attr2::A::a12= is private.
diff --git a/tests/sav/base_attr3_alt4.sav b/tests/sav/base_attr3_alt4.sav
new file mode 100644 (file)
index 0000000..4b52598
--- /dev/null
@@ -0,0 +1,17 @@
+alt/base_attr3_alt4.nit:110,2--9: Visibility error: Property base_attr2::A::a1= is private.
+alt/base_attr3_alt4.nit:111,2--5: Visibility error: Property base_attr2::A::a2 is protected and can only acceded by self.
+alt/base_attr3_alt4.nit:112,2--9: Visibility error: Property base_attr2::A::a2= is private.
+alt/base_attr3_alt4.nit:113,2--5: Visibility error: Property base_attr2::A::a3 is private.
+alt/base_attr3_alt4.nit:114,2--9: Visibility error: Property base_attr2::A::a3= is private.
+alt/base_attr3_alt4.nit:117,2--5: Visibility error: Property base_attr2::A::a5 is protected and can only acceded by self.
+alt/base_attr3_alt4.nit:119,2--5: Visibility error: Property base_attr2::A::a6 is private.
+alt/base_attr3_alt4.nit:122,2--9: Visibility error: Property base_attr2::A::a7= is protected and can only acceded by self.
+alt/base_attr3_alt4.nit:123,2--5: Visibility error: Property base_attr2::A::a8 is protected and can only acceded by self.
+alt/base_attr3_alt4.nit:124,2--9: Visibility error: Property base_attr2::A::a8= is protected and can only acceded by self.
+alt/base_attr3_alt4.nit:125,2--5: Visibility error: Property base_attr2::A::a9 is private.
+alt/base_attr3_alt4.nit:126,2--9: Visibility error: Property base_attr2::A::a9= is protected and can only acceded by self.
+alt/base_attr3_alt4.nit:128,2--10: Visibility error: Property base_attr2::A::a10= is private.
+alt/base_attr3_alt4.nit:129,2--6: Visibility error: Property base_attr2::A::a11 is protected and can only acceded by self.
+alt/base_attr3_alt4.nit:130,2--10: Visibility error: Property base_attr2::A::a11= is private.
+alt/base_attr3_alt4.nit:131,2--6: Visibility error: Property base_attr2::A::a12 is private.
+alt/base_attr3_alt4.nit:132,2--10: Visibility error: Property base_attr2::A::a12= is private.
diff --git a/tests/sav/base_attr4.sav b/tests/sav/base_attr4.sav
new file mode 100644 (file)
index 0000000..635a8c2
--- /dev/null
@@ -0,0 +1,14 @@
+1
+2
+3
+4
+
+10
+20
+30
+
+100
+200
+30
+300
+400
diff --git a/tests/sav/base_attr4_alt1.sav b/tests/sav/base_attr4_alt1.sav
new file mode 100644 (file)
index 0000000..f936345
--- /dev/null
@@ -0,0 +1 @@
+alt/base_attr4_alt1.nit:40,1--9: Error: Method 'foo=' doesn't exists in A.
diff --git a/tests/sav/base_attr4_alt2.sav b/tests/sav/base_attr4_alt2.sav
new file mode 100644 (file)
index 0000000..56e09a6
--- /dev/null
@@ -0,0 +1 @@
+alt/base_attr4_alt2.nit:43,1--5: Error: Method 'bar' doesn't exists in A.
diff --git a/tests/sav/base_attr5.sav b/tests/sav/base_attr5.sav
new file mode 100644 (file)
index 0000000..d5fac5b
--- /dev/null
@@ -0,0 +1,8 @@
+1
+1
+
+#200
+
+3
+#300
+3
diff --git a/tests/sav/base_attr5_alt1.sav b/tests/sav/base_attr5_alt1.sav
new file mode 100644 (file)
index 0000000..e65b884
--- /dev/null
@@ -0,0 +1 @@
+alt/base_attr5_alt1.nit:34,2--18: Redef error: B::foo is an inherited property. To redefine it, add the redef keyword.
diff --git a/tests/sav/base_attr5_alt11.sav b/tests/sav/base_attr5_alt11.sav
new file mode 100644 (file)
index 0000000..346d578
--- /dev/null
@@ -0,0 +1 @@
+alt/base_attr5_alt11.nit:41,2--18: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.
diff --git a/tests/sav/base_attr5_alt12.sav b/tests/sav/base_attr5_alt12.sav
new file mode 100644 (file)
index 0000000..4a7fad3
--- /dev/null
@@ -0,0 +1,2 @@
+alt/base_attr5_alt12.nit:41,2--42,24: Error: No property B::bar is inherited. Remove the redef keyword to define a new property.
+alt/base_attr5_alt12.nit:41,2--42,24: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.
diff --git a/tests/sav/base_attr5_alt13.sav b/tests/sav/base_attr5_alt13.sav
new file mode 100644 (file)
index 0000000..55c9894
--- /dev/null
@@ -0,0 +1 @@
+alt/base_attr5_alt13.nit:41,2--43,27: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.
diff --git a/tests/sav/base_attr5_alt14.sav b/tests/sav/base_attr5_alt14.sav
new file mode 100644 (file)
index 0000000..32b4ed4
--- /dev/null
@@ -0,0 +1,2 @@
+alt/base_attr5_alt14.nit:41,2--44,33: Error: No property B::bar is inherited. Remove the redef keyword to define a new property.
+alt/base_attr5_alt14.nit:41,2--44,33: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.
diff --git a/tests/sav/base_attr5_alt15.sav b/tests/sav/base_attr5_alt15.sav
new file mode 100644 (file)
index 0000000..86fb0d1
--- /dev/null
@@ -0,0 +1,9 @@
+1
+1
+
+20
+200
+
+3
+#300
+3
diff --git a/tests/sav/base_attr5_alt16.sav b/tests/sav/base_attr5_alt16.sav
new file mode 100644 (file)
index 0000000..500c953
--- /dev/null
@@ -0,0 +1 @@
+alt/base_attr5_alt16.nit:41,2--46,39: Error: No property B::bar is inherited. Remove the redef keyword to define a new property.
diff --git a/tests/sav/base_attr5_alt2.sav b/tests/sav/base_attr5_alt2.sav
new file mode 100644 (file)
index 0000000..bc7c27c
--- /dev/null
@@ -0,0 +1,8 @@
+10
+100
+
+#200
+
+3
+#300
+3
diff --git a/tests/sav/base_attr5_alt21.sav b/tests/sav/base_attr5_alt21.sav
new file mode 100644 (file)
index 0000000..842b17e
--- /dev/null
@@ -0,0 +1,2 @@
+alt/base_attr5_alt21.nit:48,2--18: Redef error: B::baz is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt21.nit:48,2--18: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.
diff --git a/tests/sav/base_attr5_alt22.sav b/tests/sav/base_attr5_alt22.sav
new file mode 100644 (file)
index 0000000..cbc00dc
--- /dev/null
@@ -0,0 +1 @@
+alt/base_attr5_alt22.nit:48,2--49,24: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.
diff --git a/tests/sav/base_attr5_alt23.sav b/tests/sav/base_attr5_alt23.sav
new file mode 100644 (file)
index 0000000..3ee67c0
--- /dev/null
@@ -0,0 +1,2 @@
+alt/base_attr5_alt23.nit:48,2--50,27: Redef error: B::baz is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt23.nit:48,2--50,27: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.
diff --git a/tests/sav/base_attr5_alt24.sav b/tests/sav/base_attr5_alt24.sav
new file mode 100644 (file)
index 0000000..33d26ec
--- /dev/null
@@ -0,0 +1 @@
+alt/base_attr5_alt24.nit:48,2--51,33: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.
diff --git a/tests/sav/base_attr5_alt25.sav b/tests/sav/base_attr5_alt25.sav
new file mode 100644 (file)
index 0000000..79508d8
--- /dev/null
@@ -0,0 +1 @@
+alt/base_attr5_alt25.nit:48,2--52,33: Redef error: B::baz is an inherited property. To redefine it, add the redef keyword.
diff --git a/tests/sav/base_attr5_alt26.sav b/tests/sav/base_attr5_alt26.sav
new file mode 100644 (file)
index 0000000..38a4119
--- /dev/null
@@ -0,0 +1,7 @@
+1
+1
+
+#200
+
+30
+300
diff --git a/tests/sav/base_attr5_alt3.sav b/tests/sav/base_attr5_alt3.sav
new file mode 100644 (file)
index 0000000..b9792b5
--- /dev/null
@@ -0,0 +1 @@
+alt/base_attr5_alt3.nit:34,2--36,27: Redef error: B::foo is an inherited property. To redefine it, add the redef keyword.
diff --git a/tests/sav/base_attr5_alt4.sav b/tests/sav/base_attr5_alt4.sav
new file mode 100644 (file)
index 0000000..bc7c27c
--- /dev/null
@@ -0,0 +1,8 @@
+10
+100
+
+#200
+
+3
+#300
+3
diff --git a/tests/sav/base_attr5_alt5.sav b/tests/sav/base_attr5_alt5.sav
new file mode 100644 (file)
index 0000000..93e9b7d
--- /dev/null
@@ -0,0 +1,2 @@
+alt/base_attr5_alt5.nit:34,2--38,33: Redef error: B::foo is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt5.nit:34,2--38,33: Error: No property B::foo= is inherited. Remove the redef keyword to define a new property.
diff --git a/tests/sav/base_attr5_alt6.sav b/tests/sav/base_attr5_alt6.sav
new file mode 100644 (file)
index 0000000..7756f12
--- /dev/null
@@ -0,0 +1 @@
+alt/base_attr5_alt6.nit:34,2--39,39: Error: No property B::foo= is inherited. Remove the redef keyword to define a new property.
diff --git a/tests/sav/base_attr6.sav b/tests/sav/base_attr6.sav
new file mode 100644 (file)
index 0000000..d24973c
--- /dev/null
@@ -0,0 +1,13 @@
+11
+110
+
+2
+#200
+220
+
+33
+#300
+360
+
+40
+400